openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

irqchip/gic-v3-its: Drop chunk allocation compatibility 

The chunk allocation system is now officially dead, so let's
remove it.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2018-05-27 17:03:03 +01:00
parent 147c8f376e
commit 38dd7c494c
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/irqchip/irq-gic-v3-its.c
View File

@ -1440,12 +1440,6 @@ static struct irq_chip its_irq_chip = {
* freeing is expensive. We assumes that freeing rarely occurs. * freeing is expensive. We assumes that freeing rarely occurs.
*/ */
/*
* Compatibility defines until we fully refactor the allocator
*/
#define IRQS_PER_CHUNK_SHIFT 5
#define IRQS_PER_CHUNK (1UL << IRQS_PER_CHUNK_SHIFT)
static DEFINE_MUTEX(lpi_range_lock); static DEFINE_MUTEX(lpi_range_lock);
static LIST_HEAD(lpi_range_list); static LIST_HEAD(lpi_range_list);
@ -1558,30 +1552,27 @@ static int __init its_lpi_init(u32 id_bits)
return err; return err;
} }
static unsigned long *its_lpi_alloc_chunks(int nr_irqs, u32 *base, int *nr_ids) static unsigned long *its_lpi_alloc(int nr_irqs, u32 *base, int *nr_ids)
{ {
unsigned long *bitmap = NULL; unsigned long *bitmap = NULL;
int err = 0; int err = 0;
int nr_lpis;
nr_lpis = round_up(nr_irqs, IRQS_PER_CHUNK);
do { do {
err = alloc_lpi_range(nr_lpis, base); err = alloc_lpi_range(nr_irqs, base);
if (!err) if (!err)
break; break;
nr_lpis -= IRQS_PER_CHUNK; nr_irqs /= 2;
} while (nr_lpis > 0); } while (nr_irqs > 0);
if (err) if (err)
goto out; goto out;
bitmap = kcalloc(BITS_TO_LONGS(nr_lpis), sizeof (long), GFP_ATOMIC); bitmap = kcalloc(BITS_TO_LONGS(nr_irqs), sizeof (long), GFP_ATOMIC);
if (!bitmap) if (!bitmap)
goto out; goto out;
*nr_ids = nr_lpis; *nr_ids = nr_irqs;
out: out:
if (!bitmap) if (!bitmap)
@ -1590,7 +1581,7 @@ static unsigned long *its_lpi_alloc_chunks(int nr_irqs, u32 *base, int *nr_ids)
return bitmap; return bitmap;
} }
static void its_lpi_free_chunks(unsigned long *bitmap, u32 base, u32 nr_ids) static void its_lpi_free(unsigned long *bitmap, u32 base, u32 nr_ids)
{ {
WARN_ON(free_lpi_range(base, nr_ids)); WARN_ON(free_lpi_range(base, nr_ids));
kfree(bitmap); kfree(bitmap);
@ -2213,7 +2204,7 @@ static struct its_device *its_create_device(struct its_node *its, u32 dev_id,
sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1; sz = max(sz, ITS_ITT_ALIGN) + ITS_ITT_ALIGN - 1;
itt = kzalloc(sz, GFP_KERNEL); itt = kzalloc(sz, GFP_KERNEL);
if (alloc_lpis) { if (alloc_lpis) {
lpi_map = its_lpi_alloc_chunks(nvecs, &lpi_base, &nr_lpis); lpi_map = its_lpi_alloc(nvecs, &lpi_base, &nr_lpis);
if (lpi_map) if (lpi_map)
col_map = kcalloc(nr_lpis, sizeof(*col_map), col_map = kcalloc(nr_lpis, sizeof(*col_map),
GFP_KERNEL); GFP_KERNEL);
@ -2448,9 +2439,9 @@ static void its_irq_domain_free(struct irq_domain *domain, unsigned int virq,
/* If all interrupts have been freed, start mopping the floor */ /* If all interrupts have been freed, start mopping the floor */
if (bitmap_empty(its_dev->event_map.lpi_map, if (bitmap_empty(its_dev->event_map.lpi_map,
its_dev->event_map.nr_lpis)) { its_dev->event_map.nr_lpis)) {
its_lpi_free_chunks(its_dev->event_map.lpi_map, its_lpi_free(its_dev->event_map.lpi_map,
its_dev->event_map.lpi_base, its_dev->event_map.lpi_base,
its_dev->event_map.nr_lpis); its_dev->event_map.nr_lpis);
kfree(its_dev->event_map.col_map); kfree(its_dev->event_map.col_map);
/* Unmap device/itt */ /* Unmap device/itt */
@ -2849,7 +2840,7 @@ static void its_vpe_irq_domain_free(struct irq_domain *domain,
} }
if (bitmap_empty(vm->db_bitmap, vm->nr_db_lpis)) { if (bitmap_empty(vm->db_bitmap, vm->nr_db_lpis)) {
its_lpi_free_chunks(vm->db_bitmap, vm->db_lpi_base, vm->nr_db_lpis); its_lpi_free(vm->db_bitmap, vm->db_lpi_base, vm->nr_db_lpis);
its_free_prop_table(vm->vprop_page); its_free_prop_table(vm->vprop_page);
} }
} }
@ -2864,18 +2855,18 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
BUG_ON(!vm); BUG_ON(!vm);
bitmap = its_lpi_alloc_chunks(roundup_pow_of_two(nr_irqs), &base, &nr_ids); bitmap = its_lpi_alloc(roundup_pow_of_two(nr_irqs), &base, &nr_ids);
if (!bitmap) if (!bitmap)
return -ENOMEM; return -ENOMEM;
if (nr_ids < nr_irqs) { if (nr_ids < nr_irqs) {
its_lpi_free_chunks(bitmap, base, nr_ids); its_lpi_free(bitmap, base, nr_ids);
return -ENOMEM; return -ENOMEM;
} }
vprop_page = its_allocate_prop_table(GFP_KERNEL); vprop_page = its_allocate_prop_table(GFP_KERNEL);
if (!vprop_page) { if (!vprop_page) {
its_lpi_free_chunks(bitmap, base, nr_ids); its_lpi_free(bitmap, base, nr_ids);
return -ENOMEM; return -ENOMEM;
} }
@ -2902,7 +2893,7 @@ static int its_vpe_irq_domain_alloc(struct irq_domain *domain, unsigned int virq
if (i > 0) if (i > 0)
its_vpe_irq_domain_free(domain, virq, i - 1); its_vpe_irq_domain_free(domain, virq, i - 1);
its_lpi_free_chunks(bitmap, base, nr_ids); its_lpi_free(bitmap, base, nr_ids);
its_free_prop_table(vprop_page); its_free_prop_table(vprop_page);
} }