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 v9 14/20] PCI: microchip: Add get_events() callback function
Date: Fri, 20 Oct 2023 18:43:35 +0800 [thread overview]
Message-ID: <20231020104341.63157-15-minda.chen@starfivetech.com> (raw)
In-Reply-To: <20231020104341.63157-1-minda.chen@starfivetech.com>
PolarFire implements their own PCIe interrupts,
which added to global PCIe field for PLDA lack of
MSI controller, the interrupts to event num mapping
is different to PLDA local interrupts. So add
get_events() function pointer.
Also add struct plda_event_ops function pointer structure
to struct plda_pcie_rp.
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>
Acked-by: Conor Dooley <conor.dooley@microchip.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 e57827bdb4b3..5a8c134bf643 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -652,7 +652,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);
@@ -811,7 +811,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,
@@ -925,6 +930,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");
@@ -935,6 +945,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 fba7343f9a96..df1729095952 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
next prev parent reply other threads:[~2023-10-20 10:43 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 10:43 [PATCH v9 0/22] Refactoring Microchip PCIe driver and add StarFive PCIe Minda Chen
2023-10-20 10:43 ` [PATCH v9 01/20] dt-bindings: PCI: Add PLDA XpressRICH PCIe host common properties Minda Chen
2023-10-20 11:04 ` Krzysztof Kozlowski
2023-10-23 1:04 ` Minda Chen
2023-10-24 3:09 ` John Clark
2023-10-25 10:28 ` Conor Dooley
2023-10-25 10:41 ` Krzysztof Kozlowski
2023-10-25 13:16 ` John Clark
2023-10-20 10:43 ` [PATCH v9 02/20] PCI: microchip: Move pcie-microchip-host.c to plda directory Minda Chen
2023-10-20 10:43 ` [PATCH v9 03/20] PCI: microchip: Move PLDA IP register macros to pcie-plda.h Minda Chen
2023-10-20 10:43 ` [PATCH v9 04/20] PCI: microchip: Add bridge_addr field to struct mc_pcie Minda Chen
2023-10-20 10:43 ` [PATCH v9 05/20] PCI: microchip: Rename two PCIe data structures Minda Chen
2023-10-20 10:43 ` [PATCH v9 06/20] PCI: microchip: Move PCIe host data structure to plda-pcie.h Minda Chen
2023-10-20 10:43 ` [PATCH v9 07/20] PCI: microchip: Rename two setup functions Minda Chen
2023-10-20 10:43 ` [PATCH v9 08/20] PCI: microchip: Change the argument of plda_pcie_setup_iomems() Minda Chen
2023-10-20 10:43 ` [PATCH v9 09/20] PCI: microchip: Move setup functions to pcie-plda-host.c Minda Chen
2023-10-20 10:43 ` [PATCH v9 10/20] PCI: microchip: Rename interrupt related functions Minda Chen
2023-10-20 10:43 ` [PATCH v9 11/20] PCI: microchip: Add num_events field to struct plda_pcie_rp Minda Chen
2023-10-20 10:43 ` [PATCH v9 12/20] PCI: microchip: Add request_event_irq() callback function Minda Chen
2023-10-20 10:43 ` [PATCH v9 13/20] PCI: microchip: Add INTx and MSI event num to struct plda_event Minda Chen
2023-10-20 10:43 ` Minda Chen [this message]
2023-10-25 10:44 ` [PATCH v9 14/20] PCI: microchip: Add get_events() callback function Conor Dooley
2023-10-26 2:22 ` Minda Chen
2023-10-20 10:43 ` [PATCH v9 15/20] PCI: microchip: Add event IRQ domain ops to struct plda_event Minda Chen
2023-10-20 10:43 ` [PATCH v9 16/20] PCI: microchip: Move IRQ functions to pcie-plda-host.c Minda Chen
2023-10-20 10:43 ` [PATCH v9 17/20] PCI: plda: Add event interrupt codes and host init/deinit functions Minda Chen
2023-10-20 10:43 ` [PATCH v9 18/20] dt-bindings: PCI: Add StarFive JH7110 PCIe controller Minda Chen
2023-10-20 10:43 ` [PATCH v9 19/20] PCI: starfive: Add " Minda Chen
2023-10-24 17:52 ` Bjorn Helgaas
2023-10-25 6:24 ` Kevin Xie
2023-10-20 10:43 ` [PATCH v9 20/20] riscv: dts: starfive: add PCIe dts configuration for JH7110 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=20231020104341.63157-15-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).