PCI: plda: Add event bitmap field to struct plda_pcie_rp

PLDA DMA interrupts are not all implemented, and the non-implemented
interrupts should be masked. Add a bitmap field to mask the non-implemented
interrupts.

Link: https://lore.kernel.org/linux-pci/20240328091835.14797-18-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>

diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index a5442d89dfbf9288b21d53e5cd52bc5bc9f1e012..36e4aef3e5268d577fd5049d0ddd4c539f563bc1 100644 (file)
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -635,6 +635,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
 
        port->plda.event_ops = &mc_event_ops;
        port->plda.event_irq_chip = &mc_event_irq_chip;
+       port->plda.events_bitmap = GENMASK(NUM_EVENTS - 1, 0);
 
        /* Address translation is up; safe to enable interrupts */
        ret = plda_init_interrupts(pdev, &port->plda, &mc_event);

diff --git a/drivers/pci/controller/plda/pcie-plda-host.c b/drivers/pci/controller/plda/pcie-plda-host.c
index 0bded72d6eb1e09cbb9f46ecccd6c5800b62316c..33e5ebc7943387394187e37da208139775ad50d4 100644 (file)
--- a/drivers/pci/controller/plda/pcie-plda-host.c
+++ b/drivers/pci/controller/plda/pcie-plda-host.c
@@ -290,6 +290,7 @@ static void plda_handle_event(struct irq_desc *desc)
 
        events = port->event_ops->get_events(port);
 
+       events &= port->events_bitmap;
        for_each_set_bit(bit, &events, port->num_events)
                generic_handle_domain_irq(port->event_domain, bit);
 
@@ -420,8 +421,9 @@ int plda_init_interrupts(struct platform_device *pdev,
 {
        struct device *dev = &pdev->dev;
        int irq;
-       int i, intx_irq, msi_irq, event_irq;
+       int intx_irq, msi_irq, event_irq;
        int ret;
+       u32 i;
 
        if (!port->event_ops)
                port->event_ops = &plda_event_ops;
@@ -439,7 +441,7 @@ int plda_init_interrupts(struct platform_device *pdev,
        if (irq < 0)
                return -ENODEV;
 
-       for (i = 0; i < port->num_events; i++) {
+       for_each_set_bit(i, &port->events_bitmap, port->num_events) {
                event_irq = irq_create_mapping(port->event_domain, i);
                if (!event_irq) {
                        dev_err(dev, "failed to map hwirq %d\n", i);

diff --git a/drivers/pci/controller/plda/pcie-plda.h b/drivers/pci/controller/plda/pcie-plda.h
index 351ea79b38136c58229c0ff6dbc7bd01ec371017..f471a4da519887cbc652208177b124044cdd915d 100644 (file)
--- a/drivers/pci/controller/plda/pcie-plda.h
+++ b/drivers/pci/controller/plda/pcie-plda.h
@@ -160,6 +160,7 @@ struct plda_pcie_rp {
        const struct plda_event_ops *event_ops;
        const struct irq_chip *event_irq_chip;
        void __iomem *bridge_addr;
+       unsigned long events_bitmap;
        int num_events;
 };