Commit 9dc6be3d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/irqdomain: Add map counter 



Add a map counter instead of counting radix tree entries for
diagnosis. That also gives correct information for linear domains.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Link: http://lkml.kernel.org/r/20170619235444.459397746@linutronix.de
parent ae904caf

include/linux/irqdomain.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,7 @@ struct irq_domain_chip_generic; 
 * @host_data: private data pointer for use by owner.  Not touched by irq_domain

 * @host_data: private data pointer for use by owner.  Not touched by irq_domain

 *             core code.

 *             core code.

 * @flags: host per irq_domain flags

 * @flags: host per irq_domain flags

 * @mapcount: The number of mapped interrupts

 *

 *

 * Optional elements

 * Optional elements

 * @of_node: Pointer to device tree nodes associated with the irq_domain. Used

 * @of_node: Pointer to device tree nodes associated with the irq_domain. Used
@@ -152,6 +153,7 @@ struct irq_domain { 
	const struct irq_domain_ops *ops;

	const struct irq_domain_ops *ops;

	void *host_data;

	void *host_data;

	unsigned int flags;

	unsigned int flags;

	unsigned int mapcount;





	/* Optional data */

	/* Optional data */

	struct fwnode_handle *fwnode;

	struct fwnode_handle *fwnode;

kernel/irq/irqdomain.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,7 @@ void irq_domain_disassociate(struct irq_domain *domain, unsigned int irq) 




	irq_data->domain = NULL;

	irq_data->domain = NULL;

	irq_data->hwirq = 0;

	irq_data->hwirq = 0;

	domain->mapcount--;





	/* Clear reverse map for this hwirq */

	/* Clear reverse map for this hwirq */

	if (hwirq < domain->revmap_size) {

	if (hwirq < domain->revmap_size) {
@@ -474,6 +475,7 @@ int irq_domain_associate(struct irq_domain *domain, unsigned int virq, 
			domain->name = irq_data->chip->name;

			domain->name = irq_data->chip->name;

	}

	}





	domain->mapcount++;

	if (hwirq < domain->revmap_size) {

	if (hwirq < domain->revmap_size) {

		domain->linear_revmap[hwirq] = virq;

		domain->linear_revmap[hwirq] = virq;

	} else {

	} else {
@@ -1081,6 +1083,7 @@ static void irq_domain_insert_irq(int virq) 
		struct irq_domain *domain = data->domain;

		struct irq_domain *domain = data->domain;

		irq_hw_number_t hwirq = data->hwirq;

		irq_hw_number_t hwirq = data->hwirq;





		domain->mapcount++;

		if (hwirq < domain->revmap_size) {

		if (hwirq < domain->revmap_size) {

			domain->linear_revmap[hwirq] = virq;

			domain->linear_revmap[hwirq] = virq;

		} else {

		} else {
@@ -1110,6 +1113,7 @@ static void irq_domain_remove_irq(int virq) 
		struct irq_domain *domain = data->domain;

		struct irq_domain *domain = data->domain;

		irq_hw_number_t hwirq = data->hwirq;

		irq_hw_number_t hwirq = data->hwirq;





		domain->mapcount--;

		if (hwirq < domain->revmap_size) {

		if (hwirq < domain->revmap_size) {

			domain->linear_revmap[hwirq] = 0;

			domain->linear_revmap[hwirq] = 0;

		} else {

		} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE