From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH] x86: drop pointless CONFIG_X86_HT Date: Thu, 26 Jun 2014 13:42:45 +0100 Message-ID: <53AC1545.7080501@citrix.com> References: <53AC10B1020000780001D8B6@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4733576579932181866==" Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X090s-0005LJ-UJ for xen-devel@lists.xenproject.org; Thu, 26 Jun 2014 12:42:51 +0000 In-Reply-To: <53AC10B1020000780001D8B6@mail.emea.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel Cc: Keir Fraser List-Id: xen-devel@lists.xenproject.org --===============4733576579932181866== Content-Type: multipart/alternative; boundary="------------040606040200000608000703" --------------040606040200000608000703 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit On 26/06/14 11:23, Jan Beulich wrote: > Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper > --- > This requires the patch series at > http://lists.xenproject.org/archives/html/xen-devel/2014-06/msg03336.html > as a prerequisite. > > --- a/xen/arch/x86/cpu/amd.c > +++ b/xen/arch/x86/cpu/amd.c > @@ -385,7 +385,6 @@ static void check_syscfg_dram_mod_en(voi > > static void __devinit amd_get_topology(struct cpuinfo_x86 *c) > { > -#ifdef CONFIG_X86_HT > int cpu; > unsigned bits; > > @@ -423,7 +422,6 @@ static void __devinit amd_get_topology(s > "Core", > cpu_has(c, X86_FEATURE_TOPOEXT) ? c->compute_unit_id : > c->cpu_core_id); > -#endif > } > > static void __devinit init_amd(struct cpuinfo_x86 *c) > --- a/xen/arch/x86/cpu/common.c > +++ b/xen/arch/x86/cpu/common.c > @@ -233,6 +233,7 @@ static void __cpuinit generic_identify(s > c->x86_model += ((tfms >> 16) & 0xF) << 4; > c->x86_mask = tfms & 15; > c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); > + c->phys_proc_id = c->apicid; > if ( cpu_has(c, X86_FEATURE_CLFLSH) ) > c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; > > @@ -257,10 +258,6 @@ static void __cpuinit generic_identify(s > } > > early_intel_workaround(c); > - > -#ifdef CONFIG_X86_HT > - c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; > -#endif > } > > /* > @@ -429,7 +426,6 @@ void __cpuinit detect_extended_topology( > } > } > > -#ifdef CONFIG_X86_HT > void __cpuinit detect_ht(struct cpuinfo_x86 *c) > { > u32 eax, ebx, ecx, edx; > @@ -474,7 +470,6 @@ void __cpuinit detect_ht(struct cpuinfo_ > c->cpu_core_id); > } > } > -#endif > > unsigned int __init apicid_to_socket(unsigned int apicid) > { > --- a/xen/include/asm-x86/config.h > +++ b/xen/include/asm-x86/config.h > @@ -17,7 +17,6 @@ > #define BITS_PER_XEN_ULONG BITS_PER_LONG > > #define CONFIG_X86 1 > -#define CONFIG_X86_HT 1 > #define CONFIG_PAGING_ASSISTANCE 1 > #define CONFIG_X86_LOCAL_APIC 1 > #define CONFIG_X86_GOOD_APIC 1 > --- a/xen/include/asm-x86/processor.h > +++ b/xen/include/asm-x86/processor.h > @@ -211,11 +211,7 @@ extern void dodgy_tsc(void); > > extern void detect_extended_topology(struct cpuinfo_x86 *c); > > -#ifdef CONFIG_X86_HT > extern void detect_ht(struct cpuinfo_x86 *c); > -#else > -static always_inline void detect_ht(struct cpuinfo_x86 *c) {} > -#endif > > #define cpu_to_core(_cpu) (cpu_data[_cpu].cpu_core_id) > #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id) > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel --------------040606040200000608000703 Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit
On 26/06/14 11:23, Jan Beulich wrote:
Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

---
This requires the patch series at
http://lists.xenproject.org/archives/html/xen-devel/2014-06/msg03336.html 
as a prerequisite.

--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -385,7 +385,6 @@ static void check_syscfg_dram_mod_en(voi
 
 static void __devinit amd_get_topology(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_X86_HT
         int cpu;
         unsigned bits;
 
@@ -423,7 +422,6 @@ static void __devinit amd_get_topology(s
                                                          "Core",
                        cpu_has(c, X86_FEATURE_TOPOEXT) ? c->compute_unit_id :
                                                          c->cpu_core_id);
-#endif
 }
 
 static void __devinit init_amd(struct cpuinfo_x86 *c)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -233,6 +233,7 @@ static void __cpuinit generic_identify(s
 		c->x86_model += ((tfms >> 16) & 0xF) << 4;
 	c->x86_mask = tfms & 15;
 	c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0);
+	c->phys_proc_id = c->apicid;
 	if ( cpu_has(c, X86_FEATURE_CLFLSH) )
 		c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8;
 
@@ -257,10 +258,6 @@ static void __cpuinit generic_identify(s
 	}
 
 	early_intel_workaround(c);
-
-#ifdef CONFIG_X86_HT
-	c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff;
-#endif
 }
 
 /*
@@ -429,7 +426,6 @@ void __cpuinit detect_extended_topology(
 	}
 }
 
-#ifdef CONFIG_X86_HT
 void __cpuinit detect_ht(struct cpuinfo_x86 *c)
 {
 	u32 	eax, ebx, ecx, edx;
@@ -474,7 +470,6 @@ void __cpuinit detect_ht(struct cpuinfo_
 			       c->cpu_core_id);
 	}
 }
-#endif
 
 unsigned int __init apicid_to_socket(unsigned int apicid)
 {
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -17,7 +17,6 @@
 #define BITS_PER_XEN_ULONG BITS_PER_LONG
 
 #define CONFIG_X86 1
-#define CONFIG_X86_HT 1
 #define CONFIG_PAGING_ASSISTANCE 1
 #define CONFIG_X86_LOCAL_APIC 1
 #define CONFIG_X86_GOOD_APIC 1
--- a/xen/include/asm-x86/processor.h
+++ b/xen/include/asm-x86/processor.h
@@ -211,11 +211,7 @@ extern void dodgy_tsc(void);
 
 extern void detect_extended_topology(struct cpuinfo_x86 *c);
 
-#ifdef CONFIG_X86_HT
 extern void detect_ht(struct cpuinfo_x86 *c);
-#else
-static always_inline void detect_ht(struct cpuinfo_x86 *c) {}
-#endif
 
 #define cpu_to_core(_cpu)   (cpu_data[_cpu].cpu_core_id)
 #define cpu_to_socket(_cpu) (cpu_data[_cpu].phys_proc_id)






_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

--------------040606040200000608000703-- --===============4733576579932181866== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============4733576579932181866==--