public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Minda Chen <minda.chen@starfivetech.com>
To: "Conor Dooley" <conor@kernel.org>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Daire McNamara" <daire.mcnamara@microchip.com>,
	"Emil Renner Berthing" <emil.renner.berthing@canonical.com>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>
Cc: <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-riscv@lists.infradead.org>, <linux-pci@vger.kernel.org>,
	Paul Walmsley <paul.walmsley@sifive.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Albert Ou <aou@eecs.berkeley.edu>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Mason Huo <mason.huo@starfivetech.com>,
	Leyfoon Tan <leyfoon.tan@starfivetech.com>,
	Kevin Xie <kevin.xie@starfivetech.com>,
	Minda Chen <minda.chen@starfivetech.com>
Subject: [PATCH v8 15/22] PCI: microchip: Add get_events() callback function
Date: Wed, 11 Oct 2023 19:05:07 +0800	[thread overview]
Message-ID: <20231011110514.107528-16-minda.chen@starfivetech.com> (raw)
In-Reply-To: <20231011110514.107528-1-minda.chen@starfivetech.com>

For different interrupts to event num mapping function,
add get_events() function pointer.

For extenting event ops in the fucture, Add struct
plda_event_ops data structure.

plda_handle_events() will call the get_events() callback
function pointer directly. For the robustness of codes,
add checking in plda_init_interrupts().

Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
---
 drivers/pci/controller/plda/pcie-microchip-host.c | 14 +++++++++++++-
 drivers/pci/controller/plda/pcie-plda.h           |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index e99498b5b563..fca1520d56c9 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -647,7 +647,7 @@ static void plda_handle_event(struct irq_desc *desc)
 
 	chained_irq_enter(chip, desc);
 
-	events = mc_get_events(port);
+	events = port->event_ops->get_events(port);
 
 	for_each_set_bit(bit, &events, port->num_events)
 		generic_handle_domain_irq(port->event_domain, bit);
@@ -806,7 +806,12 @@ static int mc_request_event_irq(struct plda_pcie_rp *plda, int event_irq,
 				0, event_cause[event].sym, plda);
 }
 
+static const struct plda_event_ops mc_event_ops = {
+	.get_events = mc_get_events,
+};
+
 static const struct plda_event mc_event = {
+	.event_ops              = &mc_event_ops,
 	.request_event_irq      = mc_request_event_irq,
 	.intx_event             = EVENT_LOCAL_PM_MSI_INT_INTX,
 	.msi_event              = EVENT_LOCAL_PM_MSI_INT_MSI,
@@ -920,6 +925,11 @@ static int plda_init_interrupts(struct platform_device *pdev,
 	int i, intx_irq, msi_irq, event_irq;
 	int ret;
 
+	if (!event->event_ops || !event->event_ops->get_events) {
+		dev_err(dev, "no get events ops\n");
+		return -EINVAL;
+	}
+
 	ret = plda_pcie_init_irq_domains(port);
 	if (ret) {
 		dev_err(dev, "failed creating IRQ domains\n");
@@ -930,6 +940,8 @@ static int plda_init_interrupts(struct platform_device *pdev,
 	if (irq < 0)
 		return -ENODEV;
 
+	port->event_ops = event->event_ops;
+
 	for (i = 0; i < port->num_events; i++) {
 		event_irq = irq_create_mapping(port->event_domain, i);
 		if (!event_irq) {
diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
index 5ad1b81c0086..6571a4befac9 100644
--- a/drivers/pci/controller/plda/pcie-plda.h
+++ b/drivers/pci/controller/plda/pcie-plda.h
@@ -102,6 +102,12 @@
 #define EVENT_PM_MSI_INT_SYS_ERR		12
 #define NUM_PLDA_EVENTS				13
 
+struct plda_pcie_rp;
+
+struct plda_event_ops {
+	u32 (*get_events)(struct plda_pcie_rp *pcie);
+};
+
 struct plda_msi {
 	struct mutex lock;		/* Protect used bitmap */
 	struct irq_domain *msi_domain;
@@ -117,11 +123,13 @@ struct plda_pcie_rp {
 	struct irq_domain *event_domain;
 	raw_spinlock_t lock;
 	struct plda_msi msi;
+	const struct plda_event_ops *event_ops;
 	void __iomem *bridge_addr;
 	int num_events;
 };
 
 struct plda_event {
+	const struct plda_event_ops *event_ops;
 	int (*request_event_irq)(struct plda_pcie_rp *pcie,
 				 int event_irq, int event);
 	int intx_event;
-- 
2.17.1


  parent reply	other threads:[~2023-10-11 11:07 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-11 11:04 [PATCH v8 0/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
2023-10-11 11:04 ` [PATCH v8 01/22] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen
2023-10-11 11:04 ` [PATCH v8 02/22] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen
2023-10-11 11:04 ` [PATCH v8 03/22] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen
2023-10-11 11:04 ` [PATCH v8 04/22] PCI: microchip: Add bridge_addr field to struct mc_pcie Minda Chen
2023-10-18 10:39   ` Conor Dooley
2023-10-11 11:04 ` [PATCH v8 05/22] PCI: microchip: Rename two PCIe data structures Minda Chen
2023-10-18 10:40   ` Conor Dooley
2023-10-11 11:04 ` [PATCH v8 06/22] PCI: microchip: Move PCIe host data structure to plda-pcie.h Minda Chen
2023-10-18 10:41   ` Conor Dooley
2023-10-11 11:04 ` [PATCH v8 07/22] PCI: microchip: Rename two setup functions Minda Chen
2023-10-11 11:05 ` [PATCH v8 08/22] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen
2023-10-11 11:05 ` [PATCH v8 09/22] PCI: microchip: Move the setup functions to pcie-plda-host.c Minda Chen
2023-10-11 11:05 ` [PATCH v8 10/22] PCI: plda: Add PLDA default event IRQ handler Minda Chen
2023-10-18 10:44   ` Conor Dooley
2023-10-18 10:50     ` Minda Chen
2023-10-11 11:05 ` [PATCH v8 11/22] PCI: microchip: Rename interrupt related functions Minda Chen
2023-10-11 11:05 ` [PATCH v8 12/22] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen
2023-10-11 11:05 ` [PATCH v8 13/22] PCI: microchip: Add request_event_irq() callback function Minda Chen
2023-10-18 10:53   ` Conor Dooley
2023-10-11 11:05 ` [PATCH v8 14/22] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen
2023-10-11 11:05 ` Minda Chen [this message]
2023-10-18 11:27   ` [PATCH v8 15/22] PCI: microchip: Add get_events() callback function Conor Dooley
2023-10-11 11:05 ` [PATCH v8 16/22] PCI: microchip: Add event IRQ domain ops to struct plda_event Minda Chen
2023-10-18 11:30   ` Conor Dooley
2023-10-19  7:39     ` Minda Chen
2023-10-11 11:05 ` [PATCH v8 17/22] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen
2023-10-11 11:05 ` [PATCH v8 18/22] PCI: plda: Set plda_event_handler() to static Minda Chen
2023-10-11 11:05 ` [PATCH v8 19/22] PCI: plda: Add event interrupt codes and IRQ domain ops Minda Chen
2023-10-11 11:05 ` [PATCH v8 20/22] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen
2023-10-11 11:05 ` [PATCH v8 21/22] PCI: starfive: Add " Minda Chen
2023-10-11 11:05 ` [PATCH v8 22/22] riscv: dts: starfive: add PCIe dts configuration for JH7110 Minda Chen
2023-10-17  5:43 ` [PATCH v8 0/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231011110514.107528-16-minda.chen@starfivetech.com \
    --to=minda.chen@starfivetech.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=bhelgaas@google.com \
    --cc=conor@kernel.org \
    --cc=daire.mcnamara@microchip.com \
    --cc=devicetree@vger.kernel.org \
    --cc=emil.renner.berthing@canonical.com \
    --cc=kevin.xie@starfivetech.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=kw@linux.com \
    --cc=leyfoon.tan@starfivetech.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=lpieralisi@kernel.org \
    --cc=mason.huo@starfivetech.com \
    --cc=p.zabel@pengutronix.de \
    --cc=palmer@dabbelt.com \
    --cc=paul.walmsley@sifive.com \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox