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 03/71] KVM: x86/pmu: 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>
    Acked-by: Sean Christopherson <seanjc@google.com>
    ---
    arch/x86/kvm/pmu.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
    index c397b28e3d1b..2faa67a4bfb6 100644
    --- a/arch/x86/kvm/pmu.c
    +++ b/arch/x86/kvm/pmu.c
    @@ -34,16 +34,16 @@ EXPORT_SYMBOL_GPL(kvm_pmu_eventsel);

    /* Precise Distribution of Instructions Retired (PDIR) */
    static const struct x86_cpu_id vmx_pebs_pdir_cpu[] = {
    - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL),
    - X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL),
    + X86_MATCH_VFM(INTEL_ICELAKE_D, NULL),
    + X86_MATCH_VFM(INTEL_ICELAKE_X, NULL),
    /* Instruction-Accurate PDIR (PDIR++) */
    - X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
    + X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
    {}
    };

    /* Precise Distribution (PDist) */
    static const struct x86_cpu_id vmx_pebs_pdist_cpu[] = {
    - X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
    + X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
    {}
    };

    --
    2.44.0

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