Commit 13c2361b authored by Peter Maydell's avatar Peter Maydell
Browse files

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



x86 queue, 2019-01-28

Two small CPU model updates:
* Enable NPT and NRIPSAVE on AMD CPUs
* Update stepping of Cascadelake-Server

# gpg: Signature made Mon 28 Jan 2019 19:36:52 GMT
# gpg:                using RSA key 2807936F984DC5A6
# 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: Enable NPT and NRIPSAVE for AMD CPUs
  i386: Update stepping of Cascadelake-Server

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b4fbe1f6 9fe8b7be

hw/i386/pc.c

+9 −0
Original line number Diff line number Diff line
@@ -114,7 +114,15 @@ GlobalProperty pc_compat_3_1[] = { 
    { "intel-iommu", "dma-drain", "off" },

    { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },

    { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" },

    { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" },

    { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" },

    { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" },

    { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" },

    { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" },

    { "EPYC" "-" TYPE_X86_CPU, "npt", "off" },

    { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" },

    { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" },

    { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" },

    { "Skylake-Client" "-" TYPE_X86_CPU,      "mpx", "on" },

    { "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },

    { "Skylake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },
@@ -122,6 +130,7 @@ GlobalProperty pc_compat_3_1[] = { 
    { "Cascadelake-Server" "-" TYPE_X86_CPU,  "mpx", "on" },

    { "Icelake-Client" "-" TYPE_X86_CPU,      "mpx", "on" },

    { "Icelake-Server" "-" TYPE_X86_CPU,      "mpx", "on" },

    { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" },

};

const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);

target/i386/cpu.c

+9 −1
Original line number Diff line number Diff line
@@ -2503,7 +2503,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
        .vendor = CPUID_VENDOR_INTEL,

        .family = 6,

        .model = 85,

        .stepping = 5,

        .stepping = 6,

        .features[FEAT_1_EDX] =

            CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |

            CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |
@@ -2801,6 +2801,8 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE |

            CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | CPUID_EXT3_SVM |

            CPUID_EXT3_LAHF_LM,

        .features[FEAT_SVM] =

            CPUID_SVM_NPT | CPUID_SVM_NRIPSAVE,

        /* no xsaveopt! */

        .xlevel = 0x8000001A,

        .model_id = "AMD Opteron 62xx class CPU",
@@ -2831,6 +2833,8 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_EXT3_3DNOWPREFETCH | CPUID_EXT3_MISALIGNSSE |

            CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | CPUID_EXT3_SVM |

            CPUID_EXT3_LAHF_LM,

        .features[FEAT_SVM] =

            CPUID_SVM_NPT | CPUID_SVM_NRIPSAVE,

        /* no xsaveopt! */

        .xlevel = 0x8000001A,

        .model_id = "AMD Opteron 63xx class CPU",
@@ -2877,6 +2881,8 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_XSAVE_XGETBV1,

        .features[FEAT_6_EAX] =

            CPUID_6_EAX_ARAT,

        .features[FEAT_SVM] =

            CPUID_SVM_NPT | CPUID_SVM_NRIPSAVE,

        .xlevel = 0x8000001E,

        .model_id = "AMD EPYC Processor",

        .cache_info = &epyc_cache_info,
@@ -2925,6 +2931,8 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_XSAVE_XGETBV1,

        .features[FEAT_6_EAX] =

            CPUID_6_EAX_ARAT,

        .features[FEAT_SVM] =

            CPUID_SVM_NPT | CPUID_SVM_NRIPSAVE,

        .xlevel = 0x8000001E,

        .model_id = "AMD EPYC Processor (with IBPB)",

        .cache_info = &epyc_cache_info,