Skip to content

Commit b0b0b8b

Browse files
paliLorenzo Pieralisi
authored andcommitted
PCI: aardvark: Fix support for MSI interrupts
Aardvark hardware supports Multi-MSI and MSI_FLAG_MULTI_PCI_MSI is already set for the MSI chip. But when allocating MSI interrupt numbers for Multi-MSI, the numbers need to be properly aligned, otherwise endpoint devices send MSI interrupt with incorrect numbers. Fix this issue by using function bitmap_find_free_region() instead of bitmap_find_next_zero_area(). To ensure that aligned MSI interrupt numbers are used by endpoint devices, we cannot use Linux virtual irq numbers (as they are random and not properly aligned). Instead we need to use the aligned hwirq numbers. This change fixes receiving MSI interrupts on Armada 3720 boards and allows using NVMe disks which use Multi-MSI feature with 3 interrupts. Without this NVMe disks freeze booting as linux nvme-core.c is waiting 60s for an interrupt. Link: https://lore.kernel.org/r/20220110015018.26359-4-kabel@kernel.org Signed-off-by: Pali Rohár <pali@kernel.org> Signed-off-by: Marek Behún <kabel@kernel.org> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
1 parent 805dfc1 commit b0b0b8b

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

drivers/pci/controller/pci-aardvark.c

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ static void advk_msi_irq_compose_msi_msg(struct irq_data *data,
11801180

11811181
msg->address_lo = lower_32_bits(msi_msg);
11821182
msg->address_hi = upper_32_bits(msi_msg);
1183-
msg->data = data->irq;
1183+
msg->data = data->hwirq;
11841184
}
11851185

11861186
static int advk_msi_set_affinity(struct irq_data *irq_data,
@@ -1197,15 +1197,11 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain,
11971197
int hwirq, i;
11981198

11991199
mutex_lock(&pcie->msi_used_lock);
1200-
hwirq = bitmap_find_next_zero_area(pcie->msi_used, MSI_IRQ_NUM,
1201-
0, nr_irqs, 0);
1202-
if (hwirq >= MSI_IRQ_NUM) {
1203-
mutex_unlock(&pcie->msi_used_lock);
1204-
return -ENOSPC;
1205-
}
1206-
1207-
bitmap_set(pcie->msi_used, hwirq, nr_irqs);
1200+
hwirq = bitmap_find_free_region(pcie->msi_used, MSI_IRQ_NUM,
1201+
order_base_2(nr_irqs));
12081202
mutex_unlock(&pcie->msi_used_lock);
1203+
if (hwirq < 0)
1204+
return -ENOSPC;
12091205

12101206
for (i = 0; i < nr_irqs; i++)
12111207
irq_domain_set_info(domain, virq + i, hwirq + i,
@@ -1223,7 +1219,7 @@ static void advk_msi_irq_domain_free(struct irq_domain *domain,
12231219
struct advk_pcie *pcie = domain->host_data;
12241220

12251221
mutex_lock(&pcie->msi_used_lock);
1226-
bitmap_clear(pcie->msi_used, d->hwirq, nr_irqs);
1222+
bitmap_release_region(pcie->msi_used, d->hwirq, order_base_2(nr_irqs));
12271223
mutex_unlock(&pcie->msi_used_lock);
12281224
}
12291225

0 commit comments

Comments
 (0)