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.

Link: https://lore.kernel.org/linux-pci/20240328091835.14797-12-minda.chen@starfivetech.com
Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index f4caca9e6e6e1fae7df9b576f4f6de772d54a358..4eba3e169b9b0fd0f19bd3baa1c968613a4dc885 100644 (file)
--- 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_desc *desc)
 
        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(struct plda_pcie_rp *port)
                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 platform_device *pdev, struct plda_pcie_r
        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);
@@ -1011,6 +1012,7 @@ static int mc_host_probe(struct platform_device *pdev)
 
        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);

diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
index e4c51b3d0c13041297f95cf0bbe5f923243017e6..2a7d82c15c8ead16828150ee738d9a2e6717b26f 100644 (file)
--- 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,