x86: unify current 3 similar ways of saving IRQ info
PATCH 1/1 x86: unify current 3 similar ways of saving IRQ info
There are 3 places defining the similar function of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch will reduce the redundant code, and make it only one API:
void mp_save_irq(struct mpc_intsrc *m);
--- arch/x86/include/asm/mpspec.h | 6 ++++++ arch/x86/kernel/acpi/boot.c | 32 +++----------------------------- arch/x86/kernel/mpparse.c | 14 +++++++------- arch/x86/platform/mrst/mrst.c | 30 ++---------------------------- 4 files changed, 18 insertions(+), 64 deletions(-)
arch/x86/include/asm/mpspec.h +6 -0
@@ -42,6 +42,12 @@ extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];#endif /* CONFIG_X86_64 */ +#ifdef CONFIG_X86_IO_APIC +void mp_save_irq (struct mpc_intsrc *m); +#else +static inline void mp_save_irq (struct mpc_intsrc *m) {} +#endif +#if defined(CONFIG_MCA ) || defined(CONFIG_EISA )extern int mp_bus_id_to_type[MAX_MP_BUSSES ];#endif
arch/x86/kernel/acpi/boot.c +3 -29
@@ -949,32 +949,6 @@ static int __init acpi_parse_madt_lapic_entries(void)extern int es7000_plat;#endif -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -void __init mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger,u32 gsi) {int ioapic;
@@ -1005,7 +979,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstapic = mp_ioapics[ioapic].apicid;/* APIC ID */ mp_irq.dstirq = pin;/* INTIN# */ -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); isa_irq_to_gsi[bus_irq] = gsi; }
@@ -1080,7 +1054,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_irq.srcbusirq = i;/* Identity mapped */ mp_irq.dstirq = pin; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); } }
@@ -1117,7 +1091,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, mp_irq.dstapic = mp_ioapics[ioapic].apicid; mp_irq.dstirq =mp_find_ioapic_pin (ioapic, gsi); -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq);#endif return 0 ; }
arch/x86/kernel/mpparse.c +7 -7
@@ -144,7 +144,7 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq) mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq); } -static void __init assign_to_mp_irq (struct mpc_intsrc *m, +static void assign_to_mp_irq (struct mpc_intsrc *m,struct mpc_intsrc *mp_irq) { mp_irq->dstapic = m->dstapic;
@@ -168,7 +168,7 @@ static void __init assign_to_mpc_intsrc(struct mpc_intsrc *mp_irq, m->dstirq = mp_irq->dstirq; } -static int __init mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, +static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq,struct mpc_intsrc *m) {if (mp_irq->dstapic != m->dstapic)
@@ -189,7 +189,8 @@ static int __init mp_irq_mpc_intsrc_cmp(struct mpc_intsrc *mp_irq,return 0 ; } -static void __init MP_intsrc_info (struct mpc_intsrc *m) +/* Will also be called in acpi/sfi related code */ +void mp_save_irq (struct mpc_intsrc *m) {int i;
@@ -207,7 +208,6 @@ static void __init MP_intsrc_info(struct mpc_intsrc *m)#else /* CONFIG_X86_IO_APIC */ static inline void __init MP_bus_info (struct mpc_bus *m) {}static inline void __init MP_ioapic_info (struct mpc_ioapic *m) {} -static inline void __init MP_intsrc_info (struct mpc_intsrc *m) {}#endif /* CONFIG_X86_IO_APIC */
@@ -337,7 +337,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)skip_entry (&mpt, &count,sizeof (struct mpc_ioapic ));break ;case MP_INTSRC : -MP_intsrc_info ((struct mpc_intsrc *)mpt); +mp_save_irq ((struct mpc_intsrc *)mpt);skip_entry (&mpt, &count,sizeof (struct mpc_intsrc ));break ;case MP_LINTSRC :
@@ -429,13 +429,13 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type) intsrc.srcbusirq = i; intsrc.dstirq = i ? i :2 ;/* IRQ0 to INTIN2 */ -MP_intsrc_info (&intsrc); +mp_save_irq (&intsrc); } intsrc.irqtype = mp_ExtINT; intsrc.srcbusirq =0 ; intsrc.dstirq =0 ;/* 8259A to INTIN0 */ -MP_intsrc_info (&intsrc); +mp_save_irq (&intsrc); }
arch/x86/platform/mrst/mrst.c +2 -28
@@ -71,32 +71,6 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];EXPORT_SYMBOL_GPL (sfi_mrtc_array);int sfi_mrtc_num; -static inline void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static inline int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -/* parse all the mtimer info to a static mtimer array */ static int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -130,7 +104,7 @@ static int __init sfi_parse_mtmr(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ;
@@ -200,7 +174,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ; }
Signature · 1 line
1.7.0.4
[tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Commit-ID: a6427a341985e0379060c86b50fcdb59883e4102 Gitweb: http://git.kernel.org/tip/a6427a341985e0379060c86b50fcdb59883e4102 Author: Feng Tang <[email protected]> AuthorDate: Fri, 3 Dec 2010 12:11:58 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 6 Dec 2010 15:58:26 +0100
x86: Unify current 3 similar ways of saving IRQ info
There are 3 places defining the similar function of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch will reduce the redundant code, and make it only one API:
void mp_save_irq(struct mpc_intsrc *m);
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/mpspec.h | 6 ++++++ arch/x86/kernel/acpi/boot.c | 32 +++----------------------------- arch/x86/kernel/mpparse.c | 14 +++++++------- arch/x86/platform/mrst/mrst.c | 30 ++---------------------------- 4 files changed, 18 insertions(+), 64 deletions(-)
arch/x86/include/asm/mpspec.h +6 -0
@@ -42,6 +42,12 @@ extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];#endif /* CONFIG_X86_64 */ +#ifdef CONFIG_X86_IO_APIC +void mp_save_irq (struct mpc_intsrc *m); +#else +static inline void mp_save_irq (struct mpc_intsrc *m) {} +#endif +#if defined(CONFIG_MCA ) || defined(CONFIG_EISA )extern int mp_bus_id_to_type[MAX_MP_BUSSES ];#endif
arch/x86/kernel/acpi/boot.c +3 -29
@@ -949,32 +949,6 @@ static int __init acpi_parse_madt_lapic_entries(void)extern int es7000_plat;#endif -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -void __init mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger,u32 gsi) {int ioapic;
@@ -1005,7 +979,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstapic = mp_ioapics[ioapic].apicid;/* APIC ID */ mp_irq.dstirq = pin;/* INTIN# */ -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); isa_irq_to_gsi[bus_irq] = gsi; }
@@ -1080,7 +1054,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_irq.srcbusirq = i;/* Identity mapped */ mp_irq.dstirq = pin; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); } }
@@ -1117,7 +1091,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, mp_irq.dstapic = mp_ioapics[ioapic].apicid; mp_irq.dstirq =mp_find_ioapic_pin (ioapic, gsi); -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq);#endif return 0 ; }
arch/x86/kernel/mpparse.c +7 -7
@@ -144,7 +144,7 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq) mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq); } -static void __init assign_to_mp_irq (struct mpc_intsrc *m, +static void assign_to_mp_irq (struct mpc_intsrc *m,struct mpc_intsrc *mp_irq) { mp_irq->dstapic = m->dstapic;
@@ -168,7 +168,7 @@ static void __init assign_to_mpc_intsrc(struct mpc_intsrc *mp_irq, m->dstirq = mp_irq->dstirq; } -static int __init mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, +static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq,struct mpc_intsrc *m) {if (mp_irq->dstapic != m->dstapic)
@@ -189,7 +189,8 @@ static int __init mp_irq_mpc_intsrc_cmp(struct mpc_intsrc *mp_irq,return 0 ; } -static void __init MP_intsrc_info (struct mpc_intsrc *m) +/* Will also be called in acpi/sfi related code */ +void mp_save_irq (struct mpc_intsrc *m) {int i;
@@ -207,7 +208,6 @@ static void __init MP_intsrc_info(struct mpc_intsrc *m)#else /* CONFIG_X86_IO_APIC */ static inline void __init MP_bus_info (struct mpc_bus *m) {}static inline void __init MP_ioapic_info (struct mpc_ioapic *m) {} -static inline void __init MP_intsrc_info (struct mpc_intsrc *m) {}#endif /* CONFIG_X86_IO_APIC */
@@ -337,7 +337,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)skip_entry (&mpt, &count,sizeof (struct mpc_ioapic ));break ;case MP_INTSRC : -MP_intsrc_info ((struct mpc_intsrc *)mpt); +mp_save_irq ((struct mpc_intsrc *)mpt);skip_entry (&mpt, &count,sizeof (struct mpc_intsrc ));break ;case MP_LINTSRC :
@@ -429,13 +429,13 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type) intsrc.srcbusirq = i; intsrc.dstirq = i ? i :2 ;/* IRQ0 to INTIN2 */ -MP_intsrc_info (&intsrc); +mp_save_irq (&intsrc); } intsrc.irqtype = mp_ExtINT; intsrc.srcbusirq =0 ; intsrc.dstirq =0 ;/* 8259A to INTIN0 */ -MP_intsrc_info (&intsrc); +mp_save_irq (&intsrc); }
arch/x86/platform/mrst/mrst.c +2 -28
@@ -71,32 +71,6 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];EXPORT_SYMBOL_GPL (sfi_mrtc_array);int sfi_mrtc_num; -static inline void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static inline int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -/* parse all the mtimer info to a static mtimer array */ static int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -130,7 +104,7 @@ static int __init sfi_parse_mtmr(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ;
@@ -200,7 +174,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ; }
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 160 lines · tip-bot for Feng Tang
Commit-ID: a6427a341985e0379060c86b50fcdb59883e4102 Gitweb: http://git.kernel.org/tip/a6427a341985e0379060c86b50fcdb59883e4102 Author: Feng Tang <[email protected]> AuthorDate: Fri, 3 Dec 2010 12:11:58 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 6 Dec 2010 15:58:26 +0100x86: Unify current 3 similar ways of saving IRQ info
There are 3 places defining the similar function of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch will reduce the redundant code, and make it only one API:
void mp_save_irq(struct mpc_intsrc *m);Signed-off-by Feng Tang <[email protected]>Cc Alan Cox <[email protected]>Cc Len Brown <[email protected]>LKML-Reference: <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>--- arch/x86/include/asm/mpspec.h | 6 ++++++ arch/x86/kernel/acpi/boot.c | 32 +++----------------------------- arch/x86/kernel/mpparse.c | 14 +++++++------- arch/x86/platform/mrst/mrst.c | 30 ++---------------------------- 4 files changed, 18 insertions(+), 64 deletions(-)arch/x86/include/asm/mpspec.h +6
-0@@ -42,6 +42,12 @@ extern int quad_local_to_mp_bus_id [NR_CPUS/4][4];#endif /* CONFIG_X86_64 */ +#ifdef CONFIG_X86_IO_APIC +void mp_save_irq (struct mpc_intsrc *m); +#else +static inline void mp_save_irq (struct mpc_intsrc *m) {} +#endif +#if defined(CONFIG_MCA ) || defined(CONFIG_EISA )extern int mp_bus_id_to_type[MAX_MP_BUSSES ];#endif arch/x86/kernel/acpi/boot.c +3
-29@@ -949,32 +949,6 @@ static int __init acpi_parse_madt_lapic_entries(void)extern int es7000_plat;#endif -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -void __init mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger,u32 gsi) {int ioapic;@@ -1005,7 +979,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstapic = mp_ioapics[ioapic].apicid;/* APIC ID */ mp_irq.dstirq = pin;/* INTIN# */ -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); isa_irq_to_gsi[bus_irq] = gsi; }@@ -1080,7 +1054,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_irq.srcbusirq = i;/* Identity mapped */ mp_irq.dstirq = pin; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); } }@@ -1117,7 +1091,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, mp_irq.dstapic = mp_ioapics[ioapic].apicid; mp_irq.dstirq =mp_find_ioapic_pin (ioapic, gsi); -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq);#endif return 0 ; }arch/x86/kernel/mpparse.c +5
-5@@ -144,7 +144,7 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq) mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq); } -static void __init assign_to_mp_irq (struct mpc_intsrc *m, +static void assign_to_mp_irq (struct mpc_intsrc *m,struct mpc_intsrc *mp_irq) { mp_irq->dstapic = m->dstapic;@@ -168,7 +168,7 @@ static void __init assign_to_mpc_intsrc(struct mpc_intsrc *mp_irq, m->dstirq = mp_irq->dstirq; } -static int __init mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, +static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq,struct mpc_intsrc *m) {if (mp_irq->dstapic != m->dstapic)@@ -189,7 +189,8 @@ static int __init mp_irq_mpc_intsrc_cmp(struct mpc_intsrc *mp_irq,return 0 ; } -static void __init MP_intsrc_info (struct mpc_intsrc *m) +/* Will also be called in acpi/sfi related code */ +void mp_save_irq (struct mpc_intsrc *m) {int i;@@ -207,7 +208,6 @@ static void __init MP_intsrc_info(struct mpc_intsrc *m)#else /* CONFIG_X86_IO_APIC */ static inline void __init MP_bus_info (struct mpc_bus *m) {}static inline void __init MP_ioapic_info (struct mpc_ioapic *m) {} -static inline void __init MP_intsrc_info (struct mpc_intsrc *m) {}#endif /* CONFIG_X86_IO_APIC */ @@ -337,7 +337,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)skip_entry (&mpt, &count,sizeof (struct mpc_ioapic ));break ;case MP_INTSRC : -MP_intsrc_info ((struct mpc_intsrc *)mpt); +mp_save_irq ((struct mpc_intsrc *)mpt);skip_entry (&mpt, &count,sizeof (struct mpc_intsrc ));break ;case MP_LINTSRC :@@ -429,13 +429,13 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type) intsrc.srcbusirq = i; intsrc.dstirq = i ? i :2 ;/* IRQ0 to INTIN2 */
arch/x86/kernel/mpparse.c static void __init construct_default_ioirq_mptable(int mpc_default_type) · line 439
Quoted 10 lines
arch/x86/kernel/mpparse.c +2
-2-MP_intsrc_info (&intsrc); +mp_save_irq (&intsrc); } intsrc.irqtype = mp_ExtINT; intsrc.srcbusirq =0 ; intsrc.dstirq =0 ;/* 8259A to INTIN0 */ -MP_intsrc_info (&intsrc); +mp_save_irq (&intsrc); }
it breaks compiling when CONFIG_X86_MPPARSE is not defined.
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
config X86_MPPARSE
bool "Enable MPS table" if ACPI
default y
depends on X86_LOCAL_APIC
---help---
For old smp systems that do not have proper acpi support. Newer systems (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
Yinghai
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 4 lines · Yinghai Lu
it breaks compiling when
CONFIG_X86_MPPARSEis not defined.obj-$(CONFIG_X86_MPPARSE) += mpparse.o
Crap. Missed that.
Thanks,
tglx
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
In reply to Yinghai LuQuoted 45 lines · On Tue, 7 Dec 2010 01:50:36 +0800 Yinghai Lu <[email protected]> wrote:
Quoted 19 lines · tip-bot for Feng Tang
Commit-ID:
a6427a341985e0379060c86b50fcdb59883e4102Gitweb:
http://git.kernel.org/tip/a6427a341985e0379060c86b50fcdb59883e4102
Author: Feng Tang <[email protected]> AuthorDate: Fri, 3 Dec
2010 12:11:58 +0800 Committer: Thomas Gleixner <[email protected]>
CommitDate: Mon, 6 Dec 2010 15:58:26 +0100x86: Unify current 3 similar ways of saving IRQ info
There are 3 places defining the similar function of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch will reduce the redundant code, and make it only one API:
void mp_save_irq(struct mpc_intsrc *m);Signed-off-by Feng Tang <[email protected]>Cc Alan Cox <[email protected]>Cc Len Brown <[email protected]>LKML-Reference:
<[email protected]>Quoted 8 lines
Signed-off-by Thomas Gleixner <[email protected]> ---arch/x86/include/asm/mpspec.h | 6 ++++++ arch/x86/kernel/acpi/boot.c | 32+++-----------------------------
arch/x86/kernel/mpparse.c|
14 +++++++-------arch/x86/platform/mrst/mrst.c| 30
++---------------------------- 4 files changed, 18 insertions(+), 64 deletions(-)it breaks compiling when
CONFIG_X86_MPPARSEis not defined.obj-$(CONFIG_X86_MPPARSE) += mpparse.o
config
X86_MPPARSE
bool "Enable MPS table" if ACPI
default y
depends onX86_LOCAL_APIC
---help---
For old smp systems that do not have proper acpi support.
Newer systems (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
Quoted 1 line
Yinghai
Thanks for the good catch! I only tried allyes/allno/allmod/def configs.
How about move the code into io_apic.c as mp_save_irq() only will get called when CONFIG_X86_IO_APIC=y, pls review the following patch which is against x86/platform branch of tip tree
Thanks,
Feng
Quoted 1 line
From
c84518b4243e30de1470c9e3dfa38b2ee4fd34eeMon Sep 17 00:00:00 2001
From: Feng Tang <[email protected]>
Date: Fri, 19 Nov 2010 11:33:35 +0800
Subject: [PATCH] x86: unify current 3 similar ways of saving IRQ info
There are 3 places defining the similar function of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch will reduce the redundant code, and make it only one API in io_apic.c:
void mp_save_irq(struct mpc_intsrc *m);
as that func will only get called when CONFIG_X86_IO_APIC=y
--- arch/x86/include/asm/io_apic.h | 2 + arch/x86/kernel/acpi/boot.c | 32 ++-------------------- arch/x86/kernel/apic/io_apic.c | 54 ++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mpparse.c | 56 ++------------------------------------- arch/x86/platform/mrst/mrst.c | 30 +-------------------- 5 files changed, 64 insertions(+), 110 deletions(-)
arch/x86/include/asm/io_apic.h +2 -0
@@ -184,6 +184,8 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi);void __init mp_register_ioapic (int id,u32 address,u32 gsi_base);extern void __init pre_init_apic_IRQ0 (void ); +extern void mp_save_irq (struct mpc_intsrc *m); +#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0
arch/x86/kernel/acpi/boot.c +3 -29
@@ -949,32 +949,6 @@ static int __init acpi_parse_madt_lapic_entries(void)extern int es7000_plat;#endif -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -void __init mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger,u32 gsi) {int ioapic;
@@ -1005,7 +979,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstapic = mp_ioapics[ioapic].apicid;/* APIC ID */ mp_irq.dstirq = pin;/* INTIN# */ -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); isa_irq_to_gsi[bus_irq] = gsi; }
@@ -1080,7 +1054,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_irq.srcbusirq = i;/* Identity mapped */ mp_irq.dstirq = pin; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); } }
@@ -1117,7 +1091,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, mp_irq.dstapic = mp_ioapics[ioapic].apicid; mp_irq.dstirq =mp_find_ioapic_pin (ioapic, gsi); -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq);#endif return 0 ; }
arch/x86/kernel/apic/io_apic.c +54 -0
66 lines not on this page · raw message
arch/x86/kernel/mpparse.c +3 -53
88 lines not on this page · raw message
arch/x86/platform/mrst/mrst.c +2 -28
@@ -71,32 +71,6 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];EXPORT_SYMBOL_GPL (sfi_mrtc_array);int sfi_mrtc_num; -static inline void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static inline int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -/* parse all the mtimer info to a static mtimer array */ static int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -130,7 +104,7 @@ static int __init sfi_parse_mtmr(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ;
@@ -200,7 +174,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ; }
Signature · 1 line
1.7.0.4
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
arch/x86/kernel/apic/io_apic.c static int __init parse_noapic(char *str) · line 138
Quoted 13 lines · Feng Tang
On Tue, 7 Dec 2010 01:50:36 +0800
Yinghai Lu <[email protected]> wrote:arch/x86/kernel/apic/io_apic.c +10
-0+static void assign_to_mp_irq (struct mpc_intsrc *m, +struct mpc_intsrc *mp_irq) +{ + mp_irq->dstapic = m->dstapic; + mp_irq->type = m->type; + mp_irq->irqtype = m->irqtype; + mp_irq->irqflag = m->irqflag; + mp_irq->srcbus = m->srcbus; + mp_irq->srcbusirq = m->srcbusirq; + mp_irq->dstirq = m->dstirq;
Can we please use the mrst version with memcpy ?
Quoted 11 lines
arch/x86/kernel/apic/io_apic.c +11
-0+} + +static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, +struct mpc_intsrc *m) +{ +if (mp_irq->dstapic != m->dstapic) +return 1 ; +if (mp_irq->type != m->type) +return 2 ; +if (mp_irq->irqtype != m->irqtype) +return 3 ;
arch/x86/kernel/apic/io_apic.c static int __init parse_noapic(char *str) · line 159
Quoted 10 lines
arch/x86/kernel/apic/io_apic.c +10
-0+if (mp_irq->irqflag != m->irqflag) +return 4 ; +if (mp_irq->srcbus != m->srcbus) +return 5 ; +if (mp_irq->srcbusirq != m->srcbusirq) +return 6 ; +if (mp_irq->dstirq != m->dstirq) +return 7 ; + +return 0 ;
Same here. No caller is interested in the detailed return value.
Thanks,
tglx
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 32 lines · Thomas Gleixner
arch/x86/kernel/apic/io_apic.c static int __init parse_noapic(char *str) · line 138
Quoted 13 lines · Feng Tang
On Tue, 7 Dec 2010 01:50:36 +0800
Yinghai Lu <[email protected]> wrote:arch/x86/kernel/apic/io_apic.c +10
-0+static void assign_to_mp_irq (struct mpc_intsrc *m, +struct mpc_intsrc *mp_irq) +{ + mp_irq->dstapic = m->dstapic; + mp_irq->type = m->type; + mp_irq->irqtype = m->irqtype; + mp_irq->irqflag = m->irqflag; + mp_irq->srcbus = m->srcbus; + mp_irq->srcbusirq = m->srcbusirq; + mp_irq->dstirq = m->dstirq;Can we please use the mrst version with memcpy ?
Quoted 15 lines
arch/x86/kernel/apic/io_apic.c +15
-0+} + +static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, +struct mpc_intsrc *m) +{ +if (mp_irq->dstapic != m->dstapic) +return 1 ; +if (mp_irq->type != m->type) +return 2 ; +if (mp_irq->irqtype != m->irqtype) +return 3 ; +if (mp_irq->irqflag != m->irqflag) +return 4 ; +if (mp_irq->srcbus != m->srcbus) +return 5 ;
Quoted 9 lines
arch/x86/kernel/apic/io_apic.c static int __init parse_noapic(char *str) · line 159
Quoted 6 lines
arch/x86/kernel/apic/io_apic.c +6
-0+if (mp_irq->srcbusirq != m->srcbusirq) +return 6 ; +if (mp_irq->dstirq != m->dstirq) +return 7 ; + +return 0 ;Same here. No caller is interested in the detailed return value.
ok, after look at code and git log, i knew the reasons for those strange duplicated functions.
Alexy changed
/* MP IRQ source entries */
-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; +struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
to make it decouple that with mpstable definition. so mptable will have mpc_intsrc, and acpi etc will use mp_config_intsrc
and he planed to add more member to mp_config_intsrc .... never happened.
then I added those functions with different parameters.
one year later JSR changed all back to mpc_instr...
so now have some duplicated functions....
even in mpparse.c we now have
static void print_MP_intsrc_info(struct mpc_intsrc *m)
{
apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
" IRQ %02x, APIC ID %x, APIC INT %02x\n",
m->irqtype, m->irqflag & 3, (m->irqflag >> 2) & 3, m->srcbus,
m->srcbusirq, m->dstapic, m->dstirq);
}static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq)
{
apic_printk(APIC_VERBOSE, "Int: type %d, pol %d, trig %d, bus %02x,"
" IRQ %02x, APIC ID %x, APIC INT %02x\n",
mp_irq->irqtype, mp_irq->irqflag & 3,
(mp_irq->irqflag >> 2) & 3, mp_irq->srcbus,
mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq);
}...
So yes, we should use simple versions in arch/x86/kernel/acpi/boot.c. ( assume functions mrst.c are copied from there)
and should kill print_mp_irq_info or print_MP_intsrc_info...
Thanks
Yinghai
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 24 lines · Yinghai Lu
Quoted 3 lines · Thomas Gleixner
Same here. No caller is interested in the detailed return value.
ok, after look at code and git log, i knew the reasons for those strange duplicated functions.
Alexy changed
/* MP IRQ source entries */
(quoted diff) +1
-1-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; +struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];to make it decouple that with mpstable definition. so mptable will have
mpc_intsrc, and acpi etc will usemp_config_intsrcand he planed to add more member to
mp_config_intsrc.... never happened.then I added those functions with different parameters.
one year later JSR changed all back to
mpc_instr...
Quoted 7 lines
so now have some duplicated functions....
So yes, we should use simple versions in
arch/x86/kernel/acpi/boot.c. ( assume functionsmrst.care copied from there)and should kill
print_mp_irq_infoorprint_MP_intsrc_info...
Nice archaelogical detective work ! :)
So now I have Fengs patch plus Yinghais series which seem to go nicely together, but I have the feeling that there is some stuff unresolved.
Yinghai, Feng: could you please work out the missing bits an pieces (if any) and provide me a delta patch on top of the existing patches?
Thanks,
tglx
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 33 lines · Thomas Gleixner
Quoted 24 lines · Yinghai Lu
Quoted 3 lines · Thomas Gleixner
Same here. No caller is interested in the detailed return value.
ok, after look at code and git log, i knew the reasons for those strange duplicated functions.
Alexy changed
/* MP IRQ source entries */
(quoted diff) +1
-1-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; +struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];to make it decouple that with mpstable definition. so mptable will have
mpc_intsrc, and acpi etc will usemp_config_intsrcand he planed to add more member to
mp_config_intsrc.... never happened.then I added those functions with different parameters.
one year later JSR changed all back to
mpc_instr...Quoted 7 lines
so now have some duplicated functions....
So yes, we should use simple versions in
arch/x86/kernel/acpi/boot.c. ( assume functionsmrst.care copied from there)and should kill
print_mp_irq_infoorprint_MP_intsrc_info...
Quoted 8 lines
Nice archaelogical detective work ! :)
So now I have Fengs patch plus Yinghais series which seem to go nicely together, but I have the feeling that there is some stuff unresolved.
Yinghai, Feng: could you please work out the missing bits an pieces (if any) and provide me a delta patch on top of the existing patches?
Maybe Feng could send you updated version with simpler function?
Yinghai
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 36 lines · Yinghai Lu
Quoted 35 lines · Thomas Gleixner
Quoted 24 lines · Yinghai Lu
Quoted 3 lines · Thomas Gleixner
Same here. No caller is interested in the detailed return value.
ok, after look at code and git log, i knew the reasons for those strange duplicated functions.
Alexy changed
/* MP IRQ source entries */
(quoted diff) +1
-1-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; +struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];to make it decouple that with mpstable definition. so mptable will have
mpc_intsrc, and acpi etc will usemp_config_intsrcand he planed to add more member to
mp_config_intsrc.... never happened.then I added those functions with different parameters.
one year later JSR changed all back to
mpc_instr...Quoted 7 lines
so now have some duplicated functions....
So yes, we should use simple versions in
arch/x86/kernel/acpi/boot.c. ( assume functionsmrst.care copied from there)and should kill
print_mp_irq_infoorprint_MP_intsrc_info...Nice archaelogical detective work ! :)
Quoted 9 lines
Quoted 6 lines
So now I have Fengs patch plus Yinghais series which seem to go nicely together, but I have the feeling that there is some stuff unresolved.
Yinghai, Feng: could you please work out the missing bits an pieces (if any) and provide me a delta patch on top of the existing patches?
Maybe Feng could send you updated version with simpler function?
also I prefer to keep save_mp_irq() instead of changing it to mp_save_irq().
Thanks
Yinghai
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
Quoted 7 lines · On Wed, 8 Dec 2010 09:47:14 +0800 Yinghai Lu <[email protected]> wrote:
Quoted 4 lines
Quoted 1 line
Maybe Feng could send you updated version with simpler function?
also I prefer to keep
save_mp_irq()instead of changing it tomp_save_irq().
The reason I changed the name is many similar functions and global variables' name in io_apic.c start with "mp_", also using "mp_save_irq()" may indicate that this piece of code originates from MP parsing code :)
Thanks,
Feng
Quoted 4 lines
Thanks
Yinghai
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
In reply to Yinghai LuQuoted 41 lines · On Wed, 8 Dec 2010 09:43:47 +0800 Yinghai Lu <[email protected]> wrote:
Quoted 40 lines · Thomas Gleixner
Quoted 25 lines · Yinghai Lu
Quoted 3 lines · Thomas Gleixner
Same here. No caller is interested in the detailed return value.
ok, after look at code and git log, i knew the reasons for those strange duplicated functions.
Alexy changed
/* MP IRQ source entries */
(quoted diff) +1
-1-struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES]; +struct mp_config_intsrc mp_irqs[MAX_IRQ_SOURCES];to make it decouple that with mpstable definition. so mptable will have
mpc_intsrc, and acpi etc will usemp_config_intsrcand he planed to add more member to
mp_config_intsrc.... never happened.then I added those functions with different parameters.
one year later JSR changed all back to
mpc_instr...Quoted 7 lines
so now have some duplicated functions....
So yes, we should use simple versions in
arch/x86/kernel/acpi/boot.c. ( assume functionsmrst.care copied from there)and should kill
print_mp_irq_infoorprint_MP_intsrc_info...Nice archaelogical detective work ! :)
So now I have Fengs patch plus Yinghais series which seem to go nicely together, but I have the feeling that there is some stuff unresolved.
Quoted 6 lines
Quoted 4 lines
Yinghai, Feng: could you please work out the missing bits an pieces (if any) and provide me a delta patch on top of the existing patches?
Maybe Feng could send you updated version with simpler function?
Sure, will do.
But I guess Thomas wants more cleanup :) The MP table parsing/ACPI/MRST have many things in common, like lapic/ioapic setup and IRQ info setting, so generally there may be some other places where we could simplify codes by using one copy to cover all three, like what you just did for lapic registering.
Anyway I will send one updated one for this patch.
Thanks,
Feng
Quoted 2 lines
Yinghai
Re: [tip:x86/platform] x86: Unify current 3 similar ways of saving IRQ info
In reply to Thomas GleixnerQuoted 11 lines · On Wed, 8 Dec 2010 06:32:46 +0800 Thomas Gleixner <[email protected]> wrote:
Nice archaelogical detective work ! :)
So now I have Fengs patch plus Yinghais series which seem to go nicely together, but I have the feeling that there is some stuff unresolved.
Yinghai, Feng: could you please work out the missing bits an pieces (if any) and provide me a delta patch on top of the existing patches?
Thanks,
tglx
Here is the incremental patch against my last one (I also put the full patch in attachment)
Thanks,
Feng
----------------
x86: more simplification for saving irq info code
arch/x86/kernel/apic/io_apic.c +2 -35
@@ -126,39 +126,6 @@ static int __init parse_noapic(char *str) }early_param ("noapic" , parse_noapic); -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ - mp_irq->dstapic = m->dstapic; - mp_irq->type = m->type; - mp_irq->irqtype = m->irqtype; - mp_irq->irqflag = m->irqflag; - mp_irq->srcbus = m->srcbus; - mp_irq->srcbusirq = m->srcbusirq; - mp_irq->dstirq = m->dstirq; -} - -static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -if (mp_irq->dstapic != m->dstapic) -return 1 ; -if (mp_irq->type != m->type) -return 2 ; -if (mp_irq->irqtype != m->irqtype) -return 3 ; -if (mp_irq->irqflag != m->irqflag) -return 4 ; -if (mp_irq->srcbus != m->srcbus) -return 5 ; -if (mp_irq->srcbusirq != m->srcbusirq) -return 6 ; -if (mp_irq->dstirq != m->dstirq) -return 7 ; - -return 0 ; -} -/* Will be called in mpparse/acpi/sfi codes for saving IRQ info */ void mp_save_irq (struct mpc_intsrc *m) {
@@ -170,11 +137,11 @@ void mp_save_irq(struct mpc_intsrc *m) m->srcbusirq, m->dstapic, m->dstirq);for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_mpc_intsrc_cmp (&mp_irqs[i], m)) +if (!memcmp (&mp_irqs[i], m,sizeof (*m)))return ; } -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); +memcpy (&mp_irqs[mp_irq_entries], m,sizeof (*m));if (++mp_irq_entries ==MAX_IRQ_SOURCES )panic ("Max # of irq sources exceeded!!\n" ); }
arch/x86/kernel/mpparse.c +6 -32
@@ -118,21 +118,8 @@ static void __init MP_bus_info(struct mpc_bus *m)static void __init MP_ioapic_info (struct mpc_ioapic *m) { -if (!(m->flags &MPC_APIC_USABLE )) -return ; - -printk (KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n" , - m->apicid, m->apicver, m->apicaddr); - -mp_register_ioapic (m->apicid, m->apicaddr, gsi_top); -} - -static void print_MP_intsrc_info (struct mpc_intsrc *m) -{ -apic_printk (APIC_VERBOSE ,"Int: type %d, pol %d, trig %d, bus %02x," -" IRQ %02x, APIC ID %x, APIC INT %02x\n" , - m->irqtype, m->irqflag &3 , (m->irqflag >>2 ) &3 , m->srcbus, - m->srcbusirq, m->dstapic, m->dstirq); +if (m->flags &MPC_APIC_USABLE ) +mp_register_ioapic (m->apicid, m->apicaddr, gsi_top); }static void __init print_mp_irq_info (struct mpc_intsrc *mp_irq)
@@ -144,23 +131,11 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq) mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq); } -static void __init assign_to_mpc_intsrc (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ - m->dstapic = mp_irq->dstapic; - m->type = mp_irq->type; - m->irqtype = mp_irq->irqtype; - m->irqflag = mp_irq->irqflag; - m->srcbus = mp_irq->srcbus; - m->srcbusirq = mp_irq->srcbusirq; - m->dstirq = mp_irq->dstirq; -}#else /* CONFIG_X86_IO_APIC */ static inline void __init MP_bus_info (struct mpc_bus *m) {}static inline void __init MP_ioapic_info (struct mpc_ioapic *m) {}#endif /* CONFIG_X86_IO_APIC */ -static void __init MP_lintsrc_info (struct mpc_lintsrc *m) { apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x,"
@@ -172,7 +147,6 @@ static void __init MP_lintsrc_info(struct mpc_lintsrc *m)/* * Read/parse the MPC */ -static int __init smp_check_mpc (struct mpc_table *mpc,char *oem,char *str) {
@@ -734,11 +708,11 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)int i;apic_printk (APIC_VERBOSE ,"OLD " ); -print_MP_intsrc_info (m); +print_mp_irq_info (m); i =get_MP_intsrc_index (m);if (i >0 ) { -assign_to_mpc_intsrc (&mp_irqs[i], m); +memcpy (m, &mp_irqs[i],sizeof (*m));apic_printk (APIC_VERBOSE ,"NEW " );print_mp_irq_info (&mp_irqs[i]);return ;
@@ -825,14 +799,14 @@ static int __init replace_intsrc_all(struct mpc_table *mpc,if (nr_m_spare >0 ) {apic_printk (APIC_VERBOSE ,"*NEW* found\n" ); nr_m_spare--; -assign_to_mpc_intsrc (&mp_irqs[i], m_spare[nr_m_spare]); +memcpy (m_spare[nr_m_spare], &mp_irqs[i],sizeof (mp_irqs[i])); m_spare[nr_m_spare] =NULL ; }else {struct mpc_intsrc *m = (struct mpc_intsrc *)mpt; count +=sizeof (struct mpc_intsrc );if (check_slot (mpc_new_phys, mpc_new_length, count) <0 ) goto out; -assign_to_mpc_intsrc (&mp_irqs[i], m); +memcpy (m, &mp_irqs[i],sizeof (*m)); mpc->length = count; mpt +=sizeof (struct mpc_intsrc ); }
Quoted 1 line
From
115d8b756a14b685a12a60e89ab60e25b05c18c4Mon Sep 17 00:00:00 2001
From: Feng Tang <[email protected]>
Date: Fri, 19 Nov 2010 11:33:35 +0800
Subject: [PATCH] x86: unify current 3 similar ways of saving IRQ info
There are 3 places defining the similar function of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. This patch will reduce the redundant code, and make it only one API in io_apic.c:
void mp_save_irq(struct mpc_intsrc *m);
as that func will only get called when CONFIG_X86_IO_APIC=y.
Also this patch does some minor clearup for mmparse.c.
--- arch/x86/include/asm/io_apic.h | 2 + arch/x86/kernel/acpi/boot.c | 32 +------------ arch/x86/kernel/apic/io_apic.c | 21 +++++++++ arch/x86/kernel/mpparse.c | 94 ++++------------------------------------ arch/x86/platform/mrst/mrst.c | 30 +------------ 5 files changed, 37 insertions(+), 142 deletions(-)
arch/x86/include/asm/io_apic.h +2 -0
@@ -184,6 +184,8 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi);void __init mp_register_ioapic (int id,u32 address,u32 gsi_base);extern void __init pre_init_apic_IRQ0 (void ); +extern void mp_save_irq (struct mpc_intsrc *m); +#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0
arch/x86/kernel/acpi/boot.c +3 -29
@@ -949,32 +949,6 @@ static int __init acpi_parse_madt_lapic_entries(void)extern int es7000_plat;#endif -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -void __init mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger,u32 gsi) {int ioapic;
@@ -1005,7 +979,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstapic = mp_ioapics[ioapic].apicid;/* APIC ID */ mp_irq.dstirq = pin;/* INTIN# */ -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); isa_irq_to_gsi[bus_irq] = gsi; }
@@ -1080,7 +1054,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_irq.srcbusirq = i;/* Identity mapped */ mp_irq.dstirq = pin; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); } }
@@ -1117,7 +1091,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, mp_irq.dstapic = mp_ioapics[ioapic].apicid; mp_irq.dstirq =mp_find_ioapic_pin (ioapic, gsi); -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq);#endif return 0 ; }
arch/x86/kernel/apic/io_apic.c +21 -0
@@ -126,6 +126,26 @@ static int __init parse_noapic(char *str) }early_param ("noapic" , parse_noapic); +/* Will be called in mpparse/acpi/sfi codes for saving IRQ info */ +void mp_save_irq (struct mpc_intsrc *m) +{ +int i; + +apic_printk (APIC_VERBOSE ,"Int: type %d, pol %d, trig %d, bus %02x," +" IRQ %02x, APIC ID %x, APIC INT %02x\n" , + m->irqtype, m->irqflag &3 , (m->irqflag >>2 ) &3 , m->srcbus, + m->srcbusirq, m->dstapic, m->dstirq); + +for (i =0 ; i < mp_irq_entries; i++) { +if (!memcmp (&mp_irqs[i], m,sizeof (*m))) +return ; + } + +memcpy (&mp_irqs[mp_irq_entries], m,sizeof (*m)); +if (++mp_irq_entries ==MAX_IRQ_SOURCES ) +panic ("Max # of irq sources exceeded!!\n" ); +} +struct irq_pin_list {int apic, pin;struct irq_pin_list *next;
@@ -136,6 +156,7 @@ static struct irq_pin_list *alloc_irq_pin_list(int node)return kzalloc_node (sizeof (struct irq_pin_list ),GFP_KERNEL , node); } +/* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */ #ifdef CONFIG_SPARSE_IRQ static struct irq_cfg irq_cfgx[NR_IRQS_LEGACY ];
arch/x86/kernel/mpparse.c +9 -85
155 lines not on this page · raw message
arch/x86/platform/mrst/mrst.c +2 -28
@@ -71,32 +71,6 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];EXPORT_SYMBOL_GPL (sfi_mrtc_array);int sfi_mrtc_num; -static inline void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static inline int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -/* parse all the mtimer info to a static mtimer array */ static int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -130,7 +104,7 @@ static int __init sfi_parse_mtmr(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ;
@@ -200,7 +174,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ; }
Signature · 1 line
1.7.0.4
[tip:x86/apic-cleanups] x86: Further simplify mp_irq info handling
Commit-ID: 0e3fa13f4ee110de007bca3bf395b77997319fc8 Gitweb: http://git.kernel.org/tip/0e3fa13f4ee110de007bca3bf395b77997319fc8 Author: Feng Tang <[email protected]> AuthorDate: Wed, 8 Dec 2010 15:18:57 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 9 Dec 2010 21:52:06 +0100
x86: Further simplify mp_irq info handling
assign_to_mp_irq() is copying the struct mpc_intsrc members one by one. That's silly. Use memcpy() and let the compiler figure it out. Same for the identical function assign_to_mpc_intsrc()
mp_irq_mpc_intsrc_cmp() is comparing the struct members one by one, but no caller ever checks the different return codes. Use memcmp() instead.
Remove the extra printk in MP_ioapic_info()
LKML-Reference: <20101208151857.212f0018@feng-i7>
--- arch/x86/kernel/apic/io_apic.c | 37 ++----------------------------------- arch/x86/kernel/mpparse.c | 38 ++++++-------------------------------- 2 files changed, 8 insertions(+), 67 deletions(-)
arch/x86/kernel/apic/io_apic.c +2 -35
@@ -126,39 +126,6 @@ static int __init parse_noapic(char *str) }early_param ("noapic" , parse_noapic); -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ - mp_irq->dstapic = m->dstapic; - mp_irq->type = m->type; - mp_irq->irqtype = m->irqtype; - mp_irq->irqflag = m->irqflag; - mp_irq->srcbus = m->srcbus; - mp_irq->srcbusirq = m->srcbusirq; - mp_irq->dstirq = m->dstirq; -} - -static int mp_irq_mpc_intsrc_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -if (mp_irq->dstapic != m->dstapic) -return 1 ; -if (mp_irq->type != m->type) -return 2 ; -if (mp_irq->irqtype != m->irqtype) -return 3 ; -if (mp_irq->irqflag != m->irqflag) -return 4 ; -if (mp_irq->srcbus != m->srcbus) -return 5 ; -if (mp_irq->srcbusirq != m->srcbusirq) -return 6 ; -if (mp_irq->dstirq != m->dstirq) -return 7 ; - -return 0 ; -} -/* Will be called in mpparse/acpi/sfi codes for saving IRQ info */ void mp_save_irq (struct mpc_intsrc *m) {
@@ -170,11 +137,11 @@ void mp_save_irq(struct mpc_intsrc *m) m->srcbusirq, m->dstapic, m->dstirq);for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_mpc_intsrc_cmp (&mp_irqs[i], m)) +if (!memcmp (&mp_irqs[i], m,sizeof (*m)))return ; } -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); +memcpy (&mp_irqs[mp_irq_entries], m,sizeof (*m));if (++mp_irq_entries ==MAX_IRQ_SOURCES )panic ("Max # of irq sources exceeded!!\n" ); }
arch/x86/kernel/mpparse.c +6 -32
@@ -118,21 +118,8 @@ static void __init MP_bus_info(struct mpc_bus *m)static void __init MP_ioapic_info (struct mpc_ioapic *m) { -if (!(m->flags &MPC_APIC_USABLE )) -return ; - -printk (KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n" , - m->apicid, m->apicver, m->apicaddr); - -mp_register_ioapic (m->apicid, m->apicaddr, gsi_top); -} - -static void print_MP_intsrc_info (struct mpc_intsrc *m) -{ -apic_printk (APIC_VERBOSE ,"Int: type %d, pol %d, trig %d, bus %02x," -" IRQ %02x, APIC ID %x, APIC INT %02x\n" , - m->irqtype, m->irqflag &3 , (m->irqflag >>2 ) &3 , m->srcbus, - m->srcbusirq, m->dstapic, m->dstirq); +if (m->flags &MPC_APIC_USABLE ) +mp_register_ioapic (m->apicid, m->apicaddr, gsi_top); }static void __init print_mp_irq_info (struct mpc_intsrc *mp_irq)
@@ -144,23 +131,11 @@ static void __init print_mp_irq_info(struct mpc_intsrc *mp_irq) mp_irq->srcbusirq, mp_irq->dstapic, mp_irq->dstirq); } -static void __init assign_to_mpc_intsrc (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ - m->dstapic = mp_irq->dstapic; - m->type = mp_irq->type; - m->irqtype = mp_irq->irqtype; - m->irqflag = mp_irq->irqflag; - m->srcbus = mp_irq->srcbus; - m->srcbusirq = mp_irq->srcbusirq; - m->dstirq = mp_irq->dstirq; -}#else /* CONFIG_X86_IO_APIC */ static inline void __init MP_bus_info (struct mpc_bus *m) {}static inline void __init MP_ioapic_info (struct mpc_ioapic *m) {}#endif /* CONFIG_X86_IO_APIC */ -static void __init MP_lintsrc_info (struct mpc_lintsrc *m) { apic_printk(APIC_VERBOSE, "Lint: type %d, pol %d, trig %d, bus %02x,"
@@ -172,7 +147,6 @@ static void __init MP_lintsrc_info(struct mpc_lintsrc *m)/* * Read/parse the MPC */ -static int __init smp_check_mpc (struct mpc_table *mpc,char *oem,char *str) {
@@ -718,11 +692,11 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)int i;apic_printk (APIC_VERBOSE ,"OLD " ); -print_MP_intsrc_info (m); +print_mp_irq_info (m); i =get_MP_intsrc_index (m);if (i >0 ) { -assign_to_mpc_intsrc (&mp_irqs[i], m); +memcpy (m, &mp_irqs[i],sizeof (*m));apic_printk (APIC_VERBOSE ,"NEW " );print_mp_irq_info (&mp_irqs[i]);return ;
@@ -809,14 +783,14 @@ static int __init replace_intsrc_all(struct mpc_table *mpc,if (nr_m_spare >0 ) {apic_printk (APIC_VERBOSE ,"*NEW* found\n" ); nr_m_spare--; -assign_to_mpc_intsrc (&mp_irqs[i], m_spare[nr_m_spare]); +memcpy (m_spare[nr_m_spare], &mp_irqs[i],sizeof (mp_irqs[i])); m_spare[nr_m_spare] =NULL ; }else {struct mpc_intsrc *m = (struct mpc_intsrc *)mpt; count +=sizeof (struct mpc_intsrc );if (check_slot (mpc_new_phys, mpc_new_length, count) <0 ) goto out; -assign_to_mpc_intsrc (&mp_irqs[i], m); +memcpy (m, &mp_irqs[i],sizeof (*m)); mpc->length = count; mpt +=sizeof (struct mpc_intsrc ); }
[tip:x86/apic-cleanups] x86: Unify 3 similar ways of saving mp_irqs info
In reply to Feng TangCommit-ID: 2d8009ba67f9503ceadf9d5a3b5637cee291ea8d Gitweb: http://git.kernel.org/tip/2d8009ba67f9503ceadf9d5a3b5637cee291ea8d Author: Feng Tang <[email protected]> AuthorDate: Fri, 19 Nov 2010 11:33:35 +0800 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 9 Dec 2010 21:52:06 +0100
x86: Unify 3 similar ways of saving mp_irqs info
There are 3 places defining similar functions of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst.
Replace the redundant code by a common function in io_apic.c as it's only called when CONFIG_X86_IO_APIC=y
LKML-Reference: <20101207133204.4d913c5a@feng-i7>
--- arch/x86/include/asm/io_apic.h | 2 + arch/x86/kernel/acpi/boot.c | 32 ++-------------------- arch/x86/kernel/apic/io_apic.c | 54 ++++++++++++++++++++++++++++++++++++++ arch/x86/kernel/mpparse.c | 56 ++------------------------------------- arch/x86/platform/mrst/mrst.c | 30 +-------------------- 5 files changed, 64 insertions(+), 110 deletions(-)
arch/x86/include/asm/io_apic.h +2 -0
@@ -184,6 +184,8 @@ int mp_find_ioapic_pin(int ioapic, u32 gsi);void __init mp_register_ioapic (int id,u32 address,u32 gsi_base);extern void __init pre_init_apic_IRQ0 (void ); +extern void mp_save_irq (struct mpc_intsrc *m); +#else /* !CONFIG_X86_IO_APIC */ #define io_apic_assign_pci_irqs 0
arch/x86/kernel/acpi/boot.c +3 -29
@@ -937,32 +937,6 @@ static int __init acpi_parse_madt_lapic_entries(void)extern int es7000_plat;#endif -static void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -void __init mp_override_legacy_irq (u8 bus_irq,u8 polarity,u8 trigger,u32 gsi) {int ioapic;
@@ -993,7 +967,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) mp_irq.dstapic = mp_ioapics[ioapic].apicid;/* APIC ID */ mp_irq.dstirq = pin;/* INTIN# */ -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); isa_irq_to_gsi[bus_irq] = gsi; }
@@ -1068,7 +1042,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_irq.srcbusirq = i;/* Identity mapped */ mp_irq.dstirq = pin; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); } }
@@ -1105,7 +1079,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, mp_irq.dstapic = mp_ioapics[ioapic].apicid; mp_irq.dstirq =mp_find_ioapic_pin (ioapic, gsi); -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq);#endif return 0 ; }
arch/x86/kernel/apic/io_apic.c +54 -0
66 lines not on this page · raw message
arch/x86/kernel/mpparse.c +3 -53
88 lines not on this page · raw message
arch/x86/platform/mrst/mrst.c +2 -28
@@ -71,32 +71,6 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];EXPORT_SYMBOL_GPL (sfi_mrtc_array);int sfi_mrtc_num; -static inline void assign_to_mp_irq (struct mpc_intsrc *m, -struct mpc_intsrc *mp_irq) -{ -memcpy (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static inline int mp_irq_cmp (struct mpc_intsrc *mp_irq, -struct mpc_intsrc *m) -{ -return memcmp (mp_irq, m,sizeof (struct mpc_intsrc )); -} - -static void save_mp_irq (struct mpc_intsrc *m) -{ -int i; - -for (i =0 ; i < mp_irq_entries; i++) { -if (!mp_irq_cmp (&mp_irqs[i], m)) -return ; - } - -assign_to_mp_irq (m, &mp_irqs[mp_irq_entries]); -if (++mp_irq_entries ==MAX_IRQ_SOURCES ) -panic ("Max # of irq sources exceeded!!\n" ); -} -/* parse all the mtimer info to a static mtimer array */ static int __init sfi_parse_mtmr (struct sfi_table_header *table) {
@@ -130,7 +104,7 @@ static int __init sfi_parse_mtmr(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ;
@@ -200,7 +174,7 @@ int __init sfi_parse_mrtc(struct sfi_table_header *table) mp_irq.srcbusirq = pentry->irq;/* IRQ */ mp_irq.dstapic =MP_APIC_ALL ; mp_irq.dstirq = pentry->irq; -save_mp_irq (&mp_irq); +mp_save_irq (&mp_irq); }return 0 ; }