Re: [PATCH v2 1/3] x86/cpu: Introduce INTEL_CPU_FAM*_NODATA() helper macros
From: Rafael J. Wysocki
Date: Fri Jan 11 2019 - 05:35:16 EST
On Wed, Jan 9, 2019 at 5:57 PM Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
>
> These macros are often used by the drivers and we have already a lot of
> duplication as ICPU() macro across them.
>
> Provide a generic x86 macro for users.
>
> This adds no driver data variants.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
If you want me to apply the series, I need an ACK for this one.
Alternatively, if you want to apply it yourself, please feel free to
add ACKs from me to the ACPI-related patches in it.
> ---
> arch/x86/include/asm/intel-family.h | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h
> index 25b28760fada..afd70055a750 100644
> --- a/arch/x86/include/asm/intel-family.h
> +++ b/arch/x86/include/asm/intel-family.h
> @@ -86,10 +86,16 @@
> .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)
> +
> +#define INTEL_CPU_FAM_ANY_NODATA(_family, _model) \
> + INTEL_CPU_FAM_ANY(_family, _model, 0)
> +
> +#define INTEL_CPU_FAM6_NODATA(_model) \
> + INTEL_CPU_FAM_ANY_NODATA(6, INTEL_FAM6_##_model)
>
> #endif /* _ASM_X86_INTEL_FAMILY_H */
> --
> 2.20.1
>