mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
e2e2fc3cd0
Add updated patches for 6.6. DMA/cache-handling patches have been reworked / backported from upstream. Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
115 lines
3.6 KiB
Diff
115 lines
3.6 KiB
Diff
From 9f202f211cc79eefecbb03715c884e54eb95a62c Mon Sep 17 00:00:00 2001
|
|
From: Minda Chen <minda.chen@starfivetech.com>
|
|
Date: Mon, 8 Jan 2024 19:06:02 +0800
|
|
Subject: [PATCH 025/116] PCI: microchip: Add request_event_irq() callback
|
|
function
|
|
|
|
As PLDA dts binding doc(Documentation/devicetree/bindings/pci/
|
|
plda,xpressrich3-axi-common.yaml) showes, PLDA PCIe contains an interrupt
|
|
controller. Microchip Polarfire PCIe add some PCIe interrupts base on
|
|
PLDA IP interrupt controller.
|
|
|
|
Microchip Polarfire PCIe additional intrerrupts:
|
|
EVENT_PCIE_L2_EXIT
|
|
EVENT_PCIE_HOTRST_EXIT
|
|
EVENT_PCIE_DLUP_EXIT
|
|
EVENT_SEC_TX_RAM_SEC_ERR
|
|
EVENT_SEC_RX_RAM_SEC_ERR
|
|
....
|
|
|
|
Both codes of register interrupts and mc_event_handler() contain
|
|
additional interrupts symbol names, these can not be re-used. So add a
|
|
new plda_event_handler() functions, which implements PLDA interrupt
|
|
defalt handler. Add request_event_irq() callback function to
|
|
compat Microchip Polorfire PCIe additional interrupts.
|
|
|
|
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(-)
|
|
|
|
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
|
|
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
|
|
@@ -642,6 +642,11 @@ static irqreturn_t mc_event_handler(int
|
|
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);
|
|
@@ -803,6 +808,17 @@ static int mc_pcie_init_clks(struct devi
|
|
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
|
|
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 p
|
|
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_c
|
|
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;
|
|
|
|
--- a/drivers/pci/controller/plda/pcie-plda.h
|
|
+++ b/drivers/pci/controller/plda/pcie-plda.h
|
|
@@ -127,6 +127,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);
|