Skip to content

Commit a576fff

Browse files
mindachen1987bjorn-helgaas
authored andcommitted
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/[email protected] Signed-off-by: Minda Chen <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 4602c37 commit a576fff

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

drivers/pci/controller/plda/pcie-microchip-host.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
635635

636636
port->plda.event_ops = &mc_event_ops;
637637
port->plda.event_irq_chip = &mc_event_irq_chip;
638+
port->plda.events_bitmap = GENMASK(NUM_EVENTS - 1, 0);
638639

639640
/* Address translation is up; safe to enable interrupts */
640641
ret = plda_init_interrupts(pdev, &port->plda, &mc_event);

drivers/pci/controller/plda/pcie-plda-host.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,7 @@ static void plda_handle_event(struct irq_desc *desc)
290290

291291
events = port->event_ops->get_events(port);
292292

293+
events &= port->events_bitmap;
293294
for_each_set_bit(bit, &events, port->num_events)
294295
generic_handle_domain_irq(port->event_domain, bit);
295296

@@ -420,8 +421,9 @@ int plda_init_interrupts(struct platform_device *pdev,
420421
{
421422
struct device *dev = &pdev->dev;
422423
int irq;
423-
int i, intx_irq, msi_irq, event_irq;
424+
int intx_irq, msi_irq, event_irq;
424425
int ret;
426+
u32 i;
425427

426428
if (!port->event_ops)
427429
port->event_ops = &plda_event_ops;
@@ -439,7 +441,7 @@ int plda_init_interrupts(struct platform_device *pdev,
439441
if (irq < 0)
440442
return -ENODEV;
441443

442-
for (i = 0; i < port->num_events; i++) {
444+
for_each_set_bit(i, &port->events_bitmap, port->num_events) {
443445
event_irq = irq_create_mapping(port->event_domain, i);
444446
if (!event_irq) {
445447
dev_err(dev, "failed to map hwirq %d\n", i);

drivers/pci/controller/plda/pcie-plda.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ struct plda_pcie_rp {
160160
const struct plda_event_ops *event_ops;
161161
const struct irq_chip *event_irq_chip;
162162
void __iomem *bridge_addr;
163+
unsigned long events_bitmap;
163164
int num_events;
164165
};
165166

0 commit comments

Comments
 (0)