Commit 3c6c9fe0 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



X86 queue 2015-03-19

# gpg: Signature made Thu Mar 19 19:40:17 2015 GMT using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: Haswell-noTSX and Broadwell-noTSX
  Revert "target-i386: Disable HLE and RTM on Haswell & Broadwell"

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4eef8648 a356850b

hw/i386/pc_piix.c

+0 −4
Original line number Diff line number Diff line
@@ -331,10 +331,6 @@ static void pc_compat_2_2(MachineState *machine) 
    x86_cpu_compat_set_features("Haswell", FEAT_1_ECX, 0, CPUID_EXT_RDRAND);

    x86_cpu_compat_set_features("Broadwell", FEAT_1_ECX, 0, CPUID_EXT_F16C);

    x86_cpu_compat_set_features("Broadwell", FEAT_1_ECX, 0, CPUID_EXT_RDRAND);

    x86_cpu_compat_set_features("Haswell", FEAT_7_0_EBX,

                                CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_RTM, 0);

    x86_cpu_compat_set_features("Broadwell", FEAT_7_0_EBX,

                                CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_RTM, 0);

    machine->suppress_vmdesc = true;

}

hw/i386/pc_q35.c

+0 −4
Original line number Diff line number Diff line
@@ -310,10 +310,6 @@ static void pc_compat_2_2(MachineState *machine) 
    x86_cpu_compat_set_features("Haswell", FEAT_1_ECX, 0, CPUID_EXT_RDRAND);

    x86_cpu_compat_set_features("Broadwell", FEAT_1_ECX, 0, CPUID_EXT_F16C);

    x86_cpu_compat_set_features("Broadwell", FEAT_1_ECX, 0, CPUID_EXT_RDRAND);

    x86_cpu_compat_set_features("Haswell", FEAT_7_0_EBX,

                                CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_RTM, 0);

    x86_cpu_compat_set_features("Broadwell", FEAT_7_0_EBX,

                                CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_RTM, 0);

    machine->suppress_vmdesc = true;

}

target-i386/cpu.c

+72 −2
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ static X86CPUDefinition builtin_x86_defs[] = { 
        .model_id = "Intel Xeon E3-12xx v2 (Ivy Bridge)",

    },

    {

        .name = "Haswell",

        .name = "Haswell-noTSX",

        .level = 0xd,

        .vendor = CPUID_VENDOR_INTEL,

        .family = 6,
@@ -1104,10 +1104,44 @@ static X86CPUDefinition builtin_x86_defs[] = { 
        .features[FEAT_XSAVE] =

            CPUID_XSAVE_XSAVEOPT,

        .xlevel = 0x8000000A,

        .model_id = "Intel Core Processor (Haswell, no TSX)",

    },    {

        .name = "Haswell",

        .level = 0xd,

        .vendor = CPUID_VENDOR_INTEL,

        .family = 6,

        .model = 60,

        .stepping = 1,

        .features[FEAT_1_EDX] =

            CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |

            CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |

            CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |

            CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |

            CPUID_DE | CPUID_FP87,

        .features[FEAT_1_ECX] =

            CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |

            CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |

            CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |

            CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |

            CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |

            CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,

        .features[FEAT_8000_0001_EDX] =

            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |

            CPUID_EXT2_SYSCALL,

        .features[FEAT_8000_0001_ECX] =

            CPUID_EXT3_LAHF_LM,

        .features[FEAT_7_0_EBX] =

            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |

            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM,

        .features[FEAT_XSAVE] =

            CPUID_XSAVE_XSAVEOPT,

        .xlevel = 0x8000000A,

        .model_id = "Intel Core Processor (Haswell)",

    },

    {

        .name = "Broadwell",

        .name = "Broadwell-noTSX",

        .level = 0xd,

        .vendor = CPUID_VENDOR_INTEL,

        .family = 6,
@@ -1140,6 +1174,42 @@ static X86CPUDefinition builtin_x86_defs[] = { 
        .features[FEAT_XSAVE] =

            CPUID_XSAVE_XSAVEOPT,

        .xlevel = 0x8000000A,

        .model_id = "Intel Core Processor (Broadwell, no TSX)",

    },

    {

        .name = "Broadwell",

        .level = 0xd,

        .vendor = CPUID_VENDOR_INTEL,

        .family = 6,

        .model = 61,

        .stepping = 2,

        .features[FEAT_1_EDX] =

            CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |

            CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |

            CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |

            CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |

            CPUID_DE | CPUID_FP87,

        .features[FEAT_1_ECX] =

            CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |

            CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |

            CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |

            CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |

            CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE |

            CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,

        .features[FEAT_8000_0001_EDX] =

            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX |

            CPUID_EXT2_SYSCALL,

        .features[FEAT_8000_0001_ECX] =

            CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,

        .features[FEAT_7_0_EBX] =

            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |

            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |

            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCID |

            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP,

        .features[FEAT_XSAVE] =

            CPUID_XSAVE_XSAVEOPT,

        .xlevel = 0x8000000A,

        .model_id = "Intel Core Processor (Broadwell)",

    },

    {