mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
66 lines
2.3 KiB
Diff
66 lines
2.3 KiB
Diff
|
From ab04dadb45a4150c9fd55b97fdd7397f4739a629 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Minda Chen <minda.chen@starfivetech.com>
|
||
|
|
Date: Mon, 8 Jan 2024 19:06:01 +0800
|
||
|
|
Subject: [PATCH 024/116] PCI: microchip: Add num_events field to struct
|
||
|
|
plda_pcie_rp
|
||
|
|
|
||
|
|
The number of events is different across platforms. In order to share
|
||
|
|
interrupt processing code, add a variable that defines the number of
|
||
|
|
events so that it can be set per-platform instead of hardcoding it.
|
||
|
|
|
||
|
|
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
|
||
|
|
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
|
||
|
|
---
|
||
|
|
drivers/pci/controller/plda/pcie-microchip-host.c | 8 +++++---
|
||
|
|
drivers/pci/controller/plda/pcie-plda.h | 1 +
|
||
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
|
||
|
|
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
|
||
|
|
@@ -653,7 +653,7 @@ static void plda_handle_event(struct irq
|
||
|
|
|
||
|
|
events = mc_get_events(port);
|
||
|
|
|
||
|
|
- for_each_set_bit(bit, &events, NUM_EVENTS)
|
||
|
|
+ for_each_set_bit(bit, &events, port->num_events)
|
||
|
|
generic_handle_domain_irq(port->event_domain, bit);
|
||
|
|
|
||
|
|
chained_irq_exit(chip, desc);
|
||
|
|
@@ -816,7 +816,8 @@ static int plda_pcie_init_irq_domains(st
|
||
|
|
return -EINVAL;
|
||
|
|
}
|
||
|
|
|
||
|
|
- port->event_domain = irq_domain_add_linear(pcie_intc_node, NUM_EVENTS,
|
||
|
|
+ port->event_domain = irq_domain_add_linear(pcie_intc_node,
|
||
|
|
+ port->num_events,
|
||
|
|
&plda_event_domain_ops,
|
||
|
|
port);
|
||
|
|
if (!port->event_domain) {
|
||
|
|
@@ -920,7 +921,7 @@ static int plda_init_interrupts(struct p
|
||
|
|
if (irq < 0)
|
||
|
|
return -ENODEV;
|
||
|
|
|
||
|
|
- for (i = 0; i < NUM_EVENTS; i++) {
|
||
|
|
+ for (i = 0; i < port->num_events; i++) {
|
||
|
|
event_irq = irq_create_mapping(port->event_domain, i);
|
||
|
|
if (!event_irq) {
|
||
|
|
dev_err(dev, "failed to map hwirq %d\n", i);
|
||
|
|
@@ -1012,6 +1013,7 @@ static int mc_host_probe(struct platform
|
||
|
|
|
||
|
|
bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
|
||
|
|
plda->bridge_addr = bridge_base_addr;
|
||
|
|
+ plda->num_events = NUM_EVENTS;
|
||
|
|
|
||
|
|
/* Allow enabling MSI by disabling MSI-X */
|
||
|
|
val = readl(bridge_base_addr + PCIE_PCI_IRQ_DW0);
|
||
|
|
--- a/drivers/pci/controller/plda/pcie-plda.h
|
||
|
|
+++ b/drivers/pci/controller/plda/pcie-plda.h
|
||
|
|
@@ -124,6 +124,7 @@ struct plda_pcie_rp {
|
||
|
|
raw_spinlock_t lock;
|
||
|
|
struct plda_msi msi;
|
||
|
|
void __iomem *bridge_addr;
|
||
|
|
+ int num_events;
|
||
|
|
};
|
||
|
|
|
||
|
|
void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
|