lkml.org 
[lkml]   [2024]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 31/47] x86/cpu: Switch to new Intel CPU model defines
    Date
    New CPU #defines encode vendor and family as well as model.

    Update INTEL_CPU_DESC() to work with vendor/family/model.

    Signed-off-by: Tony Luck <tony.luck@intel.com>
    ---
    arch/x86/include/asm/cpu_device_id.h | 8 ++--
    arch/x86/events/intel/core.c | 64 ++++++++++++++--------------
    2 files changed, 36 insertions(+), 36 deletions(-)

    diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h
    index 970a232009c3..cac33812c609 100644
    --- a/arch/x86/include/asm/cpu_device_id.h
    +++ b/arch/x86/include/asm/cpu_device_id.h
    @@ -275,10 +275,10 @@ struct x86_cpu_desc {
    u32 x86_microcode_rev;
    };

    -#define INTEL_CPU_DESC(model, stepping, revision) { \
    - .x86_family = 6, \
    - .x86_vendor = X86_VENDOR_INTEL, \
    - .x86_model = (model), \
    +#define INTEL_CPU_DESC(vfm, stepping, revision) { \
    + .x86_family = VFM_FAMILY(vfm), \
    + .x86_vendor = VFM_VENDOR(vfm), \
    + .x86_model = VFM_MODEL(vfm), \
    .x86_stepping = (stepping), \
    .x86_microcode_rev = (revision), \
    }
    diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
    index 94206f8cd371..d3294ef18aef 100644
    --- a/arch/x86/events/intel/core.c
    +++ b/arch/x86/events/intel/core.c
    @@ -5187,35 +5187,35 @@ static __init void intel_clovertown_quirk(void)
    }

    static const struct x86_cpu_desc isolation_ucodes[] = {
    - INTEL_CPU_DESC(INTEL_FAM6_HASWELL, 3, 0x0000001f),
    - INTEL_CPU_DESC(INTEL_FAM6_HASWELL_L, 1, 0x0000001e),
    - INTEL_CPU_DESC(INTEL_FAM6_HASWELL_G, 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, 4, 0x00000023),
    - INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_G, 1, 0x00000014),
    - INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 2, 0x00000010),
    - INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 3, 0x07000009),
    - INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 4, 0x0f000009),
    - INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D, 5, 0x0e000002),
    - INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_X, 1, 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_X, 5, 0x00000000),
    - INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 6, 0x00000000),
    - INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 7, 0x00000000),
    - INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 11, 0x00000000),
    - INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L, 3, 0x0000007c),
    - INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE, 3, 0x0000007c),
    - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 9, 0x0000004e),
    - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 9, 0x0000004e),
    - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 10, 0x0000004e),
    - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 11, 0x0000004e),
    - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE_L, 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),
    - INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 13, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_HASWELL, 3, 0x0000001f),
    + INTEL_CPU_DESC(INTEL_HASWELL_L, 1, 0x0000001e),
    + INTEL_CPU_DESC(INTEL_HASWELL_G, 1, 0x00000015),
    + INTEL_CPU_DESC(INTEL_HASWELL_X, 2, 0x00000037),
    + INTEL_CPU_DESC(INTEL_HASWELL_X, 4, 0x0000000a),
    + INTEL_CPU_DESC(INTEL_BROADWELL, 4, 0x00000023),
    + INTEL_CPU_DESC(INTEL_BROADWELL_G, 1, 0x00000014),
    + INTEL_CPU_DESC(INTEL_BROADWELL_D, 2, 0x00000010),
    + INTEL_CPU_DESC(INTEL_BROADWELL_D, 3, 0x07000009),
    + INTEL_CPU_DESC(INTEL_BROADWELL_D, 4, 0x0f000009),
    + INTEL_CPU_DESC(INTEL_BROADWELL_D, 5, 0x0e000002),
    + INTEL_CPU_DESC(INTEL_BROADWELL_X, 1, 0x0b000014),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_X, 3, 0x00000021),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_X, 4, 0x00000000),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_X, 5, 0x00000000),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_X, 6, 0x00000000),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_X, 7, 0x00000000),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_X, 11, 0x00000000),
    + INTEL_CPU_DESC(INTEL_SKYLAKE_L, 3, 0x0000007c),
    + INTEL_CPU_DESC(INTEL_SKYLAKE, 3, 0x0000007c),
    + INTEL_CPU_DESC(INTEL_KABYLAKE, 9, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE_L, 9, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE_L, 10, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE_L, 11, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE_L, 12, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE, 10, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE, 11, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE, 12, 0x0000004e),
    + INTEL_CPU_DESC(INTEL_KABYLAKE, 13, 0x0000004e),
    {}
    };

    @@ -5232,9 +5232,9 @@ static __init void intel_pebs_isolation_quirk(void)
    }

    static const struct x86_cpu_desc pebs_ucodes[] = {
    - INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE, 7, 0x00000028),
    - INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 6, 0x00000618),
    - INTEL_CPU_DESC(INTEL_FAM6_SANDYBRIDGE_X, 7, 0x0000070c),
    + INTEL_CPU_DESC(INTEL_SANDYBRIDGE, 7, 0x00000028),
    + INTEL_CPU_DESC(INTEL_SANDYBRIDGE_X, 6, 0x00000618),
    + INTEL_CPU_DESC(INTEL_SANDYBRIDGE_X, 7, 0x0000070c),
    {}
    };

    --
    2.44.0

    \
     
     \ /
      Last update: 2024-05-27 18:09    [W:4.082 / U:1.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site