* [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" [not found] <20080602143830.GA6835@elte.hu> @ 2008-06-03 17:37 ` Robert Richter 2008-06-04 15:11 ` Robert Richter 0 siblings, 1 reply; 6+ messages in thread From: Robert Richter @ 2008-06-03 17:37 UTC (permalink / raw) To: Ingo Molnar Cc: Yinghai Lu, Thomas Gleixner, LKML, Andi Kleen, Arjan van de Ven Signed-off-by: Robert Richter <robert.richter@amd.com> --- arch/powerpc/kernel/setup_64.c | 2 -- arch/x86/kernel/cpu/amd.c | 1 - arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/setup.c | 4 ++-- include/asm-x86/mmconfig.h | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 098fd96..3a193a9 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -62,8 +62,6 @@ #include <asm/udbg.h> #include <asm/kexec.h> -#include "setup.h" - #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt) #else diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 656b40a..99221f9 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -4,7 +4,6 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> -#include <asm/mmconfig.h> #include <mach_apic.h> #include "../setup.h" diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c index 180097e..6c63496 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c @@ -6,6 +6,7 @@ #include <asm/cacheflush.h> #include <mach_apic.h> +#include "../setup.h" extern int __cpuinit get_model_name(struct cpuinfo_x86 *c); extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 549e6e6..a7185ac 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -204,6 +204,8 @@ void __init setup_per_cpu_areas(void) setup_cpumask_of_cpu(); } +#endif + #define ENABLE_CF8_EXT_CFG (1ULL << 46) void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) @@ -217,8 +219,6 @@ void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) set_cpu_cap(c, X86_FEATURE_PCI_EXT_CFG); } -#endif - #ifdef X86_64_NUMA /* diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 691798f..95beda0 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h @@ -9,10 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { } static inline void check_enable_amd_mmconf_dmi(void) { } #endif -#if defined(CONFIG_SMP) && defined(CONFIG_X86_64) -extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); -#else -static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { } -#endif - #endif -- 1.5.5.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" 2008-06-03 17:37 ` [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" Robert Richter @ 2008-06-04 15:11 ` Robert Richter 2008-06-05 17:32 ` Robert Richter 0 siblings, 1 reply; 6+ messages in thread From: Robert Richter @ 2008-06-04 15:11 UTC (permalink / raw) To: Ingo Molnar Cc: Yinghai Lu, Thomas Gleixner, LKML, Andi Kleen, Arjan van de Ven Ingo, On 03.06.08 19:37:04, Robert Richter wrote: > Signed-off-by: Robert Richter <robert.richter@amd.com> > --- > arch/powerpc/kernel/setup_64.c | This patch is wrong. It touches a different setup_64.c file. Sorry for that, will send an update for tip/x86/cpu. -Robert > arch/x86/kernel/cpu/amd.c | 1 - > arch/x86/kernel/cpu/amd_64.c | 1 + > arch/x86/kernel/setup.c | 4 ++-- > include/asm-x86/mmconfig.h | 6 ------ > 5 files changed, 3 insertions(+), 11 deletions(-) ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" 2008-06-04 15:11 ` Robert Richter @ 2008-06-05 17:32 ` Robert Richter 2008-06-05 20:41 ` Thomas Gleixner 0 siblings, 1 reply; 6+ messages in thread From: Robert Richter @ 2008-06-05 17:32 UTC (permalink / raw) To: Ingo Molnar Cc: Yinghai Lu, Thomas Gleixner, LKML, Andi Kleen, Arjan van de Ven Signed-off-by: Robert Richter <robert.richter@amd.com> --- arch/x86/kernel/cpu/amd.c | 1 - arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/setup.c | 4 ++-- arch/x86/kernel/setup_64.c | 2 -- include/asm-x86/mmconfig.h | 6 ------ 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 656b40a..99221f9 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -4,7 +4,6 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> -#include <asm/mmconfig.h> #include <mach_apic.h> #include "../setup.h" diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c index 180097e..6c63496 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c @@ -6,6 +6,7 @@ #include <asm/cacheflush.h> #include <mach_apic.h> +#include "../setup.h" extern int __cpuinit get_model_name(struct cpuinfo_x86 *c); extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d8f1712..f2dc414 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -136,6 +136,8 @@ void __init setup_per_cpu_areas(void) setup_cpumask_of_cpu(); } +#endif + #define ENABLE_CF8_EXT_CFG (1ULL << 46) void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) @@ -148,5 +150,3 @@ void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) } set_cpu_cap(c, X86_FEATURE_PCI_EXT_CFG); } - -#endif diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 215bd67..25afdd8 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -73,8 +73,6 @@ #include <asm/pat.h> #include <asm/mmconfig.h> -#include "setup.h" - #include <mach_apic.h> #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 691798f..95beda0 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h @@ -9,10 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { } static inline void check_enable_amd_mmconf_dmi(void) { } #endif -#if defined(CONFIG_SMP) && defined(CONFIG_X86_64) -extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); -#else -static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { } -#endif - #endif -- 1.5.5.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" 2008-06-05 17:32 ` Robert Richter @ 2008-06-05 20:41 ` Thomas Gleixner 2008-06-06 10:01 ` [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3) Robert Richter 0 siblings, 1 reply; 6+ messages in thread From: Thomas Gleixner @ 2008-06-05 20:41 UTC (permalink / raw) To: Robert Richter Cc: Ingo Molnar, Yinghai Lu, LKML, Andi Kleen, Arjan van de Ven On Thu, 5 Jun 2008, Robert Richter wrote: > --- a/include/asm-x86/mmconfig.h > +++ b/include/asm-x86/mmconfig.h > @@ -9,10 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { } > static inline void check_enable_amd_mmconf_dmi(void) { } > #endif > > -#if defined(CONFIG_SMP) && defined(CONFIG_X86_64) > -extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); > -#else > -static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { } > -#endif > - Can we please remove this superflous arch/x86/kernel/setup.h file, which has a length/content ratio of 26:1. This removes the ugly "../setup.h" includes Thanks, tglx ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3) 2008-06-05 20:41 ` Thomas Gleixner @ 2008-06-06 10:01 ` Robert Richter 2008-06-10 10:33 ` Ingo Molnar 0 siblings, 1 reply; 6+ messages in thread From: Robert Richter @ 2008-06-06 10:01 UTC (permalink / raw) To: Thomas Gleixner Cc: Ingo Molnar, Yinghai Lu, LKML, Andi Kleen, Arjan van de Ven Much more less code now. Signed-off-by: Robert Richter <robert.richter@amd.com> --- arch/x86/kernel/cpu/amd.c | 2 -- arch/x86/kernel/cpu/amd_64.c | 1 + arch/x86/kernel/cpu/cpu.h | 5 +++++ arch/x86/kernel/setup.c | 4 ++-- arch/x86/kernel/setup.h | 26 -------------------------- arch/x86/kernel/setup_64.c | 2 -- include/asm-x86/mmconfig.h | 6 ------ 7 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 arch/x86/kernel/setup.h diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 656b40a..a38d54f 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -4,10 +4,8 @@ #include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> -#include <asm/mmconfig.h> #include <mach_apic.h> -#include "../setup.h" #include "cpu.h" /* diff --git a/arch/x86/kernel/cpu/amd_64.c b/arch/x86/kernel/cpu/amd_64.c index 180097e..626fc21 100644 --- a/arch/x86/kernel/cpu/amd_64.c +++ b/arch/x86/kernel/cpu/amd_64.c @@ -6,6 +6,7 @@ #include <asm/cacheflush.h> #include <mach_apic.h> +#include "cpu.h" extern int __cpuinit get_model_name(struct cpuinfo_x86 *c); extern void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c); diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 783691b..f5d5bb1 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h @@ -1,3 +1,4 @@ +#ifdef CONFIG_X86_32 struct cpu_model_info { int vendor; @@ -36,3 +37,7 @@ extern struct cpu_vendor_dev __x86cpuvendor_start[], __x86cpuvendor_end[]; extern int get_model_name(struct cpuinfo_x86 *c); extern void display_cacheinfo(struct cpuinfo_x86 *c); + +#endif /* CONFIG_X86_32 */ + +extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d8f1712..f2dc414 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -136,6 +136,8 @@ void __init setup_per_cpu_areas(void) setup_cpumask_of_cpu(); } +#endif + #define ENABLE_CF8_EXT_CFG (1ULL << 46) void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) @@ -148,5 +150,3 @@ void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) } set_cpu_cap(c, X86_FEATURE_PCI_EXT_CFG); } - -#endif diff --git a/arch/x86/kernel/setup.h b/arch/x86/kernel/setup.h deleted file mode 100644 index 66cc2c7..0000000 --- a/arch/x86/kernel/setup.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Internal declarations for shared x86 setup code. - * - * Copyright (c) 2008 Advanced Micro Devices, Inc. - * Contributed by Robert Richter <robert.richter@amd.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA - */ - -#ifndef _ARCH_X86_KERNEL_SETUP_H - -extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); - -#endif /* _ARCH_X86_KERNEL_SETUP_H */ diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 215bd67..25afdd8 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -73,8 +73,6 @@ #include <asm/pat.h> #include <asm/mmconfig.h> -#include "setup.h" - #include <mach_apic.h> #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> diff --git a/include/asm-x86/mmconfig.h b/include/asm-x86/mmconfig.h index 691798f..95beda0 100644 --- a/include/asm-x86/mmconfig.h +++ b/include/asm-x86/mmconfig.h @@ -9,10 +9,4 @@ static inline void fam10h_check_enable_mmcfg(void) { } static inline void check_enable_amd_mmconf_dmi(void) { } #endif -#if defined(CONFIG_SMP) && defined(CONFIG_X86_64) -extern void __cpuinit amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c); -#else -static inline void amd_enable_pci_ext_cfg(struct cpuinfo_x86 *c) { } -#endif - #endif -- 1.5.5.3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3) 2008-06-06 10:01 ` [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3) Robert Richter @ 2008-06-10 10:33 ` Ingo Molnar 0 siblings, 0 replies; 6+ messages in thread From: Ingo Molnar @ 2008-06-10 10:33 UTC (permalink / raw) To: Robert Richter Cc: Thomas Gleixner, Yinghai Lu, LKML, Andi Kleen, Arjan van de Ven * Robert Richter <robert.richter@amd.com> wrote: > Much more less code now. > > Signed-off-by: Robert Richter <robert.richter@amd.com> applied to tip/x86/cpu - thanks Robert. Ingo ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-06-10 10:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20080602143830.GA6835@elte.hu>
2008-06-03 17:37 ` [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" Robert Richter
2008-06-04 15:11 ` Robert Richter
2008-06-05 17:32 ` Robert Richter
2008-06-05 20:41 ` Thomas Gleixner
2008-06-06 10:01 ` [PATCH] fix build bug in "x86: add PCI extended config space access for AMD Barcelona" (try #3) Robert Richter
2008-06-10 10:33 ` Ingo Molnar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox