[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] i386/cpu: Remove the deprecated cpu model 'Icelake-Client'
|
From: |
Robert Hoo |
|
Subject: |
Re: [PATCH] i386/cpu: Remove the deprecated cpu model 'Icelake-Client' |
|
Date: |
Mon, 21 Mar 2022 10:46:20 +0800 |
Hi Igor,
Ping...
Thanks.
On Mon, 2022-03-14 at 16:50 +0800, Robert Hoo wrote:
> Icelake, is the codename for Intel 3rd generation Xeon Scalable
> server
> processors. There isn't ever client variants. This "Icelake-Client"
> CPU
> model was added wrongly and imaginarily.
>
> It has been deprecated since v5.2, now it's time to remove it
> completely
> from code.
>
> Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
> ---
> Note: This patch is a reword, rebase and resend of
> https://lore.kernel.org/qemu-devel/1619660147-136679-1-git-send-email-robert.hu@linux.intel.com/
> ---
> docs/about/deprecated.rst | 6 --
> docs/about/removed-features.rst | 6 ++
> target/i386/cpu.c | 122 ------------------------------
> --
> 3 files changed, 6 insertions(+), 128 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index cf02ef6821..1adc762958 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -289,12 +289,6 @@ from Linux upstream kernel, declare it
> deprecated.
> System emulator CPUS
> --------------------
>
> -``Icelake-Client`` CPU Model (since 5.2)
> -''''''''''''''''''''''''''''''''''''''''
> -
> -``Icelake-Client`` CPU Models are deprecated. Use ``Icelake-Server``
> CPU
> -Models instead.
> -
> MIPS ``I7200`` CPU Model (since 5.2)
> ''''''''''''''''''''''''''''''''''''
>
> diff --git a/docs/about/removed-features.rst b/docs/about/removed-
> features.rst
> index 4b831ea291..3fb5b28518 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -538,6 +538,12 @@ Support for this CPU was removed from the
> upstream Linux kernel, and
> there is no available upstream toolchain to build binaries for it.
> Removed without replacement.
>
> +x86 ``Icelake-Client`` CPU (removed in 7.1)
> +'''''''''''''''''''''''''''''''''''''''''''
> +
> +There isn't ever Icelake Client CPU, it is some wrong and imaginary
> one.
> +Use ``Icelake-Server`` instead.
> +
> System emulator machines
> ------------------------
>
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 6c7ef1099b..82f1cecf76 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -3238,128 +3238,6 @@ static const X86CPUDefinition
> builtin_x86_defs[] = {
> { /* end of list */ }
> }
> },
> - {
> - .name = "Icelake-Client",
> - .level = 0xd,
> - .vendor = CPUID_VENDOR_INTEL,
> - .family = 6,
> - .model = 126,
> - .stepping = 0,
> - .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_ABM | CPUID_EXT3_LAHF_LM |
> CPUID_EXT3_3DNOWPREFETCH,
> - .features[FEAT_8000_0008_EBX] =
> - CPUID_8000_0008_EBX_WBNOINVD,
> - .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_7_0_ECX] =
> - CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP |
> CPUID_7_0_ECX_PKU |
> - CPUID_7_0_ECX_AVX512_VBMI2 | CPUID_7_0_ECX_GFNI |
> - CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ |
> - CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |
> - CPUID_7_0_ECX_AVX512_VPOPCNTDQ,
> - .features[FEAT_7_0_EDX] =
> - CPUID_7_0_EDX_SPEC_CTRL | CPUID_7_0_EDX_SPEC_CTRL_SSBD,
> - /* XSAVES is added in version 3 */
> - .features[FEAT_XSAVE] =
> - CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
> - CPUID_XSAVE_XGETBV1,
> - .features[FEAT_6_EAX] =
> - CPUID_6_EAX_ARAT,
> - /* Missing: Mode-based execute control (XS/XU), processor
> tracing, TSC scaling */
> - .features[FEAT_VMX_BASIC] = MSR_VMX_BASIC_INS_OUTS |
> - MSR_VMX_BASIC_TRUE_CTLS,
> - .features[FEAT_VMX_ENTRY_CTLS] = VMX_VM_ENTRY_IA32E_MODE |
> - VMX_VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL |
> VMX_VM_ENTRY_LOAD_IA32_PAT |
> - VMX_VM_ENTRY_LOAD_DEBUG_CONTROLS |
> VMX_VM_ENTRY_LOAD_IA32_EFER,
> - .features[FEAT_VMX_EPT_VPID_CAPS] = MSR_VMX_EPT_EXECONLY |
> - MSR_VMX_EPT_PAGE_WALK_LENGTH_4 | MSR_VMX_EPT_WB |
> MSR_VMX_EPT_2MB |
> - MSR_VMX_EPT_1GB | MSR_VMX_EPT_INVEPT |
> - MSR_VMX_EPT_INVEPT_SINGLE_CONTEXT |
> MSR_VMX_EPT_INVEPT_ALL_CONTEXT |
> - MSR_VMX_EPT_INVVPID | MSR_VMX_EPT_INVVPID_SINGLE_ADDR |
> - MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT |
> MSR_VMX_EPT_INVVPID_ALL_CONTEXT |
> - MSR_VMX_EPT_INVVPID_SINGLE_CONTEXT_NOGLOBALS |
> MSR_VMX_EPT_AD_BITS,
> - .features[FEAT_VMX_EXIT_CTLS] =
> - VMX_VM_EXIT_ACK_INTR_ON_EXIT |
> VMX_VM_EXIT_SAVE_DEBUG_CONTROLS |
> - VMX_VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL |
> - VMX_VM_EXIT_LOAD_IA32_PAT | VMX_VM_EXIT_LOAD_IA32_EFER
> |
> - VMX_VM_EXIT_SAVE_IA32_PAT | VMX_VM_EXIT_SAVE_IA32_EFER
> |
> - VMX_VM_EXIT_SAVE_VMX_PREEMPTION_TIMER,
> - .features[FEAT_VMX_MISC] = MSR_VMX_MISC_ACTIVITY_HLT |
> - MSR_VMX_MISC_STORE_LMA | MSR_VMX_MISC_VMWRITE_VMEXIT,
> - .features[FEAT_VMX_PINBASED_CTLS] =
> VMX_PIN_BASED_EXT_INTR_MASK |
> - VMX_PIN_BASED_NMI_EXITING | VMX_PIN_BASED_VIRTUAL_NMIS
> |
> - VMX_PIN_BASED_VMX_PREEMPTION_TIMER,
> - .features[FEAT_VMX_PROCBASED_CTLS] =
> VMX_CPU_BASED_VIRTUAL_INTR_PENDING |
> - VMX_CPU_BASED_USE_TSC_OFFSETING |
> VMX_CPU_BASED_HLT_EXITING |
> - VMX_CPU_BASED_INVLPG_EXITING |
> VMX_CPU_BASED_MWAIT_EXITING |
> - VMX_CPU_BASED_RDPMC_EXITING |
> VMX_CPU_BASED_RDTSC_EXITING |
> - VMX_CPU_BASED_CR8_LOAD_EXITING |
> VMX_CPU_BASED_CR8_STORE_EXITING |
> - VMX_CPU_BASED_TPR_SHADOW | VMX_CPU_BASED_MOV_DR_EXITING
> |
> - VMX_CPU_BASED_UNCOND_IO_EXITING |
> VMX_CPU_BASED_USE_IO_BITMAPS |
> - VMX_CPU_BASED_MONITOR_EXITING |
> VMX_CPU_BASED_PAUSE_EXITING |
> - VMX_CPU_BASED_VIRTUAL_NMI_PENDING |
> VMX_CPU_BASED_USE_MSR_BITMAPS |
> - VMX_CPU_BASED_CR3_LOAD_EXITING |
> VMX_CPU_BASED_CR3_STORE_EXITING |
> - VMX_CPU_BASED_MONITOR_TRAP_FLAG |
> - VMX_CPU_BASED_ACTIVATE_SECONDARY_CONTROLS,
> - .features[FEAT_VMX_SECONDARY_CTLS] =
> - VMX_SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
> - VMX_SECONDARY_EXEC_WBINVD_EXITING |
> VMX_SECONDARY_EXEC_ENABLE_EPT |
> - VMX_SECONDARY_EXEC_DESC | VMX_SECONDARY_EXEC_RDTSCP |
> - VMX_SECONDARY_EXEC_ENABLE_VPID |
> VMX_SECONDARY_EXEC_UNRESTRICTED_GUEST |
> - VMX_SECONDARY_EXEC_RDRAND_EXITING |
> VMX_SECONDARY_EXEC_ENABLE_INVPCID |
> - VMX_SECONDARY_EXEC_ENABLE_VMFUNC |
> VMX_SECONDARY_EXEC_SHADOW_VMCS |
> - VMX_SECONDARY_EXEC_RDSEED_EXITING |
> VMX_SECONDARY_EXEC_ENABLE_PML,
> - .features[FEAT_VMX_VMFUNC] = MSR_VMX_VMFUNC_EPT_SWITCHING,
> - .xlevel = 0x80000008,
> - .model_id = "Intel Core Processor (Icelake)",
> - .versions = (X86CPUVersionDefinition[]) {
> - {
> - .version = 1,
> - .note = "deprecated"
> - },
> - {
> - .version = 2,
> - .note = "no TSX, deprecated",
> - .alias = "Icelake-Client-noTSX",
> - .props = (PropValue[]) {
> - { "hle", "off" },
> - { "rtm", "off" },
> - { /* end of list */ }
> - },
> - },
> - {
> - .version = 3,
> - .note = "no TSX, XSAVES, deprecated",
> - .props = (PropValue[]) {
> - { "xsaves", "on" },
> - { "vmx-xsaves", "on" },
> - { /* end of list */ }
> - },
> - },
> - { /* end of list */ }
> - },
> - .deprecation_note = "use Icelake-Server instead"
> - },
> {
> .name = "Icelake-Server",
> .level = 0xd,
>
> base-commit: 1416688c53be6535be755b44c15fb2eb9defd20f