From: Thomas Gleixner <tglx@linutronix.de>
To: David Wang <davidwang@zhaoxin.com>
Cc: mingo@redhat.com, hpa@zytor.com, gregkh@linuxfoundation.org,
x86@kernel.org, linux-kernel@vger.kernel.org,
brucechang@via-alliance.com, cooperyan@zhaoxin.com,
qiyuanwang@zhaoxin.com, benjaminpan@viatech.com,
lukelin@viacpu.com, timguo@zhaoxin.com
Subject: Re: [PATCH v2] x86/centaur: report correct CPU/cache topology
Date: Thu, 26 Apr 2018 11:11:59 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1804261059080.1584@nanos.tec.linutronix.de> (raw)
In-Reply-To: <1524646110-4808-1-git-send-email-davidwang@zhaoxin.com>
On Wed, 25 Apr 2018, David Wang wrote:
>
> +static void early_init_centaur_mc(struct cpuinfo_x86 *c)
> +{
> +#ifdef CONFIG_SMP
> + unsigned int eax, ebx, ecx, edx;
> +
> + if (c->cpuid_level < 4)
> + return;
> +
> + cpuid_count(4, 0, &eax, &ebx, &ecx, &edx);
> + if (eax & 0x1f)
> + c->x86_max_cores = (eax >> 26) + 1;
> + else
> + return;
> +#endif
> +}
My review comment from last time still stands:
> > This is a bad copy of intel_num_cpu_cores(). See for the subtle
> > difference. Please rename the intel function and move it to common.c
In other words:
Make a patch which moves intel_num_cpu_cores() into common.c. Rename the
function into something like detect_num_cpu_cores() and fix up the call
site in intel.c.
Then add your patch and use the very same function.
> +
> static void early_init_centaur(struct cpuinfo_x86 *c)
> {
> + early_init_centaur_mc(c);
> switch (c->x86) {
> #ifdef CONFIG_X86_32
> case 5:
> @@ -146,6 +163,7 @@ static void centaur_detect_vmx_virtcap(struct cpuinfo_x86 *c)
>
> static void init_centaur(struct cpuinfo_x86 *c)
> {
> + unsigned int l2 = 0;
> #ifdef CONFIG_X86_32
> char *name;
> u32 fcr_set = 0;
> @@ -161,6 +179,17 @@ static void init_centaur(struct cpuinfo_x86 *c)
> #endif
> early_init_centaur(c);
>
> + l2 = init_intel_cacheinfo(c);
> +
> + /* Detect legacy cache sizes if init_intel_cacheinfo did not */
> + if (l2 == 0) {
> + cpu_detect_cache_sizes(c);
> + }
Aside of the pointless parentheses, this really wants to be cleaned up as
well.
init_intel_cacheinfo() is called from the intel init code and it does the
same silly thing.
So the right thing to do is in a separate patch first
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -679,12 +679,6 @@ static void init_intel(struct cpuinfo_x8
l2 = init_intel_cacheinfo(c);
- /* Detect legacy cache sizes if init_intel_cacheinfo did not */
- if (l2 == 0) {
- cpu_detect_cache_sizes(c);
- l2 = c->x86_cache_size;
- }
-
if (c->cpuid_level > 9) {
unsigned eax = cpuid_eax(10);
/* Check for version and the number of counters */
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -802,6 +802,11 @@ unsigned int init_intel_cacheinfo(struct
c->x86_cache_size = l3 ? l3 : (l2 ? l2 : (l1i+l1d));
+ /* Detect legacy cache sizes if the above did not work */
+ if (!l2) {
+ cpu_detect_cache_sizes(c);
+ l2 = c->x86_cache_size;
+ }
return l2;
}
Hmm?
tglx
next prev parent reply other threads:[~2018-04-26 9:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-25 8:48 David Wang
2018-04-26 9:11 ` Thomas Gleixner [this message]
2018-04-26 9:52 David Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.1804261059080.1584@nanos.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=benjaminpan@viatech.com \
--cc=brucechang@via-alliance.com \
--cc=cooperyan@zhaoxin.com \
--cc=davidwang@zhaoxin.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lukelin@viacpu.com \
--cc=mingo@redhat.com \
--cc=qiyuanwang@zhaoxin.com \
--cc=timguo@zhaoxin.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®