Archive-only list for patches
 help / color / mirror / Atom feed
* [PATCH v8 0/3] Final pieces of Intel new families support
@ 2024-09-03 17:34 Tony Luck
  2024-09-03 17:34 ` [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines Tony Luck
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: Tony Luck @ 2024-09-03 17:34 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86
  Cc: Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches, Tony Luck

All except one of the precursor patches were merged to Linus' tree
in the v6.11 merge window. The exception is a one-liner that is in
the maintainer tree and linux-next, but didn't get pulled this time.

Here's that patch (cherry-picked from intel-next so it has Chanwoo
Choi's sign-off). Also the two cleanup patches that remove all the
old FAM6 specific infrastructure.

All on top of TIP x86/cpu branch.

Signed-off-by: Tony Luck <tony.luck@intel.com>

Tony Luck (3):
  extcon: axp288: Switch to new Intel CPU model defines
  x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros
  x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines

 arch/x86/include/asm/cpu_device_id.h | 20 -------
 arch/x86/include/asm/intel-family.h  | 85 +---------------------------
 drivers/extcon/extcon-axp288.c       |  2 +-
 3 files changed, 3 insertions(+), 104 deletions(-)


base-commit: fd82221a59fa5ce9dc7523e11c5e995104a28cb0
-- 
2.46.0


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines
  2024-09-03 17:34 [PATCH v8 0/3] Final pieces of Intel new families support Tony Luck
@ 2024-09-03 17:34 ` Tony Luck
  2024-09-04 15:19   ` Chanwoo Choi
  2024-09-03 17:34 ` [PATCH v8 2/3] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Tony Luck
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 12+ messages in thread
From: Tony Luck @ 2024-09-03 17:34 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86
  Cc: Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches, Tony Luck

New CPU #defines encode vendor and family as well as model.

Link: https://lore.kernel.org/lkml/20240611174016.352953-1-tony.luck@intel.com/
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
---
 drivers/extcon/extcon-axp288.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index a703a8315634..d3bcbe839c09 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -108,7 +108,7 @@ struct axp288_extcon_info {
 };
 
 static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
-	X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,	NULL),
+	X86_MATCH_VFM(INTEL_ATOM_AIRMONT,	NULL),
 	{}
 };
 
-- 
2.46.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v8 2/3] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros
  2024-09-03 17:34 [PATCH v8 0/3] Final pieces of Intel new families support Tony Luck
  2024-09-03 17:34 ` [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines Tony Luck
@ 2024-09-03 17:34 ` Tony Luck
  2024-09-03 17:34 ` [PATCH v8 3/3] x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines Tony Luck
  2024-09-03 19:26 ` [PATCH v8 0/3] Final pieces of Intel new families support Borislav Petkov
  3 siblings, 0 replies; 12+ messages in thread
From: Tony Luck @ 2024-09-03 17:34 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86
  Cc: Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches, Tony Luck

These macros have been replaced by X86_MATCH_VFM[_STEPPING]()

Signed-off-by: Tony Luck <tony.luck@intel.com>
---
 arch/x86/include/asm/cpu_device_id.h | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
index 3831f612e89c..e4121d9aa9e1 100644
--- a/arch/x86/include/asm/cpu_device_id.h
+++ b/arch/x86/include/asm/cpu_device_id.h
@@ -192,26 +192,6 @@
 #define X86_MATCH_VENDOR_FAM(vendor, family, data)			\
 	X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data)
 
-/**
- * X86_MATCH_INTEL_FAM6_MODEL - Match vendor INTEL, family 6 and model
- * @model:	The model name without the INTEL_FAM6_ prefix or ANY
- *		The model name is expanded to INTEL_FAM6_@model internally
- * @data:	Driver specific data or NULL. The internal storage
- *		format is unsigned long. The supplied value, pointer
- *		etc. is casted to unsigned long internally.
- *
- * The vendor is set to INTEL, the family to 6 and all other missing
- * arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are set to wildcards.
- *
- * See X86_MATCH_VENDOR_FAM_MODEL_FEATURE() for further information.
- */
-#define X86_MATCH_INTEL_FAM6_MODEL(model, data)				\
-	X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data)
-
-#define X86_MATCH_INTEL_FAM6_MODEL_STEPPINGS(model, steppings, data)	\
-	X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, INTEL_FAM6_##model, \
-						     steppings, X86_FEATURE_ANY, data)
-
 /**
  * X86_MATCH_VFM - Match encoded vendor/family/model
  * @vfm:	Encoded 8-bits each for vendor, family, model
-- 
2.46.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v8 3/3] x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines
  2024-09-03 17:34 [PATCH v8 0/3] Final pieces of Intel new families support Tony Luck
  2024-09-03 17:34 ` [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines Tony Luck
  2024-09-03 17:34 ` [PATCH v8 2/3] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Tony Luck
@ 2024-09-03 17:34 ` Tony Luck
  2024-09-03 19:26 ` [PATCH v8 0/3] Final pieces of Intel new families support Borislav Petkov
  3 siblings, 0 replies; 12+ messages in thread
From: Tony Luck @ 2024-09-03 17:34 UTC (permalink / raw)
  To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86
  Cc: Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches, Tony Luck

All code has been converted to use the vendor/family/model versions.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---
 arch/x86/include/asm/intel-family.h | 85 +----------------------------
 1 file changed, 2 insertions(+), 83 deletions(-)

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 27bdf3b55c6f..44949f972826 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -10,7 +10,7 @@
  * 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}
+ *	INTEL_{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
@@ -42,217 +42,136 @@
 
 #define IFM(_fam, _model)	VFM_MAKE(X86_VENDOR_INTEL, _fam, _model)
 
-/* Wildcard match for FAM6 so X86_MATCH_INTEL_FAM6_MODEL(ANY) works */
-#define INTEL_FAM6_ANY			X86_MODEL_ANY
-/* Wildcard match for FAM6 so X86_MATCH_VFM(ANY) works */
+/* Wildcard match so X86_MATCH_VFM(ANY) works */
 #define INTEL_ANY			IFM(X86_FAMILY_ANY, X86_MODEL_ANY)
 
 #define INTEL_PENTIUM_PRO		IFM(6, 0x01)
 
-#define INTEL_FAM6_CORE_YONAH		0x0E
 #define INTEL_CORE_YONAH		IFM(6, 0x0E)
 
-#define INTEL_FAM6_CORE2_MEROM		0x0F
 #define INTEL_CORE2_MEROM		IFM(6, 0x0F)
-#define INTEL_FAM6_CORE2_MEROM_L	0x16
 #define INTEL_CORE2_MEROM_L		IFM(6, 0x16)
-#define INTEL_FAM6_CORE2_PENRYN		0x17
 #define INTEL_CORE2_PENRYN		IFM(6, 0x17)
-#define INTEL_FAM6_CORE2_DUNNINGTON	0x1D
 #define INTEL_CORE2_DUNNINGTON		IFM(6, 0x1D)
 
-#define INTEL_FAM6_NEHALEM		0x1E
 #define INTEL_NEHALEM			IFM(6, 0x1E)
-#define INTEL_FAM6_NEHALEM_G		0x1F /* Auburndale / Havendale */
 #define INTEL_NEHALEM_G			IFM(6, 0x1F) /* Auburndale / Havendale */
-#define INTEL_FAM6_NEHALEM_EP		0x1A
 #define INTEL_NEHALEM_EP		IFM(6, 0x1A)
-#define INTEL_FAM6_NEHALEM_EX		0x2E
 #define INTEL_NEHALEM_EX		IFM(6, 0x2E)
 
-#define INTEL_FAM6_WESTMERE		0x25
 #define INTEL_WESTMERE			IFM(6, 0x25)
-#define INTEL_FAM6_WESTMERE_EP		0x2C
 #define INTEL_WESTMERE_EP		IFM(6, 0x2C)
-#define INTEL_FAM6_WESTMERE_EX		0x2F
 #define INTEL_WESTMERE_EX		IFM(6, 0x2F)
 
-#define INTEL_FAM6_SANDYBRIDGE		0x2A
 #define INTEL_SANDYBRIDGE		IFM(6, 0x2A)
-#define INTEL_FAM6_SANDYBRIDGE_X	0x2D
 #define INTEL_SANDYBRIDGE_X		IFM(6, 0x2D)
-#define INTEL_FAM6_IVYBRIDGE		0x3A
 #define INTEL_IVYBRIDGE			IFM(6, 0x3A)
-#define INTEL_FAM6_IVYBRIDGE_X		0x3E
 #define INTEL_IVYBRIDGE_X		IFM(6, 0x3E)
 
-#define INTEL_FAM6_HASWELL		0x3C
 #define INTEL_HASWELL			IFM(6, 0x3C)
-#define INTEL_FAM6_HASWELL_X		0x3F
 #define INTEL_HASWELL_X			IFM(6, 0x3F)
-#define INTEL_FAM6_HASWELL_L		0x45
 #define INTEL_HASWELL_L			IFM(6, 0x45)
-#define INTEL_FAM6_HASWELL_G		0x46
 #define INTEL_HASWELL_G			IFM(6, 0x46)
 
-#define INTEL_FAM6_BROADWELL		0x3D
 #define INTEL_BROADWELL			IFM(6, 0x3D)
-#define INTEL_FAM6_BROADWELL_G		0x47
 #define INTEL_BROADWELL_G		IFM(6, 0x47)
-#define INTEL_FAM6_BROADWELL_X		0x4F
 #define INTEL_BROADWELL_X		IFM(6, 0x4F)
-#define INTEL_FAM6_BROADWELL_D		0x56
 #define INTEL_BROADWELL_D		IFM(6, 0x56)
 
-#define INTEL_FAM6_SKYLAKE_L		0x4E	/* Sky Lake             */
 #define INTEL_SKYLAKE_L			IFM(6, 0x4E) /* Sky Lake */
-#define INTEL_FAM6_SKYLAKE		0x5E	/* Sky Lake             */
 #define INTEL_SKYLAKE			IFM(6, 0x5E) /* Sky Lake */
-#define INTEL_FAM6_SKYLAKE_X		0x55	/* Sky Lake             */
 #define INTEL_SKYLAKE_X			IFM(6, 0x55) /* Sky Lake */
 /*                 CASCADELAKE_X	0x55	   Sky Lake -- s: 7     */
 /*                 COOPERLAKE_X		0x55	   Sky Lake -- s: 11    */
 
-#define INTEL_FAM6_KABYLAKE_L		0x8E	/* Sky Lake             */
 #define INTEL_KABYLAKE_L		IFM(6, 0x8E) /* Sky Lake */
 /*                 AMBERLAKE_L		0x8E	   Sky Lake -- s: 9     */
 /*                 COFFEELAKE_L		0x8E	   Sky Lake -- s: 10    */
 /*                 WHISKEYLAKE_L	0x8E       Sky Lake -- s: 11,12 */
 
-#define INTEL_FAM6_KABYLAKE		0x9E	/* Sky Lake             */
 #define INTEL_KABYLAKE			IFM(6, 0x9E) /* Sky Lake */
 /*                 COFFEELAKE		0x9E	   Sky Lake -- s: 10-13 */
 
-#define INTEL_FAM6_COMETLAKE		0xA5	/* Sky Lake             */
 #define INTEL_COMETLAKE			IFM(6, 0xA5) /* Sky Lake */
-#define INTEL_FAM6_COMETLAKE_L		0xA6	/* Sky Lake             */
 #define INTEL_COMETLAKE_L		IFM(6, 0xA6) /* Sky Lake */
 
-#define INTEL_FAM6_CANNONLAKE_L		0x66	/* Palm Cove */
 #define INTEL_CANNONLAKE_L		IFM(6, 0x66) /* Palm Cove */
 
-#define INTEL_FAM6_ICELAKE_X		0x6A	/* Sunny Cove */
 #define INTEL_ICELAKE_X			IFM(6, 0x6A) /* Sunny Cove */
-#define INTEL_FAM6_ICELAKE_D		0x6C	/* Sunny Cove */
 #define INTEL_ICELAKE_D			IFM(6, 0x6C) /* Sunny Cove */
-#define INTEL_FAM6_ICELAKE		0x7D	/* Sunny Cove */
 #define INTEL_ICELAKE			IFM(6, 0x7D) /* Sunny Cove */
-#define INTEL_FAM6_ICELAKE_L		0x7E	/* Sunny Cove */
 #define INTEL_ICELAKE_L			IFM(6, 0x7E) /* Sunny Cove */
-#define INTEL_FAM6_ICELAKE_NNPI		0x9D	/* Sunny Cove */
 #define INTEL_ICELAKE_NNPI		IFM(6, 0x9D) /* Sunny Cove */
 
-#define INTEL_FAM6_ROCKETLAKE		0xA7	/* Cypress Cove */
 #define INTEL_ROCKETLAKE		IFM(6, 0xA7) /* Cypress Cove */
 
-#define INTEL_FAM6_TIGERLAKE_L		0x8C	/* Willow Cove */
 #define INTEL_TIGERLAKE_L		IFM(6, 0x8C) /* Willow Cove */
-#define INTEL_FAM6_TIGERLAKE		0x8D	/* Willow Cove */
 #define INTEL_TIGERLAKE			IFM(6, 0x8D) /* Willow Cove */
 
-#define INTEL_FAM6_SAPPHIRERAPIDS_X	0x8F	/* Golden Cove */
 #define INTEL_SAPPHIRERAPIDS_X		IFM(6, 0x8F) /* Golden Cove */
 
-#define INTEL_FAM6_EMERALDRAPIDS_X	0xCF
 #define INTEL_EMERALDRAPIDS_X		IFM(6, 0xCF)
 
-#define INTEL_FAM6_GRANITERAPIDS_X	0xAD
 #define INTEL_GRANITERAPIDS_X		IFM(6, 0xAD)
-#define INTEL_FAM6_GRANITERAPIDS_D	0xAE
 #define INTEL_GRANITERAPIDS_D		IFM(6, 0xAE)
 
 /* "Hybrid" Processors (P-Core/E-Core) */
 
-#define INTEL_FAM6_LAKEFIELD		0x8A	/* Sunny Cove / Tremont */
 #define INTEL_LAKEFIELD			IFM(6, 0x8A) /* Sunny Cove / Tremont */
 
-#define INTEL_FAM6_ALDERLAKE		0x97	/* Golden Cove / Gracemont */
 #define INTEL_ALDERLAKE			IFM(6, 0x97) /* Golden Cove / Gracemont */
-#define INTEL_FAM6_ALDERLAKE_L		0x9A	/* Golden Cove / Gracemont */
 #define INTEL_ALDERLAKE_L		IFM(6, 0x9A) /* Golden Cove / Gracemont */
 
-#define INTEL_FAM6_RAPTORLAKE		0xB7	/* Raptor Cove / Enhanced Gracemont */
 #define INTEL_RAPTORLAKE		IFM(6, 0xB7) /* Raptor Cove / Enhanced Gracemont */
-#define INTEL_FAM6_RAPTORLAKE_P		0xBA
 #define INTEL_RAPTORLAKE_P		IFM(6, 0xBA)
-#define INTEL_FAM6_RAPTORLAKE_S		0xBF
 #define INTEL_RAPTORLAKE_S		IFM(6, 0xBF)
 
-#define INTEL_FAM6_METEORLAKE		0xAC
 #define INTEL_METEORLAKE		IFM(6, 0xAC)
-#define INTEL_FAM6_METEORLAKE_L		0xAA
 #define INTEL_METEORLAKE_L		IFM(6, 0xAA)
 
-#define INTEL_FAM6_ARROWLAKE_H		0xC5
 #define INTEL_ARROWLAKE_H		IFM(6, 0xC5)
-#define INTEL_FAM6_ARROWLAKE		0xC6
 #define INTEL_ARROWLAKE			IFM(6, 0xC6)
-#define INTEL_FAM6_ARROWLAKE_U		0xB5
 #define INTEL_ARROWLAKE_U		IFM(6, 0xB5)
 
-#define INTEL_FAM6_LUNARLAKE_M		0xBD
 #define INTEL_LUNARLAKE_M		IFM(6, 0xBD)
 
 /* "Small Core" Processors (Atom/E-Core) */
 
-#define INTEL_FAM6_ATOM_BONNELL		0x1C /* Diamondville, Pineview */
 #define INTEL_ATOM_BONNELL		IFM(6, 0x1C) /* Diamondville, Pineview */
-#define INTEL_FAM6_ATOM_BONNELL_MID	0x26 /* Silverthorne, Lincroft */
 #define INTEL_ATOM_BONNELL_MID		IFM(6, 0x26) /* Silverthorne, Lincroft */
 
-#define INTEL_FAM6_ATOM_SALTWELL	0x36 /* Cedarview */
 #define INTEL_ATOM_SALTWELL		IFM(6, 0x36) /* Cedarview */
-#define INTEL_FAM6_ATOM_SALTWELL_MID	0x27 /* Penwell */
 #define INTEL_ATOM_SALTWELL_MID		IFM(6, 0x27) /* Penwell */
-#define INTEL_FAM6_ATOM_SALTWELL_TABLET	0x35 /* Cloverview */
 #define INTEL_ATOM_SALTWELL_TABLET	IFM(6, 0x35) /* Cloverview */
 
-#define INTEL_FAM6_ATOM_SILVERMONT	0x37 /* Bay Trail, Valleyview */
 #define INTEL_ATOM_SILVERMONT		IFM(6, 0x37) /* Bay Trail, Valleyview */
-#define INTEL_FAM6_ATOM_SILVERMONT_D	0x4D /* Avaton, Rangely */
 #define INTEL_ATOM_SILVERMONT_D		IFM(6, 0x4D) /* Avaton, Rangely */
-#define INTEL_FAM6_ATOM_SILVERMONT_MID	0x4A /* Merriefield */
 #define INTEL_ATOM_SILVERMONT_MID	IFM(6, 0x4A) /* Merriefield */
 
-#define INTEL_FAM6_ATOM_AIRMONT		0x4C /* Cherry Trail, Braswell */
 #define INTEL_ATOM_AIRMONT		IFM(6, 0x4C) /* Cherry Trail, Braswell */
-#define INTEL_FAM6_ATOM_AIRMONT_MID	0x5A /* Moorefield */
 #define INTEL_ATOM_AIRMONT_MID		IFM(6, 0x5A) /* Moorefield */
-#define INTEL_FAM6_ATOM_AIRMONT_NP	0x75 /* Lightning Mountain */
 #define INTEL_ATOM_AIRMONT_NP		IFM(6, 0x75) /* Lightning Mountain */
 
-#define INTEL_FAM6_ATOM_GOLDMONT	0x5C /* Apollo Lake */
 #define INTEL_ATOM_GOLDMONT		IFM(6, 0x5C) /* Apollo Lake */
-#define INTEL_FAM6_ATOM_GOLDMONT_D	0x5F /* Denverton */
 #define INTEL_ATOM_GOLDMONT_D		IFM(6, 0x5F) /* Denverton */
 
 /* Note: the micro-architecture is "Goldmont Plus" */
-#define INTEL_FAM6_ATOM_GOLDMONT_PLUS	0x7A /* Gemini Lake */
 #define INTEL_ATOM_GOLDMONT_PLUS	IFM(6, 0x7A) /* Gemini Lake */
 
-#define INTEL_FAM6_ATOM_TREMONT_D	0x86 /* Jacobsville */
 #define INTEL_ATOM_TREMONT_D		IFM(6, 0x86) /* Jacobsville */
-#define INTEL_FAM6_ATOM_TREMONT		0x96 /* Elkhart Lake */
 #define INTEL_ATOM_TREMONT		IFM(6, 0x96) /* Elkhart Lake */
-#define INTEL_FAM6_ATOM_TREMONT_L	0x9C /* Jasper Lake */
 #define INTEL_ATOM_TREMONT_L		IFM(6, 0x9C) /* Jasper Lake */
 
-#define INTEL_FAM6_ATOM_GRACEMONT	0xBE /* Alderlake N */
 #define INTEL_ATOM_GRACEMONT		IFM(6, 0xBE) /* Alderlake N */
 
-#define INTEL_FAM6_ATOM_CRESTMONT_X	0xAF /* Sierra Forest */
 #define INTEL_ATOM_CRESTMONT_X		IFM(6, 0xAF) /* Sierra Forest */
-#define INTEL_FAM6_ATOM_CRESTMONT	0xB6 /* Grand Ridge */
 #define INTEL_ATOM_CRESTMONT		IFM(6, 0xB6) /* Grand Ridge */
 
-#define INTEL_FAM6_ATOM_DARKMONT_X	0xDD /* Clearwater Forest */
 #define INTEL_ATOM_DARKMONT_X		IFM(6, 0xDD) /* Clearwater Forest */
 
 /* Xeon Phi */
 
-#define INTEL_FAM6_XEON_PHI_KNL		0x57 /* Knights Landing */
 #define INTEL_XEON_PHI_KNL		IFM(6, 0x57) /* Knights Landing */
-#define INTEL_FAM6_XEON_PHI_KNM		0x85 /* Knights Mill */
 #define INTEL_XEON_PHI_KNM		IFM(6, 0x85) /* Knights Mill */
 
 /* Family 5 */
-- 
2.46.0


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v8 0/3] Final pieces of Intel new families support
  2024-09-03 17:34 [PATCH v8 0/3] Final pieces of Intel new families support Tony Luck
                   ` (2 preceding siblings ...)
  2024-09-03 17:34 ` [PATCH v8 3/3] x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines Tony Luck
@ 2024-09-03 19:26 ` Borislav Petkov
  2024-09-03 19:43   ` Luck, Tony
  3 siblings, 1 reply; 12+ messages in thread
From: Borislav Petkov @ 2024-09-03 19:26 UTC (permalink / raw)
  To: Tony Luck, Chanwoo Choi
  Cc: Thomas Gleixner, Ingo Molnar, Dave Hansen, x86, H. Peter Anvin,
	Peter Zijlstra (Intel), linux-kernel, patches

On Tue, Sep 03, 2024 at 10:34:40AM -0700, Tony Luck wrote:
> All except one of the precursor patches were merged to Linus' tree
> in the v6.11 merge window. The exception is a one-liner that is in
> the maintainer tree and linux-next, but didn't get pulled this time.

So when is Chanwoo planning on sending that one to Linus?

Or should he drop it and I pick up all three and finish this conversion?

Hmmm.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 12+ messages in thread

* RE: [PATCH v8 0/3] Final pieces of Intel new families support
  2024-09-03 19:26 ` [PATCH v8 0/3] Final pieces of Intel new families support Borislav Petkov
@ 2024-09-03 19:43   ` Luck, Tony
  2024-09-04 10:13     ` Borislav Petkov
  0 siblings, 1 reply; 12+ messages in thread
From: Luck, Tony @ 2024-09-03 19:43 UTC (permalink / raw)
  To: Borislav Petkov, Chanwoo Choi
  Cc: Thomas Gleixner, Ingo Molnar, Dave Hansen, x86@kernel.org,
	H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel@vger.kernel.org, patches@lists.linux.dev

>> All except one of the precursor patches were merged to Linus' tree
>> in the v6.11 merge window. The exception is a one-liner that is in
>> the maintainer tree and linux-next, but didn't get pulled this time.
>
> So when is Chanwoo planning on sending that one to Linus?

I don't know why it wasn't pulled.

> Or should he drop it and I pick up all three and finish this conversion?
>
> Hmmm.

That would be simplest at this point.

-Tony

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v8 0/3] Final pieces of Intel new families support
  2024-09-03 19:43   ` Luck, Tony
@ 2024-09-04 10:13     ` Borislav Petkov
  2024-09-04 15:51       ` Luck, Tony
  0 siblings, 1 reply; 12+ messages in thread
From: Borislav Petkov @ 2024-09-04 10:13 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Luck, Tony, Thomas Gleixner, Ingo Molnar, Dave Hansen,
	x86@kernel.org, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel@vger.kernel.org, patches@lists.linux.dev

Chanwoo,

On Tue, Sep 03, 2024 at 07:43:35PM +0000, Luck, Tony wrote:
> >> All except one of the precursor patches were merged to Linus' tree
> >> in the v6.11 merge window. The exception is a one-liner that is in
> >> the maintainer tree and linux-next, but didn't get pulled this time.
> >
> > So when is Chanwoo planning on sending that one to Linus?
> 
> I don't know why it wasn't pulled.
> 
> > Or should he drop it and I pick up all three and finish this conversion?
> >
> > Hmmm.
> 
> That would be simplest at this point.

how about it?

How about you drop this patch from your tree and I take it with the other two
and send them to Linus now so that this conversion is done?

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines
  2024-09-03 17:34 ` [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines Tony Luck
@ 2024-09-04 15:19   ` Chanwoo Choi
  2024-09-04 15:24     ` Borislav Petkov
  0 siblings, 1 reply; 12+ messages in thread
From: Chanwoo Choi @ 2024-09-04 15:19 UTC (permalink / raw)
  To: Tony Luck, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
	Dave Hansen, x86
  Cc: Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches

24. 9. 4. 02:34에 Tony Luck 이(가) 쓴 글:
> New CPU #defines encode vendor and family as well as model.
> 
> Link: https://lore.kernel.org/lkml/20240611174016.352953-1-tony.luck@intel.com/
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
> ---
>  drivers/extcon/extcon-axp288.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
> index a703a8315634..d3bcbe839c09 100644
> --- a/drivers/extcon/extcon-axp288.c
> +++ b/drivers/extcon/extcon-axp288.c
> @@ -108,7 +108,7 @@ struct axp288_extcon_info {
>  };
>  
>  static const struct x86_cpu_id cherry_trail_cpu_ids[] = {
> -	X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT,	NULL),
> +	X86_MATCH_VFM(INTEL_ATOM_AIRMONT,	NULL),
>  	{}
>  };
>  

Applied it.
https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=089a6e37c5394bc22d34c0c22b14a31b897b5831

-- 
Best Regards,
Samsung Electronics
Chanwoo Choi


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines
  2024-09-04 15:19   ` Chanwoo Choi
@ 2024-09-04 15:24     ` Borislav Petkov
  2024-09-04 15:30       ` Chanwoo Choi
  0 siblings, 1 reply; 12+ messages in thread
From: Borislav Petkov @ 2024-09-04 15:24 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Tony Luck, Thomas Gleixner, Ingo Molnar, Dave Hansen, x86,
	Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches

On Thu, Sep 05, 2024 at 12:19:17AM +0900, Chanwoo Choi wrote:
> Applied it.
> https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=089a6e37c5394bc22d34c0c22b14a31b897b5831

Now, can you remove it pls?

It will be way easier if I queue it along with the other two...

Thx.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines
  2024-09-04 15:24     ` Borislav Petkov
@ 2024-09-04 15:30       ` Chanwoo Choi
  2024-09-04 15:33         ` Borislav Petkov
  0 siblings, 1 reply; 12+ messages in thread
From: Chanwoo Choi @ 2024-09-04 15:30 UTC (permalink / raw)
  To: Borislav Petkov
  Cc: Tony Luck, Thomas Gleixner, Ingo Molnar, Dave Hansen, x86,
	Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches

24. 9. 5. 00:24에 Borislav Petkov 이(가) 쓴 글:
> On Thu, Sep 05, 2024 at 12:19:17AM +0900, Chanwoo Choi wrote:
>> Applied it.
>> https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git/commit/?h=extcon-next&id=089a6e37c5394bc22d34c0c22b14a31b897b5831
> 
> Now, can you remove it pls?
> 
> It will be way easier if I queue it along with the other two...
> 
> Thx.
> 

OK. I'll remove it from extcon.git. 

-- 
Best Regards,
Samsung Electronics
Chanwoo Choi


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines
  2024-09-04 15:30       ` Chanwoo Choi
@ 2024-09-04 15:33         ` Borislav Petkov
  0 siblings, 0 replies; 12+ messages in thread
From: Borislav Petkov @ 2024-09-04 15:33 UTC (permalink / raw)
  To: Chanwoo Choi
  Cc: Tony Luck, Thomas Gleixner, Ingo Molnar, Dave Hansen, x86,
	Chanwoo Choi, H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel, patches

On Thu, Sep 05, 2024 at 12:30:13AM +0900, Chanwoo Choi wrote:
> OK. I'll remove it from extcon.git. 

Thx, lemme queue it through tip.

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

^ permalink raw reply	[flat|nested] 12+ messages in thread

* RE: [PATCH v8 0/3] Final pieces of Intel new families support
  2024-09-04 10:13     ` Borislav Petkov
@ 2024-09-04 15:51       ` Luck, Tony
  0 siblings, 0 replies; 12+ messages in thread
From: Luck, Tony @ 2024-09-04 15:51 UTC (permalink / raw)
  To: Borislav Petkov, Chanwoo Choi
  Cc: Thomas Gleixner, Ingo Molnar, Dave Hansen, x86@kernel.org,
	H. Peter Anvin, Peter Zijlstra (Intel),
	linux-kernel@vger.kernel.org, patches@lists.linux.dev

> How about you drop this patch from your tree and I take it with the other two
> and send them to Linus now so that this conversion is done?

Sending to Linus now would be awesome!

Note that if you apply these to the x86/cpu branch you'll need to deal with
a merge issue for tip/master because some other tip branch has added:

#define INTEL_PENTIUM_PRO              IFM(6, 0x01)

to <asm/intel-family.h>

-Tony

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-09-04 15:51 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-03 17:34 [PATCH v8 0/3] Final pieces of Intel new families support Tony Luck
2024-09-03 17:34 ` [PATCH v8 1/3] extcon: axp288: Switch to new Intel CPU model defines Tony Luck
2024-09-04 15:19   ` Chanwoo Choi
2024-09-04 15:24     ` Borislav Petkov
2024-09-04 15:30       ` Chanwoo Choi
2024-09-04 15:33         ` Borislav Petkov
2024-09-03 17:34 ` [PATCH v8 2/3] x86/cpu/vfm: Delete X86_MATCH_INTEL_FAM6_MODEL[_STEPPING]() macros Tony Luck
2024-09-03 17:34 ` [PATCH v8 3/3] x86/cpu/vfm: Delete all the *_FAM6_ CPU #defines Tony Luck
2024-09-03 19:26 ` [PATCH v8 0/3] Final pieces of Intel new families support Borislav Petkov
2024-09-03 19:43   ` Luck, Tony
2024-09-04 10:13     ` Borislav Petkov
2024-09-04 15:51       ` Luck, Tony

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox