lkml.org 
[lkml]   [2024]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 23/71] perf/x86/intel/uncore: Switch to new Intel CPU model defines
    Date
    New CPU #defines encode vendor and family as well as model.

    Signed-off-by: Tony Luck <tony.luck@intel.com>
    ---
    arch/x86/events/intel/uncore_snbep.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c
    index 2eaf0f339849..74b8b21e8990 100644
    --- a/arch/x86/events/intel/uncore_snbep.c
    +++ b/arch/x86/events/intel/uncore_snbep.c
    @@ -1,5 +1,6 @@
    // SPDX-License-Identifier: GPL-2.0
    /* SandyBridge-EP/IvyTown uncore support */
    +#include <asm/cpu_device_id.h>
    #include "uncore.h"
    #include "uncore_discovery.h"

    @@ -3285,7 +3286,7 @@ void bdx_uncore_cpu_init(void)
    uncore_msr_uncores = bdx_msr_uncores;

    /* Detect systems with no SBOXes */
    - if ((boot_cpu_data.x86_model == 86) || hswep_has_limit_sbox(BDX_PCU_DID))
    + if (boot_cpu_data.x86_vfm == INTEL_BROADWELL_D || hswep_has_limit_sbox(BDX_PCU_DID))
    uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;

    hswep_uncore_pcu.constraints = bdx_uncore_pcu_constraints;
    @@ -5394,7 +5395,7 @@ static int icx_iio_get_topology(struct intel_uncore_type *type)
    static void icx_iio_set_mapping(struct intel_uncore_type *type)
    {
    /* Detect ICX-D system. This case is not supported */
    - if (boot_cpu_data.x86_model == INTEL_FAM6_ICELAKE_D) {
    + if (boot_cpu_data.x86_vfm == INTEL_ICELAKE_D) {
    pmu_clear_mapping_attr(type->attr_update, &icx_iio_mapping_group);
    return;
    }
    --
    2.44.0

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