lkml.org 
[lkml]   [2024]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/cpu] perf/x86/intel/pt: Switch to new Intel CPU model defines
    The following commit has been merged into the x86/cpu branch of tip:

    Commit-ID: a7011b852a30ab0fdb469991037613407e49f2cb
    Gitweb: https://git.kernel.org/tip/a7011b852a30ab0fdb469991037613407e49f2cb
    Author: Tony Luck <tony.luck@intel.com>
    AuthorDate: Wed, 24 Apr 2024 11:15:00 -07:00
    Committer: Dave Hansen <dave.hansen@linux.intel.com>
    CommitterDate: Thu, 25 Apr 2024 09:04:32 -07:00

    perf/x86/intel/pt: Switch to new Intel CPU model defines

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

    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
    Link: https://lore.kernel.org/all/20240424181500.41538-1-tony.luck%40intel.com
    ---
    arch/x86/events/intel/pt.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
    index 8e2a122..14db6d9 100644
    --- a/arch/x86/events/intel/pt.c
    +++ b/arch/x86/events/intel/pt.c
    @@ -22,7 +22,7 @@
    #include <asm/insn.h>
    #include <asm/io.h>
    #include <asm/intel_pt.h>
    -#include <asm/intel-family.h>
    +#include <asm/cpu_device_id.h>

    #include "../perf_event.h"
    #include "pt.h"
    @@ -211,11 +211,11 @@ static int __init pt_pmu_hw_init(void)
    }

    /* model-specific quirks */
    - switch (boot_cpu_data.x86_model) {
    - case INTEL_FAM6_BROADWELL:
    - case INTEL_FAM6_BROADWELL_D:
    - case INTEL_FAM6_BROADWELL_G:
    - case INTEL_FAM6_BROADWELL_X:
    + switch (boot_cpu_data.x86_vfm) {
    + case INTEL_BROADWELL:
    + case INTEL_BROADWELL_D:
    + case INTEL_BROADWELL_G:
    + case INTEL_BROADWELL_X:
    /* not setting BRANCH_EN will #GP, erratum BDM106 */
    pt_pmu.branch_en_always_on = true;
    break;
    \
     
     \ /
      Last update: 2024-05-27 18:04    [W:3.395 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site