|
|
@@ -483,15 +483,13 @@ static int nwl_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,
|
|
|
int i;
|
|
|
|
|
|
mutex_lock(&msi->lock);
|
|
|
- bit = bitmap_find_next_zero_area(msi->bitmap, INT_PCI_MSI_NR, 0,
|
|
|
- nr_irqs, 0);
|
|
|
- if (bit >= INT_PCI_MSI_NR) {
|
|
|
+ bit = bitmap_find_free_region(msi->bitmap, INT_PCI_MSI_NR,
|
|
|
+ get_count_order(nr_irqs));
|
|
|
+ if (bit < 0) {
|
|
|
mutex_unlock(&msi->lock);
|
|
|
return -ENOSPC;
|
|
|
}
|
|
|
|
|
|
- bitmap_set(msi->bitmap, bit, nr_irqs);
|
|
|
-
|
|
|
for (i = 0; i < nr_irqs; i++) {
|
|
|
irq_domain_set_info(domain, virq + i, bit + i, &nwl_irq_chip,
|
|
|
domain->host_data, handle_simple_irq,
|
|
|
@@ -509,7 +507,8 @@ static void nwl_irq_domain_free(struct irq_domain *domain, unsigned int virq,
|
|
|
struct nwl_msi *msi = &pcie->msi;
|
|
|
|
|
|
mutex_lock(&msi->lock);
|
|
|
- bitmap_clear(msi->bitmap, data->hwirq, nr_irqs);
|
|
|
+ bitmap_release_region(msi->bitmap, data->hwirq,
|
|
|
+ get_count_order(nr_irqs));
|
|
|
mutex_unlock(&msi->lock);
|
|
|
}
|
|
|
|