Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 449e9cae authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

genirq: Move field 'node' from irq_data into irq_common_data 



NUMA node information is per-irq instead of per-irqchip, so move it into
struct irq_common_data. Also use CONFIG_NUMA to guard irq_common_data.node.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/1433145945-789-8-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4df7f54d

include/linux/irq.h

+14 −3
Original line number Diff line number Diff line
@@ -129,9 +129,13 @@ struct irq_domain; 
 * struct irq_common_data - per irq data shared by all irqchips

 * @state_use_accessors: status information for irq chip functions.

 *			Use accessor functions to deal with it

 * @node:		node index useful for balancing

 */

struct irq_common_data {

	unsigned int		state_use_accessors;

#ifdef CONFIG_NUMA

	unsigned int		node;

#endif

};



/**
@@ -139,7 +143,6 @@ struct irq_common_data { 
 * @mask:		precomputed bitmask for accessing the chip registers

 * @irq:		interrupt number

 * @hwirq:		hardware interrupt number, local to the interrupt domain

 * @node:		node index useful for balancing

 * @common:		point to data shared by all irqchips

 * @chip:		low level interrupt hardware access

 * @domain:		Interrupt translation domain; responsible for mapping
@@ -156,7 +159,6 @@ struct irq_data { 
	u32			mask;

	unsigned int		irq;

	unsigned long		hwirq;

	unsigned int		node;

	struct irq_common_data	*common;

	struct irq_chip		*chip;

	struct irq_domain	*domain;
@@ -664,9 +666,18 @@ static inline u32 irq_get_trigger_type(unsigned int irq) 
	return d ? irqd_get_trigger_type(d) : 0;

}



static inline int irq_data_get_node(struct irq_data *d)

static inline int irq_common_data_get_node(struct irq_common_data *d)

{

#ifdef CONFIG_NUMA

	return d->node;

#else

	return 0;

#endif

}



static inline int irq_data_get_node(struct irq_data *d)

{

	return irq_common_data_get_node(d->common);

}



static inline struct cpumask *irq_get_affinity_mask(int irq)

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc) 


static inline int irq_desc_get_node(struct irq_desc *desc)

{

	return irq_data_get_node(&desc->irq_data);

	return irq_common_data_get_node(&desc->irq_common_data);

}



#ifdef CONFIG_PM_SLEEP

kernel/irq/irqdesc.c

+3 −1
Original line number Diff line number Diff line
@@ -52,11 +52,13 @@ static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node) 


static void desc_smp_init(struct irq_desc *desc, int node)

{

	desc->irq_data.node = node;

	cpumask_copy(desc->irq_data.affinity, irq_default_affinity);

#ifdef CONFIG_GENERIC_PENDING_IRQ

	cpumask_clear(desc->pending_mask);

#endif

#ifdef CONFIG_NUMA

	desc->irq_common_data.node = node;

#endif

}



#else

kernel/irq/irqdomain.c

+0 −1
Original line number Diff line number Diff line
@@ -844,7 +844,6 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain, 
		child->parent_data = irq_data;

		irq_data->irq = child->irq;

		irq_data->common = child->common;

		irq_data->node = child->node;

		irq_data->domain = domain;

	}