[PATCH v1 1/2] x86/cpu: Allow INTEL_CPU_FAM_ANY() to take integers

[PATCH v1 1/2] x86/cpu: Allow INTEL_CPU_FAM_ANY() to take integers

[Andy Shevchenko]

Driver data can be a plain integer and we have such users.
For now they are implementing a custom macro to accept this.

Let's allow them to use generic one by moving address-of
operation outside of the INTEL_CPU_FAM_ANY() macro.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/include/asm/intel-family.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 698d53852919..4120dfcd8891 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -87,10 +87,10 @@
 	.family		= _family,				\
 	.model		= _model,				\
 	.feature	= X86_FEATURE_ANY,			\
-	.driver_data	= (kernel_ulong_t)&_driver_data		\
+	.driver_data	= (kernel_ulong_t)_driver_data		\
 }
 
 #define INTEL_CPU_FAM6(_model, _driver_data)			\
-	INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, _driver_data)
+	INTEL_CPU_FAM_ANY(6, INTEL_FAM6_##_model, &_driver_data)
 
 #endif /* _ASM_X86_INTEL_FAMILY_H */
-- 
2.20.1

[PATCH v1 2/2] x86/cpu: Split Tremont based Atoms from the rest

[Andy Shevchenko]

Split Tremont based Atoms from the rest to keep logical grouping.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/include/asm/intel-family.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
index 4120dfcd8891..0b918d813f3c 100644
--- a/arch/x86/include/asm/intel-family.h
+++ b/arch/x86/include/asm/intel-family.h
@@ -73,6 +73,7 @@
 #define INTEL_FAM6_ATOM_GOLDMONT	0x5C /* Apollo Lake */
 #define INTEL_FAM6_ATOM_GOLDMONT_X	0x5F /* Denverton */
 #define INTEL_FAM6_ATOM_GOLDMONT_PLUS	0x7A /* Gemini Lake */
+
 #define INTEL_FAM6_ATOM_TREMONT_X	0x86 /* Jacobsville */
 
 /* Xeon Phi */
-- 
2.20.1

Re: [PATCH v1 1/2] x86/cpu: Allow INTEL_CPU_FAM_ANY() to take integers

[Thomas Gleixner]

On Fri, 15 Feb 2019, Andy Shevchenko wrote:

> Driver data can be a plain integer and we have such users.
> For now they are implementing a custom macro to accept this.

It would be nice to actually see the conversions as well.

Thanks,

	tglx