x86 queue for 4.1

* Rename and fix SnowRidge CPU model (Paul Lai)
 -----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEEWjIv1avE09usz9GqKAeTb5hNxaYFAl0/Gj4UHGVoYWJrb3N0
 QHJlZGhhdC5jb20ACgkQKAeTb5hNxab/Zw/+LQxNhWnDyBSijgiopD8ghdkV/NVs
 eQNBBVkBoiJ8uPaA+sj7891iZnRSrqDFV+9WM2ZUQQTahvA7wZ7PIz1i7PqsICf0
 1uvJb+c5P+PLUDqs9rJTKC5+jocBo/h1gUKFnyMDwLC+atohmge1pz/ZrKiFw03e
 TvKE0ffNUcIsDaPHsF4HgEho9RT8gtlHCFJsnD8A8/ea8Xz1bL6JCMdsCewg+FlK
 u17s+nJ+Jy6U8OeE78TbablMzXIo8yU9fDdzP+2TuGm4Lfv9yBFjJMxynEsLexc4
 CTrp8NtYQNXEZR0KGHpBx2DBXbtsvZS2eoFE5PgPzjh4nXHeNvGISnkWVeM8cmVl
 BtBKK1XLBuIigl4FaJ71EZb19Z7wC719PHa00Y2bDMH7ij6kIymDIcgG0N1D3amN
 vnn11DfVylGmSpVdOYTbD4XPmqj8BwNfzW5qimW+tXFp7p8FjIxzYYuJiaO10mN9
 1QSNB/knOzVrKODx6w9cusGfwQmDwZDpMxJbs9TAf9y9AmCo8O9VxMET77595XpF
 UTH6iSKSJIUus2cUwCPqCb7H/CIJnAYJIi2ePbt0n3lw2dkWuZCWWoeZNkSlB8Nv
 P1/y9omY/tpCkRJrV7CPl7sqLkPUTK79+Blh+V9xwDA/DcughSzsnOEHFhPjWysY
 a0VrXq8Xj/AwDXs=
 =XiSq
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' into staging

x86 queue for 4.1

* Rename and fix SnowRidge CPU model (Paul Lai)

# gpg: Signature made Mon 29 Jul 2019 17:09:34 BST
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-next-pull-request:
  i386: Fix Snowridge CPU model name and features

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2019-07-29 17:11:18 +01:00
commit 34e2746bca

View file

@ -2472,7 +2472,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
.model_id = "Intel Xeon Processor (Icelake)",
},
{
.name = "SnowRidge-Server",
.name = "Snowridge",
.level = 27,
.vendor = CPUID_VENDOR_INTEL,
.family = 6,
@ -2490,7 +2490,6 @@ static X86CPUDefinition builtin_x86_defs[] = {
CPUID_FXSR | CPUID_SSE | CPUID_SSE2,
.features[FEAT_1_ECX] =
CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | CPUID_EXT_MONITOR |
CPUID_EXT_VMX |
CPUID_EXT_SSSE3 |
CPUID_EXT_CX16 |
CPUID_EXT_SSE41 |