[xen stable-4.15] x86/intel: insert Ice Lake-SP and Ice Lake-D model numbers

[patchbot@xxxxxxx]

commit cacad0cdfcf2763e3377316e779532a4a115ae8c
Author:     Igor Druzhinin <igor.druzhinin@xxxxxxxxxx>
AuthorDate: Fri Jun 4 14:45:39 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Jun 4 14:45:39 2021 +0200

    x86/intel: insert Ice Lake-SP and Ice Lake-D model numbers
    
    LBR, C-state MSRs should correspond to Ice Lake desktop according to
    SDM rev. 74 for both models.
    
    Ice Lake-SP is known to expose IF_PSCHANGE_MC_NO in IA32_ARCH_CAPABILITIES 
MSR
    (as advisory tells and Whitley SDP confirms) which means the erratum is 
fixed
    in hardware for that model and therefore it shouldn't be present in
    has_if_pschange_mc list. Provisionally assume the same to be the case
    for Ice Lake-D.
    
    Signed-off-by: Igor Druzhinin <igor.druzhinin@xxxxxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx>
    master commit: 95419adfd4b275cffe24b96edcc2f15bc4db8907
    master date: 2021-04-26 10:22:48 +0200
---
 xen/arch/x86/acpi/cpu_idle.c | 2 ++
 xen/arch/x86/hvm/vmx/vmx.c   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index c092086b33..d788c8bffc 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -181,6 +181,8 @@ static void do_get_hw_residencies(void *arg)
     case 0x55:
     case 0x5E:
     /* Ice Lake */
+    case 0x6A:
+    case 0x6C:
     case 0x7D:
     case 0x7E:
     /* Tiger Lake */
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 8e0aa976c2..dde4f3b70d 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2973,7 +2973,7 @@ static const struct lbr_info *last_branch_msr_get(void)
         /* Goldmont Plus */
         case 0x7a:
         /* Ice Lake */
-        case 0x7d: case 0x7e:
+        case 0x6a: case 0x6c: case 0x7d: case 0x7e:
         /* Tiger Lake */
         case 0x8c: case 0x8d:
         /* Tremont */
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.15