Split struct irq_data into common part and per-chip part
Subsystems (27)
v3 cover Split struct irq_data into common part and per-chip part
Hi all,
Now the irq core supports hierarchy irq and stacked irqchips,
so there may be multiple irq_datas associated with the same irq. But some fields in struct irq_data are per-irq instance and duplicating those fields into multiple irq_data may cause troubles.
So this patch introduces a new data structure 'structirq_common_data' to host per-irq instance data fields, and struct irq_data will only host per-chip data fields after the conversion.
It's based on tip/x86/apic.
And it passes Fengguang's zeroday test suite.
V2->V3:
1) Add patch 1-2 to fix a regression revealed by this patch set. It caused me about ten days to shoot down this bug, and it also proves that this patch set is the right thing to do.
2) Split changes into per-arch slices
3) Kill the last direct reference to data->common->handler_data from file drivers/sh/intc/virq.c.
V1->V2:
1) Patch "net/mlx4: Cache irq_desc->affinity instead of irq_desc" is still kept to avoid build failure. It may be dropped if Amir Vadai changed related code.
2) Reorganize patches according to Thomas's suggestion.
3) Rename irq_data_get_msi() as irq_data_get_msi_desc().
Thanks!
Gerry
Jiang Liu (36):
genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
genirq: Fix crash caused by irq_move_irq() when hierarch irqdomain is
enabled
genirq: Introduce struct irq_common_data to host shared irq data
genirq: Introduce helper function irq_data_get_node()
x86, irq: Use accessor irq_data_get_node() to hide struct irq_data
detail
sh, irq: Use accessor irq_data_get_node() to hide struct irq_data
detail
genirq: Move field 'node' from struct irq_data into struct
irq_common_data
sparc, irq: Use helper irq_data_get_irq_handler_data() to hide
irq_desc details
x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc
details
x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc
details
sh, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc
details
genirq: Move field 'handler_data' from struct irq_data into struct
irq_common_data
mn10300: Fix incorrect use of data->affinity
genirq: Introduce helper function irq_data_get_affinity_mask() alpha, irq: Use access helper irq_data_get_affinity_mask() ARM, irq: Use access helper irq_data_get_affinity_mask() ARM64, irq: Use access helper irq_data_get_affinity_mask() blackfin, irq: Use access helper irq_data_get_affinity_mask() IA64, irq: Use access helper irq_data_get_affinity_mask() metag, irq: Use access helper irq_data_get_affinity_mask() mips, irq: Use access helper irq_data_get_affinity_mask() mn10300, irq: Use access helper irq_data_get_affinity_mask() parisc, irq: Use access helper irq_data_get_affinity_mask() powerpc, irq: Use access helper irq_data_get_affinity_mask() sh, irq: Use access helper irq_data_get_affinity_mask() sparc, irq: Use access helper irq_data_get_affinity_mask() x86, irq: Use access helper irq_data_get_affinity_mask() xtensa, irq: Use access helper irq_data_get_affinity_mask() irqchip, irq: Use access helper irq_data_get_affinity_mask() net/mlx4: Cache irq_desc->affinity instead of irq_desc
genirq: Move field 'affinity' from struct irq_data into struct
irq_common_data
genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
genirq: Use helper function to access irq_data->msi_desc
genirq: Move field 'msi_desc' from struct irq_data into struct
irq_common_data
genirq: Pass irq_data to helper function
__irq_set_chip_handler_name_locked()
genirq: Optimize irq_data_to_desc() to avoid irq_to_desc() lookup
arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 4 +- arch/arm64/kernel/irq.c | 4 +- arch/blackfin/mach-common/ints-priority.c | 3 +- arch/ia64/kernel/iosapic.c | 8 +- arch/ia64/kernel/irq.c | 6 +- arch/ia64/kernel/msi_ia64.c | 6 +- arch/ia64/sn/kernel/msi_sn.c | 4 +- arch/metag/kernel/irq.c | 10 ++- arch/mips/alchemy/common/irq.c | 4 +- arch/mips/bcm63xx/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 14 ++-- arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 +- arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/irq.c | 13 +-- arch/parisc/kernel/irq.c | 12 +-- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 4 +- arch/powerpc/sysdev/xics/ics-rtas.c | 4 +- arch/sh/kernel/irq.c | 9 ++- arch/sparc/kernel/irq_64.c | 27 ++++--- arch/sparc/kernel/leon_kernel.c | 6 +- arch/sparc/kernel/sun4d_irq.c | 4 +- arch/sparc/kernel/sun4m_irq.c | 6 +- arch/tile/kernel/pci_gx.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/msi.c | 2 +- arch/x86/kernel/apic/vector.c | 13 ++- arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/irq.c | 5 +- arch/x86/platform/uv/uv_irq.c | 2 +- arch/xtensa/kernel/irq.c | 10 ++- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpio/gpio-zynq.c | 9 +-- drivers/irqchip/irq-metag-ext.c | 5 +- drivers/irqchip/irq-mips-gic.c | 13 ++- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- drivers/parisc/iosapic.c | 2 +- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/msi.c | 4 +- drivers/sh/intc/chip.c | 6 +- drivers/sh/intc/virq.c | 12 +-- drivers/xen/events/events_base.c | 4 +- include/linux/irq.h | 112 +++++++++++++++++--------- include/linux/irqdesc.h | 23 ++++-- kernel/irq/chip.c | 4 +- kernel/irq/internals.h | 17 ++-- kernel/irq/irqdesc.c | 27 +++---- kernel/irq/irqdomain.c | 5 +- kernel/irq/manage.c | 14 ++-- kernel/irq/migration.c | 9 ++- kernel/irq/proc.c | 4 +- 54 files changed, 277 insertions(+), 209 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v3 1/36 genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
For irq associated with hierarchy irqdomains, there will be multiple irq_datas for one irq_desc. So enhance irq_data_to_desc() to support hierarchy irqdomain. Also export irq_data_to_desc() as an inline function for later reuse.
--- include/linux/irqdesc.h | 9 +++++++++ kernel/irq/internals.h | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-)
include/linux/irqdesc.h +9 -0
@@ -93,6 +93,15 @@ struct irq_desc {extern struct irq_desc irq_desc[NR_IRQS ];#endif +static inline struct irq_desc *irq_data_to_desc (struct irq_data *data) +{ +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY +return irq_to_desc (data->irq); +#else + return container_of(data, struct irq_desc, irq_data); +#endif +} +static inline struct irq_data *irq_desc_get_irq_data (struct irq_desc *desc) {return &desc->irq_data;
kernel/irq/internals.h +0 -2
@@ -59,8 +59,6 @@ enum {#include "debug.h" #include "settings.h" -#define irq_data_to_desc (data) container_of(data, struct irq_desc, irq_data) -extern int __irq_set_trigger (struct irq_desc *desc,unsigned int irq,unsigned long flags);extern void __disable_irq (struct irq_desc *desc,unsigned int irq);
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:x86/apic] genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
Commit-ID: c7cfc94096db28d3072b402c224eb50349926e24 Gitweb: http://git.kernel.org/tip/c7cfc94096db28d3072b402c224eb50349926e24 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:10 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Jun 2015 10:10:16 +0200
genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
For irq associated with hierarchy irqdomains, there will be multiple irq_datas for one irq_desc. So enhance irq_data_to_desc() to support hierarchy irqdomain. Also export irq_data_to_desc() as an inline function for later reuse.
--- include/linux/irqdesc.h | 9 +++++++++ kernel/irq/internals.h | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-)
include/linux/irqdesc.h +9 -0
@@ -93,6 +93,15 @@ struct irq_desc {extern struct irq_desc irq_desc[NR_IRQS ];#endif +static inline struct irq_desc *irq_data_to_desc (struct irq_data *data) +{ +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY +return irq_to_desc (data->irq); +#else + return container_of(data, struct irq_desc, irq_data); +#endif +} +static inline struct irq_data *irq_desc_get_irq_data (struct irq_desc *desc) {return &desc->irq_data;
kernel/irq/internals.h +0 -2
@@ -59,8 +59,6 @@ enum {#include "debug.h" #include "settings.h" -#define irq_data_to_desc (data) container_of(data, struct irq_desc, irq_data) -extern int __irq_set_trigger (struct irq_desc *desc,unsigned int irq,unsigned long flags);extern void __disable_irq (struct irq_desc *desc,unsigned int irq);
tip-bot for Jiang Liu
merge bot[tip:irq/core] genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
In reply to Jiang Liugenirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
Commit-ID: 7bbf1dd24b17b9ec4f47c43ce4e05bf190745553 Gitweb: http://git.kernel.org/tip/7bbf1dd24b17b9ec4f47c43ce4e05bf190745553 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:10 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 12 Jun 2015 16:54:21 +0200
genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain
For irq associated with hierarchy irqdomains, there will be multiple irq_datas for one irq_desc. So enhance irq_data_to_desc() to support hierarchy irqdomain. Also export irq_data_to_desc() as an inline function for later reuse.
--- include/linux/irqdesc.h | 9 +++++++++ kernel/irq/internals.h | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-)
include/linux/irqdesc.h +9 -0
@@ -93,6 +93,15 @@ struct irq_desc {extern struct irq_desc irq_desc[NR_IRQS ];#endif +static inline struct irq_desc *irq_data_to_desc (struct irq_data *data) +{ +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY +return irq_to_desc (data->irq); +#else + return container_of(data, struct irq_desc, irq_data); +#endif +} +static inline struct irq_data *irq_desc_get_irq_data (struct irq_desc *desc) {return &desc->irq_data;
kernel/irq/internals.h +0 -2
@@ -59,8 +59,6 @@ enum {#include "debug.h" #include "settings.h" -#define irq_data_to_desc (data) container_of(data, struct irq_desc, irq_data) -extern int __irq_set_trigger (struct irq_desc *desc,unsigned int irq,unsigned long flags);extern void __disable_irq (struct irq_desc *desc,unsigned int irq);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH v3 2/36 genirq: Fix crash caused by irq_move_irq() when hierarch irqdomain is enabled
In reply to Jiang LiuFunction irq_move_irq() and irq_move_masked_irq() expects that caller passes the top-level irq_data to them when hierarchy irqdomain is enabled. But that's not true when called by apic_ack_edge(), and then causes null pointer dereference by idata->chip->irq_mask(idata).
Instead of fixing callers to passing top-level irq_data, this patch enhances irq_move_irq()/irq_move_masked_irq() to accept any irq_data.
--- kernel/irq/migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/irq/migration.c +8 -1
@@ -7,7 +7,7 @@void irq_move_masked_irq (struct irq_data *idata) {struct irq_desc *desc =irq_data_to_desc (idata); -struct irq_chip *chip = idata->chip; +struct irq_chip *chip = desc->irq_data.chip;if (likely (!irqd_is_setaffinity_pending (&desc->irq_data)))return ;
@@ -52,6 +52,13 @@ void irq_move_irq(struct irq_data *idata) {bool masked; +/* +* Get top level irq_data when CONFIG_IRQ_DOMAIN_HIERARCHY is enabled, +* and it should be optimized away when CONFIG_IRQ_DOMAIN_HIERARCHY is +* disabled. So we avoid an "#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY" here. +*/ + idata =irq_desc_get_irq_data (irq_data_to_desc (idata)); +if (likely (!irqd_is_setaffinity_pending (idata)))return ;
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:x86/apic] genirq: Prevent crash in irq_move_irq()
genirq: Prevent crash in irq_move_irq()
Commit-ID: 458526ec81d755dfaa17f3d863302afe6fbefca0 Gitweb: http://git.kernel.org/tip/458526ec81d755dfaa17f3d863302afe6fbefca0 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:11 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Jun 2015 09:23:28 +0200
genirq: Prevent crash in irq_move_irq()
The functions irq_move_irq() and irq_move_masked_irq() expect that the caller passes the top-level irq_data to them when hierarchical irqdomains are enabled. But that's not true when called from apic_ack_edge(), which results in a null pointer dereference by idata->chip->irq_mask(idata).
Instead of fixing callers to passing top-level irq_data, we rather change irq_move_irq()/irq_move_masked_irq() to accept any irq_data.
--- kernel/irq/migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/irq/migration.c +8 -1
@@ -7,7 +7,7 @@void irq_move_masked_irq (struct irq_data *idata) {struct irq_desc *desc =irq_data_to_desc (idata); -struct irq_chip *chip = idata->chip; +struct irq_chip *chip = desc->irq_data.chip;if (likely (!irqd_is_setaffinity_pending (&desc->irq_data)))return ;
@@ -52,6 +52,13 @@ void irq_move_irq(struct irq_data *idata) {bool masked; +/* +* Get top level irq_data when CONFIG_IRQ_DOMAIN_HIERARCHY is enabled, +* and it should be optimized away when CONFIG_IRQ_DOMAIN_HIERARCHY is +* disabled. So we avoid an "#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY" here. +*/ + idata =irq_desc_get_irq_data (irq_data_to_desc (idata)); +if (likely (!irqd_is_setaffinity_pending (idata)))return ;
Re: [tip:x86/apic] genirq: Prevent crash in irq_move_irq()
Quoted 15 lines · tip-bot for Jiang Liu
Commit-ID: 458526ec81d755dfaa17f3d863302afe6fbefca0 Gitweb: http://git.kernel.org/tip/458526ec81d755dfaa17f3d863302afe6fbefca0 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:11 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Jun 2015 09:23:28 +0200genirq: Prevent crash in
irq_move_irq()The functions
irq_move_irq()andirq_move_masked_irq()expect that the caller passes the top-levelirq_datato them when hierarchical irqdomains are enabled. But that's not true when called fromapic_ack_edge(), which results in a null pointer dereference byidata->chip->irq_mask(idata).
Quoted 4 lines
Instead of fixing callers to passing top-level
irq_data, we rather change irq_move_irq()/irq_move_masked_irq() to accept anyirq_data.Fixes 52f518a3a7c 'x86/MSI: Use hierarchical irqdomains to manage MSI interrupts'
Hi Thomas,
This patch has dependency on patch "[Patch v3 01/36] genirq:
Enhance irq_data_to_desc() to support hierarchy irqdomain" in the same patch set, otherwise irq_data_to_desc(idata) may return invalid irq_desc and may cause memory crash.
Thanks!
Gerry
Re: [tip:x86/apic] genirq: Prevent crash in irq_move_irq()
Quoted 19 lines · Jiang Liu
Quoted 18 lines · tip-bot for Jiang Liu
Commit-ID: 458526ec81d755dfaa17f3d863302afe6fbefca0 Gitweb: http://git.kernel.org/tip/458526ec81d755dfaa17f3d863302afe6fbefca0 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:11 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Jun 2015 09:23:28 +0200genirq: Prevent crash in
irq_move_irq()The functions
irq_move_irq()andirq_move_masked_irq()expect that the caller passes the top-levelirq_datato them when hierarchical irqdomains are enabled. But that's not true when called fromapic_ack_edge(), which results in a null pointer dereference byidata->chip->irq_mask(idata).Instead of fixing callers to passing top-level
irq_data, we rather change irq_move_irq()/irq_move_masked_irq() to accept anyirq_data.
Quoted 6 lines
Quoted 1 line
Fixes 52f518a3a7c 'x86/MSI: Use hierarchical irqdomains to manage MSI interrupts'Hi Thomas,
This patch has dependency on patch "[Patch v3 01/36] genirq:
Enhanceirq_data_to_desc()to support hierarchy irqdomain" in the same patch set, otherwiseirq_data_to_desc(idata)may return invalidirq_descand may cause memory crash.
That's why you should not mix bug fixes with performance improvement series.
Thanks,
tglx
Re: [tip:x86/apic] genirq: Prevent crash in irq_move_irq()
Quoted 23 lines · Thomas Gleixner
Quoted 19 lines · Jiang Liu
Quoted 18 lines · tip-bot for Jiang Liu
Commit-ID: 458526ec81d755dfaa17f3d863302afe6fbefca0 Gitweb: http://git.kernel.org/tip/458526ec81d755dfaa17f3d863302afe6fbefca0 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:11 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Jun 2015 09:23:28 +0200genirq: Prevent crash in
irq_move_irq()The functions
irq_move_irq()andirq_move_masked_irq()expect that the caller passes the top-levelirq_datato them when hierarchical irqdomains are enabled. But that's not true when called fromapic_ack_edge(), which results in a null pointer dereference byidata->chip->irq_mask(idata).Instead of fixing callers to passing top-level
irq_data, we rather change irq_move_irq()/irq_move_masked_irq() to accept anyirq_data.
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
Fixes 52f518a3a7c 'x86/MSI: Use hierarchical irqdomains to manage MSI interrupts'Hi Thomas,
This patch has dependency on patch "[Patch v3 01/36] genirq:
Enhanceirq_data_to_desc()to support hierarchy irqdomain" in the same patch set, otherwiseirq_data_to_desc(idata)may return invalidirq_descand may cause memory crash.That's why you should not mix bug fixes with performance improvement series.
Yes, it's a lesson. I always fall into troubles when managing several inter-dependent patch sets at the same time.
Thanks!
Gerry
tip-bot for Jiang Liu
merge bot[tip:x86/apic] genirq: Prevent crash in irq_move_irq()
In reply to Jiang Liugenirq: Prevent crash in irq_move_irq()
Commit-ID: f6b1464f647424bbeb609ec832428e4079940701 Gitweb: http://git.kernel.org/tip/f6b1464f647424bbeb609ec832428e4079940701 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:11 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 16 Jun 2015 10:10:20 +0200
genirq: Prevent crash in irq_move_irq()
The functions irq_move_irq() and irq_move_masked_irq() expect that the caller passes the top-level irq_data to them when hierarchical irqdomains are enabled. But that's not true when called from apic_ack_edge(), which results in a null pointer dereference by idata->chip->irq_mask(idata).
Instead of fixing callers to passing top-level irq_data, we rather change irq_move_irq()/irq_move_masked_irq() to accept any irq_data.
--- kernel/irq/migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/irq/migration.c +8 -1
@@ -7,7 +7,7 @@void irq_move_masked_irq (struct irq_data *idata) {struct irq_desc *desc =irq_data_to_desc (idata); -struct irq_chip *chip = idata->chip; +struct irq_chip *chip = desc->irq_data.chip;if (likely (!irqd_is_setaffinity_pending (&desc->irq_data)))return ;
@@ -52,6 +52,13 @@ void irq_move_irq(struct irq_data *idata) {bool masked; +/* +* Get top level irq_data when CONFIG_IRQ_DOMAIN_HIERARCHY is enabled, +* and it should be optimized away when CONFIG_IRQ_DOMAIN_HIERARCHY is +* disabled. So we avoid an "#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY" here. +*/ + idata =irq_desc_get_irq_data (irq_data_to_desc (idata)); +if (likely (!irqd_is_setaffinity_pending (idata)))return ;
tip-bot for Jiang Liu
merge bot[tip:irq/core] genirq: Prevent crash in irq_move_irq()
In reply to Jiang Liugenirq: Prevent crash in irq_move_irq()
Commit-ID: 77ed42f18edd486e9994ccd1f174076309a6343f Gitweb: http://git.kernel.org/tip/77ed42f18edd486e9994ccd1f174076309a6343f Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:11 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 12 Jun 2015 16:54:21 +0200
genirq: Prevent crash in irq_move_irq()
The functions irq_move_irq() and irq_move_masked_irq() expect that the caller passes the top-level irq_data to them when hierarchical irqdomains are enabled. But that's not true when called from apic_ack_edge(), which results in a null pointer dereference by idata->chip->irq_mask(idata).
Instead of fixing callers to passing top-level irq_data, we rather change irq_move_irq()/irq_move_masked_irq() to accept any irq_data.
--- kernel/irq/migration.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/irq/migration.c +8 -1
@@ -7,7 +7,7 @@void irq_move_masked_irq (struct irq_data *idata) {struct irq_desc *desc =irq_data_to_desc (idata); -struct irq_chip *chip = idata->chip; +struct irq_chip *chip = desc->irq_data.chip;if (likely (!irqd_is_setaffinity_pending (&desc->irq_data)))return ;
@@ -52,6 +52,13 @@ void irq_move_irq(struct irq_data *idata) {bool masked; +/* +* Get top level irq_data when CONFIG_IRQ_DOMAIN_HIERARCHY is enabled, +* and it should be optimized away when CONFIG_IRQ_DOMAIN_HIERARCHY is +* disabled. So we avoid an "#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY" here. +*/ + idata =irq_desc_get_irq_data (irq_data_to_desc (idata)); +if (likely (!irqd_is_setaffinity_pending (idata)))return ;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH v3 3/36 genirq: Introduce struct irq_common_data to host shared irq data
In reply to Jiang LiuWith introduction of hierarchy irqdomain, struct irq_data becomes per-chip instead of per-irq and there may be multiple irq_datas associated with the same irq. Some per-irq data stored in struct irq_data now may get duplicated into multiple irq_datas, and causes inconsistent view.
So introduce struct irq_common_data to host per-irq common data and to achieve consistent view among irq_chips.
Other patches in this patch set will move common fields from struct irq_data into struct irq_common_data one by one.
--- include/linux/irq.h | 54 ++++++++++++++++++++++++++++------------------- include/linux/irqdesc.h | 3 ++- kernel/irq/internals.h | 10 ++++----- kernel/irq/irqdesc.c | 1 + kernel/irq/irqdomain.c | 1 + 5 files changed, 41 insertions(+), 28 deletions(-)
include/linux/irq.h +32 -22
@@ -126,13 +126,21 @@ struct msi_desc;struct irq_domain ;/** -* struct irq_data - per irq and irq chip data passed down to chip functions +* 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 +*/ +struct irq_common_data { +unsigned int state_use_accessors; +}; + +/** +* struct irq_data - per irq chip data passed down to chip functions * @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 -* @state_use_accessors: status information for irq chip functions. -* Use accessor functions to deal with it +* @common: point to data shared by all irqchips * @chip: low level interrupt hardware access * @domain: Interrupt translation domain; responsible for mapping * between hwirq number and linux irq number.
@@ -153,7 +161,7 @@ struct irq_data {unsigned int irq;unsigned long hwirq;unsigned int node; -unsigned int state_use_accessors; +struct irq_common_data *common;struct irq_chip *chip;struct irq_domain *domain;#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
@@ -166,7 +174,7 @@ struct irq_data { };/* -* Bit masks for irq_data.state +* Bit masks for irq_common_data.state_use_accessors * * IRQD_TRIGGER_MASK - Mask for the trigger type bits * IRQD_SETAFFINITY_PENDING - Affinity setting is pending
@@ -198,34 +206,36 @@ enum { IRQD_WAKEUP_ARMED = (1 << 19), }; +#define __irqd_to_state (d) ((d)->common->state_use_accessors) +static inline bool irqd_is_setaffinity_pending (struct irq_data *d) { -return d->state_use_accessors &IRQD_SETAFFINITY_PENDING ; +return __irqd_to_state (d) &IRQD_SETAFFINITY_PENDING ; }static inline bool irqd_is_per_cpu (struct irq_data *d) { -return d->state_use_accessors &IRQD_PER_CPU ; +return __irqd_to_state (d) &IRQD_PER_CPU ; }static inline bool irqd_can_balance (struct irq_data *d) { -return !(d->state_use_accessors & (IRQD_PER_CPU |IRQD_NO_BALANCING )); +return !(__irqd_to_state (d) & (IRQD_PER_CPU |IRQD_NO_BALANCING )); }static inline bool irqd_affinity_was_set (struct irq_data *d) { -return d->state_use_accessors &IRQD_AFFINITY_SET ; +return __irqd_to_state (d) &IRQD_AFFINITY_SET ; }static inline void irqd_mark_affinity_was_set (struct irq_data *d) { - d->state_use_accessors |=IRQD_AFFINITY_SET ; +__irqd_to_state (d) |=IRQD_AFFINITY_SET ; }static inline u32 irqd_get_trigger_type (struct irq_data *d) { -return d->state_use_accessors &IRQD_TRIGGER_MASK ; +return __irqd_to_state (d) &IRQD_TRIGGER_MASK ; }/*
@@ -233,43 +243,43 @@ static inline u32 irqd_get_trigger_type(struct irq_data *d)*/ static inline void irqd_set_trigger_type (struct irq_data *d,u32 type) { - d->state_use_accessors &= ~IRQD_TRIGGER_MASK ; - d->state_use_accessors |= type &IRQD_TRIGGER_MASK ; +__irqd_to_state (d) &= ~IRQD_TRIGGER_MASK ; +__irqd_to_state (d) |= type &IRQD_TRIGGER_MASK ; }static inline bool irqd_is_level_type (struct irq_data *d) { -return d->state_use_accessors &IRQD_LEVEL ; +return __irqd_to_state (d) &IRQD_LEVEL ; }static inline bool irqd_is_wakeup_set (struct irq_data *d) { -return d->state_use_accessors &IRQD_WAKEUP_STATE ; +return __irqd_to_state (d) &IRQD_WAKEUP_STATE ; }static inline bool irqd_can_move_in_process_context (struct irq_data *d) { -return d->state_use_accessors &IRQD_MOVE_PCNTXT ; +return __irqd_to_state (d) &IRQD_MOVE_PCNTXT ; }static inline bool irqd_irq_disabled (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_DISABLED ; +return __irqd_to_state (d) &IRQD_IRQ_DISABLED ; }static inline bool irqd_irq_masked (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_MASKED ; +return __irqd_to_state (d) &IRQD_IRQ_MASKED ; }static inline bool irqd_irq_inprogress (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_INPROGRESS ; +return __irqd_to_state (d) &IRQD_IRQ_INPROGRESS ; }static inline bool irqd_is_wakeup_armed (struct irq_data *d) { -return d->state_use_accessors &IRQD_WAKEUP_ARMED ; +return __irqd_to_state (d) &IRQD_WAKEUP_ARMED ; }
@@ -280,12 +290,12 @@ static inline bool irqd_is_wakeup_armed(struct irq_data *d)*/ static inline void irqd_set_chained_irq_inprogress (struct irq_data *d) { - d->state_use_accessors |=IRQD_IRQ_INPROGRESS ; +__irqd_to_state (d) |=IRQD_IRQ_INPROGRESS ; }static inline void irqd_clr_chained_irq_inprogress (struct irq_data *d) { - d->state_use_accessors &= ~IRQD_IRQ_INPROGRESS ; +__irqd_to_state (d) &= ~IRQD_IRQ_INPROGRESS ; }static inline irq_hw_number_t irqd_to_hwirq (struct irq_data *d)
include/linux/irqdesc.h +2 -1
@@ -17,7 +17,7 @@ struct pt_regs;/** * struct irq_desc - interrupt descriptor -* @irq_data: per irq and chip data passed down to chip functions +* @irq_common_data: per irq and chip data passed down to chip functions * @kstat_irqs: irq stats per cpu * @handle_irq: highlevel irq-events handler * @preflow_handler: handler called before the flow handler (currently used by sparc)
@@ -47,6 +47,7 @@ struct pt_regs;* @name: flow handler name for /proc/interrupts output */ struct irq_desc { +struct irq_common_data irq_common_data;struct irq_data irq_data;unsigned int __percpu *kstat_irqs;irq_flow_handler_t handle_irq;
kernel/irq/internals.h +5 -5
@@ -168,27 +168,27 @@ irq_put_desc_unlock(struct irq_desc *desc, unsigned long flags)*/ static inline void irqd_set_move_pending (struct irq_data *d) { - d->state_use_accessors |=IRQD_SETAFFINITY_PENDING ; +__irqd_to_state (d) |=IRQD_SETAFFINITY_PENDING ; }static inline void irqd_clr_move_pending (struct irq_data *d) { - d->state_use_accessors &= ~IRQD_SETAFFINITY_PENDING ; +__irqd_to_state (d) &= ~IRQD_SETAFFINITY_PENDING ; }static inline void irqd_clear (struct irq_data *d,unsigned int mask) { - d->state_use_accessors &= ~mask; +__irqd_to_state (d) &= ~mask; }static inline void irqd_set (struct irq_data *d,unsigned int mask) { - d->state_use_accessors |= mask; +__irqd_to_state (d) |= mask; }static inline bool irqd_has_set (struct irq_data *d,unsigned int mask) { -return d->state_use_accessors & mask; +return __irqd_to_state (d) & mask; }static inline void kstat_incr_irqs_this_cpu (unsigned int irq,struct irq_desc *desc)
kernel/irq/irqdesc.c +1 -0
@@ -76,6 +76,7 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, {int cpu; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ;
kernel/irq/irqdomain.c +1 -0
@@ -834,6 +834,7 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain,if (irq_data) { child->parent_data = irq_data; irq_data->irq = child->irq; + irq_data->common = child->common; irq_data->node = child->node; irq_data->domain = domain; }
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] genirq: Introduce struct irq_common_data to host shared irq data
genirq: Introduce struct irq_common_data to host shared irq data
Commit-ID: 0d0b4c866bcce647f40d73efe5e90aeeb079050a Gitweb: http://git.kernel.org/tip/0d0b4c866bcce647f40d73efe5e90aeeb079050a Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:12 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 12 Jun 2015 16:54:21 +0200
genirq: Introduce struct irq_common_data to host shared irq data
With the introduction of hierarchy irqdomain, struct irq_data becomes per-chip instead of per-irq and there may be multiple irq_datas associated with the same irq. Some per-irq data stored in struct irq_data now may get duplicated into multiple irq_datas, and causes inconsistent view.
So introduce struct irq_common_data to host per-irq common data and to achieve consistent view among irq_chips.
--- include/linux/irq.h | 54 +++++++++++++++++++++++++++++-------------------- include/linux/irqdesc.h | 3 ++- kernel/irq/internals.h | 10 ++++----- kernel/irq/irqdesc.c | 1 + kernel/irq/irqdomain.c | 1 + 5 files changed, 41 insertions(+), 28 deletions(-)
include/linux/irq.h +32 -22
@@ -126,13 +126,21 @@ struct msi_desc;struct irq_domain ;/** -* struct irq_data - per irq and irq chip data passed down to chip functions +* 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 +*/ +struct irq_common_data { +unsigned int state_use_accessors; +}; + +/** +* struct irq_data - per irq chip data passed down to chip functions * @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 -* @state_use_accessors: status information for irq chip functions. -* Use accessor functions to deal with it +* @common: point to data shared by all irqchips * @chip: low level interrupt hardware access * @domain: Interrupt translation domain; responsible for mapping * between hwirq number and linux irq number.
@@ -153,7 +161,7 @@ struct irq_data {unsigned int irq;unsigned long hwirq;unsigned int node; -unsigned int state_use_accessors; +struct irq_common_data *common;struct irq_chip *chip;struct irq_domain *domain;#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
@@ -166,7 +174,7 @@ struct irq_data { };/* -* Bit masks for irq_data.state +* Bit masks for irq_common_data.state_use_accessors * * IRQD_TRIGGER_MASK - Mask for the trigger type bits * IRQD_SETAFFINITY_PENDING - Affinity setting is pending
@@ -198,34 +206,36 @@ enum { IRQD_WAKEUP_ARMED = (1 << 19), }; +#define __irqd_to_state (d) ((d)->common->state_use_accessors) +static inline bool irqd_is_setaffinity_pending (struct irq_data *d) { -return d->state_use_accessors &IRQD_SETAFFINITY_PENDING ; +return __irqd_to_state (d) &IRQD_SETAFFINITY_PENDING ; }static inline bool irqd_is_per_cpu (struct irq_data *d) { -return d->state_use_accessors &IRQD_PER_CPU ; +return __irqd_to_state (d) &IRQD_PER_CPU ; }static inline bool irqd_can_balance (struct irq_data *d) { -return !(d->state_use_accessors & (IRQD_PER_CPU |IRQD_NO_BALANCING )); +return !(__irqd_to_state (d) & (IRQD_PER_CPU |IRQD_NO_BALANCING )); }static inline bool irqd_affinity_was_set (struct irq_data *d) { -return d->state_use_accessors &IRQD_AFFINITY_SET ; +return __irqd_to_state (d) &IRQD_AFFINITY_SET ; }static inline void irqd_mark_affinity_was_set (struct irq_data *d) { - d->state_use_accessors |=IRQD_AFFINITY_SET ; +__irqd_to_state (d) |=IRQD_AFFINITY_SET ; }static inline u32 irqd_get_trigger_type (struct irq_data *d) { -return d->state_use_accessors &IRQD_TRIGGER_MASK ; +return __irqd_to_state (d) &IRQD_TRIGGER_MASK ; }/*
@@ -233,43 +243,43 @@ static inline u32 irqd_get_trigger_type(struct irq_data *d)*/ static inline void irqd_set_trigger_type (struct irq_data *d,u32 type) { - d->state_use_accessors &= ~IRQD_TRIGGER_MASK ; - d->state_use_accessors |= type &IRQD_TRIGGER_MASK ; +__irqd_to_state (d) &= ~IRQD_TRIGGER_MASK ; +__irqd_to_state (d) |= type &IRQD_TRIGGER_MASK ; }static inline bool irqd_is_level_type (struct irq_data *d) { -return d->state_use_accessors &IRQD_LEVEL ; +return __irqd_to_state (d) &IRQD_LEVEL ; }static inline bool irqd_is_wakeup_set (struct irq_data *d) { -return d->state_use_accessors &IRQD_WAKEUP_STATE ; +return __irqd_to_state (d) &IRQD_WAKEUP_STATE ; }static inline bool irqd_can_move_in_process_context (struct irq_data *d) { -return d->state_use_accessors &IRQD_MOVE_PCNTXT ; +return __irqd_to_state (d) &IRQD_MOVE_PCNTXT ; }static inline bool irqd_irq_disabled (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_DISABLED ; +return __irqd_to_state (d) &IRQD_IRQ_DISABLED ; }static inline bool irqd_irq_masked (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_MASKED ; +return __irqd_to_state (d) &IRQD_IRQ_MASKED ; }static inline bool irqd_irq_inprogress (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_INPROGRESS ; +return __irqd_to_state (d) &IRQD_IRQ_INPROGRESS ; }static inline bool irqd_is_wakeup_armed (struct irq_data *d) { -return d->state_use_accessors &IRQD_WAKEUP_ARMED ; +return __irqd_to_state (d) &IRQD_WAKEUP_ARMED ; }
@@ -280,12 +290,12 @@ static inline bool irqd_is_wakeup_armed(struct irq_data *d)*/ static inline void irqd_set_chained_irq_inprogress (struct irq_data *d) { - d->state_use_accessors |=IRQD_IRQ_INPROGRESS ; +__irqd_to_state (d) |=IRQD_IRQ_INPROGRESS ; }static inline void irqd_clr_chained_irq_inprogress (struct irq_data *d) { - d->state_use_accessors &= ~IRQD_IRQ_INPROGRESS ; +__irqd_to_state (d) &= ~IRQD_IRQ_INPROGRESS ; }static inline irq_hw_number_t irqd_to_hwirq (struct irq_data *d)
include/linux/irqdesc.h +2 -1
@@ -17,7 +17,7 @@ struct pt_regs;/** * struct irq_desc - interrupt descriptor -* @irq_data: per irq and chip data passed down to chip functions +* @irq_common_data: per irq and chip data passed down to chip functions * @kstat_irqs: irq stats per cpu * @handle_irq: highlevel irq-events handler * @preflow_handler: handler called before the flow handler (currently used by sparc)
@@ -47,6 +47,7 @@ struct pt_regs;* @name: flow handler name for /proc/interrupts output */ struct irq_desc { +struct irq_common_data irq_common_data;struct irq_data irq_data;unsigned int __percpu *kstat_irqs;irq_flow_handler_t handle_irq;
kernel/irq/internals.h +5 -5
@@ -168,27 +168,27 @@ irq_put_desc_unlock(struct irq_desc *desc, unsigned long flags)*/ static inline void irqd_set_move_pending (struct irq_data *d) { - d->state_use_accessors |=IRQD_SETAFFINITY_PENDING ; +__irqd_to_state (d) |=IRQD_SETAFFINITY_PENDING ; }static inline void irqd_clr_move_pending (struct irq_data *d) { - d->state_use_accessors &= ~IRQD_SETAFFINITY_PENDING ; +__irqd_to_state (d) &= ~IRQD_SETAFFINITY_PENDING ; }static inline void irqd_clear (struct irq_data *d,unsigned int mask) { - d->state_use_accessors &= ~mask; +__irqd_to_state (d) &= ~mask; }static inline void irqd_set (struct irq_data *d,unsigned int mask) { - d->state_use_accessors |= mask; +__irqd_to_state (d) |= mask; }static inline bool irqd_has_set (struct irq_data *d,unsigned int mask) { -return d->state_use_accessors & mask; +return __irqd_to_state (d) & mask; }static inline void kstat_incr_irqs_this_cpu (unsigned int irq,struct irq_desc *desc)
kernel/irq/irqdesc.c +1 -0
@@ -76,6 +76,7 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, {int cpu; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ;
kernel/irq/irqdomain.c +1 -0
@@ -834,6 +834,7 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain,if (irq_data) { child->parent_data = irq_data; irq_data->irq = child->irq; + irq_data->common = child->common; irq_data->node = child->node; irq_data->domain = domain; }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH v3 4/36 genirq: Introduce helper function irq_data_get_node()
In reply to Jiang LiuIntroduce helper function irq_data_get_node() and friends to hide struct irq_data implementation details.
--- include/linux/irq.h | 5 +++++ kernel/irq/internals.h | 5 +++++ kernel/irq/irqdesc.c | 8 +------- kernel/irq/irqdomain.c | 3 ++- kernel/irq/manage.c | 2 +- kernel/irq/proc.c | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-)
include/linux/irq.h +5 -0
@@ -640,6 +640,11 @@ 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) +{ +return d->node; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
kernel/irq/internals.h +5 -0
@@ -197,6 +197,11 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *d__this_cpu_inc (kstat.irqs_sum); } +static inline int irq_desc_get_node (struct irq_desc *desc) +{ +return irq_data_get_node (&desc->irq_data); +} +#ifdef CONFIG_PM_SLEEP bool irq_pm_check_wakeup (struct irq_desc *desc);void irq_pm_install_action (struct irq_desc *desc,struct irqaction *action);
kernel/irq/irqdesc.c +1 -7
@@ -59,16 +59,10 @@ static void desc_smp_init(struct irq_desc *desc, int node)#endif } -static inline int desc_node (struct irq_desc *desc) -{ -return desc->irq_data.node; -} -#else static inline int alloc_masks (struct irq_desc *desc,gfp_t gfp,int node) {return 0 ; }static inline void desc_smp_init (struct irq_desc *desc,int node) { } -static inline int desc_node (struct irq_desc *desc) {return 0 ; }#endif static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,
@@ -300,7 +294,7 @@ static void free_desc(unsigned int irq)unsigned long flags;raw_spin_lock_irqsave (&desc->lock, flags); -desc_set_defaults (irq, desc,desc_node (desc),NULL ); +desc_set_defaults (irq, desc,irq_desc_get_node (desc),NULL );raw_spin_unlock_irqrestore (&desc->lock, flags); }
kernel/irq/irqdomain.c +2 -1
@@ -830,7 +830,8 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain, {struct irq_data *irq_data; - irq_data =kzalloc_node (sizeof (*irq_data),GFP_KERNEL , child->node); + irq_data =kzalloc_node (sizeof (*irq_data),GFP_KERNEL , +irq_data_get_node (child));if (irq_data) { child->parent_data = irq_data; irq_data->irq = child->irq;
kernel/irq/manage.c +1 -1
@@ -363,7 +363,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) { struct cpumask *set = irq_default_affinity; -int node = desc->irq_data.node; +int node =irq_desc_get_node (desc);/* Excludes PER_CPU and NO_BALANCE interrupts */ if (!irq_can_set_affinity (irq))
kernel/irq/proc.c +1 -1
@@ -241,7 +241,7 @@ static int irq_node_proc_show(struct seq_file *m, void *v) {struct irq_desc *desc =irq_to_desc ((long ) m->private); -seq_printf (m,"%d\n" , desc->irq_data.node); +seq_printf (m,"%d\n" ,irq_desc_get_node (desc));return 0 ; }
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] genirq: Introduce helper function irq_data_get_node()
genirq: Introduce helper function irq_data_get_node()
Commit-ID: 6783011b48096b9a0c239d0f7645f93070b6eefd Gitweb: http://git.kernel.org/tip/6783011b48096b9a0c239d0f7645f93070b6eefd Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:13 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 12 Jun 2015 16:54:21 +0200
genirq: Introduce helper function irq_data_get_node()
Introduce helper function irq_data_get_node() and variants thereof to hide struct irq_data implementation details.
Convert the core code to use them.
--- include/linux/irq.h | 5 +++++ kernel/irq/internals.h | 5 +++++ kernel/irq/irqdesc.c | 8 +------- kernel/irq/irqdomain.c | 3 ++- kernel/irq/manage.c | 2 +- kernel/irq/proc.c | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-)
include/linux/irq.h +5 -0
@@ -640,6 +640,11 @@ 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) +{ +return d->node; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
kernel/irq/internals.h +5 -0
@@ -197,6 +197,11 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *d__this_cpu_inc (kstat.irqs_sum); } +static inline int irq_desc_get_node (struct irq_desc *desc) +{ +return irq_data_get_node (&desc->irq_data); +} +#ifdef CONFIG_PM_SLEEP bool irq_pm_check_wakeup (struct irq_desc *desc);void irq_pm_install_action (struct irq_desc *desc,struct irqaction *action);
kernel/irq/irqdesc.c +1 -7
@@ -59,16 +59,10 @@ static void desc_smp_init(struct irq_desc *desc, int node)#endif } -static inline int desc_node (struct irq_desc *desc) -{ -return desc->irq_data.node; -} -#else static inline int alloc_masks (struct irq_desc *desc,gfp_t gfp,int node) {return 0 ; }static inline void desc_smp_init (struct irq_desc *desc,int node) { } -static inline int desc_node (struct irq_desc *desc) {return 0 ; }#endif static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,
@@ -300,7 +294,7 @@ static void free_desc(unsigned int irq)unsigned long flags;raw_spin_lock_irqsave (&desc->lock, flags); -desc_set_defaults (irq, desc,desc_node (desc),NULL ); +desc_set_defaults (irq, desc,irq_desc_get_node (desc),NULL );raw_spin_unlock_irqrestore (&desc->lock, flags); }
kernel/irq/irqdomain.c +2 -1
@@ -830,7 +830,8 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain, {struct irq_data *irq_data; - irq_data =kzalloc_node (sizeof (*irq_data),GFP_KERNEL , child->node); + irq_data =kzalloc_node (sizeof (*irq_data),GFP_KERNEL , +irq_data_get_node (child));if (irq_data) { child->parent_data = irq_data; irq_data->irq = child->irq;
kernel/irq/manage.c +1 -1
@@ -363,7 +363,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) { struct cpumask *set = irq_default_affinity; -int node = desc->irq_data.node; +int node =irq_desc_get_node (desc);/* Excludes PER_CPU and NO_BALANCE interrupts */ if (!irq_can_set_affinity (irq))
kernel/irq/proc.c +1 -1
@@ -241,7 +241,7 @@ static int irq_node_proc_show(struct seq_file *m, void *v) {struct irq_desc *desc =irq_to_desc ((long ) m->private); -seq_printf (m,"%d\n" , desc->irq_data.node); +seq_printf (m,"%d\n" ,irq_desc_get_node (desc));return 0 ; }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH v3 5/36 x86, irq: Use accessor irq_data_get_node() to hide struct irq_data detail
In reply to Jiang LiuUse accessor irq_data_get_node() to hide struct irq_data implementation detail, so we could easily reconstruct struct irq_data later.
--- arch/x86/kernel/apic/vector.c | 8 ++++---- arch/x86/platform/uv/uv_irq.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/vector.c +4 -4
@@ -296,7 +296,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,struct irq_alloc_info *info = arg;struct apic_chip_data *data;struct irq_data *irq_data; -int i, err; +int i, err, node;if (disable_apic)return -ENXIO ;
@@ -308,12 +308,13 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,for (i =0 ; i < nr_irqs; i++) { irq_data =irq_domain_get_irq_data (domain, virq + i);BUG_ON (!irq_data); + node =irq_data_get_node (irq_data);#ifdef CONFIG_X86_IO_APIC if (virq + i <nr_legacy_irqs () && legacy_irq_data[virq + i]) data = legacy_irq_data[virq + i]; else#endif - data =alloc_apic_chip_data (irq_data->node); + data =alloc_apic_chip_data (node);if (!data) { err = -ENOMEM ; goto error;
@@ -322,8 +323,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, irq_data->chip = &lapic_controller; irq_data->chip_data = data; irq_data->hwirq = virq + i; - err =assign_irq_vector_policy (virq, irq_data->node, data, - info); + err =assign_irq_vector_policy (virq, node, data, info);if (err) goto error; }
arch/x86/platform/uv/uv_irq.c +1 -1
@@ -89,7 +89,7 @@ static int uv_domain_alloc(struct irq_domain *domain, unsigned int virq,return -EINVAL ; chip_data =kmalloc_node (sizeof (*chip_data),GFP_KERNEL , - irq_data->node); +irq_data_get_node (irq_data));if (!chip_data)return -ENOMEM ;
Signature · 1 line
1.7.10.4
PATCH v3 6/36 sh, irq: Use accessor irq_data_get_node() to hide struct irq_data detail
In reply to Jiang LiuUse accessor irq_data_get_node() to hide struct irq_data implementation detail, so we could easily reconstruct struct irq_data later.
--- arch/sh/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/irq.c +1 -1
@@ -227,7 +227,7 @@ void migrate_irqs(void)for_each_active_irq (irq) {struct irq_data *data =irq_get_irq_data (irq); -if (data->node == cpu) { +if (irq_data_get_node (data) == cpu) {unsigned int newcpu =cpumask_any_and (data->affinity, cpu_online_mask);if (newcpu >= nr_cpu_ids) {
Signature · 1 line
1.7.10.4
PATCH v3 7/36 genirq: Move field 'node' from struct irq_data into struct irq_common_data
In reply to Jiang LiuNUMA 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.
--- include/linux/irq.h | 17 ++++++++++++++--- kernel/irq/internals.h | 2 +- kernel/irq/irqdesc.c | 4 +++- kernel/irq/irqdomain.c | 1 - 4 files changed, 18 insertions(+), 6 deletions(-)
include/linux/irq.h +14 -3
@@ -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
@@ -160,7 +163,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;
@@ -640,9 +642,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); }unsigned int arch_dynirq_lower_bound (unsigned int from);
kernel/irq/internals.h +1 -1
@@ -199,7 +199,7 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *dstatic 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
@@ -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
@@ -836,7 +836,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; }
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/urgent] genirq: Move field 'node' from irq_data into irq_common_data
genirq: Move field 'node' from irq_data into irq_common_data
Commit-ID: 449e9cae58b06be1293858ec8e5d8cb728238baa Gitweb: http://git.kernel.org/tip/449e9cae58b06be1293858ec8e5d8cb728238baa Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:16 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 16 Sep 2015 15:46:49 +0200
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.
--- include/linux/irq.h | 17 ++++++++++++++--- kernel/irq/internals.h | 2 +- kernel/irq/irqdesc.c | 4 +++- kernel/irq/irqdomain.c | 1 - 4 files changed, 18 insertions(+), 6 deletions(-)
include/linux/irq.h +14 -3
@@ -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
@@ -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
@@ -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
@@ -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; }
PATCH v3 8/36 sparc, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details
In reply to Jiang LiuUse helper function irq_data_get_irq_handler_data() to hide irq_desc implementation details.
--- arch/sparc/kernel/irq_64.c | 15 +++++++++------ arch/sparc/kernel/sun4d_irq.c | 4 ++-- arch/sparc/kernel/sun4m_irq.c | 6 ++++-- 3 files changed, 15 insertions(+), 10 deletions(-)
arch/sparc/kernel/irq_64.c +9 -6
@@ -210,21 +210,21 @@ struct irq_handler_data {static inline unsigned int irq_data_to_handle (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->dev_handle; }static inline unsigned int irq_data_to_ino (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->dev_ino; }static inline unsigned long irq_data_to_sysino (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->sysino; }
@@ -370,8 +370,9 @@ static int irq_choose_cpu(unsigned int irq, const struct cpumask *affinity)static void sun4u_irq_enable (struct irq_data *data) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data)) {unsigned long cpuid, imap, val;unsigned int tid;
@@ -393,8 +394,9 @@ static void sun4u_irq_enable(struct irq_data *data)static int sun4u_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data)) {unsigned long cpuid, imap, val;unsigned int tid;
@@ -438,8 +440,9 @@ static void sun4u_irq_disable(struct irq_data *data)static void sun4u_irq_eoi (struct irq_data *data) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data))upa_writeq (ICLR_IDLE , handler_data->iclr); }
arch/sparc/kernel/sun4d_irq.c +2 -2
@@ -188,7 +188,7 @@ void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs)static void sun4d_mask_irq (struct irq_data *data) { -struct sun4d_handler_data *handler_data = data->handler_data; +struct sun4d_handler_data *handler_data =irq_data_get_irq_handler_data (data);unsigned int real_irq;#ifdef CONFIG_SMP int cpuid = handler_data->cpuid;
@@ -206,7 +206,7 @@ static void sun4d_mask_irq(struct irq_data *data)static void sun4d_unmask_irq (struct irq_data *data) { -struct sun4d_handler_data *handler_data = data->handler_data; +struct sun4d_handler_data *handler_data =irq_data_get_irq_handler_data (data);unsigned int real_irq;#ifdef CONFIG_SMP int cpuid = handler_data->cpuid;
arch/sparc/kernel/sun4m_irq.c +4 -2
@@ -188,9 +188,10 @@ static unsigned long sun4m_imask[0x50] = {static void sun4m_mask_irq (struct irq_data *data) { -struct sun4m_handler_data *handler_data = data->handler_data; +struct sun4m_handler_data *handler_data;int cpu =smp_processor_id (); + handler_data =irq_data_get_irq_handler_data (data);if (handler_data->mask) {unsigned long flags;
@@ -206,9 +207,10 @@ static void sun4m_mask_irq(struct irq_data *data)static void sun4m_unmask_irq (struct irq_data *data) { -struct sun4m_handler_data *handler_data = data->handler_data; +struct sun4m_handler_data *handler_data;int cpu =smp_processor_id (); + handler_data =irq_data_get_irq_handler_data (data);if (handler_data->mask) {unsigned long flags;
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] sparc/irq: Use helper irq_data_get_irq_handler_data()
sparc/irq: Use helper irq_data_get_irq_handler_data()
Commit-ID: 6a4a5b34c315be04abdc366cda7a00b7249550f3 Gitweb: http://git.kernel.org/tip/6a4a5b34c315be04abdc366cda7a00b7249550f3 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:17 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 31 Jul 2015 22:20:05 +0200
sparc/irq: Use helper irq_data_get_irq_handler_data()
Use helper function irq_data_get_irq_handler_data() to hide irq_desc implementation details. This allows to move irq_data->handler_data to irq_data_common, once all usage sites are converted.
--- arch/sparc/kernel/irq_64.c | 15 +++++++++------ arch/sparc/kernel/sun4d_irq.c | 4 ++-- arch/sparc/kernel/sun4m_irq.c | 6 ++++-- 3 files changed, 15 insertions(+), 10 deletions(-)
arch/sparc/kernel/irq_64.c +9 -6
@@ -210,21 +210,21 @@ struct irq_handler_data {static inline unsigned int irq_data_to_handle (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->dev_handle; }static inline unsigned int irq_data_to_ino (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->dev_ino; }static inline unsigned long irq_data_to_sysino (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->sysino; }
@@ -370,8 +370,9 @@ static int irq_choose_cpu(unsigned int irq, const struct cpumask *affinity)static void sun4u_irq_enable (struct irq_data *data) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data)) {unsigned long cpuid, imap, val;unsigned int tid;
@@ -393,8 +394,9 @@ static void sun4u_irq_enable(struct irq_data *data)static int sun4u_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data)) {unsigned long cpuid, imap, val;unsigned int tid;
@@ -438,8 +440,9 @@ static void sun4u_irq_disable(struct irq_data *data)static void sun4u_irq_eoi (struct irq_data *data) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data))upa_writeq (ICLR_IDLE , handler_data->iclr); }
arch/sparc/kernel/sun4d_irq.c +2 -2
@@ -188,7 +188,7 @@ void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs)static void sun4d_mask_irq (struct irq_data *data) { -struct sun4d_handler_data *handler_data = data->handler_data; +struct sun4d_handler_data *handler_data =irq_data_get_irq_handler_data (data);unsigned int real_irq;#ifdef CONFIG_SMP int cpuid = handler_data->cpuid;
@@ -206,7 +206,7 @@ static void sun4d_mask_irq(struct irq_data *data)static void sun4d_unmask_irq (struct irq_data *data) { -struct sun4d_handler_data *handler_data = data->handler_data; +struct sun4d_handler_data *handler_data =irq_data_get_irq_handler_data (data);unsigned int real_irq;#ifdef CONFIG_SMP int cpuid = handler_data->cpuid;
arch/sparc/kernel/sun4m_irq.c +4 -2
@@ -188,9 +188,10 @@ static unsigned long sun4m_imask[0x50] = {static void sun4m_mask_irq (struct irq_data *data) { -struct sun4m_handler_data *handler_data = data->handler_data; +struct sun4m_handler_data *handler_data;int cpu =smp_processor_id (); + handler_data =irq_data_get_irq_handler_data (data);if (handler_data->mask) {unsigned long flags;
@@ -206,9 +207,10 @@ static void sun4m_mask_irq(struct irq_data *data)static void sun4m_unmask_irq (struct irq_data *data) { -struct sun4m_handler_data *handler_data = data->handler_data; +struct sun4m_handler_data *handler_data;int cpu =smp_processor_id (); + handler_data =irq_data_get_irq_handler_data (data);if (handler_data->mask) {unsigned long flags;
PATCH v3 9/36 x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details
In reply to Jiang LiuUse helper function irq_data_get_irq_handler_data() to hide irq_desc implementation details.
--- arch/x86/kernel/apic/msi.c | 2 +- arch/x86/kernel/hpet.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/kernel/apic/msi.c +1 -1
@@ -264,7 +264,7 @@ static inline int hpet_dev_id(struct irq_domain *domain)static void hpet_msi_write_msg (struct irq_data *data,struct msi_msg *msg) { -hpet_msi_write (data->handler_data, msg); +hpet_msi_write (irq_data_get_irq_handler_data (data), msg); }static struct irq_chip hpet_msi_controller = {
arch/x86/kernel/hpet.c +2 -2
@@ -426,7 +426,7 @@ static struct irq_domain *hpet_domain;void hpet_msi_unmask (struct irq_data *data) { -struct hpet_dev *hdev = data->handler_data; +struct hpet_dev *hdev =irq_data_get_irq_handler_data (data);unsigned int cfg;/* unmask it */
@@ -437,7 +437,7 @@ void hpet_msi_unmask(struct irq_data *data)void hpet_msi_mask (struct irq_data *data) { -struct hpet_dev *hdev = data->handler_data; +struct hpet_dev *hdev =irq_data_get_irq_handler_data (data);unsigned int cfg;/* mask it */
Signature · 1 line
1.7.10.4
PATCH v3 10/36 x86, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details
In reply to Jiang LiuUse helper function irq_data_get_irq_handler_data() to hide irq_desc implementation details.
--- drivers/gpio/gpio-davinci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-davinci.c +1 -1
@@ -396,7 +396,7 @@ static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger)struct davinci_gpio_regs __iomem *g;u32 mask; - d = (struct davinci_gpio_controller *)data->handler_data; + d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data (data); g = (struct davinci_gpio_regs __iomem *)d->regs; mask =__gpio_mask (data->irq - d->gpio_irq);
Signature · 1 line
1.7.10.4
PATCH v3 11/36 sh, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details
In reply to Jiang LiuUse helper function irq_data_get_irq_handler_data() to hide irq_desc implementation details.
--- drivers/sh/intc/virq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/sh/intc/virq.c +7 -5
@@ -83,12 +83,11 @@ EXPORT_SYMBOL_GPL(intc_irq_lookup);static int add_virq_to_pirq (unsigned int irq,unsigned int virq) { -struct intc_virq_list **last, *entry; -struct irq_data *data =irq_get_irq_data (irq); +struct intc_virq_list *entry; +struct intc_virq_list **last =NULL ;/* scan for duplicates */ - last = (struct intc_virq_list **)&data->handler_data; -for_each_virq (entry, data->handler_data) { +for_each_virq (entry,irq_get_handler_data (irq)) {if (entry->irq == virq)return 0 ; last = &entry->next;
@@ -102,7 +101,10 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) entry->irq = virq; - *last = entry; +if (last) + *last = entry; +else +irq_set_handler_data (irq, entry);return 0 ; }
Signature · 1 line
1.7.10.4
Re: [Patch v3 11/36] sh, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details
Hello.
Quoted 2 lines · Jiang Liu
Use helper function
irq_data_get_irq_handler_data()to hideirq_descimplementation details.
I'm only seeing calls to irq_{get|set}_handler_data() below...
Quoted 27 lines
Signed-off-by Jiang Liu <[email protected]>--- drivers/sh/intc/virq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)drivers/sh/intc/virq.c +3
-4@@ -83,12 +83,11 @@ EXPORT_SYMBOL_GPL(intc_irq_lookup);static int add_virq_to_pirq (unsigned int irq,unsigned int virq) { -struct intc_virq_list **last, *entry; -struct irq_data *data =irq_get_irq_data (irq); +struct intc_virq_list *entry; +struct intc_virq_list **last =NULL ;/* scan for duplicates */ - last = (struct intc_virq_list **)&data->handler_data; -for_each_virq (entry, data->handler_data) { +for_each_virq (entry,irq_get_handler_data (irq)) {if (entry->irq == virq)return 0 ; last = &entry->next;@@ -102,7 +101,10 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)
drivers/sh/intc/virq.c static int add_virq_to_pirq(unsigned int irq, unsigned int virq) · line 110
Quoted 10 lines
drivers/sh/intc/virq.c +4
-1entry->irq = virq; - *last = entry; +if (last) + *last = entry; +else +irq_set_handler_data (irq, entry);return 0 ; }
WBR, Sergei
Re: [Patch v3 11/36] sh, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details
Quoted 8 lines · Sergei Shtylyov
Hello.
Quoted 2 lines · Jiang Liu
Use helper function
irq_data_get_irq_handler_data()to hideirq_descimplementation details.I'm only seeing calls to irq_{get|set}_handler_data() below...
Hi Sergei,
Thanks for review, I will fix the commit message.
Thanks!
Gerry
Quoted 42 lines
Quoted 38 lines
Signed-off-by Jiang Liu <[email protected]>--- drivers/sh/intc/virq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)drivers/sh/intc/virq.c +7
-5@@ -83,12 +83,11 @@ EXPORT_SYMBOL_GPL(intc_irq_lookup);static int add_virq_to_pirq (unsigned int irq,unsigned int virq) { -struct intc_virq_list **last, *entry; -struct irq_data *data =irq_get_irq_data (irq); +struct intc_virq_list *entry; +struct intc_virq_list **last =NULL ;/* scan for duplicates */ - last = (struct intc_virq_list **)&data->handler_data; -for_each_virq (entry, data->handler_data) { +for_each_virq (entry,irq_get_handler_data (irq)) {if (entry->irq == virq)return 0 ; last = &entry->next;@@ -102,7 +101,10 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq) entry->irq = virq; - *last = entry; +if (last) + *last = entry; +else +irq_set_handler_data (irq, entry);return 0 ;Quoted 1 line
}WBR, Sergei
PATCH v3 12/36 genirq: Move field 'handler_data' from struct irq_data into struct irq_common_data
In reply to Jiang LiuHandler data (handler_data) is per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/irqdesc.c | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-)
include/linux/irq.h +4 -4
@@ -130,12 +130,14 @@ struct irq_domain;* @state_use_accessors: status information for irq chip functions. * Use accessor functions to deal with it * @node: node index useful for balancing +* @handler_data: per-IRQ data for the irq_chip methods */ struct irq_common_data {unsigned int state_use_accessors;#ifdef CONFIG_NUMA unsigned int node;#endif +void *handler_data; };/**
@@ -149,7 +151,6 @@ struct irq_common_data {* between hwirq number and linux irq number. * @parent_data: pointer to parent struct irq_data to support hierarchy * irq_domain -* @handler_data: per-IRQ data for the irq_chip methods * @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor
@@ -169,7 +170,6 @@ struct irq_data {#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY struct irq_data *parent_data;#endif -void *handler_data;void *chip_data;struct msi_desc *msi_desc;cpumask_var_t affinity;
@@ -617,12 +617,12 @@ static inline void *irq_data_get_irq_chip_data(struct irq_data *d)static inline void *irq_get_handler_data (unsigned int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->handler_data :NULL ; +return d ? d->common->handler_data :NULL ; }static inline void *irq_data_get_irq_handler_data (struct irq_data *d) { -return d->handler_data; +return d->common->handler_data; }static inline struct msi_desc *irq_get_msi_desc (unsigned int irq)
include/linux/irqdesc.h +1 -1
@@ -120,7 +120,7 @@ static inline void *irq_desc_get_chip_data(struct irq_desc *desc)static inline void *irq_desc_get_handler_data (struct irq_desc *desc) { -return desc->irq_data.handler_data; +return desc->irq_common_data.handler_data; }static inline struct msi_desc *irq_desc_get_msi_desc (struct irq_desc *desc)
kernel/irq/chip.c +1 -1
@@ -83,7 +83,7 @@ int irq_set_handler_data(unsigned int irq, void *data)if (!desc)return -EINVAL ; - desc->irq_data.handler_data = data; + desc->irq_common_data.handler_data = data;irq_put_desc_unlock (desc, flags);return 0 ; }
kernel/irq/irqdesc.c +2 -1
@@ -72,11 +72,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, {int cpu; + desc->irq_common_data.handler_data =NULL ; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ; - desc->irq_data.handler_data =NULL ; desc->irq_data.msi_desc =NULL ;irq_settings_clr_and_set (desc, ~0 , _IRQ_DEFAULT_INIT_FLAGS);irqd_set (&desc->irq_data,IRQD_IRQ_DISABLED );
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/urgent] genirq: Move field 'handler_data' from irq_data into irq_common_data
genirq: Move field 'handler_data' from irq_data into irq_common_data
Commit-ID: af7080e040d223b5e7d0a8de28f7cea24ef017c4 Gitweb: http://git.kernel.org/tip/af7080e040d223b5e7d0a8de28f7cea24ef017c4 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:21 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 16 Sep 2015 15:46:49 +0200
genirq: Move field 'handler_data' from irq_data into irq_common_data
Handler data (handler_data) is per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 4 ++-- kernel/irq/irqdesc.c | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-)
include/linux/irq.h +4 -4
@@ -130,12 +130,14 @@ struct irq_domain;* @state_use_accessors: status information for irq chip functions. * Use accessor functions to deal with it * @node: node index useful for balancing +* @handler_data: per-IRQ data for the irq_chip methods */ struct irq_common_data {unsigned int state_use_accessors;#ifdef CONFIG_NUMA unsigned int node;#endif +void *handler_data; };/**
@@ -149,7 +151,6 @@ struct irq_common_data {* between hwirq number and linux irq number. * @parent_data: pointer to parent struct irq_data to support hierarchy * irq_domain -* @handler_data: per-IRQ data for the irq_chip methods * @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor
@@ -165,7 +166,6 @@ struct irq_data {#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY struct irq_data *parent_data;#endif -void *handler_data;void *chip_data;struct msi_desc *msi_desc;cpumask_var_t affinity;
@@ -641,12 +641,12 @@ static inline void *irq_data_get_irq_chip_data(struct irq_data *d)static inline void *irq_get_handler_data (unsigned int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->handler_data :NULL ; +return d ? d->common->handler_data :NULL ; }static inline void *irq_data_get_irq_handler_data (struct irq_data *d) { -return d->handler_data; +return d->common->handler_data; }static inline struct msi_desc *irq_get_msi_desc (unsigned int irq)
include/linux/irqdesc.h +1 -1
@@ -123,7 +123,7 @@ static inline void *irq_desc_get_chip_data(struct irq_desc *desc)static inline void *irq_desc_get_handler_data (struct irq_desc *desc) { -return desc->irq_data.handler_data; +return desc->irq_common_data.handler_data; }static inline struct msi_desc *irq_desc_get_msi_desc (struct irq_desc *desc)
kernel/irq/chip.c +2 -2
@@ -83,7 +83,7 @@ int irq_set_handler_data(unsigned int irq, void *data)if (!desc)return -EINVAL ; - desc->irq_data.handler_data = data; + desc->irq_common_data.handler_data = data;irq_put_desc_unlock (desc, flags);return 0 ; }
@@ -796,7 +796,7 @@ irq_set_chained_handler_and_data(unsigned int irq, irq_flow_handler_t handle,return ;__irq_do_set_handler (desc, handle,1 ,NULL ); - desc->irq_data.handler_data = data; + desc->irq_common_data.handler_data = data;irq_put_desc_busunlock (desc, flags); }
kernel/irq/irqdesc.c +2 -1
@@ -72,11 +72,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, {int cpu; + desc->irq_common_data.handler_data =NULL ; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ; - desc->irq_data.handler_data =NULL ; desc->irq_data.msi_desc =NULL ;irq_settings_clr_and_set (desc, ~0 , _IRQ_DEFAULT_INIT_FLAGS);irqd_set (&desc->irq_data,IRQD_IRQ_DISABLED );
PATCH v3 13/36 mn10300: Fix incorrect use of data->affinity
In reply to Jiang LiuThe field affinity in struct irq_data is type of cpumask_var_t, so we should pass in data->affinity instead of &data->affinity when calling cpumask_xxxx().
--- arch/mn10300/kernel/irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mn10300/kernel/irq.c +3 -3
@@ -320,11 +320,11 @@ void migrate_irqs(void)if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, &data->affinity) && +if (cpumask_test_cpu (self, data->affinity) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, &data->affinity); +cpumask_set_cpu (cpu_id, data->affinity); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,7 +335,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (&data->affinity, + new =cpumask_any_and (data->affinity, cpu_online_mask); irq_affinity_online[irq] = new;
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/urgent] mn10300: Fix incorrect use of irq_data->affinity
mn10300: Fix incorrect use of irq_data->affinity
Commit-ID: 856b859df4237ed10176c6afc2c97aa90ab04ffc Gitweb: http://git.kernel.org/tip/856b859df4237ed10176c6afc2c97aa90ab04ffc Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:22 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 25 Jun 2015 12:02:43 +0200
mn10300: Fix incorrect use of irq_data->affinity
The field affinity in struct irq_data is type of cpumask_var_t, so we should pass in data->affinity instead of &data->affinity when calling cpumask_xxxx().
--- arch/mn10300/kernel/irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mn10300/kernel/irq.c +3 -3
@@ -320,11 +320,11 @@ void migrate_irqs(void)if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, &data->affinity) && +if (cpumask_test_cpu (self, data->affinity) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, &data->affinity); +cpumask_set_cpu (cpu_id, data->affinity); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,7 +335,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (&data->affinity, + new =cpumask_any_and (data->affinity, cpu_online_mask); irq_affinity_online[irq] = new;
PATCH v3 14/36 genirq: Introduce helper function irq_data_get_affinity_mask()
In reply to Jiang LiuIntroduce helper function irq_data_get_affinity_mask() and irq_get_affinity_mask() to hide implementation details, so we could move field 'affinity' from struct irq_data into struct irq_common_data later.
--- include/linux/irq.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/irq.h +12 -0
@@ -656,6 +656,18 @@ 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) +{ +struct irq_data *d =irq_get_irq_data (irq); + +return d ? d->affinity :NULL ; +} + +static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) +{ +return d->affinity; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] genirq: Introduce helper function irq_data_get_affinity_mask()
genirq: Introduce helper function irq_data_get_affinity_mask()
Commit-ID: c64301a230a64dfc2fcf4581cd98a2d703f3c057 Gitweb: http://git.kernel.org/tip/c64301a230a64dfc2fcf4581cd98a2d703f3c057 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:23 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 12 Jun 2015 16:54:21 +0200
genirq: Introduce helper function irq_data_get_affinity_mask()
Introduce helper function irq_data_get_affinity_mask() and irq_get_affinity_mask() to hide implementation details, so we could move field 'affinity' from struct irq_data into struct irq_common_data later.
--- include/linux/irq.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/linux/irq.h +12 -0
@@ -645,6 +645,18 @@ static inline int irq_data_get_node(struct irq_data *d)return d->node; } +static inline struct cpumask *irq_get_affinity_mask (int irq) +{ +struct irq_data *d =irq_get_irq_data (irq); + +return d ? d->affinity :NULL ; +} + +static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) +{ +return d->affinity; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/
PATCH v3 15/36 alpha, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/alpha/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/alpha/kernel/irq.c +1 -1
@@ -60,7 +60,7 @@ int irq_select_affinity(unsigned int irq) cpu = (cpu < (NR_CPUS -1 ) ? cpu +1 :0 ); last_cpu = cpu; -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); chip->irq_set_affinity (data,cpumask_of (cpu), false);return 0 ; }
Signature · 1 line
1.7.10.4
PATCH v3 16/36 ARM, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/arm/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/kernel/irq.c +2 -2
@@ -140,7 +140,7 @@ int __init arch_probe_nr_irqs(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
@@ -160,7 +160,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
Signature · 1 line
1.7.10.4
PATCH v3 17/36 ARM64, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/arm64/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kernel/irq.c +2 -2
@@ -61,7 +61,7 @@ void __init init_IRQ(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
@@ -81,7 +81,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
Signature · 1 line
1.7.10.4
Re: [Patch v3 17/36] ARM64, irq: Use access helper irq_data_get_affinity_mask()
Quoted 22 lines · Jiang Liu
Use access helper
irq_data_get_affinity_mask()to hide implementation details of structirq_desc.Signed-off-by Jiang Liu <[email protected]>--- arch/arm64/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/arm64/kernel/irq.c +1
-1@@ -61,7 +61,7 @@ void __init init_IRQ(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
arch/arm64/kernel/irq.c static bool migrate_one_irq(struct irq_desc *desc) · line 87
Quoted 8 lines
arch/arm64/kernel/irq.c +1
-1@@ -81,7 +81,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
Thanks
Hanjun
PATCH v3 18/36 blackfin, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/blackfin/mach-common/ints-priority.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/blackfin/mach-common/ints-priority.c +2 -1
@@ -194,7 +194,8 @@ void bfin_internal_unmask_irq(unsigned int irq)#ifdef CONFIG_SMP static void bfin_internal_unmask_irq_chip (struct irq_data *d) { -bfin_internal_unmask_irq_affinity (d->irq, d->affinity); +bfin_internal_unmask_irq_affinity (d->irq, +irq_data_get_affinity_mask (d)); } static int bfin_internal_set_affinity(struct irq_data *d,
Signature · 1 line
1.7.10.4
PATCH v3 19/36 IA64, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 6 +++--- arch/ia64/kernel/msi_ia64.c | 4 ++-- arch/ia64/sn/kernel/msi_sn.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
arch/ia64/kernel/iosapic.c +1 -1
@@ -838,7 +838,7 @@ iosapic_unregister_intr (unsigned int gsi)if (iosapic_intr_info[irq].count ==0 ) {#ifdef CONFIG_SMP /* Clear affinity */ -cpumask_setall (irq_get_irq_data (irq)->affinity); +cpumask_setall (irq_get_affinity_mask (irq));#endif /* Clear the interrupt information */ iosapic_intr_info[irq].dest =0 ;
arch/ia64/kernel/irq.c +3 -3
@@ -67,7 +67,7 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };void set_irq_affinity_info (unsigned int irq,int hwid,int redir) {if (irq <NR_IRQS ) { -cpumask_copy (irq_get_irq_data (irq)->affinity, +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu_logical_id (hwid))); irq_redir[irq] = (char ) (redir &0xff ); }
@@ -119,8 +119,8 @@ static void migrate_irqs(void)if (irqd_is_per_cpu (data))continue ; -if (cpumask_any_and (data->affinity, cpu_online_mask) - >= nr_cpu_ids) { +if (cpumask_any_and (irq_data_get_affinity_mask (data), + cpu_online_mask) >= nr_cpu_ids) {/* * Save it for phase 2 processing */
arch/ia64/kernel/msi_ia64.c +2 -2
@@ -36,7 +36,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, msg.data = data;pci_write_msi_msg (irq, &msg); -cpumask_copy (idata->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (idata),cpumask_of (cpu));return 0 ; }
@@ -148,7 +148,7 @@ static int dmar_msi_set_affinity(struct irq_data *data, msg.address_lo |=MSI_ADDR_DEST_ID_CPU (cpu_physical_id (cpu));dmar_msi_write (irq, &msg); -cpumask_copy (data->affinity, mask); +cpumask_copy (irq_data_get_affinity_mask (data), mask);return 0 ; }
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, msg.address_lo = (u32)(bus_addr &0x00000000ffffffff );pci_write_msi_msg (irq, &msg); -cpumask_copy (data->affinity, cpu_mask); +cpumask_copy (irq_data_get_affinity_mask (data), cpu_mask);return 0 ; }
Signature · 1 line
1.7.10.4
PATCH v3 20/36 metag, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/metag/kernel/irq.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/metag/kernel/irq.c +6 -4
@@ -270,23 +270,25 @@ void migrate_irqs(void)for_each_active_irq (i) {struct irq_data *data =irq_get_irq_data (i); +struct cpumask *mask;unsigned int newcpu;if (irqd_is_per_cpu (data))continue ; -if (!cpumask_test_cpu (cpu, data->affinity)) + mask =irq_data_get_affinity_mask (data); +if (!cpumask_test_cpu (cpu, mask))continue ; - newcpu =cpumask_any_and (data->affinity, cpu_online_mask); + newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , i, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (i, data->affinity); +irq_set_affinity (i, mask); } }#endif /* CONFIG_HOTPLUG_CPU */
Signature · 1 line
1.7.10.4
PATCH v3 21/36 mips, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/mips/bcm63xx/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 14 ++++++++------ arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-)
arch/mips/bcm63xx/irq.c +1 -1
@@ -60,7 +60,7 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d,if (m) enable &=cpumask_test_cpu (cpu, m);else if (irqd_affinity_was_set (d)) - enable &=cpumask_test_cpu (cpu, d->affinity); + enable &=cpumask_test_cpu (cpu,irq_data_get_affinity_mask (d));#endif return enable; }
arch/mips/cavium-octeon/octeon-irq.c +8 -6
@@ -225,13 +225,14 @@ static int next_cpu_for_irq(struct irq_data *data)#ifdef CONFIG_SMP int cpu; -int weight =cpumask_weight (data->affinity); +struct cpumask *mask =irq_data_get_affinity_mask (data); +int weight =cpumask_weight (mask);struct octeon_ciu_chip_data *cd =irq_data_get_irq_chip_data (data);if (weight >1 ) { cpu = cd->current_cpu;for (;;) { - cpu =cpumask_next (cpu, data->affinity); + cpu =cpumask_next (cpu, mask);if (cpu >= nr_cpu_ids) { cpu =-1 ;continue ;
@@ -240,7 +241,7 @@ static int next_cpu_for_irq(struct irq_data *data) } } }else if (weight ==1 ) { - cpu =cpumask_first (data->affinity); + cpu =cpumask_first (mask); }else { cpu =smp_processor_id (); }
@@ -710,16 +711,17 @@ static void octeon_irq_cpu_offline_ciu(struct irq_data *data) {int cpu =smp_processor_id ();cpumask_t new_affinity; +struct cpumask *mask =irq_data_get_affinity_mask (data); -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu, mask))return ; -if (cpumask_weight (data->affinity) >1 ) { +if (cpumask_weight (mask) >1 ) {/* * It has multi CPU affinity, just remove this CPU * from the affinity set. */ -cpumask_copy (&new_affinity, data->affinity); +cpumask_copy (&new_affinity, mask);cpumask_clear_cpu (cpu, &new_affinity); }else {/* Otherwise, put it on lowest numbered online CPU. */
arch/mips/pmcs-msp71xx/msp_irq_cic.c +2 -1
@@ -88,7 +88,8 @@ static void unmask_cic_irq(struct irq_data *d)* Make sure we have IRQ affinity. It may have changed while * we were processing the IRQ. */ -if (!cpumask_test_cpu (smp_processor_id (), d->affinity)) +if (!cpumask_test_cpu (smp_processor_id (), +irq_data_get_affinity_mask (d)))return ;#endif
Signature · 1 line
1.7.10.4
Re: [Patch v3 21/36] mips, irq: Use access helper irq_data_get_affinity_mask()
On Mon, Jun 01, 2015 at 04:05:30PM +0800, Jiang Liu wrote:
Ralf
PATCH v3 22/36 mn10300, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/irq.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-)
arch/mn10300/kernel/cevt-mn10300.c +1 -1
@@ -123,7 +123,7 @@ int __init init_clockevents(void) {struct irq_data *data; data =irq_get_irq_data (cd->irq); -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); iact->flags |=IRQF_NOBALANCING ; }#endif
arch/mn10300/kernel/irq.c +7 -6
@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d) tmp2 =GxICR (irq); irq_affinity_online[irq] = -cpumask_any_and (d->affinity, cpu_online_mask); +cpumask_any_and (irq_data_get_affinity_mask (d), + cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d) }else { tmp =GxICR (irq); - irq_affinity_online[irq] =cpumask_any_and (d->affinity, + irq_affinity_online[irq] =cpumask_any_and (irq_data_get_affinity_mask (d), cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -316,15 +317,16 @@ void migrate_irqs(void) self =smp_processor_id ();for (irq =0 ; irq <NR_IRQS ; irq++) {struct irq_data *data =irq_get_irq_data (irq); +struct cpumask *mask =irq_data_get_affinity_mask (data);if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, data->affinity) && +if (cpumask_test_cpu (self, mask) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, data->affinity); +cpumask_set_cpu (cpu_id, mask); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,8 +337,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (data->affinity, - cpu_online_mask); + new =cpumask_any_and (mask, cpu_online_mask); irq_affinity_online[irq] = new; CROSS_GxICR(irq, new) =
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] mn10300/irq: Use access helper irq_data_get_affinity_mask()
mn10300/irq: Use access helper irq_data_get_affinity_mask()
Commit-ID: 9d03e784bc225e7ccaa53bcdb64c8ebf96f153d7 Gitweb: http://git.kernel.org/tip/9d03e784bc225e7ccaa53bcdb64c8ebf96f153d7 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:31 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 31 Jul 2015 22:20:04 +0200
mn10300/irq: Use access helper irq_data_get_affinity_mask()
Use access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/irq.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-)
arch/mn10300/kernel/cevt-mn10300.c +1 -1
@@ -123,7 +123,7 @@ int __init init_clockevents(void) {struct irq_data *data; data =irq_get_irq_data (cd->irq); -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); iact->flags |=IRQF_NOBALANCING ; }#endif
arch/mn10300/kernel/irq.c +7 -6
@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d) tmp2 =GxICR (irq); irq_affinity_online[irq] = -cpumask_any_and (d->affinity, cpu_online_mask); +cpumask_any_and (irq_data_get_affinity_mask (d), + cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d) }else { tmp =GxICR (irq); - irq_affinity_online[irq] =cpumask_any_and (d->affinity, + irq_affinity_online[irq] =cpumask_any_and (irq_data_get_affinity_mask (d), cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -316,15 +317,16 @@ void migrate_irqs(void) self =smp_processor_id ();for (irq =0 ; irq <NR_IRQS ; irq++) {struct irq_data *data =irq_get_irq_data (irq); +struct cpumask *mask =irq_data_get_affinity_mask (data);if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, data->affinity) && +if (cpumask_test_cpu (self, mask) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, data->affinity); +cpumask_set_cpu (cpu_id, mask); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,8 +337,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (data->affinity, - cpu_online_mask); + new =cpumask_any_and (mask, cpu_online_mask); irq_affinity_online[irq] = new; CROSS_GxICR(irq, new) =
PATCH v3 23/36 parisc, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/parisc/kernel/irq.c | 12 ++++++------ drivers/parisc/iosapic.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
arch/parisc/kernel/irq.c +6 -6
@@ -131,7 +131,7 @@ static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest,if (cpu_dest <0 )return -1 ; -cpumask_copy (d->affinity, dest); +cpumask_copy (irq_data_get_affinity_mask (d), dest);return 0 ; }
@@ -339,7 +339,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu) {#ifdef CONFIG_SMP struct irq_data *d =irq_get_irq_data (irq); -cpumask_copy (d->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (cpu));#endif return per_cpu (cpu_data, cpu).txn_addr;
@@ -508,7 +508,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)unsigned long eirr_val;int irq, cpu =smp_processor_id ();#ifdef CONFIG_SMP -struct irq_desc *desc; +struct irq_data *irq_data;cpumask_t dest;#endif
@@ -522,9 +522,9 @@ void do_cpu_irq_mask(struct pt_regs *regs) irq =eirr_to_irq (eirr_val);#ifdef CONFIG_SMP - desc =irq_to_desc (irq); -cpumask_copy (&dest, desc->irq_data.affinity); -if (irqd_is_per_cpu (&desc->irq_data) && + irq_data =irq_get_irq_data (irq); +cpumask_copy (&dest,irq_data_get_affinity_mask (irq_data)); +if (irqd_is_per_cpu (irq_data) && !cpumask_test_cpu (smp_processor_id (), &dest)) {int cpu =cpumask_first (&dest);
drivers/parisc/iosapic.c +1 -1
@@ -691,7 +691,7 @@ static int iosapic_set_affinity_irq(struct irq_data *d,if (dest_cpu <0 )return -1 ; -cpumask_copy (d->affinity,cpumask_of (dest_cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (dest_cpu)); vi->txn_addr =txn_affinity_addr (d->irq, dest_cpu);spin_lock_irqsave (&iosapic_lock, flags);
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] parisc/irq: Use access helper irq_data_get_affinity_mask()
parisc/irq: Use access helper irq_data_get_affinity_mask()
Commit-ID: d2109a12198edf22eb85e475c223eea14b9c3fbe Gitweb: http://git.kernel.org/tip/d2109a12198edf22eb85e475c223eea14b9c3fbe Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:32 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 31 Jul 2015 22:20:04 +0200
parisc/irq: Use access helper irq_data_get_affinity_mask()
Use access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/parisc/kernel/irq.c | 12 ++++++------ drivers/parisc/iosapic.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
arch/parisc/kernel/irq.c +6 -6
@@ -131,7 +131,7 @@ static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest,if (cpu_dest <0 )return -1 ; -cpumask_copy (d->affinity, dest); +cpumask_copy (irq_data_get_affinity_mask (d), dest);return 0 ; }
@@ -339,7 +339,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu) {#ifdef CONFIG_SMP struct irq_data *d =irq_get_irq_data (irq); -cpumask_copy (d->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (cpu));#endif return per_cpu (cpu_data, cpu).txn_addr;
@@ -508,7 +508,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)unsigned long eirr_val;int irq, cpu =smp_processor_id ();#ifdef CONFIG_SMP -struct irq_desc *desc; +struct irq_data *irq_data;cpumask_t dest;#endif
@@ -522,9 +522,9 @@ void do_cpu_irq_mask(struct pt_regs *regs) irq =eirr_to_irq (eirr_val);#ifdef CONFIG_SMP - desc =irq_to_desc (irq); -cpumask_copy (&dest, desc->irq_data.affinity); -if (irqd_is_per_cpu (&desc->irq_data) && + irq_data =irq_get_irq_data (irq); +cpumask_copy (&dest,irq_data_get_affinity_mask (irq_data)); +if (irqd_is_per_cpu (irq_data) && !cpumask_test_cpu (smp_processor_id (), &dest)) {int cpu =cpumask_first (&dest);
drivers/parisc/iosapic.c +1 -1
@@ -691,7 +691,7 @@ static int iosapic_set_affinity_irq(struct irq_data *d,if (dest_cpu <0 )return -1 ; -cpumask_copy (d->affinity,cpumask_of (dest_cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (dest_cpu)); vi->txn_addr =txn_affinity_addr (d->irq, dest_cpu);spin_lock_irqsave (&iosapic_lock, flags);
PATCH v3 24/36 powerpc, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/irq.c +1 -1
@@ -441,7 +441,7 @@ void migrate_irqs(void) chip =irq_data_get_irq_chip (data); -cpumask_and (mask, data->affinity, map); +cpumask_and (mask,irq_data_get_affinity_mask (data), map);if (cpumask_any (mask) >= nr_cpu_ids) {pr_warn ("Breaking affinity for irq %i\n" , irq);cpumask_copy (mask, map);
arch/powerpc/sysdev/xics/ics-opal.c +1 -1
@@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); server =ics_opal_mangle_server (server); rc =opal_set_xive (hw_irq, server,DEFAULT_PRIORITY );
arch/powerpc/sysdev/xics/ics-rtas.c +1 -1
@@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); call_status =rtas_call (ibm_set_xive,3 ,1 ,NULL , hw_irq, server,DEFAULT_PRIORITY );
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/urgent] powerpc, irq: Use access helper irq_data_get_affinity_mask()
powerpc, irq: Use access helper irq_data_get_affinity_mask()
Commit-ID: da92b4eb7e2ec9866f14a0c8f453788e8052dee7 Gitweb: http://git.kernel.org/tip/da92b4eb7e2ec9866f14a0c8f453788e8052dee7 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:33 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 15 Sep 2015 17:06:28 +0200
powerpc, irq: Use access helper irq_data_get_affinity_mask()
Use access helper irq_data_get_affinity_mask() so we can move the affinity mask to irq_common_data.
--- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/kernel/irq.c +1 -1
@@ -441,7 +441,7 @@ void migrate_irqs(void) chip =irq_data_get_irq_chip (data); -cpumask_and (mask, data->affinity, map); +cpumask_and (mask,irq_data_get_affinity_mask (data), map);if (cpumask_any (mask) >= nr_cpu_ids) {pr_warn ("Breaking affinity for irq %i\n" , irq);cpumask_copy (mask, map);
arch/powerpc/sysdev/xics/ics-opal.c +1 -1
@@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); server =ics_opal_mangle_server (server); rc =opal_set_xive (hw_irq, server,DEFAULT_PRIORITY );
arch/powerpc/sysdev/xics/ics-rtas.c +1 -1
@@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); call_status =rtas_call (ibm_set_xive,3 ,1 ,NULL , hw_irq, server,DEFAULT_PRIORITY );
PATCH v3 25/36 sh, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/sh/kernel/irq.c | 7 ++++--- drivers/sh/intc/chip.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-)
arch/sh/kernel/irq.c +4 -3
@@ -228,15 +228,16 @@ void migrate_irqs(void)struct irq_data *data =irq_get_irq_data (irq);if (irq_data_get_node (data) == cpu) { -unsigned int newcpu =cpumask_any_and (data->affinity, +struct cpumask *mask =irq_data_get_affinity_mask (data); +unsigned int newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , irq, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (irq, data->affinity); +irq_set_affinity (irq, mask); } } }
drivers/sh/intc/chip.c +3 -3
@@ -22,7 +22,7 @@ void _intc_enable(struct irq_data *data, unsigned long handle)for (cpu =0 ; cpu <SMP_NR (d,_INTC_ADDR_E (handle)); cpu++) {#ifdef CONFIG_SMP -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu,irq_data_get_affinity_mask (data)))continue ;#endif addr =INTC_REG (d,_INTC_ADDR_E (handle), cpu);
@@ -50,7 +50,7 @@ static void intc_disable(struct irq_data *data)for (cpu =0 ; cpu <SMP_NR (d,_INTC_ADDR_D (handle)); cpu++) {#ifdef CONFIG_SMP -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu,irq_data_get_affinity_mask (data)))continue ;#endif addr =INTC_REG (d,_INTC_ADDR_D (handle), cpu);
@@ -72,7 +72,7 @@ static int intc_set_affinity(struct irq_data *data,if (!cpumask_intersects (cpumask, cpu_online_mask))return -1 ; -cpumask_copy (data->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (data), cpumask);return IRQ_SET_MASK_OK_NOCOPY ; }
Signature · 1 line
1.7.10.4
PATCH v3 26/36 sparc, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/sparc/kernel/irq_64.c | 12 +++++++----- arch/sparc/kernel/leon_kernel.c | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-)
arch/sparc/kernel/irq_64.c +7 -5
@@ -377,7 +377,8 @@ static void sun4u_irq_enable(struct irq_data *data)unsigned long cpuid, imap, val;unsigned int tid; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data)); imap = handler_data->imap; tid =sun4u_compute_tid (imap, cpuid);
@@ -449,7 +450,8 @@ static void sun4u_irq_eoi(struct irq_data *data)static void sun4v_irq_enable (struct irq_data *data) { -unsigned long cpuid =irq_choose_cpu (data->irq, data->affinity); +unsigned long cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data));unsigned int ino =irq_data_to_sysino (data);int err;
@@ -511,7 +513,7 @@ static void sun4v_virq_enable(struct irq_data *data)unsigned long cpuid;int err; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq,irq_data_get_affinity_mask (data)); err =sun4v_vintr_set_target (dev_handle, dev_ino, cpuid);if (err !=HV_EOK )
@@ -884,8 +886,8 @@ void fixup_irqs(void)if (desc->action && !irqd_is_per_cpu (data)) {if (data->chip->irq_set_affinity) data->chip->irq_set_affinity (data, - data->affinity, - false); +irq_data_get_affinity_mask (data), + false); }raw_spin_unlock_irqrestore (&desc->lock, flags); }
arch/sparc/kernel/leon_kernel.c +3 -3
@@ -126,7 +126,7 @@ static int leon_set_affinity(struct irq_data *data, const struct cpumask *dest,int oldcpu, newcpu; mask = (unsigned long )data->chip_data; - oldcpu =irq_choose_cpu (data->affinity); + oldcpu =irq_choose_cpu (irq_data_get_affinity_mask (data)); newcpu =irq_choose_cpu (dest);if (oldcpu == newcpu)
@@ -149,7 +149,7 @@ static void leon_unmask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask | mask));
@@ -162,7 +162,7 @@ static void leon_mask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask & ~mask));
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] sparc/irq: Use access helper irq_data_get_affinity_mask()
sparc/irq: Use access helper irq_data_get_affinity_mask()
Commit-ID: d7185a98d576e33982cd28e65889b3e4122fe5d8 Gitweb: http://git.kernel.org/tip/d7185a98d576e33982cd28e65889b3e4122fe5d8 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:35 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Fri, 31 Jul 2015 22:20:05 +0200
sparc/irq: Use access helper irq_data_get_affinity_mask()
This is a preparatory patch for moving irq_data struct members.
--- arch/sparc/kernel/irq_64.c | 12 +++++++----- arch/sparc/kernel/leon_kernel.c | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-)
arch/sparc/kernel/irq_64.c +7 -5
@@ -377,7 +377,8 @@ static void sun4u_irq_enable(struct irq_data *data)unsigned long cpuid, imap, val;unsigned int tid; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data)); imap = handler_data->imap; tid =sun4u_compute_tid (imap, cpuid);
@@ -449,7 +450,8 @@ static void sun4u_irq_eoi(struct irq_data *data)static void sun4v_irq_enable (struct irq_data *data) { -unsigned long cpuid =irq_choose_cpu (data->irq, data->affinity); +unsigned long cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data));unsigned int ino =irq_data_to_sysino (data);int err;
@@ -511,7 +513,7 @@ static void sun4v_virq_enable(struct irq_data *data)unsigned long cpuid;int err; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq,irq_data_get_affinity_mask (data)); err =sun4v_vintr_set_target (dev_handle, dev_ino, cpuid);if (err !=HV_EOK )
@@ -884,8 +886,8 @@ void fixup_irqs(void)if (desc->action && !irqd_is_per_cpu (data)) {if (data->chip->irq_set_affinity) data->chip->irq_set_affinity (data, - data->affinity, - false); +irq_data_get_affinity_mask (data), + false); }raw_spin_unlock_irqrestore (&desc->lock, flags); }
arch/sparc/kernel/leon_kernel.c +3 -3
@@ -126,7 +126,7 @@ static int leon_set_affinity(struct irq_data *data, const struct cpumask *dest,int oldcpu, newcpu; mask = (unsigned long )data->chip_data; - oldcpu =irq_choose_cpu (data->affinity); + oldcpu =irq_choose_cpu (irq_data_get_affinity_mask (data)); newcpu =irq_choose_cpu (dest);if (oldcpu == newcpu)
@@ -149,7 +149,7 @@ static void leon_unmask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask | mask));
@@ -162,7 +162,7 @@ static void leon_mask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask & ~mask));
PATCH v3 27/36 x86, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 5 ++--- arch/x86/kernel/irq.c | 5 +++-- drivers/xen/events/events_base.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void)* Honour affinities which have been set in early boot */ if (!irqd_can_balance (idata) ||irqd_affinity_was_set (idata)) - mask = idata->affinity; + mask =irq_data_get_affinity_mask (idata);else mask = apic->target_cpus ();
arch/x86/kernel/apic/vector.c +2 -3
@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
arch/x86/kernel/irq.c +3 -2
@@ -342,7 +342,8 @@ int check_irq_vectors_for_cpu_disable(void)continue ; data =irq_desc_get_irq_data (desc); -cpumask_copy (&affinity_new, data->affinity); +cpumask_copy (&affinity_new, +irq_data_get_affinity_mask (data));cpumask_clear_cpu (this_cpu, &affinity_new);/* Do not count inactive or per-cpu irqs. */
@@ -420,7 +421,7 @@ void fixup_irqs(void)raw_spin_lock (&desc->lock); data =irq_desc_get_irq_data (desc); - affinity = data->affinity; + affinity =irq_data_get_affinity_mask (data);if (!irq_has_action (irq) ||irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);
drivers/xen/events/events_base.c +2 -2
@@ -336,7 +336,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)BUG_ON (irq ==-1 );#ifdef CONFIG_SMP -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (cpu)); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu));#endif xen_evtchn_port_bind_to_cpu (info, cpu);
@@ -373,7 +373,7 @@ static void xen_irq_init(unsigned irq)struct irq_info *info;#ifdef CONFIG_SMP /* By default all event channels notify CPU#0. */ -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (0 )); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (0 ));#endif info =kzalloc (sizeof (*info),GFP_KERNEL );
Signature · 1 line
1.7.10.4
Re: [Patch v3 27/36] x86, irq: Use access helper irq_data_get_affinity_mask()
arch/x86/kernel/apic/vector.c static int apic_set_affinity(struct irq_data *irq_data, · line 498
Quoted 13 lines · Jiang Liu
arch/x86/kernel/apic/vector.c +2
-3@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))
Does this patch work w/o moving the affinity mask to common data? I doubt so, as you remove the retrieval of 'top'.
Thanks,
tglx
Re: [Patch v3 27/36] x86, irq: Use access helper irq_data_get_affinity_mask()
Quoted 8 lines · Thomas Gleixner
Quoted 6 lines · Jiang Liu
arch/x86/kernel/apic/vector.c +0
-0@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data,
Quoted 10 lines
arch/x86/kernel/apic/vector.c static int apic_set_affinity(struct irq_data *irq_data, · line 498
Quoted 7 lines
arch/x86/kernel/apic/vector.c +2
-3err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))Does this patch work w/o moving the affinity mask to common data? I doubt so, as you remove the retrieval of 'top'.
Hi Thomas,
This piece of code should be moved into [31/36], otherwise
it will break bisecting. I will redo patch this and [31/36] to support bisecting.
Thanks!
Gerry
Quoted 5 lines
Thanks,
tglx
Re: [Patch v3 27/36] x86, irq: Use access helper irq_data_get_affinity_mask()
In reply to Thomas GleixnerQuoted 8 lines · Thomas Gleixner
Quoted 6 lines · Jiang Liu
arch/x86/kernel/apic/vector.c +0
-0@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data,
Quoted 10 lines
arch/x86/kernel/apic/vector.c static int apic_set_affinity(struct irq_data *irq_data, · line 498
Quoted 7 lines
arch/x86/kernel/apic/vector.c +2
-3err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))Does this patch work w/o moving the affinity mask to common data? I doubt so, as you remove the retrieval of 'top'.
Hi Thomas,
This piece of code should be moved into [31/36], otherwise
it will break bisecting. I will redo patch this and [31/36] to support bisecting.
Thanks!
Gerry
Quoted 5 lines
Thanks,
tglx
PATCH v3 27/36 x86, irq: Use access helper irq_data_get_affinity_mask()
In reply to Thomas GleixnerUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
---
Hi Thomas,
This version changes the patch to correctly support bisecting.
Thanks!
Gerry
--- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 3 ++- arch/x86/kernel/irq.c | 5 +++-- drivers/xen/events/events_base.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void)* Honour affinities which have been set in early boot */ if (!irqd_can_balance (idata) ||irqd_affinity_was_set (idata)) - mask = idata->affinity; + mask =irq_data_get_affinity_mask (idata);else mask = apic->target_cpus ();
arch/x86/kernel/apic/vector.c +2 -1
@@ -496,7 +496,8 @@ static int apic_set_affinity(struct irq_data *irq_data,if (err) {struct irq_data *top =irq_get_irq_data (irq); -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (top)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
arch/x86/kernel/irq.c +3 -2
@@ -342,7 +342,8 @@ int check_irq_vectors_for_cpu_disable(void)continue ; data =irq_desc_get_irq_data (desc); -cpumask_copy (&affinity_new, data->affinity); +cpumask_copy (&affinity_new, +irq_data_get_affinity_mask (data));cpumask_clear_cpu (this_cpu, &affinity_new);/* Do not count inactive or per-cpu irqs. */
@@ -420,7 +421,7 @@ void fixup_irqs(void)raw_spin_lock (&desc->lock); data =irq_desc_get_irq_data (desc); - affinity = data->affinity; + affinity =irq_data_get_affinity_mask (data);if (!irq_has_action (irq) ||irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);
drivers/xen/events/events_base.c +2 -2
@@ -336,7 +336,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)BUG_ON (irq ==-1 );#ifdef CONFIG_SMP -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (cpu)); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu));#endif xen_evtchn_port_bind_to_cpu (info, cpu);
@@ -373,7 +373,7 @@ static void xen_irq_init(unsigned irq)struct irq_info *info;#ifdef CONFIG_SMP /* By default all event channels notify CPU#0. */ -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (0 )); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (0 ));#endif info =kzalloc (sizeof (*info),GFP_KERNEL );
Signature · 1 line
1.7.10.4
PATCH v3 27/36 x86, irq: Use access helper irq_data_get_affinity_mask()
In reply to Thomas GleixnerUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
---
Hi Thomas,
This version changes the patch to correctly support bisecting.
Thanks!
Gerry
--- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 3 ++- arch/x86/kernel/irq.c | 5 +++-- drivers/xen/events/events_base.c | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void)* Honour affinities which have been set in early boot */ if (!irqd_can_balance (idata) ||irqd_affinity_was_set (idata)) - mask = idata->affinity; + mask =irq_data_get_affinity_mask (idata);else mask = apic->target_cpus ();
arch/x86/kernel/apic/vector.c +2 -1
@@ -496,7 +496,8 @@ static int apic_set_affinity(struct irq_data *irq_data,if (err) {struct irq_data *top =irq_get_irq_data (irq); -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (top)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
arch/x86/kernel/irq.c +3 -2
@@ -342,7 +342,8 @@ int check_irq_vectors_for_cpu_disable(void)continue ; data =irq_desc_get_irq_data (desc); -cpumask_copy (&affinity_new, data->affinity); +cpumask_copy (&affinity_new, +irq_data_get_affinity_mask (data));cpumask_clear_cpu (this_cpu, &affinity_new);/* Do not count inactive or per-cpu irqs. */
@@ -420,7 +421,7 @@ void fixup_irqs(void)raw_spin_lock (&desc->lock); data =irq_desc_get_irq_data (desc); - affinity = data->affinity; + affinity =irq_data_get_affinity_mask (data);if (!irq_has_action (irq) ||irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);
drivers/xen/events/events_base.c +2 -2
@@ -336,7 +336,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)BUG_ON (irq ==-1 );#ifdef CONFIG_SMP -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (cpu)); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu));#endif xen_evtchn_port_bind_to_cpu (info, cpu);
@@ -373,7 +373,7 @@ static void xen_irq_init(unsigned irq)struct irq_info *info;#ifdef CONFIG_SMP /* By default all event channels notify CPU#0. */ -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (0 )); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (0 ));#endif info =kzalloc (sizeof (*info),GFP_KERNEL );
Signature · 1 line
1.7.10.4
Re: [Patch v3 27/36] x86, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang Liuarch/x86/kernel/apic/vector.c static int apic_set_affinity(struct irq_data *irq_data, · line 498
Quoted 13 lines · Jiang Liu
arch/x86/kernel/apic/vector.c +2
-3@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))
Does this patch work w/o moving the affinity mask to common data? I doubt so, as you remove the retrieval of 'top'.
Thanks,
tglx
PATCH v3 27/36 x86, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 5 ++--- arch/x86/kernel/irq.c | 5 +++-- drivers/xen/events/events_base.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void)* Honour affinities which have been set in early boot */ if (!irqd_can_balance (idata) ||irqd_affinity_was_set (idata)) - mask = idata->affinity; + mask =irq_data_get_affinity_mask (idata);else mask = apic->target_cpus ();
arch/x86/kernel/apic/vector.c +2 -3
@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
arch/x86/kernel/irq.c +3 -2
@@ -342,7 +342,8 @@ int check_irq_vectors_for_cpu_disable(void)continue ; data =irq_desc_get_irq_data (desc); -cpumask_copy (&affinity_new, data->affinity); +cpumask_copy (&affinity_new, +irq_data_get_affinity_mask (data));cpumask_clear_cpu (this_cpu, &affinity_new);/* Do not count inactive or per-cpu irqs. */
@@ -420,7 +421,7 @@ void fixup_irqs(void)raw_spin_lock (&desc->lock); data =irq_desc_get_irq_data (desc); - affinity = data->affinity; + affinity =irq_data_get_affinity_mask (data);if (!irq_has_action (irq) ||irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);
drivers/xen/events/events_base.c +2 -2
@@ -336,7 +336,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)BUG_ON (irq ==-1 );#ifdef CONFIG_SMP -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (cpu)); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu));#endif xen_evtchn_port_bind_to_cpu (info, cpu);
@@ -373,7 +373,7 @@ static void xen_irq_init(unsigned irq)struct irq_info *info;#ifdef CONFIG_SMP /* By default all event channels notify CPU#0. */ -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (0 )); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (0 ));#endif info =kzalloc (sizeof (*info),GFP_KERNEL );
Signature · 1 line
1.7.10.4
PATCH v3 28/36 xtensa, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- arch/xtensa/kernel/irq.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/xtensa/kernel/irq.c +6 -4
@@ -166,23 +166,25 @@ void migrate_irqs(void)for_each_active_irq (i) {struct irq_data *data =irq_get_irq_data (i); +struct cpumask *mask;unsigned int newcpu;if (irqd_is_per_cpu (data))continue ; -if (!cpumask_test_cpu (cpu, data->affinity)) + mask =irq_data_get_affinity_mask (data); +if (!cpumask_test_cpu (cpu, mask))continue ; - newcpu =cpumask_any_and (data->affinity, cpu_online_mask); + newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , i, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (i, data->affinity); +irq_set_affinity (i, mask); } }#endif /* CONFIG_HOTPLUG_CPU */
Signature · 1 line
1.7.10.4
PATCH v3 29/36 irqchip, irq: Use access helper irq_data_get_affinity_mask()
In reply to Jiang LiuUse access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
--- drivers/irqchip/irq-mips-gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -403,7 +403,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,clear_bit (irq, pcpu_masks[i].pcpu_mask);set_bit (irq, pcpu_masks[cpumask_first (&tmp)].pcpu_mask); -cpumask_copy (d->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (d), cpumask);spin_unlock_irqrestore (&gic_lock, flags);return IRQ_SET_MASK_OK_NOCOPY ;
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/core] irqchip/mips-gic: Use access helper irq_data_get_affinity_mask()
irqchip/mips-gic: Use access helper irq_data_get_affinity_mask()
Commit-ID: 72f86db4dd5eafbadd45c9092df73c49f320f638 Gitweb: http://git.kernel.org/tip/72f86db4dd5eafbadd45c9092df73c49f320f638 Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:38 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Sat, 11 Jul 2015 23:14:27 +0200
irqchip/mips-gic: Use access helper irq_data_get_affinity_mask()
Use access helper irq_data_get_affinity_mask() to hide implementation details of struct irq_desc.
[ tglx: Verified with coccinelle ]
--- drivers/irqchip/irq-mips-gic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -405,7 +405,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,clear_bit (irq, pcpu_masks[i].pcpu_mask);set_bit (irq, pcpu_masks[cpumask_first (&tmp)].pcpu_mask); -cpumask_copy (d->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (d), cpumask);spin_unlock_irqrestore (&gic_lock, flags);return IRQ_SET_MASK_OK_NOCOPY ;
PATCH v3 30/36 net/mlx4: Cache irq_desc->affinity instead of irq_desc
In reply to Jiang LiuThe field 'affinity' in irq_desc won't change once the irq_desc data structure is created. So cache irq_desc->affinity instead of irq_desc. This also helps to hide struct irq_desc from device drivers.
--- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 6 +++--- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +---- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_cq.c +3 -3
@@ -31,6 +31,7 @@* */ +#include <linux/irq.h> #include <linux/mlx4/cq.h> #include <linux/mlx4/qp.h> #include <linux/mlx4/cmd.h>
@@ -135,9 +136,8 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, mdev->dev->caps.num_comp_vectors; } - cq->irq_desc = -irq_to_desc (mlx4_eq_get_irq (mdev->dev, - cq->vector)); + cq->irq_affinity =irq_get_affinity_mask ( +mlx4_eq_get_irq (mdev->dev, cq->vector)); }else {/* For TX we use the same irq per ring we assigned for the RX */
drivers/net/ethernet/mellanox/mlx4/en_rx.c +1 -4
@@ -1044,14 +1044,11 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)/* If we used up all the quota - we're probably not done yet... */ if (done == budget) {int cpu_curr; -const struct cpumask *aff;INC_PERF_COUNTER (priv->pstats.napi_quota); cpu_curr =smp_processor_id (); - aff =irq_desc_get_irq_data (cq->irq_desc)->affinity; - -if (likely (cpumask_test_cpu (cpu_curr, aff))) +if (likely (cpumask_test_cpu (cpu_curr, cq->irq_affinity)))return budget;/* Current cpu is not according to smp_irq_affinity -
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +1 -1
@@ -357,7 +357,7 @@ struct mlx4_en_cq {#define CQ_USER_PEND (MLX4_EN_CQ_STATE_POLL | MLX4_EN_CQ_STATE_POLL_YIELD)spinlock_t poll_lock;/* protects from LLS/napi conflicts */ #endif /* CONFIG_NET_RX_BUSY_POLL */ -struct irq_desc *irq_desc; +struct cpumask *irq_affinity; };struct mlx4_en_port_profile {
Signature · 1 line
1.7.10.4
PATCH v3 31/36 genirq: Move field 'affinity' from struct irq_data into struct irq_common_data
In reply to Jiang LiuIrq affinity mask is per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 12 ++++++------ kernel/irq/irqdesc.c | 9 +++++---- kernel/irq/manage.c | 12 ++++++------ kernel/irq/proc.c | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-)
include/linux/irq.h +6 -6
@@ -110,8 +110,8 @@ enum {/* * Return value for chip->irq_set_affinity() * -* IRQ_SET_MASK_OK - OK, core updates irq_data.affinity -* IRQ_SET_MASK_NOCPY - OK, chip did update irq_data.affinity +* IRQ_SET_MASK_OK - OK, core updates irq_common_data.affinity +* IRQ_SET_MASK_NOCPY - OK, chip did update irq_common_data.affinity * IRQ_SET_MASK_OK_DONE - Same as IRQ_SET_MASK_OK for core. Special code to * support stacked irqchips, which indicates skipping * all descendent irqchips.
@@ -131,6 +131,7 @@ struct irq_domain;* Use accessor functions to deal with it * @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods +* @affinity: IRQ affinity on SMP */ struct irq_common_data {unsigned int state_use_accessors;
@@ -138,6 +139,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +cpumask_var_t affinity; };/**
@@ -154,7 +156,6 @@ struct irq_common_data {* @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor -* @affinity: IRQ affinity on SMP * * The fields here need to overlay the ones in irq_desc until we * cleaned up the direct references and switched everything over to
@@ -172,7 +173,6 @@ struct irq_data {#endif void *chip_data;struct msi_desc *msi_desc; -cpumask_var_t affinity; };/*
@@ -660,12 +660,12 @@ static inline struct cpumask *irq_get_affinity_mask(int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->affinity :NULL ; +return d ? d->common->affinity :NULL ; }static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) { -return d->affinity; +return d->common->affinity; }unsigned int arch_dynirq_lower_bound (unsigned int from);
kernel/irq/irqdesc.c +5 -4
@@ -38,12 +38,13 @@ static void __init init_irq_default_affinity(void)#ifdef CONFIG_SMP static int alloc_masks (struct irq_desc *desc,gfp_t gfp,int node) { -if (!zalloc_cpumask_var_node (&desc->irq_data.affinity, gfp, node)) +if (!zalloc_cpumask_var_node (&desc->irq_common_data.affinity, + gfp, node))return -ENOMEM ;#ifdef CONFIG_GENERIC_PENDING_IRQ if (!zalloc_cpumask_var_node (&desc->pending_mask, gfp, node)) { -free_cpumask_var (desc->irq_data.affinity); +free_cpumask_var (desc->irq_common_data.affinity);return -ENOMEM ; }#endif
@@ -52,7 +53,7 @@ static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)static void desc_smp_init (struct irq_desc *desc,int node) { -cpumask_copy (desc->irq_data.affinity, irq_default_affinity); +cpumask_copy (desc->irq_common_data.affinity, irq_default_affinity);#ifdef CONFIG_GENERIC_PENDING_IRQ cpumask_clear (desc->pending_mask);#endif
@@ -124,7 +125,7 @@ static void free_masks(struct irq_desc *desc)#ifdef CONFIG_GENERIC_PENDING_IRQ free_cpumask_var (desc->pending_mask);#endif - free_cpumask_var(desc->irq_data.affinity); + free_cpumask_var(desc->irq_common_data.affinity); }#else static inline void free_masks (struct irq_desc *desc) { }
kernel/irq/manage.c +6 -6
@@ -190,7 +190,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask,switch (ret) {case IRQ_SET_MASK_OK :case IRQ_SET_MASK_OK_DONE : -cpumask_copy (data->affinity, mask); +cpumask_copy (desc->irq_common_data.affinity, mask);case IRQ_SET_MASK_OK_NOCOPY :irq_set_thread_affinity (desc); ret =0 ;
@@ -302,7 +302,7 @@ static void irq_affinity_notify(struct work_struct *work)if (irq_move_pending (&desc->irq_data))irq_get_pending (cpumask, desc);else -cpumask_copy (cpumask, desc->irq_data.affinity); +cpumask_copy (cpumask, desc->irq_common_data.affinity);raw_spin_unlock_irqrestore (&desc->lock, flags); notify->notify (notify, cpumask);
@@ -374,9 +374,9 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)* one of the targets is online. */ if (irqd_has_set (&desc->irq_data,IRQD_AFFINITY_SET )) { -if (cpumask_intersects (desc->irq_data.affinity, +if (cpumask_intersects (desc->irq_common_data.affinity, cpu_online_mask)) - set = desc->irq_data.affinity; + set = desc->irq_common_data.affinity;else irqd_clear (&desc->irq_data,IRQD_AFFINITY_SET ); }
@@ -827,8 +827,8 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)* This code is triggered unconditionally. Check the affinity * mask pointer. For CPU_MASK_OFFSTACK=n this is optimized out. */ -if (desc->irq_data.affinity) -cpumask_copy (mask, desc->irq_data.affinity); +if (desc->irq_common_data.affinity) +cpumask_copy (mask, desc->irq_common_data.affinity);else valid = false;raw_spin_unlock_irq (&desc->lock);
kernel/irq/proc.c +1 -1
@@ -39,7 +39,7 @@ static struct proc_dir_entry *root_irq_dir;static int show_irq_affinity (int type,struct seq_file *m,void *v) {struct irq_desc *desc =irq_to_desc ((long )m->private); -const struct cpumask *mask = desc->irq_data.affinity; +const struct cpumask *mask = desc->irq_common_data.affinity;#ifdef CONFIG_GENERIC_PENDING_IRQ if (irqd_is_setaffinity_pending (&desc->irq_data))
Signature · 1 line
1.7.10.4
PATCH v3 31/36 genirq: Move field 'affinity' from struct irq_data into struct irq_common_data
Irq affinity mask is per-irq instead of per irqchip, so move it into struct irq_common_data.
---
Hi Thomas,
This version changes the patch to correctly support bisecting.
Thanks!
Gerry
--- arch/x86/kernel/apic/vector.c | 4 +--- include/linux/irq.h | 12 ++++++------ kernel/irq/irqdesc.c | 9 +++++---- kernel/irq/manage.c | 12 ++++++------ kernel/irq/proc.c | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-)
arch/x86/kernel/apic/vector.c +1 -3
@@ -494,10 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); -if (assign_irq_vector (irq, data, -irq_data_get_affinity_mask (top))) +irq_data_get_affinity_mask (irq_data)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
include/linux/irq.h +6 -6
@@ -110,8 +110,8 @@ enum {/* * Return value for chip->irq_set_affinity() * -* IRQ_SET_MASK_OK - OK, core updates irq_data.affinity -* IRQ_SET_MASK_NOCPY - OK, chip did update irq_data.affinity +* IRQ_SET_MASK_OK - OK, core updates irq_common_data.affinity +* IRQ_SET_MASK_NOCPY - OK, chip did update irq_common_data.affinity * IRQ_SET_MASK_OK_DONE - Same as IRQ_SET_MASK_OK for core. Special code to * support stacked irqchips, which indicates skipping * all descendent irqchips.
@@ -131,6 +131,7 @@ struct irq_domain;* Use accessor functions to deal with it * @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods +* @affinity: IRQ affinity on SMP */ struct irq_common_data {unsigned int state_use_accessors;
@@ -138,6 +139,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +cpumask_var_t affinity; };/**
@@ -154,7 +156,6 @@ struct irq_common_data {* @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor -* @affinity: IRQ affinity on SMP * * The fields here need to overlay the ones in irq_desc until we * cleaned up the direct references and switched everything over to
@@ -172,7 +173,6 @@ struct irq_data {#endif void *chip_data;struct msi_desc *msi_desc; -cpumask_var_t affinity; };/*
@@ -660,12 +660,12 @@ static inline struct cpumask *irq_get_affinity_mask(int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->affinity :NULL ; +return d ? d->common->affinity :NULL ; }static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) { -return d->affinity; +return d->common->affinity; }unsigned int arch_dynirq_lower_bound (unsigned int from);
kernel/irq/irqdesc.c +5 -4
@@ -38,12 +38,13 @@ static void __init init_irq_default_affinity(void)#ifdef CONFIG_SMP static int alloc_masks (struct irq_desc *desc,gfp_t gfp,int node) { -if (!zalloc_cpumask_var_node (&desc->irq_data.affinity, gfp, node)) +if (!zalloc_cpumask_var_node (&desc->irq_common_data.affinity, + gfp, node))return -ENOMEM ;#ifdef CONFIG_GENERIC_PENDING_IRQ if (!zalloc_cpumask_var_node (&desc->pending_mask, gfp, node)) { -free_cpumask_var (desc->irq_data.affinity); +free_cpumask_var (desc->irq_common_data.affinity);return -ENOMEM ; }#endif
@@ -52,7 +53,7 @@ static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)static void desc_smp_init (struct irq_desc *desc,int node) { -cpumask_copy (desc->irq_data.affinity, irq_default_affinity); +cpumask_copy (desc->irq_common_data.affinity, irq_default_affinity);#ifdef CONFIG_GENERIC_PENDING_IRQ cpumask_clear (desc->pending_mask);#endif
@@ -124,7 +125,7 @@ static void free_masks(struct irq_desc *desc)#ifdef CONFIG_GENERIC_PENDING_IRQ free_cpumask_var (desc->pending_mask);#endif - free_cpumask_var(desc->irq_data.affinity); + free_cpumask_var(desc->irq_common_data.affinity); }#else static inline void free_masks (struct irq_desc *desc) { }
kernel/irq/manage.c +6 -6
@@ -190,7 +190,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask,switch (ret) {case IRQ_SET_MASK_OK :case IRQ_SET_MASK_OK_DONE : -cpumask_copy (data->affinity, mask); +cpumask_copy (desc->irq_common_data.affinity, mask);case IRQ_SET_MASK_OK_NOCOPY :irq_set_thread_affinity (desc); ret =0 ;
@@ -302,7 +302,7 @@ static void irq_affinity_notify(struct work_struct *work)if (irq_move_pending (&desc->irq_data))irq_get_pending (cpumask, desc);else -cpumask_copy (cpumask, desc->irq_data.affinity); +cpumask_copy (cpumask, desc->irq_common_data.affinity);raw_spin_unlock_irqrestore (&desc->lock, flags); notify->notify (notify, cpumask);
@@ -374,9 +374,9 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)* one of the targets is online. */ if (irqd_has_set (&desc->irq_data,IRQD_AFFINITY_SET )) { -if (cpumask_intersects (desc->irq_data.affinity, +if (cpumask_intersects (desc->irq_common_data.affinity, cpu_online_mask)) - set = desc->irq_data.affinity; + set = desc->irq_common_data.affinity;else irqd_clear (&desc->irq_data,IRQD_AFFINITY_SET ); }
@@ -827,8 +827,8 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)* This code is triggered unconditionally. Check the affinity * mask pointer. For CPU_MASK_OFFSTACK=n this is optimized out. */ -if (desc->irq_data.affinity) -cpumask_copy (mask, desc->irq_data.affinity); +if (desc->irq_common_data.affinity) +cpumask_copy (mask, desc->irq_common_data.affinity);else valid = false;raw_spin_unlock_irq (&desc->lock);
kernel/irq/proc.c +1 -1
@@ -39,7 +39,7 @@ static struct proc_dir_entry *root_irq_dir;static int show_irq_affinity (int type,struct seq_file *m,void *v) {struct irq_desc *desc =irq_to_desc ((long )m->private); -const struct cpumask *mask = desc->irq_data.affinity; +const struct cpumask *mask = desc->irq_common_data.affinity;#ifdef CONFIG_GENERIC_PENDING_IRQ if (irqd_is_setaffinity_pending (&desc->irq_data))
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/urgent] genirq: Move field 'affinity' from irq_data into irq_common_data
genirq: Move field 'affinity' from irq_data into irq_common_data
Commit-ID: 9df872faa7e1619e9278bec00ceaed2236533530 Gitweb: http://git.kernel.org/tip/9df872faa7e1619e9278bec00ceaed2236533530 Author: Jiang Liu <[email protected]> AuthorDate: Wed, 3 Jun 2015 11:47:50 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 16 Sep 2015 15:46:49 +0200
genirq: Move field 'affinity' from irq_data into irq_common_data
Irq affinity mask is per-irq instead of per irqchip, so move it into struct irq_common_data.
--- arch/x86/kernel/apic/vector.c | 4 +--- include/linux/irq.h | 12 ++++++------ kernel/irq/irqdesc.c | 9 +++++---- kernel/irq/manage.c | 12 ++++++------ kernel/irq/proc.c | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-)
arch/x86/kernel/apic/vector.c +1 -3
@@ -489,10 +489,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); -if (assign_irq_vector (irq, data, -irq_data_get_affinity_mask (top))) +irq_data_get_affinity_mask (irq_data)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
include/linux/irq.h +6 -6
@@ -110,8 +110,8 @@ enum {/* * Return value for chip->irq_set_affinity() * -* IRQ_SET_MASK_OK - OK, core updates irq_data.affinity -* IRQ_SET_MASK_NOCPY - OK, chip did update irq_data.affinity +* IRQ_SET_MASK_OK - OK, core updates irq_common_data.affinity +* IRQ_SET_MASK_NOCPY - OK, chip did update irq_common_data.affinity * IRQ_SET_MASK_OK_DONE - Same as IRQ_SET_MASK_OK for core. Special code to * support stacked irqchips, which indicates skipping * all descendent irqchips.
@@ -131,6 +131,7 @@ struct irq_domain;* Use accessor functions to deal with it * @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods +* @affinity: IRQ affinity on SMP */ struct irq_common_data {unsigned int state_use_accessors;
@@ -138,6 +139,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +cpumask_var_t affinity; };/**
@@ -154,7 +156,6 @@ struct irq_common_data {* @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor -* @affinity: IRQ affinity on SMP */ struct irq_data {u32 mask;
@@ -168,7 +169,6 @@ struct irq_data {#endif void *chip_data;struct msi_desc *msi_desc; -cpumask_var_t affinity; };/*
@@ -684,12 +684,12 @@ static inline struct cpumask *irq_get_affinity_mask(int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->affinity :NULL ; +return d ? d->common->affinity :NULL ; }static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) { -return d->affinity; +return d->common->affinity; }unsigned int arch_dynirq_lower_bound (unsigned int from);
kernel/irq/irqdesc.c +5 -4
@@ -38,12 +38,13 @@ static void __init init_irq_default_affinity(void)#ifdef CONFIG_SMP static int alloc_masks (struct irq_desc *desc,gfp_t gfp,int node) { -if (!zalloc_cpumask_var_node (&desc->irq_data.affinity, gfp, node)) +if (!zalloc_cpumask_var_node (&desc->irq_common_data.affinity, + gfp, node))return -ENOMEM ;#ifdef CONFIG_GENERIC_PENDING_IRQ if (!zalloc_cpumask_var_node (&desc->pending_mask, gfp, node)) { -free_cpumask_var (desc->irq_data.affinity); +free_cpumask_var (desc->irq_common_data.affinity);return -ENOMEM ; }#endif
@@ -52,7 +53,7 @@ static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)static void desc_smp_init (struct irq_desc *desc,int node) { -cpumask_copy (desc->irq_data.affinity, irq_default_affinity); +cpumask_copy (desc->irq_common_data.affinity, irq_default_affinity);#ifdef CONFIG_GENERIC_PENDING_IRQ cpumask_clear (desc->pending_mask);#endif
@@ -124,7 +125,7 @@ static void free_masks(struct irq_desc *desc)#ifdef CONFIG_GENERIC_PENDING_IRQ free_cpumask_var (desc->pending_mask);#endif - free_cpumask_var(desc->irq_data.affinity); + free_cpumask_var(desc->irq_common_data.affinity); }#else static inline void free_masks (struct irq_desc *desc) { }
kernel/irq/manage.c +6 -6
@@ -192,7 +192,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask,switch (ret) {case IRQ_SET_MASK_OK :case IRQ_SET_MASK_OK_DONE : -cpumask_copy (data->affinity, mask); +cpumask_copy (desc->irq_common_data.affinity, mask);case IRQ_SET_MASK_OK_NOCOPY :irq_set_thread_affinity (desc); ret =0 ;
@@ -304,7 +304,7 @@ static void irq_affinity_notify(struct work_struct *work)if (irq_move_pending (&desc->irq_data))irq_get_pending (cpumask, desc);else -cpumask_copy (cpumask, desc->irq_data.affinity); +cpumask_copy (cpumask, desc->irq_common_data.affinity);raw_spin_unlock_irqrestore (&desc->lock, flags); notify->notify (notify, cpumask);
@@ -375,9 +375,9 @@ static int setup_affinity(struct irq_desc *desc, struct cpumask *mask)* one of the targets is online. */ if (irqd_has_set (&desc->irq_data,IRQD_AFFINITY_SET )) { -if (cpumask_intersects (desc->irq_data.affinity, +if (cpumask_intersects (desc->irq_common_data.affinity, cpu_online_mask)) - set = desc->irq_data.affinity; + set = desc->irq_common_data.affinity;else irqd_clear (&desc->irq_data,IRQD_AFFINITY_SET ); }
@@ -829,8 +829,8 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)* This code is triggered unconditionally. Check the affinity * mask pointer. For CPU_MASK_OFFSTACK=n this is optimized out. */ -if (desc->irq_data.affinity) -cpumask_copy (mask, desc->irq_data.affinity); +if (desc->irq_common_data.affinity) +cpumask_copy (mask, desc->irq_common_data.affinity);else valid = false;raw_spin_unlock_irq (&desc->lock);
kernel/irq/proc.c +1 -1
@@ -39,7 +39,7 @@ static struct proc_dir_entry *root_irq_dir;static int show_irq_affinity (int type,struct seq_file *m,void *v) {struct irq_desc *desc =irq_to_desc ((long )m->private); -const struct cpumask *mask = desc->irq_data.affinity; +const struct cpumask *mask = desc->irq_common_data.affinity;#ifdef CONFIG_GENERIC_PENDING_IRQ if (irqd_is_setaffinity_pending (&desc->irq_data))
PATCH v3 32/36 genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
In reply to Jiang LiuRename irq_data_get_msi() as irq_data_get_msi_desc() to keep consistency with other irq_data access helpers.
--- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/msi.c | 2 +- include/linux/irq.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/pci/host/pcie-designware.c +1 -1
@@ -309,7 +309,7 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,static void dw_msi_teardown_irq (struct msi_controller *chip,unsigned int irq) {struct irq_data *data =irq_get_irq_data (irq); -struct msi_desc *msi =irq_data_get_msi (data); +struct msi_desc *msi =irq_data_get_msi_desc (data);struct pcie_port *pp =sys_to_pcie (msi->dev->bus->sysdata);clear_irq_range (pp, irq,1 , data->hwirq);
drivers/pci/msi.c +1 -1
@@ -270,7 +270,7 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag)static void msi_set_mask_bit (struct irq_data *data,u32 flag) { -struct msi_desc *desc =irq_data_get_msi (data); +struct msi_desc *desc =irq_data_get_msi_desc (data);if (desc->msi_attrib.is_msix) {msix_mask_irq (desc, flag);
include/linux/irq.h +1 -1
@@ -631,7 +631,7 @@ static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)return d ? d->msi_desc :NULL ; } -static inline struct msi_desc *irq_data_get_msi (struct irq_data *d) +static inline struct msi_desc *irq_data_get_msi_desc (struct irq_data *d) {return d->msi_desc; }
Signature · 1 line
1.7.10.4
PATCH v3 33/36 genirq: Use helper function to access irq_data->msi_desc
In reply to Jiang LiuUse irq_data access helper to access irq_data->msi_desc, so we could move msi_desc from struct irq_data into struct irq_common_data later.
--- arch/ia64/kernel/msi_ia64.c | 2 +- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- arch/tile/kernel/pci_gx.c | 2 +- drivers/pci/msi.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
arch/ia64/kernel/msi_ia64.c +1 -1
@@ -23,7 +23,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,if (irq_prepare_move (irq, cpu))return -1 ; -__get_cached_msi_msg (idata->msi_desc, &msg); +__get_cached_msi_msg (irq_data_get_msi_desc (idata), &msg); addr = msg.address_lo; addr &=MSI_ADDR_DEST_ID_MASK ;
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -175,7 +175,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,* Release XIO resources for the old MSI PCI address */ -__get_cached_msi_msg (data->msi_desc, &msg); +__get_cached_msi_msg (irq_data_get_msi_desc (data), &msg); sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; pdev = sn_pdev->pdi_linux_pcidev; provider =SN_PCIDEV_BUSPROVIDER (pdev);
arch/powerpc/sysdev/xics/ics-opal.c +1 -1
@@ -72,7 +72,7 @@ static unsigned int ics_opal_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif
arch/powerpc/sysdev/xics/ics-rtas.c +1 -1
@@ -75,7 +75,7 @@ static unsigned int ics_rtas_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif /* unmask it */
arch/tile/kernel/pci_gx.c +1 -1
@@ -1442,7 +1442,7 @@ static struct pci_ops tile_cfg_ops = {/* MSI support starts here. */ static unsigned int tilegx_msi_startup (struct irq_data *d) { -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);return 0 ;
drivers/pci/msi.c +1 -1
@@ -1178,7 +1178,7 @@ EXPORT_SYMBOL(pci_enable_msix_range);*/ void pci_msi_domain_write_msg (struct irq_data *irq_data,struct msi_msg *msg) { -struct msi_desc *desc = irq_data->msi_desc; +struct msi_desc *desc =irq_data_get_msi_desc (irq_data);/* * For MSI-X desc->irq is always equal to irq_data->irq. For
Signature · 1 line
1.7.10.4
Re: [v3,33/36] genirq: Use helper function to access irq_data->msi_desc
Quoted 26 lines · Jiang Liu
Use
irq_dataaccess helper to accessirq_data->msi_desc, so we could movemsi_descfrom structirq_datainto structirq_common_datalater.Signed-off-by Jiang Liu <[email protected]>--- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +-arch/powerpc/sysdev/xics/ics-opal.c +1
-1@@ -72,7 +72,7 @@ static unsigned int ics_opal_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif arch/powerpc/sysdev/xics/ics-rtas.c +0
-0
arch/powerpc/sysdev/xics/ics-rtas.c static unsigned int ics_rtas_startup(struct irq_data *d) · line 81
Quoted 8 lines
arch/powerpc/sysdev/xics/ics-rtas.c +1
-1@@ -75,7 +75,7 @@ static unsigned int ics_rtas_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif /* unmask it */
These look OK.
Though I would point out we already have 16 irq_foo_get_bar() accessors?!
cheers
Re: [v3,33/36] genirq: Use helper function to access irq_data->msi_desc
Quoted 38 lines · Michael Ellerman
Quoted 26 lines · Jiang Liu
Use
irq_dataaccess helper to accessirq_data->msi_desc, so we could movemsi_descfrom structirq_datainto structirq_common_datalater.Signed-off-by Jiang Liu <[email protected]>--- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +-arch/powerpc/sysdev/xics/ics-opal.c +1
-1@@ -72,7 +72,7 @@ static unsigned int ics_opal_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif arch/powerpc/sysdev/xics/ics-rtas.c +0
-0arch/powerpc/sysdev/xics/ics-rtas.c static unsigned int ics_rtas_startup(struct irq_data *d) · line 81
Quoted 8 lines
arch/powerpc/sysdev/xics/ics-rtas.c +1
-1@@ -75,7 +75,7 @@ static unsigned int ics_rtas_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif /* unmask it */ These look OK.
Quoted 1 line
Though I would point out we already have 16
irq_foo_get_bar()accessors?!
Hi Michael,
Thanks for review. We are trying to solve some issues introduced
by hierarchy irqdomain/irqchip by splitting irq_data into a common part (irq_common_data) and per-chip part(irq_data). These accessors are used to ease the transition and hide implementation details. Thanks!
Gerry
Quoted 5 lines
Acked-by Michael Ellerman <[email protected]>cheers
Re: [v3,33/36] genirq: Use helper function to access irq_data->msi_desc
In reply to Michael EllermanQuoted 1 line · Michael Ellerman
Though I would point out we already have 16
irq_foo_get_bar()accessors?!
Say thanks to the people who mindlessly fiddled in the core managed fields of irqdesc and irqdata. The hard to track down wreckage they caused me to enforce accessors.
The new accessors are to help migrating members of irq_data to a new data structure without breaking the world and some more.
Thanks,
tglx
PATCH v3 34/36 genirq: Move field 'msi_desc' from struct irq_data into struct irq_common_data
In reply to Jiang LiuMSI descriptors are per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/irqdesc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
include/linux/irq.h +4 -4
@@ -132,6 +132,7 @@ struct irq_domain;* @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods * @affinity: IRQ affinity on SMP +* @msi_desc: MSI descriptor */ struct irq_common_data {unsigned int state_use_accessors;
@@ -139,6 +140,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +struct msi_desc *msi_desc;cpumask_var_t affinity; };
@@ -155,7 +157,6 @@ struct irq_common_data {* irq_domain * @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations -* @msi_desc: MSI descriptor * * The fields here need to overlay the ones in irq_desc until we * cleaned up the direct references and switched everything over to
@@ -172,7 +173,6 @@ struct irq_data {struct irq_data *parent_data;#endif void *chip_data; -struct msi_desc *msi_desc; };/*
@@ -628,12 +628,12 @@ static inline void *irq_data_get_irq_handler_data(struct irq_data *d)static inline struct msi_desc *irq_get_msi_desc (unsigned int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->msi_desc :NULL ; +return d ? d->common->msi_desc :NULL ; }static inline struct msi_desc *irq_data_get_msi_desc (struct irq_data *d) { -return d->msi_desc; +return d->common->msi_desc; }static inline u32 irq_get_trigger_type (unsigned int irq)
include/linux/irqdesc.h +1 -1
@@ -125,7 +125,7 @@ static inline void *irq_desc_get_handler_data(struct irq_desc *desc)static inline struct msi_desc *irq_desc_get_msi_desc (struct irq_desc *desc) { -return desc->irq_data.msi_desc; +return desc->irq_common_data.msi_desc; }/*
kernel/irq/chip.c +1 -1
@@ -105,7 +105,7 @@ int irq_set_msi_desc_off(unsigned int irq_base, unsigned int irq_offset,if (!desc)return -EINVAL ; - desc->irq_data.msi_desc = entry; + desc->irq_common_data.msi_desc = entry;if (entry && !irq_offset) entry->irq = irq_base;irq_put_desc_unlock (desc, flags);
kernel/irq/irqdesc.c +1 -1
@@ -74,12 +74,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,int cpu; desc->irq_common_data.handler_data =NULL ; + desc->irq_common_data.msi_desc =NULL ; desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ; - desc->irq_data.msi_desc =NULL ;irq_settings_clr_and_set (desc, ~0 , _IRQ_DEFAULT_INIT_FLAGS);irqd_set (&desc->irq_data,IRQD_IRQ_DISABLED ); desc->handle_irq = handle_bad_irq;
Signature · 1 line
1.7.10.4
tip-bot for Jiang Liu
merge bot[tip:irq/urgent] genirq: Move field 'msi_desc' from irq_data into irq_common_data
genirq: Move field 'msi_desc' from irq_data into irq_common_data
Commit-ID: b237721c5d95082a803c0be686f56d2dd1de995b Gitweb: http://git.kernel.org/tip/b237721c5d95082a803c0be686f56d2dd1de995b Author: Jiang Liu <[email protected]> AuthorDate: Mon, 1 Jun 2015 16:05:43 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 16 Sep 2015 15:46:49 +0200
genirq: Move field 'msi_desc' from irq_data into irq_common_data
MSI descriptors are per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/irqdesc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
include/linux/irq.h +4 -4
@@ -132,6 +132,7 @@ struct irq_domain;* @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods * @affinity: IRQ affinity on SMP +* @msi_desc: MSI descriptor */ struct irq_common_data {unsigned int state_use_accessors;
@@ -139,6 +140,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +struct msi_desc *msi_desc;cpumask_var_t affinity; };
@@ -155,7 +157,6 @@ struct irq_common_data {* irq_domain * @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations -* @msi_desc: MSI descriptor */ struct irq_data {u32 mask;
@@ -168,7 +169,6 @@ struct irq_data {struct irq_data *parent_data;#endif void *chip_data; -struct msi_desc *msi_desc; };/*
@@ -652,12 +652,12 @@ static inline void *irq_data_get_irq_handler_data(struct irq_data *d)static inline struct msi_desc *irq_get_msi_desc (unsigned int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->msi_desc :NULL ; +return d ? d->common->msi_desc :NULL ; }static inline struct msi_desc *irq_data_get_msi_desc (struct irq_data *d) { -return d->msi_desc; +return d->common->msi_desc; }static inline u32 irq_get_trigger_type (unsigned int irq)
include/linux/irqdesc.h +1 -1
@@ -128,7 +128,7 @@ static inline void *irq_desc_get_handler_data(struct irq_desc *desc)static inline struct msi_desc *irq_desc_get_msi_desc (struct irq_desc *desc) { -return desc->irq_data.msi_desc; +return desc->irq_common_data.msi_desc; }/*
kernel/irq/chip.c +1 -1
@@ -105,7 +105,7 @@ int irq_set_msi_desc_off(unsigned int irq_base, unsigned int irq_offset,if (!desc)return -EINVAL ; - desc->irq_data.msi_desc = entry; + desc->irq_common_data.msi_desc = entry;if (entry && !irq_offset) entry->irq = irq_base;irq_put_desc_unlock (desc, flags);
kernel/irq/irqdesc.c +1 -1
@@ -74,12 +74,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,int cpu; desc->irq_common_data.handler_data =NULL ; + desc->irq_common_data.msi_desc =NULL ; desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ; - desc->irq_data.msi_desc =NULL ;irq_settings_clr_and_set (desc, ~0 , _IRQ_DEFAULT_INIT_FLAGS);irqd_set (&desc->irq_data,IRQD_IRQ_DISABLED ); desc->handle_irq = handle_bad_irq;
PATCH v3 35/36 genirq: Pass irq_data to helper function __irq_set_chip_handler_name_locked()
In reply to Jiang LiuFor most cases, callers pass irq_data->irq to helper function __irq_set_chip_handler_name_locked() and __irq_set_chip_handler_name_locked() looks up irq_data again by calling irq_get_irq_data(irq_data->irq).
So pass irq_data directly instead of irq_data->irq to __irq_set_chip_handler_name_locked().
This also helps to better support hierarchy irqdomain in irq core.
--- arch/ia64/kernel/iosapic.c | 6 +++--- arch/mips/alchemy/common/irq.c | 4 ++-- drivers/gpio/gpio-zynq.c | 9 ++++----- drivers/irqchip/irq-metag-ext.c | 5 ++--- drivers/irqchip/irq-mips-gic.c | 11 ++++------- include/linux/irqdesc.h | 7 +++---- 6 files changed, 18 insertions(+), 24 deletions(-)
arch/ia64/kernel/iosapic.c +3 -3
@@ -610,9 +610,9 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery, chip->name, irq_type->name); chip = irq_type; } -__irq_set_chip_handler_name_locked (irq, chip, trigger ==IOSAPIC_EDGE ? - handle_edge_irq : handle_level_irq, -NULL ); +__irq_set_chip_handler_name_locked (irq_get_irq_data (irq), chip, + trigger ==IOSAPIC_EDGE ? handle_edge_irq : handle_level_irq, +NULL );return 0 ; }
arch/mips/alchemy/common/irq.c +2 -2
@@ -491,7 +491,7 @@ static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type)default : ret = -EINVAL ; } -__irq_set_chip_handler_name_locked (d->irq, chip, handler, name); +__irq_set_chip_handler_name_locked (d, chip, handler, name);wmb ();
@@ -703,7 +703,7 @@ static int au1300_gpic_settype(struct irq_data *d, unsigned int type)return -EINVAL ; } -__irq_set_chip_handler_name_locked (d->irq, &au1300_gpic, hdl, name); +__irq_set_chip_handler_name_locked (d, &au1300_gpic, hdl, name);au1300_gpic_chgcfg (d->irq -ALCHEMY_GPIC_INT_BASE ,GPIC_CFG_IC_MASK , s);
drivers/gpio/gpio-zynq.c +4 -5
@@ -422,13 +422,12 @@ static int zynq_gpio_set_irq_type(struct irq_data *irq_data, unsigned int type)writel_relaxed (int_any, gpio->base_addr +ZYNQ_GPIO_INTANY_OFFSET (bank_num)); -if (type &IRQ_TYPE_LEVEL_MASK ) { -__irq_set_chip_handler_name_locked (irq_data->irq, +if (type &IRQ_TYPE_LEVEL_MASK ) +__irq_set_chip_handler_name_locked (irq_data, &zynq_gpio_level_irqchip, handle_fasteoi_irq,NULL ); - }else { -__irq_set_chip_handler_name_locked (irq_data->irq, +else +__irq_set_chip_handler_name_locked (irq_data, &zynq_gpio_edge_irqchip, handle_level_irq,NULL ); - }return 0 ; }
drivers/irqchip/irq-metag-ext.c +2 -3
@@ -404,7 +404,6 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)#ifdef CONFIG_METAG_SUSPEND_MEM struct meta_intc_priv *priv = &meta_intc_priv;#endif -unsigned int irq = data->irq;irq_hw_number_t hw = data->hwirq;unsigned int bit =1 <<meta_intc_offset (hw);void __iomem *level_addr =meta_intc_level_addr (hw);
@@ -413,10 +412,10 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)/* update the chip/handler */ if (flow_type &IRQ_TYPE_LEVEL_MASK ) -__irq_set_chip_handler_name_locked (irq, &meta_intc_level_chip, +__irq_set_chip_handler_name_locked (data, &meta_intc_level_chip, handle_level_irq,NULL );else -__irq_set_chip_handler_name_locked (irq, &meta_intc_edge_chip, +__irq_set_chip_handler_name_locked (data, &meta_intc_edge_chip, handle_edge_irq,NULL );/* and clear/set the bit in HWLEVELEXT */
drivers/irqchip/irq-mips-gic.c +4 -7
@@ -365,15 +365,12 @@ static int gic_set_type(struct irq_data *d, unsigned int type)break ; } -if (is_edge) { -__irq_set_chip_handler_name_locked (d->irq, - &gic_edge_irq_controller, +if (is_edge) +__irq_set_chip_handler_name_locked (d, &gic_edge_irq_controller, handle_edge_irq,NULL ); - }else { -__irq_set_chip_handler_name_locked (d->irq, - &gic_level_irq_controller, +else +__irq_set_chip_handler_name_locked (d, &gic_level_irq_controller, handle_level_irq,NULL ); - }spin_unlock_irqrestore (&gic_lock, flags);return 0 ;
include/linux/irqdesc.h +3 -4
@@ -177,15 +177,14 @@ static inline void __irq_set_handler_locked(unsigned int irq,/* caller has locked the irq_desc and both params are valid */ static inline void -__irq_set_chip_handler_name_locked (unsigned int irq,struct irq_chip *chip, +__irq_set_chip_handler_name_locked (struct irq_data *data,struct irq_chip *chip,irq_flow_handler_t handler,const char *name) { -struct irq_desc *desc; +struct irq_desc *desc =irq_data_to_desc (data); - desc =irq_to_desc (irq); -irq_desc_get_irq_data (desc)->chip = chip; desc->handle_irq = handler; desc->name = name; + data->chip = chip; }static inline int irq_balancing_disabled (unsigned int irq)
Signature · 1 line
1.7.10.4
Re: [Patch v3 35/36] genirq: Pass irq_data to helper function __irq_set_chip_handler_name_locked()
On Mon, Jun 01, 2015 at 04:05:44PM +0800, Jiang Liu wrote:
For arch/mips/alchemy/common/irq.c:
Ralf
PATCH v3 36/36 genirq: Optimize irq_data_to_desc() to avoid irq_to_desc() lookup
In reply to Jiang LiuOptimize irq_data_to_desc() to avoid irq_to_desc() lookup.
--- include/linux/irqdesc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/irqdesc.h +1 -1
@@ -97,7 +97,7 @@ extern struct irq_desc irq_desc[NR_IRQS];static inline struct irq_desc *irq_data_to_desc (struct irq_data *data) {#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY -return irq_to_desc (data->irq); + return container_of(data->common, struct irq_desc, irq_common_data);#else return container_of(data, struct irq_desc, irq_data);#endif
Signature · 1 line
1.7.10.4