From: Minda Chen <minda.chen@starfivetech.com>
To: "Daire McNamara" <daire.mcnamara@microchip.com>,
"Conor Dooley" <conor@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Emil Renner Berthing" <emil.renner.berthing@canonical.com>
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 v7 11/19] PCI: microchip: Add request_event_irq() callback function
Date: Wed, 27 Sep 2023 18:07:54 +0800 [thread overview]
Message-ID: <20230927100802.46620-12-minda.chen@starfivetech.com> (raw)
In-Reply-To: <20230927100802.46620-1-minda.chen@starfivetech.com>
PolarFire register 28 interrupts symbols name.
PLDA just reguster 13 interrupts, it is not require to
register symbol name. So add a callback functions
to support StarFive and Microchip platforms.
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
---
.../pci/controller/plda/pcie-microchip-host.c | 25 ++++++++++++++++---
drivers/pci/controller/plda/pcie-plda.h | 5 ++++
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index d9dd63084e2b..e3c7d5e66150 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -798,6 +798,17 @@ static int mc_pcie_init_clks(struct device *dev)
return 0;
}
+static int mc_request_event_irq(struct plda_pcie_rp *plda, int event_irq,
+ int event)
+{
+ return devm_request_irq(plda->dev, event_irq, mc_event_handler,
+ 0, event_cause[event].sym, plda);
+}
+
+static const struct plda_event mc_event = {
+ .request_event_irq = mc_request_event_irq,
+};
+
static int plda_pcie_init_irq_domains(struct plda_pcie_rp *port)
{
struct device *dev = port->dev;
@@ -897,7 +908,9 @@ static void mc_disable_interrupts(struct mc_pcie *port)
writel_relaxed(GENMASK(31, 0), bridge_base_addr + ISTATUS_HOST);
}
-static int plda_init_interrupts(struct platform_device *pdev, struct plda_pcie_rp *port)
+static int plda_init_interrupts(struct platform_device *pdev,
+ struct plda_pcie_rp *port,
+ const struct plda_event *event)
{
struct device *dev = &pdev->dev;
int irq;
@@ -921,8 +934,12 @@ static int plda_init_interrupts(struct platform_device *pdev, struct plda_pcie_r
return -ENXIO;
}
- ret = devm_request_irq(dev, event_irq, mc_event_handler,
- 0, event_cause[i].sym, port);
+ if (event->request_event_irq)
+ ret = event->request_event_irq(port, event_irq, i);
+ else
+ ret = devm_request_irq(dev, event_irq, plda_event_handler,
+ 0, NULL, port);
+
if (ret) {
dev_err(dev, "failed to request IRQ %d\n", event_irq);
return ret;
@@ -976,7 +993,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
return ret;
/* Address translation is up; safe to enable interrupts */
- ret = plda_init_interrupts(pdev, &port->plda);
+ ret = plda_init_interrupts(pdev, &port->plda, &mc_event);
if (ret)
return ret;
diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
index 5b09ffed623c..4e0712c9365e 100644
--- a/drivers/pci/controller/plda/pcie-plda.h
+++ b/drivers/pci/controller/plda/pcie-plda.h
@@ -153,6 +153,11 @@ struct plda_pcie_rp {
int num_events;
};
+struct plda_event {
+ int (*request_event_irq)(struct plda_pcie_rp *pcie,
+ int event_irq, int event);
+};
+
irqreturn_t plda_event_handler(int irq, void *dev_id);
void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
phys_addr_t axi_addr, phys_addr_t pci_addr,
--
2.17.1
next prev parent reply other threads:[~2023-09-27 10:08 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 10:07 [PATCH v7 0/19] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
2023-09-27 10:07 ` [PATCH v7 01/19] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen
2023-09-27 10:07 ` [PATCH v7 02/19] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen
2023-09-27 10:07 ` [PATCH v7 03/19] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen
2023-09-27 10:07 ` [PATCH v7 04/19] PCI: microchip: Rename data structure Minda Chen
2023-09-27 10:07 ` [PATCH v7 05/19] PCI: microchip: Rename two setup functions Minda Chen
2023-09-27 10:07 ` [PATCH v7 06/19] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen
2023-09-27 10:07 ` [PATCH v7 07/19] PCI: plda: Move the setup functions to pcie-plda-host.c Minda Chen
2023-09-27 10:07 ` [PATCH v7 08/19] PCI: plda: Add event interrupt codes and IRQ domain ops Minda Chen
2023-09-27 10:07 ` [PATCH v7 09/19] PCI: microchip: Rename interrupt related functions Minda Chen
2023-10-09 13:39 ` Conor Dooley
2023-09-27 10:07 ` [PATCH v7 10/19] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen
2023-10-09 13:41 ` Conor Dooley
2023-09-27 10:07 ` Minda Chen [this message]
2023-10-09 13:45 ` [PATCH v7 11/19] PCI: microchip: Add request_event_irq() callback function Conor Dooley
2023-09-27 10:07 ` [PATCH v7 12/19] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen
2023-10-09 13:46 ` Conor Dooley
2023-09-27 10:07 ` [PATCH v7 13/19] PCI: microchip: Add get_events() callback function Minda Chen
2023-10-09 13:51 ` Conor Dooley
2023-09-27 10:07 ` [PATCH v7 14/19] PCI: microchip: Add event IRQ domain ops to struct plda_event Minda Chen
2023-10-09 13:54 ` Conor Dooley
2023-09-27 10:07 ` [PATCH v7 15/19] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen
2023-10-09 13:56 ` Conor Dooley
2023-09-27 10:07 ` [PATCH v7 16/19] PCI: plda: Set plda_event_handler() and event ops to static Minda Chen
2023-09-27 10:08 ` [PATCH v7 17/19] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen
2023-09-27 10:08 ` [PATCH v7 18/19] PCI: starfive: Add " Minda Chen
2023-09-27 10:08 ` [PATCH v7 19/19] riscv: dts: starfive: add PCIe dts configuration for JH7110 Minda Chen
2023-10-09 10:58 ` [PATCH v7 0/19] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
2023-10-09 11:16 ` Conor Dooley
2023-10-10 2:32 ` 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=20230927100802.46620-12-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;
as well as URLs for NNTP newsgroup(s).