MAINTAINERS, x86/CPU: Tony Luck will maintain asm/intel-family.h
Subsystems (9)
Tony Luck
maintainerPATCH 1/1 MAINTAINERS, x86/CPU: Tony Luck will maintain asm/intel-family.h
There are a few different subsystems in the kernel that depend on model specific behaviour (perf, EDAC, power, ...). Easier for just one person to have the task to get new model numbers included instead of having these groups trip over each other to do it.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -8064,6 +8064,12 @@ T: git git://git.code.sf.net/p/intel-sas/isci S: Supported F: drivers/scsi/isci/ +INTEL Cpu family model numbers +M: Tony Luck <[email protected]> +L: [email protected] +S: Supported +F: arch/x86/include/asm/intel-family.h + INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) M: Jani Nikula <[email protected]> M: Joonas Lahtinen <[email protected]>
Signature · 1 line
2.20.1
Quoted 9 lines · Tony Luck
There are a few different subsystems in the kernel that depend on model specific behaviour (perf, EDAC, power, ...). Easier for just one person to have the task to get new model numbers included instead of having these groups trip over each other to do it.
Signed-off-by Tony Luck <[email protected]>--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
Applied, thanks.
As a first order of business, pls sum up the naming scheme convention you guys are going to adhere to so that it is clear to everybody:
https://lkml.kernel.org/r/[email protected]
in a patch form. :)
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Luck, Tony
maintainerQuoted 11 lines · Borislav Petkov
Quoted 9 lines · Tony Luck
There are a few different subsystems in the kernel that depend on model specific behaviour (perf, EDAC, power, ...). Easier for just one person to have the task to get new model numbers included instead of having these groups trip over each other to do it.
Signed-off-by Tony Luck <[email protected]>--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
Quoted 8 lines
Applied, thanks.
As a first order of business, pls sum up the naming scheme convention you guys are going to adhere to so that it is clear to everybody:
https://lkml.kernel.org/r/[email protected]
in a patch form. :)
Like this?
From 364e337ec2008442a8a77cf919fbf499b297b3f4 Mon Sep 17 00:00:00 2001
From: Tony Luck <[email protected]>
Date: Thu, 15 Aug 2019 10:04:18 -0700
Subject: [PATCH] Documentation: x86: Explain Intel model naming convention
This was written in an e-mail by Dave Hansen, but not everybody reads the entire LKML archive before posting a patch.
https://lkml.kernel.org/r/[email protected]
--- Documentation/x86/index.rst | 1 + Documentation/x86/intel-cpu-models.rst | 37 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Documentation/x86/intel-cpu-models.rst
Documentation/x86/index.rst +1 -0
@@ -19,6 +19,7 @@ x86-specific Documentation tlb mtrr pat + intel-cpu-models intel_mpx intel-iommu intel_txt
Documentation/x86/intel-cpu-models.rst new file +37 -0
@@ -0,0 +1,37 @@ +.. SPDX-License-Identifier: GPL-2.0 + +======================= +Intel CPU model numbers +======================= + +The CPU model number on a running system can be found by executing +the CPUID(EAX=0) instruction to find the vendor, family, model +and stepping. The model number is found by concatenating two bit +fields from the EAX return value. Bits 19:16 (extended model number) +and 7:4 (model number). + +Inside the Linux kernel the vendor, family, model and stepping are +stored in the cpuinfo_x86 structure. Model specific code typically +uses x86_match_cpu() to determine if it is running on any of some +list of CPU models. + +There are several subsystems that need model specific handling on +Intel CPUs. For code legibility it is better to assign names for +the various model numbers in the include file <asm/intel-family.h> + +Currently all interesting Intel CPU models are in family 6. + +HOWTO Build an INTEL_FAM6_ definition: + +1. Start with INTEL_FAM6_ +2. If not Core-family, add a note about it, like "ATOM". There are only + two options for this (Xeon Phi and Atom). It is exceedingly unlikely + that you are adding a cpu which needs a new option here. +3. Add the processor microarchitecture, not the platform name +4. Add a short differentiator if necessary. Add an _X to differentiate + Server from Client. +5. Add an optional comment with the platform name(s) + +It should end up looking like this: + +INTEL_FAM6_<ATOM?>_<MICROARCH>_<SHORT...> /* Platform Name */
Signature · 1 line
2.20.1
Borislav Petkov
maintainerQuoted 1 line · Tony
Like this?
Actually, I was thinking you'd put it above the defines in the file intel-family.h itself so that *everyone* who wants to add a model, sees it first and while that explanation below is very nice...
Quoted 6 lines
Documentation/x86/intel-cpu-models.rst new file +6
-0+The CPU model number on a running system can be found by executing +the CPUID(EAX=0) instruction to find the vendor, family, model +and stepping. The model number is found by concatenating two bit +fields from the EAX return value. Bits 19:16 (extended model number) +and 7:4 (model number). +
Documentation/x86/intel-cpu-models.rst line 22
Quoted 10 lines
Documentation/x86/intel-cpu-models.rst new file +10
-0+Inside the Linux kernel the vendor, family, model and stepping are +stored in the cpuinfo_x86 structure. Model specific code typically +uses x86_match_cpu() to determine if it is running on any of some +list of CPU models. + +There are several subsystems that need model specific handling on +Intel CPUs. For code legibility it is better to assign names for +the various model numbers in the include file <asm/intel-family.h> + +Currently all interesting Intel CPU models are in family 6.
.. we're probably going to need the text only from here on down:
Quoted 6 lines
Documentation/x86/intel-cpu-models.rst new file +5
-0+ +HOWTO Build an INTEL_FAM6_ definition: + +1. Start with INTEL_FAM6_ +2. If not Core-family, add a note about it, like "ATOM". There are only
Documentation/x86/intel-cpu-models.rst line 37
Quoted 10 lines
Documentation/x86/intel-cpu-models.rst new file +10
-0+ two options for this (Xeon Phi and Atom). It is exceedingly unlikely + that you are adding a cpu which needs a new option here. +3. Add the processor microarchitecture, not the platform name +4. Add a short differentiator if necessary. Add an _X to differentiate + Server from Client. +5. Add an optional comment with the platform name(s) + +It should end up looking like this: + +INTEL_FAM6_<ATOM?>_<MICROARCH>_<SHORT...> /* Platform Name */
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Luck, Tony
maintainerQuoted 6 lines · Borislav Petkov
Quoted 1 line · Tony
Like this?
Actually, I was thinking you'd put it above the defines in the file
intel-family.hitself so that *everyone* who wants to add a model, sees it first and while that explanation below is very nice...
V2 ... ugh ... C doesn't do well with nested comments, so the example has issues. I chose to use a C++ style comment (as they are not as verboten in Linux as they used to be).
Another option would be to put the instructions inside #if 0 ... #endif but that seems less than ideal.
Any other ideas?
-Tony
From 84624a3410a3ba03c3acb13e54b1292c3ca64b8c Mon Sep 17 00:00:00 2001
From: Tony Luck <[email protected]>
Date: Thu, 15 Aug 2019 11:16:24 -0700
Subject: [PATCH] x86/cpu: Explain Intel model naming convention
Dave Hansen spelled out the rules in an e-mail:
https://lkml.kernel.org/r/[email protected]
Copy those right into the <asm/intel-family.h> file to make it easy for people to find them.
--- arch/x86/include/asm/intel-family.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/x86/include/asm/intel-family.h +15 -0
@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. +* +* HOWTO Build an INTEL_FAM6_ definition: +* +* 1. Start with INTEL_FAM6_ +* 2. If not Core-family, add a note about it, like "ATOM". There are only +* two options for this (Xeon Phi and Atom). It is exceedingly unlikely +* that you are adding a cpu which needs a new option here. +* 3. Add the processor microarchitecture, not the platform name +* 4. Add a short differentiator if necessary. Add an _X to differentiate +* Server from Client. +* 5. Add an optional comment with the platform name(s) +* +* It should end up looking like this: +* +* INTEL_FAM6_<ATOM?>_<MICROARCH>_<SHORT...> // Platform Name(s) */ #define INTEL_FAM6_CORE_YONAH 0x0E
Signature · 1 line
2.20.1
Borislav Petkov
maintainerQuoted 54 lines · Tony
Quoted 6 lines · Borislav Petkov
Quoted 1 line · Tony
Like this?
Actually, I was thinking you'd put it above the defines in the file
intel-family.hitself so that *everyone* who wants to add a model, sees it first and while that explanation below is very nice...V2 ... ugh ... C doesn't do well with nested comments, so the example has issues. I chose to use a C++ style comment (as they are not as verboten in Linux as they used to be).
Another option would be to put the instructions inside #if 0 ... #endif but that seems less than ideal.
Any other ideas?
-Tony
From
84624a3410a3ba03c3acb13e54b1292c3ca64b8cMon Sep 17 00:00:00 2001
From: Tony Luck <[email protected]>
Date: Thu, 15 Aug 2019 11:16:24 -0700
Subject: [PATCH] x86/cpu: Explain Intel model naming conventionDave Hansen spelled out the rules in an e-mail:
https://lkml.kernel.org/r/[email protected]
Copy those right into the <
asm/intel-family.h> file to make it easy for people to find them.Suggested-by Borislav Petkov <[email protected]>Signed-off-by Tony Luck <[email protected]>--- arch/x86/include/asm/intel-family.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/x86/include/asm/intel-family.h +8
-0@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. +* +* HOWTO Build an INTEL_FAM6_ definition: +* +* 1. Start with INTEL_FAM6_ +* 2. If not Core-family, add a note about it, like "ATOM". There are only +* two options for this (Xeon Phi and Atom). It is exceedingly unlikely +* that you are adding a cpu which needs a new option here. +* 3. Add the processor microarchitecture, not the platform name
arch/x86/include/asm/intel-family.h line 31
Quoted 10 lines
arch/x86/include/asm/intel-family.h +7
-0+* 4. Add a short differentiator if necessary. Add an _X to differentiate +* Server from Client. +* 5. Add an optional comment with the platform name(s) +* +* It should end up looking like this: +* +* INTEL_FAM6_<ATOM?>_<MICROARCH>_<SHORT...> // Platform Name(s) */ #define INTEL_FAM6_CORE_YONAH 0x0E
Thanks, LGTM. Let's wait for the others to bikeshed a little before I take it.
:-)
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Quoted 5 lines · Tony
On Thu, Aug 15, 2019 at 07:54:55PM +0200, Borislav Petkov wrote:
arch/x86/include/asm/intel-family.h +0
-0@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number.
arch/x86/include/asm/intel-family.h line 23
Quoted 10 lines
arch/x86/include/asm/intel-family.h +10
-0+* +* HOWTO Build an INTEL_FAM6_ definition: +* +* 1. Start with INTEL_FAM6_ +* 2. If not Core-family, add a note about it, like "ATOM". There are only +* two options for this (Xeon Phi and Atom). It is exceedingly unlikely +* that you are adding a cpu which needs a new option here. +* 3. Add the processor microarchitecture, not the platform name +* 4. Add a short differentiator if necessary. Add an _X to differentiate +* Server from Client.
We have the following existing _SHORT variants:
_G_EP_EX_CORE_ULT_GT3E_XEON_D_MOBILE_DESKTOP_NNPI_MID_TABLET_PLUS
So we should document the list of valid and usable ones and either fixup broken ones or document that they are historic ballast and not to be used for new ones. Otherwise you end up with the same discussions again.
Thanks,
tglx
Luck, Tony
maintainerQuoted 5 lines · Thomas Gleixner
Quoted 1 line · Tony
On Thu, Aug 15, 2019 at 07:54:55PM +0200, Borislav Petkov wrote:
So we should document the list of valid and usable ones and either fixup broken ones or document that they are historic ballast and not to be used for new ones. Otherwise you end up with the same discussions again.
This version is a lot more specific (but still allows future flexibility). I see a world of bike-shedding if I try to come up with a naming scheme to fix previous questionable naming choices ... I'm not going to open that can of worms.
-Tony
From 093bf8cd02f4c7a3fa256c2cf7302014190e2840 Mon Sep 17 00:00:00 2001
From: Tony Luck <[email protected]>
Date: Thu, 15 Aug 2019 11:16:24 -0700
Subject: [PATCH] x86/cpu: Explain Intel model naming convention
Dave Hansen spelled out the rules in an e-mail:
https://lkml.kernel.org/r/[email protected]
Copy those right into the <asm/intel-family.h> file to make it easy for people to find them.
--- arch/x86/include/asm/intel-family.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/x86/include/asm/intel-family.h +15 -0
@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. +* +* The defined symbol names have the following form: +* INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF} +* where: +* OPTFAMILY Describes the family of CPUs that this belongs to. Default +* is assumed to be "_CORE" (and should be omitted). Other values +* currently in use are _ATOM and _XEON_PHI +* MICROARCH Is the code name for the micro-architecture for this core. +* N.B. Not the platform name. +* OPTDIFF If needed, a short string to differentiate by market segment. +* Exact strings here will vary over time. _DESKTOP, _MOBILE, and +* _X (short for Xeon server) should be used when they are +* appropriate. +* +* The #define line may optionally include a comment including platform names. */ #define INTEL_FAM6_CORE_YONAH 0x0E
Signature · 1 line
2.20.1
Borislav Petkov
maintainerQuoted 37 lines · Tony
Quoted 5 lines · Thomas Gleixner
Quoted 1 line · Tony
On Thu, Aug 15, 2019 at 07:54:55PM +0200, Borislav Petkov wrote:
So we should document the list of valid and usable ones and either fixup broken ones or document that they are historic ballast and not to be used for new ones. Otherwise you end up with the same discussions again.
This version is a lot more specific (but still allows future flexibility). I see a world of bike-shedding if I try to come up with a naming scheme to fix previous questionable naming choices ... I'm not going to open that can of worms.
-Tony
From
093bf8cd02f4c7a3fa256c2cf7302014190e2840Mon Sep 17 00:00:00 2001
From: Tony Luck <[email protected]>
Date: Thu, 15 Aug 2019 11:16:24 -0700
Subject: [PATCH] x86/cpu: Explain Intel model naming conventionDave Hansen spelled out the rules in an e-mail:
https://lkml.kernel.org/r/[email protected]
Copy those right into the <
asm/intel-family.h> file to make it easy for people to find them.Suggested-by Borislav Petkov <[email protected]>Signed-off-by Tony Luck <[email protected]>--- arch/x86/include/asm/intel-family.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/x86/include/asm/intel-family.h +0
-0
arch/x86/include/asm/intel-family.h line 16
Quoted 6 lines
arch/x86/include/asm/intel-family.h +3
-0@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. +* +* The defined symbol names have the following form: +* INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF}
I think you want to have the underscores in the template:
INTEL_FAM6_{OPTFAMILY}_{MICROARCH}_{OPTDIFF}but no need to resend if this is the only issue - I'll fix it up when applying.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Luck, Tony
maintainerQuoted 9 lines
Quoted 2 lines
+ * The defined symbol names have the following form:
+ * INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF}I think you want to have the underscores in the template:
INTEL_FAM6_{OPTFAMILY}_{MICROARCH}_{OPTDIFF}but no need to resend if this is the only issue - I'll fix it up when applying.
I started there, but then had to include a sentence saying to skip the "_" if you didn't include either/both of the optional fields.
-Tony
From: Luck, Tony
Quoted 6 lines
Sent: 16 August 2019 17:29
Quoted 5 lines
Quoted 2 lines
+ * The defined symbol names have the following form:
+ * INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF}I think you want to have the underscores in the template:
Quoted 7 lines
Quoted 4 lines
INTEL_FAM6_{OPTFAMILY}_{MICROARCH}_{OPTDIFF}but no need to resend if this is the only issue - I'll fix it up when applying.
I started there, but then had to include a sentence saying to skip the "_" if you didn't include either/both of the optional fields.
Might get difficult working out whether INTER_FAM6_FOO_BAR has an OPTFAMILY of FOO and MICROARCH of BAR, or MICROARCH of FOO and OPTDIFF of BAR.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Borislav Petkov
maintainerQuoted 5 lines · Tony
Quoted 5 lines
Quoted 2 lines
+ * The defined symbol names have the following form:
+ * INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF}I think you want to have the underscores in the template:
Quoted 7 lines
Quoted 4 lines
INTEL_FAM6_{OPTFAMILY}_{MICROARCH}_{OPTDIFF}but no need to resend if this is the only issue - I'll fix it up when applying.
I started there, but then had to include a sentence saying to skip the "_" if you didn't include either/both of the optional fields.
Ok, I see, that's why you call it "_CORE" - with a prepended underscore
- which should be omitted, for example. Ok, I'll take it and we can always fix it up if it ain't clear.
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.Thomas Gleixner
Acked-byQuoted 32 lines · Tony
Quoted 1 line
From
093bf8cd02f4c7a3fa256c2cf7302014190e2840Mon Sep 17 00:00:00 2001From: Tony Luck <[email protected]>
Date: Thu, 15 Aug 2019 11:16:24 -0700
Subject: [PATCH] x86/cpu: Explain Intel model naming conventionDave Hansen spelled out the rules in an e-mail:
https://lkml.kernel.org/r/[email protected]
Copy those right into the <
asm/intel-family.h> file to make it easy for people to find them.Suggested-by Borislav Petkov <[email protected]>Signed-off-by Tony Luck <[email protected]>--- arch/x86/include/asm/intel-family.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/x86/include/asm/intel-family.h +6
-0@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. +* +* The defined symbol names have the following form: +* INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF} +* where: +* OPTFAMILY Describes the family of CPUs that this belongs to. Default +* is assumed to be "_CORE" (and should be omitted). Other values
arch/x86/include/asm/intel-family.h line 29
Quoted 10 lines
arch/x86/include/asm/intel-family.h +9
-0+* currently in use are _ATOM and _XEON_PHI +* MICROARCH Is the code name for the micro-architecture for this core. +* N.B. Not the platform name. +* OPTDIFF If needed, a short string to differentiate by market segment. +* Exact strings here will vary over time. _DESKTOP, _MOBILE, and +* _X (short for Xeon server) should be used when they are +* appropriate. +* +* The #define line may optionally include a comment including platform names. */
tip-bot for Tony Luck
merge bot[tip:x86/urgent] x86/cpu: Explain Intel model naming convention
In reply to Luck, Tonyx86/cpu: Explain Intel model naming convention
Commit-ID: 12ece2d53d3e8f827e972caf497c165f7729c717 Gitweb: https://git.kernel.org/tip/12ece2d53d3e8f827e972caf497c165f7729c717 Author: Tony Luck <[email protected]> AuthorDate: Thu, 15 Aug 2019 11:16:24 -0700 Committer: Borislav Petkov <[email protected]> CommitDate: Sat, 17 Aug 2019 10:06:32 +0200
x86/cpu: Explain Intel model naming convention
Dave Hansen spelled out the rules in an e-mail:
https://lkml.kernel.org/r/[email protected]
Copy those right into the <asm/intel-family.h> file to make it easy for people to find them.
--- arch/x86/include/asm/intel-family.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/x86/include/asm/intel-family.h +15 -0
@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. +* +* The defined symbol names have the following form: +* INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF} +* where: +* OPTFAMILY Describes the family of CPUs that this belongs to. Default +* is assumed to be "_CORE" (and should be omitted). Other values +* currently in use are _ATOM and _XEON_PHI +* MICROARCH Is the code name for the micro-architecture for this core. +* N.B. Not the platform name. +* OPTDIFF If needed, a short string to differentiate by market segment. +* Exact strings here will vary over time. _DESKTOP, _MOBILE, and +* _X (short for Xeon server) should be used when they are +* appropriate. +* +* The #define line may optionally include a comment including platform names. */ #define INTEL_FAM6_CORE_YONAH 0x0E
Peter Zijlstra
maintainerQuoted 19 lines · Thomas Gleixner
Quoted 5 lines · Tony
On Thu, Aug 15, 2019 at 07:54:55PM +0200, Borislav Petkov wrote:
arch/x86/include/asm/intel-family.h +0
-0@@ -11,6 +11,21 @@* While adding a new CPUID for a new microarchitecture, add a new * group to keep logically sorted out in chronological order. Within * that group keep the CPUID for the variants sorted by model number. arch/x86/include/asm/intel-family.h line 23
Quoted 10 lines
arch/x86/include/asm/intel-family.h +10
-0+* +* HOWTO Build an INTEL_FAM6_ definition: +* +* 1. Start with INTEL_FAM6_ +* 2. If not Core-family, add a note about it, like "ATOM". There are only +* two options for this (Xeon Phi and Atom). It is exceedingly unlikely +* that you are adding a cpu which needs a new option here. +* 3. Add the processor microarchitecture, not the platform name +* 4. Add a short differentiator if necessary. Add an _X to differentiate +* Server from Client. We have the following existing
_SHORTvariants:
Quoted 1 line
_PLUS
That one isn't actually a _SHORT, the uarch is called 'Goldmont Plus'.
Peter Zijlstra
maintainerQuoted 4 lines · Thomas Gleixner
We have the following existing
_SHORTvariants:_G
_GT3E
Those two are special SOCs due to 'extra graphics bits on', and I suppose we could collate them. That said; I'm not sure NHM_G ever shipped, I'm looking at a wikipedia page that says both Auburndale and Havendale got scrapped.
Quoted 2 lines
_EP_EX
Both are historical, intel is no longer making that distinction and current chips will have _X.
Quoted 2 lines
_CORE_DESKTOP
These two and no _SHORT should/could be collated, I think.
Quoted 2 lines
_ULT_MOBILE
I suspect these two are the same.
Quoted 1 line
_XEON_D
Bit unfortunate that; we use _XEON_D for big microservers and ATOM_*_X for small microservers. So there's room for improvement here by unifying this.
Quoted 1 line
_MID
That one lived for 4 atom generations, but afaict it's no longer alive.
Quoted 2 lines
_NNPI_TABLET
These are so far one offs, not sure about the future.
Quoted 1 line
_PLUS
Like said in the other email, that one is not actually a _SHORT at all, but rather the uarch is 'Goldmont Plus'
Peter Zijlstra
maintainerQuoted 4 lines · Peter Zijlstra
Quoted 2 lines
_CORE_DESKTOPThese two and no
_SHORTshould/could be collated, I think.
for i in git grep -l "INTEL_FAM6_.*_\(CORE\|DESKTOP\)" do
sed -i -e 's/\(INTEL_FAM6_.*\)_\(CORE\|DESKTOP\)/\1/g' ${i}done
--- arch/x86/events/intel/core.c | 26 +++++++++++++------------- arch/x86/events/intel/cstate.c | 22 +++++++++++----------- arch/x86/events/intel/pt.c | 2 +- arch/x86/events/intel/rapl.c | 10 +++++----- arch/x86/events/intel/uncore.c | 12 ++++++------ arch/x86/events/msr.c | 8 ++++---- arch/x86/include/asm/intel-family.h | 10 +++++----- arch/x86/kernel/apic/apic.c | 8 ++++---- arch/x86/kernel/cpu/bugs.c | 8 ++++---- arch/x86/kernel/cpu/intel.c | 10 +++++----- drivers/cpufreq/intel_pstate.c | 12 ++++++------ drivers/idle/intel_idle.c | 2 +- tools/power/x86/turbostat/turbostat.c | 28 ++++++++++++++-------------- 13 files changed, 79 insertions(+), 79 deletions(-)
arch/x86/events/intel/core.c +13 -13
@@ -3964,12 +3964,12 @@ static __init void intel_clovertown_quirk(void) }static const struct x86_cpu_desc isolation_ucodes[] = { -INTEL_CPU_DESC (INTEL_FAM6_HASWELL_CORE ,3 ,0x0000001f ), +INTEL_CPU_DESC (INTEL_FAM6_HASWELL ,3 ,0x0000001f ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_ULT ,1 ,0x0000001e ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_GT3E ,1 ,0x00000015 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,2 ,0x00000037 ),INTEL_CPU_DESC (INTEL_FAM6_HASWELL_X ,4 ,0x0000000a ), -INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_CORE ,4 ,0x00000023 ), +INTEL_CPU_DESC (INTEL_FAM6_BROADWELL ,4 ,0x00000023 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_GT3E ,1 ,0x00000014 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,2 ,0x00000010 ),INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_XEON_D ,3 ,0x07000009 ),
@@ -3979,16 +3979,16 @@ static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,4 ,0x00000000 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_MOBILE ,3 ,0x0000007c ), -INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_DESKTOP ,3 ,0x0000007c ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,9 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE ,3 ,0x0000007c ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,9 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,9 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,10 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,11 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,12 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,10 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,11 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_DESKTOP ,12 ,0x0000004e ), - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_DESKTOP, 13, 0x0000004e), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,10 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,11 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,12 ,0x0000004e ), + INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 13, 0x0000004e), {} };
@@ -4857,7 +4857,7 @@ __init int intel_pmu_init(void)break ; -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E :
@@ -4890,7 +4890,7 @@ __init int intel_pmu_init(void) name ="haswell" ;break ; -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
@@ -4956,9 +4956,9 @@ __init int intel_pmu_init(void) pmem = true;/* fall through */ case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));
@@ -5006,7 +5006,7 @@ __init int intel_pmu_init(void) pmem = true;/* fall through */ case INTEL_FAM6_ICELAKE_MOBILE : -case INTEL_FAM6_ICELAKE_DESKTOP : +case INTEL_FAM6_ICELAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));memcpy (hw_cache_extra_regs, skl_hw_cache_extra_regs,sizeof (hw_cache_extra_regs));
arch/x86/events/intel/cstate.c +11 -11
@@ -593,40 +593,40 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_IVYBRIDGE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_CORE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_HASWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_X , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_HASWELL_ULT , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT , slm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_SILVERMONT_X , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_AIRMONT , slm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_CORE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_XEON_D , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_DESKTOP , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_MOBILE , cnl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNL , knl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNM , knl_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_X , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates),X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), - X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_DESKTOP, snb_cstates), + X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE, snb_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
arch/x86/events/intel/pt.c +1 -1
@@ -204,7 +204,7 @@ static int __init pt_pmu_hw_init(void)/* model-specific quirks */ switch (boot_cpu_data.x86_model) { -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
arch/x86/events/intel/rapl.c +5 -5
@@ -720,27 +720,27 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , model_snbep),X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , model_snb),X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , model_snbep), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , model_hsw), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_DESKTOP , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_MOBILE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , model_skl), - X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_DESKTOP, model_skl), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), {}, };
arch/x86/events/intel/uncore.c +6 -6
@@ -1451,10 +1451,10 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_WESTMERE_EP , nhm_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE , snb_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE , ivb_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , hsw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , hsw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , bdw_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , bdw_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SANDYBRIDGE_X , snbep_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_NEHALEM_EX, nhmex_uncore_init),
@@ -1465,14 +1465,14 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , bdx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_DESKTOP ,skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , skx_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_DESKTOP , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_DESKTOP , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init), {}, };
arch/x86/events/msr.c +4 -4
@@ -59,12 +59,12 @@ static bool test_intel(int idx, void *data)case INTEL_FAM6_IVYBRIDGE :case INTEL_FAM6_IVYBRIDGE_X : -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_X :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E : -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_XEON_D :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_BROADWELL_X :
@@ -85,10 +85,10 @@ static bool test_intel(int idx, void *data)break ;case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_SKYLAKE_X :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :case INTEL_FAM6_ICELAKE_MOBILE :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;
arch/x86/include/asm/intel-family.h +5 -5
@@ -49,27 +49,27 @@#define INTEL_FAM6_IVYBRIDGE 0x3A#define INTEL_FAM6_IVYBRIDGE_X 0x3E -#define INTEL_FAM6_HASWELL_CORE 0x3C +#define INTEL_FAM6_HASWELL 0x3C#define INTEL_FAM6_HASWELL_X 0x3F#define INTEL_FAM6_HASWELL_ULT 0x45#define INTEL_FAM6_HASWELL_GT3E 0x46 -#define INTEL_FAM6_BROADWELL_CORE 0x3D +#define INTEL_FAM6_BROADWELL 0x3D#define INTEL_FAM6_BROADWELL_GT3E 0x47#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E -#define INTEL_FAM6_SKYLAKE_DESKTOP 0x5E +#define INTEL_FAM6_SKYLAKE 0x5E#define INTEL_FAM6_SKYLAKE_X 0x55#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E -#define INTEL_FAM6_KABYLAKE_DESKTOP 0x9E +#define INTEL_FAM6_KABYLAKE 0x9E#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66#define INTEL_FAM6_ICELAKE_X 0x6A#define INTEL_FAM6_ICELAKE_XEON_D 0x6C -#define INTEL_FAM6_ICELAKE_DESKTOP 0x7D +#define INTEL_FAM6_ICELAKE 0x7D#define INTEL_FAM6_ICELAKE_MOBILE 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D
arch/x86/kernel/apic/apic.c +4 -4
@@ -593,18 +593,18 @@ static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_BROADWELL_XEON_D , bdx_deadline_rev),DEADLINE_MODEL_MATCH_FUNC (INTEL_FAM6_SKYLAKE_X , skx_deadline_rev), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_CORE ,0x22 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL ,0x22 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_ULT ,0x20 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_HASWELL_GT3E ,0x17 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_CORE ,0x25 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_MOBILE ,0xb2 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_DESKTOP ,0xb2 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE ,0xb2 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_MOBILE ,0x52 ), - DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE_DESKTOP, 0x52), + DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE, 0x52), {}, };
arch/x86/kernel/cpu/bugs.c +4 -4
@@ -1184,15 +1184,15 @@ static void override_cache_bits(struct cpuinfo_x86 *c)case INTEL_FAM6_WESTMERE :case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE : -case INTEL_FAM6_HASWELL_CORE : +case INTEL_FAM6_HASWELL :case INTEL_FAM6_HASWELL_ULT :case INTEL_FAM6_HASWELL_GT3E : -case INTEL_FAM6_BROADWELL_CORE : +case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_GT3E :case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :if (c->x86_cache_bits <44 ) c->x86_cache_bits =44 ;break ;
arch/x86/kernel/cpu/intel.c +5 -5
@@ -142,21 +142,21 @@ struct sku_microcode {u32 microcode; };static const struct sku_microcode spectre_bad_microcodes[] = { - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x0B ,0x80 }, - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x0A ,0x80 }, - {INTEL_FAM6_KABYLAKE_DESKTOP ,0x09 ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x0B ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x0A ,0x80 }, + {INTEL_FAM6_KABYLAKE ,0x09 ,0x80 }, {INTEL_FAM6_KABYLAKE_MOBILE ,0x0A ,0x80 }, {INTEL_FAM6_KABYLAKE_MOBILE ,0x09 ,0x80 }, {INTEL_FAM6_SKYLAKE_X ,0x03 ,0x0100013e }, {INTEL_FAM6_SKYLAKE_X ,0x04 ,0x0200003c }, - {INTEL_FAM6_BROADWELL_CORE ,0x04 ,0x28 }, + {INTEL_FAM6_BROADWELL ,0x04 ,0x28 }, {INTEL_FAM6_BROADWELL_GT3E ,0x01 ,0x1b }, {INTEL_FAM6_BROADWELL_XEON_D ,0x02 ,0x14 }, {INTEL_FAM6_BROADWELL_XEON_D ,0x03 ,0x07000011 }, {INTEL_FAM6_BROADWELL_X ,0x01 ,0x0b000025 }, {INTEL_FAM6_HASWELL_ULT ,0x01 ,0x21 }, {INTEL_FAM6_HASWELL_GT3E ,0x01 ,0x18 }, - {INTEL_FAM6_HASWELL_CORE ,0x03 ,0x23 }, + {INTEL_FAM6_HASWELL ,0x03 ,0x23 }, {INTEL_FAM6_HASWELL_X ,0x02 ,0x3b }, {INTEL_FAM6_HASWELL_X ,0x04 ,0x10 }, {INTEL_FAM6_IVYBRIDGE_X ,0x04 ,0x42a },
drivers/cpufreq/intel_pstate.c +6 -6
@@ -1867,12 +1867,12 @@ static const struct pstate_funcs knl_funcs = { (unsigned long)&policy }static const struct x86_cpu_id intel_pstate_cpu_ids[] = { -ICPU (INTEL_FAM6_SANDYBRIDGE , core_funcs), +ICPU (INTEL_FAM6_SANDYBRIDGE , core_funcs),ICPU (INTEL_FAM6_SANDYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_ATOM_SILVERMONT , silvermont_funcs),ICPU (INTEL_FAM6_IVYBRIDGE , core_funcs), -ICPU (INTEL_FAM6_HASWELL_CORE , core_funcs), -ICPU (INTEL_FAM6_BROADWELL_CORE , core_funcs), +ICPU (INTEL_FAM6_HASWELL , core_funcs), +ICPU (INTEL_FAM6_BROADWELL , core_funcs),ICPU (INTEL_FAM6_IVYBRIDGE_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_X , core_funcs),ICPU (INTEL_FAM6_HASWELL_ULT , core_funcs),
@@ -1881,7 +1881,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs),ICPU (INTEL_FAM6_SKYLAKE_MOBILE , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs), -ICPU (INTEL_FAM6_SKYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE , core_funcs),ICPU (INTEL_FAM6_BROADWELL_XEON_D , core_funcs),ICPU (INTEL_FAM6_XEON_PHI_KNL , knl_funcs), ICPU(INTEL_FAM6_XEON_PHI_KNM, knl_funcs),
@@ -1900,13 +1900,13 @@ static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = { };static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = { -ICPU (INTEL_FAM6_KABYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_KABYLAKE , core_funcs), {} };static const struct x86_cpu_id intel_pstate_hwp_boost_ids[] = {ICPU (INTEL_FAM6_SKYLAKE_X , core_funcs), -ICPU (INTEL_FAM6_SKYLAKE_DESKTOP , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE , core_funcs), {} };
drivers/idle/intel_idle.c +1 -1
@@ -1311,7 +1311,7 @@ static void intel_idle_state_table_update(void)case INTEL_FAM6_ATOM_GOLDMONT_PLUS :bxt_idle_state_table_update ();break ; -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :sklh_idle_state_table_update ();break ; }
tools/power/x86/turbostat/turbostat.c +14 -14
@@ -3207,10 +3207,10 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) pkg_cstate_limits = snb_pkg_cstate_limits; has_misc_feature_control =1 ;break ; -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -3403,10 +3403,10 @@ int has_config_tdp(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_IVYBRIDGE :/* IVB */ -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSX */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -3840,9 +3840,9 @@ void rapl_probe_intel(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_SANDYBRIDGE :case INTEL_FAM6_IVYBRIDGE : -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_GFX |RAPL_PKG_POWER_INFO ;if (rapl_joules) {
@@ -4031,7 +4031,7 @@ void perf_limit_reasons_probe(unsigned int family, unsigned int model)return ;switch (model) { -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ do_gfx_perf_limit_reasons =1 ;case INTEL_FAM6_HASWELL_X :/* HSX */
@@ -4249,10 +4249,10 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_SANDYBRIDGE_X :case INTEL_FAM6_IVYBRIDGE :/* IVB */ case INTEL_FAM6_IVYBRIDGE_X :/* IVB Xeon */ -case INTEL_FAM6_HASWELL_CORE :/* HSW */ +case INTEL_FAM6_HASWELL :/* HSW */ case INTEL_FAM6_HASWELL_X :/* HSW */ case INTEL_FAM6_HASWELL_GT3E :/* HSW */ -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */
@@ -4284,8 +4284,8 @@ int has_hsw_msrs(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_HASWELL_CORE : -case INTEL_FAM6_BROADWELL_CORE :/* BDW */ +case INTEL_FAM6_HASWELL : +case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */
@@ -4569,16 +4569,16 @@ unsigned int intel_model_duplicates(unsigned int model)return INTEL_FAM6_XEON_PHI_KNL ;case INTEL_FAM6_HASWELL_ULT : -return INTEL_FAM6_HASWELL_CORE ; +return INTEL_FAM6_HASWELL ;case INTEL_FAM6_BROADWELL_X :case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ;case INTEL_FAM6_SKYLAKE_MOBILE : -case INTEL_FAM6_SKYLAKE_DESKTOP : +case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_KABYLAKE_MOBILE : -case INTEL_FAM6_KABYLAKE_DESKTOP : +case INTEL_FAM6_KABYLAKE :return INTEL_FAM6_SKYLAKE_MOBILE ;case INTEL_FAM6_ICELAKE_MOBILE :
Peter Zijlstra
maintainerQuoted 4 lines · Peter Zijlstra
Quoted 2 lines
_ULT_MOBILEI suspect these two are the same.
for i in git grep -l "INTEL_FAM6_.*_MOBILE"
do
sed -i -e 's/\(INTEL_FAM6_.*\)_MOBILE/\1_ULT/g' ${i}done
--- arch/x86/events/intel/core.c | 16 +++++++-------- arch/x86/events/intel/cstate.c | 14 ++++++------- arch/x86/events/intel/rapl.c | 8 ++++---- arch/x86/events/intel/uncore.c | 6 +++--- arch/x86/events/msr.c | 6 +++--- arch/x86/include/asm/intel-family.h | 8 ++++---- arch/x86/kernel/apic/apic.c | 4 ++-- arch/x86/kernel/cpu/bugs.c | 4 ++-- arch/x86/kernel/cpu/intel.c | 4 ++-- drivers/cpufreq/intel_pstate.c | 2 +- tools/power/x86/turbostat/turbostat.c | 38 +++++++++++++++++------------------ 11 files changed, 55 insertions(+), 55 deletions(-)
arch/x86/events/intel/core.c +8 -8
@@ -3978,13 +3978,13 @@ static const struct x86_cpu_desc isolation_ucodes[] = {INTEL_CPU_DESC (INTEL_FAM6_BROADWELL_X ,2 ,0x0b000014 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,3 ,0x00000021 ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_X ,4 ,0x00000000 ), -INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_MOBILE ,3 ,0x0000007c ), +INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE_ULT ,3 ,0x0000007c ),INTEL_CPU_DESC (INTEL_FAM6_SKYLAKE ,3 ,0x0000007c ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,9 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,9 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,10 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,11 ,0x0000004e ), -INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_MOBILE ,12 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_ULT ,9 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_ULT ,10 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_ULT ,11 ,0x0000004e ), +INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE_ULT ,12 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,10 ,0x0000004e ),INTEL_CPU_DESC (INTEL_FAM6_KABYLAKE ,11 ,0x0000004e ), INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 12, 0x0000004e),
@@ -4955,9 +4955,9 @@ __init int intel_pmu_init(void)case INTEL_FAM6_SKYLAKE_X : pmem = true;/* fall through */ -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_ULT :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_ULT :case INTEL_FAM6_KABYLAKE :x86_add_quirk (intel_pebs_isolation_quirk); x86_pmu.late_ack = true;
@@ -5005,7 +5005,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_ICELAKE_XEON_D : pmem = true;/* fall through */ -case INTEL_FAM6_ICELAKE_MOBILE : +case INTEL_FAM6_ICELAKE_ULT :case INTEL_FAM6_ICELAKE : x86_pmu.late_ack = true;memcpy (hw_cache_event_ids, skl_hw_cache_event_ids,sizeof (hw_cache_event_ids));
arch/x86/events/intel/cstate.c +7 -7
@@ -608,14 +608,14 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_GT3E , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_BROADWELL_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_ULT , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_ULT , hswult_cstates),X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE , hswult_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_MOBILE , cnl_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_CANNONLAKE_ULT , cnl_cstates),X86_CSTATES_MODEL (INTEL_FAM6_XEON_PHI_KNL , knl_cstates), X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),
@@ -625,8 +625,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_ATOM_GOLDMONT_PLUS , glm_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE_ULT , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_ICELAKE , snb_cstates), { }, };MODULE_DEVICE_TABLE (x86cpu, intel_cstates_match);
arch/x86/events/intel/rapl.c +4 -4
@@ -730,16 +730,16 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , model_hsx),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , model_knl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , model_knl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_ULT , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , model_hsx), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE_ULT , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_KABYLAKE , model_skl), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_CANNONLAKE_ULT , model_skl),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_X , model_hsw),X86_RAPL_MODEL_MATCH (INTEL_FAM6_ATOM_GOLDMONT_PLUS , model_hsw), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , model_skl), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_ICELAKE_ULT , model_skl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), {}, };
arch/x86/events/intel/uncore.c +3 -3
@@ -1466,11 +1466,11 @@ static const struct x86_cpu_id intel_uncore_match[] __initconst = {X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNM , knl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_MOBILE , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_ULT , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_SKYLAKE_X , skx_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_MOBILE , skl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE_ULT , skl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_KABYLAKE , skl_uncore_init), -X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_MOBILE , icl_uncore_init), +X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_ULT , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE_NNPI , icl_uncore_init),X86_UNCORE_MODEL_MATCH (INTEL_FAM6_ICELAKE , icl_uncore_init), X86_UNCORE_MODEL_MATCH(INTEL_FAM6_ATOM_TREMONT_X, snr_uncore_init),
arch/x86/events/msr.c +3 -3
@@ -84,12 +84,12 @@ static bool test_intel(int idx, void *data)return true;break ; -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_ULT :case INTEL_FAM6_SKYLAKE :case INTEL_FAM6_SKYLAKE_X : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_ULT :case INTEL_FAM6_KABYLAKE : -case INTEL_FAM6_ICELAKE_MOBILE : +case INTEL_FAM6_ICELAKE_ULT :if (idx ==PERF_MSR_SMI || idx ==PERF_MSR_PPERF )return true;break ;
arch/x86/include/asm/intel-family.h +4 -4
@@ -59,18 +59,18 @@#define INTEL_FAM6_BROADWELL_X 0x4F#define INTEL_FAM6_BROADWELL_XEON_D 0x56 -#define INTEL_FAM6_SKYLAKE_MOBILE 0x4E +#define INTEL_FAM6_SKYLAKE_ULT 0x4E#define INTEL_FAM6_SKYLAKE 0x5E#define INTEL_FAM6_SKYLAKE_X 0x55 -#define INTEL_FAM6_KABYLAKE_MOBILE 0x8E +#define INTEL_FAM6_KABYLAKE_ULT 0x8E#define INTEL_FAM6_KABYLAKE 0x9E -#define INTEL_FAM6_CANNONLAKE_MOBILE 0x66 +#define INTEL_FAM6_CANNONLAKE_ULT 0x66#define INTEL_FAM6_ICELAKE_X 0x6A#define INTEL_FAM6_ICELAKE_XEON_D 0x6C#define INTEL_FAM6_ICELAKE 0x7D -#define INTEL_FAM6_ICELAKE_MOBILE 0x7E +#define INTEL_FAM6_ICELAKE_ULT 0x7E#define INTEL_FAM6_ICELAKE_NNPI 0x9D/* "Small Core" Processors (Atom) */
arch/x86/kernel/apic/apic.c +2 -2
@@ -600,10 +600,10 @@ static const struct x86_cpu_id deadline_match[] = {DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL ,0x25 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_BROADWELL_GT3E ,0x17 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_MOBILE ,0xb2 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE_ULT ,0xb2 ),DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_SKYLAKE ,0xb2 ), -DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_MOBILE ,0x52 ), +DEADLINE_MODEL_MATCH_REV (INTEL_FAM6_KABYLAKE_ULT ,0x52 ), DEADLINE_MODEL_MATCH_REV ( INTEL_FAM6_KABYLAKE, 0x52), {},
arch/x86/kernel/cpu/bugs.c +2 -2
@@ -1189,9 +1189,9 @@ static void override_cache_bits(struct cpuinfo_x86 *c)case INTEL_FAM6_HASWELL_GT3E :case INTEL_FAM6_BROADWELL :case INTEL_FAM6_BROADWELL_GT3E : -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_ULT :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_ULT :case INTEL_FAM6_KABYLAKE :if (c->x86_cache_bits <44 ) c->x86_cache_bits =44 ;
arch/x86/kernel/cpu/intel.c +2 -2
@@ -145,8 +145,8 @@ static const struct sku_microcode spectre_bad_microcodes[] = { { INTEL_FAM6_KABYLAKE, 0x0B, 0x80 }, { INTEL_FAM6_KABYLAKE, 0x0A, 0x80 }, { INTEL_FAM6_KABYLAKE, 0x09, 0x80 }, - { INTEL_FAM6_KABYLAKE_MOBILE, 0x0A, 0x80 }, - { INTEL_FAM6_KABYLAKE_MOBILE, 0x09, 0x80 }, + { INTEL_FAM6_KABYLAKE_ULT, 0x0A, 0x80 }, + { INTEL_FAM6_KABYLAKE_ULT, 0x09, 0x80 }, { INTEL_FAM6_SKYLAKE_X, 0x03, 0x0100013e }, { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, { INTEL_FAM6_BROADWELL, 0x04, 0x28 },
drivers/cpufreq/intel_pstate.c +1 -1
@@ -1879,7 +1879,7 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {ICPU (INTEL_FAM6_HASWELL_GT3E , core_funcs),ICPU (INTEL_FAM6_BROADWELL_GT3E , core_funcs),ICPU (INTEL_FAM6_ATOM_AIRMONT , airmont_funcs), -ICPU (INTEL_FAM6_SKYLAKE_MOBILE , core_funcs), +ICPU (INTEL_FAM6_SKYLAKE_ULT , core_funcs),ICPU (INTEL_FAM6_BROADWELL_X , core_funcs),ICPU (INTEL_FAM6_SKYLAKE , core_funcs), ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_funcs),
tools/power/x86/turbostat/turbostat.c +19 -19
@@ -3213,8 +3213,8 @@ int probe_nhm_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ pkg_cstate_limits = hsw_pkg_cstate_limits; has_misc_feature_control =1 ;break ;
@@ -3409,8 +3409,8 @@ int has_config_tdp(unsigned int family, unsigned int model)case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_XEON_PHI_KNL :/* Knights Landing */
@@ -3863,8 +3863,8 @@ void rapl_probe_intel(unsigned int family, unsigned int model)else BIC_PRESENT (BIC_PkgWatt);break ; -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ do_rapl =RAPL_PKG |RAPL_CORES |RAPL_CORE_POLICY |RAPL_DRAM |RAPL_DRAM_PERF_STATUS |RAPL_PKG_PERF_STATUS |RAPL_GFX |RAPL_PKG_POWER_INFO ;BIC_PRESENT (BIC_PKG__ );BIC_PRESENT (BIC_RAM__ );
@@ -4255,8 +4255,8 @@ int has_snb_msrs(unsigned int family, unsigned int model)case INTEL_FAM6_BROADWELL :/* BDW */ case INTEL_FAM6_BROADWELL_GT3E :/* BDW */ case INTEL_FAM6_BROADWELL_X :/* BDX */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ case INTEL_FAM6_SKYLAKE_X :/* SKX */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS :
@@ -4286,8 +4286,8 @@ int has_hsw_msrs(unsigned int family, unsigned int model)switch (model) {case INTEL_FAM6_HASWELL :case INTEL_FAM6_BROADWELL :/* BDW */ -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ case INTEL_FAM6_ATOM_GOLDMONT :/* BXT */ case INTEL_FAM6_ATOM_GOLDMONT_PLUS :return 1 ;
@@ -4309,8 +4309,8 @@ int has_skl_msrs(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ return 1 ; }return 0 ;
@@ -4345,7 +4345,7 @@ int is_cnl(unsigned int family, unsigned int model)return 0 ;switch (model) { -case INTEL_FAM6_CANNONLAKE_MOBILE :/* CNL */ +case INTEL_FAM6_CANNONLAKE_ULT :/* CNL */ return 1 ; }
@@ -4575,14 +4575,14 @@ unsigned int intel_model_duplicates(unsigned int model)case INTEL_FAM6_BROADWELL_XEON_D :/* BDX-DE */ return INTEL_FAM6_BROADWELL_X ; -case INTEL_FAM6_SKYLAKE_MOBILE : +case INTEL_FAM6_SKYLAKE_ULT :case INTEL_FAM6_SKYLAKE : -case INTEL_FAM6_KABYLAKE_MOBILE : +case INTEL_FAM6_KABYLAKE_ULT :case INTEL_FAM6_KABYLAKE : -return INTEL_FAM6_SKYLAKE_MOBILE ; +return INTEL_FAM6_SKYLAKE_ULT ; -case INTEL_FAM6_ICELAKE_MOBILE : -return INTEL_FAM6_CANNONLAKE_MOBILE ; +case INTEL_FAM6_ICELAKE_ULT : +return INTEL_FAM6_CANNONLAKE_ULT ; }return model; }
@@ -4731,7 +4731,7 @@ void process_cpuid()if (crystal_hz ==0 )switch (model) { -case INTEL_FAM6_SKYLAKE_MOBILE :/* SKL */ +case INTEL_FAM6_SKYLAKE_ULT :/* SKL */ crystal_hz =24000000 ;/* 24.0 MHz */ break ;case INTEL_FAM6_ATOM_GOLDMONT_X :/* DNV */
Luck, Tony
maintainerQuoted 1 line
sed -i -e 's/\(INTEL_FAM6_.*\)_MOBILE/\1_ULT/g' ${i}I think it would be better to change the one _ULT to _MOBILE, rather than all the _MOBILE to _ULT
-Tony
Peter Zijlstra
maintainerQuoted 15 lines · Thomas Gleixner
We have the following existing
_SHORTvariants:_G
_EP_EX_CORE_ULT_GT3E_XEON_D_MOBILE_DESKTOP_NNPI_MID_TABLET_PLUS
Your list is missing: _L and _X.
_X is the generic 'server'
And we have only MEROM_L, which, afaict, is a mobile variant of MEROM. Now, I just send out patches doing s/_MOBILE/_ULT/, so I suppose this then should be MEROM_ULT.
Or we go the other way and do: s/_ULT/_MOBILE/, in which case this
becomes: MEROM_MOBILE.
No strong feelings either way.
tip-bot for Tony Luck
merge botMAINTAINERS, x86/CPU: Tony Luck will maintain asm/intel-family.h
Commit-ID: 5ed1c835ed8b522ce25071cc2d56a9a09bd5b59e Gitweb: https://git.kernel.org/tip/5ed1c835ed8b522ce25071cc2d56a9a09bd5b59e Author: Tony Luck <[email protected]> AuthorDate: Wed, 14 Aug 2019 16:40:30 -0700 Committer: Borislav Petkov <[email protected]> CommitDate: Thu, 15 Aug 2019 09:54:05 +0200
MAINTAINERS, x86/CPU: Tony Luck will maintain asm/intel-family.h
There are a few different subsystems in the kernel that depend on model specific behaviour (perf, EDAC, power, ...). Easier for just one person to have the task to get new model numbers included instead of having these groups trip over each other to do it.
[ bp: s/Cpu/CPU/ and add [email protected] so that it gets CCed too as
FYI. ]
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -8064,6 +8064,13 @@ T: git git://git.code.sf.net/p/intel-sas/isci S: Supported F: drivers/scsi/isci/ +INTEL CPU family model numbers +M: Tony Luck <[email protected]> +M: [email protected] +L: [email protected] +S: Supported +F: arch/x86/include/asm/intel-family.h + INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) M: Jani Nikula <[email protected]> M: Joonas Lahtinen <[email protected]>