From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 17 May 2019 18:23:55 +0000 (+0100)
Subject: x86/spec-ctrl: Knights Landing/Mill are retpoline-safe
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2145
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2105180f99d22aad47ee57113015e11d7397e54;p=xen.git

x86/spec-ctrl: Knights Landing/Mill are retpoline-safe

They are both Airmont-based and should have been included in c/s 17f74242ccf
"x86/spec-ctrl: Extend repoline safey calcuations for eIBRS and Atom parts".

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c
index 5d98cac009..e66879f5c0 100644
--- a/xen/arch/x86/spec_ctrl.c
+++ b/xen/arch/x86/spec_ctrl.c
@@ -524,9 +524,11 @@ static bool __init retpoline_safe(uint64_t caps)
     case 0x4d: /* Avaton / Rangely (Silvermont) */
     case 0x4c: /* Cherrytrail / Brasswell */
     case 0x4a: /* Merrifield */
+    case 0x57: /* Knights Landing */
     case 0x5a: /* Moorefield */
     case 0x5c: /* Goldmont */
     case 0x5f: /* Denverton */
+    case 0x85: /* Knights Mill */
         return true;
 
     default: