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 v11 12/20] PCI: microchip: Add request_event_irq() callback function
Date: Wed, 15 Nov 2023 19:49:04 +0800 [thread overview]
Message-ID: <20231115114912.71448-13-minda.chen@starfivetech.com> (raw)
In-Reply-To: <20231115114912.71448-1-minda.chen@starfivetech.com>
PolarFire implements specific PCIe interrupts except PLDA local interrupt.
For lack of MSI controller, these interrupts have to be added to global
event field. PolarFire driver also register additional interrupt symbol
name.
PolarFire PCIe contain total 28 interrupts event while PLDA contain 13
local interrupts event, interrupt to event num mapping is different.
So add a callback function to support different IRQ register function.
Also Add PLDA default handler function, which will be moved to pcie-
plda-host.c in moving codes patch.
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
---
.../pci/controller/plda/pcie-microchip-host.c | 31 ++++++++++++++++---
drivers/pci/controller/plda/pcie-plda.h | 5 +++
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index d42278c006bc..f89d102f4979 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -643,6 +643,11 @@ static irqreturn_t mc_event_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static irqreturn_t plda_event_handler(int irq, void *dev_id)
+{
+ return IRQ_HANDLED;
+}
+
static void plda_handle_event(struct irq_desc *desc)
{
struct plda_pcie_rp *port = irq_desc_get_handler_data(desc);
@@ -804,6 +809,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;
@@ -904,7 +920,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;
@@ -928,8 +946,13 @@ 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;
@@ -983,7 +1006,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 e3d35cef9894..28ed1374e1de 100644
--- a/drivers/pci/controller/plda/pcie-plda.h
+++ b/drivers/pci/controller/plda/pcie-plda.h
@@ -121,6 +121,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);
+};
+
void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
phys_addr_t axi_addr, phys_addr_t pci_addr,
size_t size);
--
2.17.1
next prev parent reply other threads:[~2023-11-15 11:49 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 11:48 [PATCH v11 0/20] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
2023-11-15 11:48 ` [PATCH v11 01/20] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen
2023-11-15 11:48 ` [PATCH v11 02/20] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen
2023-11-15 11:48 ` [PATCH v11 03/20] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen
2023-11-15 11:48 ` [PATCH v11 04/20] PCI: microchip: Add bridge_addr field to struct mc_pcie Minda Chen
2023-11-15 11:48 ` [PATCH v11 05/20] PCI: microchip: Rename two PCIe data structures Minda Chen
2023-11-15 11:48 ` [PATCH v11 06/20] PCI: microchip: Move PCIe host data structures to plda-pcie.h Minda Chen
2023-11-15 11:48 ` [PATCH v11 07/20] PCI: microchip: Rename two setup functions Minda Chen
2023-11-15 11:49 ` [PATCH v11 08/20] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen
2023-11-15 11:49 ` [PATCH v11 09/20] PCI: microchip: Move setup functions to pcie-plda-host.c Minda Chen
2023-11-15 11:49 ` [PATCH v11 10/20] PCI: microchip: Rename interrupt related functions Minda Chen
2023-11-15 11:49 ` [PATCH v11 11/20] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen
2023-11-15 11:49 ` Minda Chen [this message]
2023-11-15 11:49 ` [PATCH v11 13/20] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen
2023-11-15 11:49 ` [PATCH v11 14/20] PCI: microchip: Add get_events() callback function Minda Chen
2023-11-15 11:49 ` [PATCH v11 15/20] PCI: microchip: Add event IRQ domain ops to struct plda_event Minda Chen
2023-11-15 11:49 ` [PATCH v11 16/20] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen
2023-11-15 11:49 ` [PATCH v11 17/20] PCI: plda: Add event interrupt codes and host init/deinit functions Minda Chen
2023-11-15 11:49 ` [PATCH v11 18/20] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen
2023-11-15 11:49 ` [PATCH v11 19/20] PCI: starfive: Add " Minda Chen
2023-11-20 10:07 ` Minda Chen
2023-11-20 18:23 ` Bjorn Helgaas
2023-11-21 0:52 ` Minda Chen
2023-11-21 21:32 ` Bjorn Helgaas
2023-11-23 11:42 ` Minda Chen
2023-12-02 14:44 ` Emil Renner Berthing
2023-12-04 6:03 ` Minda Chen
2023-11-15 11:49 ` [PATCH v11 20/20] riscv: dts: starfive: add PCIe dts configuration for JH7110 Minda Chen
2023-11-29 6:39 ` [PATCH v11 0/20] Refactoring Microchip PCIe driver and add StarFive PCIe Damian Tometzki
2023-11-29 11:32 ` Damian Tometzki
2023-12-01 7:15 ` Minda Chen
2023-12-01 15:32 ` Damian Tometzki
2023-12-02 13:17 ` Minda Chen
2023-12-04 21:28 ` Bjorn Helgaas
2023-12-05 1:21 ` Minda Chen
2023-12-05 9:18 ` Damian Tometzki
2023-12-05 17:02 ` Bjorn Helgaas
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=20231115114912.71448-13-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).