Re: [PATCH v3] i386/cpu: Remove the deprecated cpu model 'Icelake-Client'
On Tue, 08 Feb 2022 16:38:27 +0800 Robert Hoo wrote: > Hi, > > Can we remove the deprecated 'Icelake-Client' CPU model now? if so, I > can rebase patch to latest and resend. Please rebase and resend. PS: Also looking at deprecation commit 3e6a015cbd0f, it doesn't have any reason behind deprecation so please add explanation to commit message why it's being removed. > Thanks. > > On Sat, 2021-05-08 at 11:16 +0800, Robert Hoo wrote: > > Hi, > > > > Ping... > > > > Thanks. > > > > On Thu, 2021-04-29 at 09:35 +0800, Robert Hoo wrote: > > > As it's been marked deprecated since v5.2, now I think it's time > > > remove it > > > from code. > > > > > > Signed-off-by: Robert Hoo > > > --- > > > Changelog: > > > v3: > > > Update deprecated.rst. (Sorry for my carelessness in last > > > search. I > > > sware I did search.) > > > v2: > > > Update removed-features.rst. > > > --- > > > docs/system/deprecated.rst | 6 -- > > > docs/system/removed-features.rst | 5 ++ > > > target/i386/cpu.c| 118 --- > > > > > > 3 files changed, 5 insertions(+), 124 deletions(-) > > > > > > diff --git a/docs/system/deprecated.rst > > > b/docs/system/deprecated.rst > > > index 80cae86..780b756 100644 > > > --- a/docs/system/deprecated.rst > > > +++ b/docs/system/deprecated.rst > > > @@ -222,12 +222,6 @@ a future version of QEMU. Support for this CPU > > > was removed from the > > > upstream Linux kernel, and there is no available upstream > > > toolchain > > > to build binaries for it. > > > > > > -``Icelake-Client`` CPU Model (since 5.2.0) > > > -'' > > > - > > > -``Icelake-Client`` CPU Models are deprecated. Use ``Icelake- > > > Server`` > > > CPU > > > -Models instead. > > > - > > > MIPS ``I7200`` CPU Model (since 5.2) > > > > > > > > > diff --git a/docs/system/removed-features.rst > > > b/docs/system/removed- > > > features.rst > > > index 29e9060..f1b5a16 100644 > > > --- a/docs/system/removed-features.rst > > > +++ b/docs/system/removed-features.rst > > > @@ -285,6 +285,11 @@ The RISC-V no MMU cpus have been removed. The > > > two CPUs: ``rv32imacu-nommu`` and > > > ``rv64imacu-nommu`` can no longer be used. Instead the MMU status > > > can be specified > > > via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` > > > CPUs. > > > > > > +x86 Icelake-Client CPU (removed in 6.1) > > > +''' > > > + > > > +``Icelake-Client`` cpu can no longer be used. Use ``Icelake- > > > Server`` > > > instead. > > > + > > > System emulator machines > > > > > > > > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > > > index ad99cad..75f2ad1 100644 > > > --- a/target/i386/cpu.c > > > +++ b/target/i386/cpu.c > > > @@ -3338,124 +3338,6 @@ static X86CPUDefinition builtin_x86_defs[] > > > = > > > { > > > .model_id = "Intel Xeon Processor (Cooperlake)", > > > }, > > > { > > > -.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] = > > >
Re: [PATCH v3] i386/cpu: Remove the deprecated cpu model 'Icelake-Client'
Hi, Can we remove the deprecated 'Icelake-Client' CPU model now? if so, I can rebase patch to latest and resend. Thanks. On Sat, 2021-05-08 at 11:16 +0800, Robert Hoo wrote: > Hi, > > Ping... > > Thanks. > > On Thu, 2021-04-29 at 09:35 +0800, Robert Hoo wrote: > > As it's been marked deprecated since v5.2, now I think it's time > > remove it > > from code. > > > > Signed-off-by: Robert Hoo > > --- > > Changelog: > > v3: > > Update deprecated.rst. (Sorry for my carelessness in last > > search. I > > sware I did search.) > > v2: > > Update removed-features.rst. > > --- > > docs/system/deprecated.rst | 6 -- > > docs/system/removed-features.rst | 5 ++ > > target/i386/cpu.c| 118 --- > > > > 3 files changed, 5 insertions(+), 124 deletions(-) > > > > diff --git a/docs/system/deprecated.rst > > b/docs/system/deprecated.rst > > index 80cae86..780b756 100644 > > --- a/docs/system/deprecated.rst > > +++ b/docs/system/deprecated.rst > > @@ -222,12 +222,6 @@ a future version of QEMU. Support for this CPU > > was removed from the > > upstream Linux kernel, and there is no available upstream > > toolchain > > to build binaries for it. > > > > -``Icelake-Client`` CPU Model (since 5.2.0) > > -'' > > - > > -``Icelake-Client`` CPU Models are deprecated. Use ``Icelake- > > Server`` > > CPU > > -Models instead. > > - > > MIPS ``I7200`` CPU Model (since 5.2) > > > > > > diff --git a/docs/system/removed-features.rst > > b/docs/system/removed- > > features.rst > > index 29e9060..f1b5a16 100644 > > --- a/docs/system/removed-features.rst > > +++ b/docs/system/removed-features.rst > > @@ -285,6 +285,11 @@ The RISC-V no MMU cpus have been removed. The > > two CPUs: ``rv32imacu-nommu`` and > > ``rv64imacu-nommu`` can no longer be used. Instead the MMU status > > can be specified > > via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` > > CPUs. > > > > +x86 Icelake-Client CPU (removed in 6.1) > > +''' > > + > > +``Icelake-Client`` cpu can no longer be used. Use ``Icelake- > > Server`` > > instead. > > + > > System emulator machines > > > > > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > > index ad99cad..75f2ad1 100644 > > --- a/target/i386/cpu.c > > +++ b/target/i386/cpu.c > > @@ -3338,124 +3338,6 @@ static X86CPUDefinition builtin_x86_defs[] > > = > > { > > .model_id = "Intel Xeon Processor (Cooperlake)", > > }, > > { > > -.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, > > -/* Missing: XSAVES (not supported by some L
Re: [PATCH v3] i386/cpu: Remove the deprecated cpu model 'Icelake-Client'
Hi, Ping... Thanks. On Thu, 2021-04-29 at 09:35 +0800, Robert Hoo wrote: > As it's been marked deprecated since v5.2, now I think it's time > remove it > from code. > > Signed-off-by: Robert Hoo > --- > Changelog: > v3: > Update deprecated.rst. (Sorry for my carelessness in last > search. I > sware I did search.) > v2: > Update removed-features.rst. > --- > docs/system/deprecated.rst | 6 -- > docs/system/removed-features.rst | 5 ++ > target/i386/cpu.c| 118 --- > > 3 files changed, 5 insertions(+), 124 deletions(-) > > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index 80cae86..780b756 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -222,12 +222,6 @@ a future version of QEMU. Support for this CPU > was removed from the > upstream Linux kernel, and there is no available upstream toolchain > to build binaries for it. > > -``Icelake-Client`` CPU Model (since 5.2.0) > -'' > - > -``Icelake-Client`` CPU Models are deprecated. Use ``Icelake-Server`` > CPU > -Models instead. > - > MIPS ``I7200`` CPU Model (since 5.2) > > > diff --git a/docs/system/removed-features.rst b/docs/system/removed- > features.rst > index 29e9060..f1b5a16 100644 > --- a/docs/system/removed-features.rst > +++ b/docs/system/removed-features.rst > @@ -285,6 +285,11 @@ The RISC-V no MMU cpus have been removed. The > two CPUs: ``rv32imacu-nommu`` and > ``rv64imacu-nommu`` can no longer be used. Instead the MMU status > can be specified > via the CPU ``mmu`` option when using the ``rv32`` or ``rv64`` CPUs. > > +x86 Icelake-Client CPU (removed in 6.1) > +''' > + > +``Icelake-Client`` cpu can no longer be used. Use ``Icelake-Server`` > instead. > + > System emulator machines > > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index ad99cad..75f2ad1 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -3338,124 +3338,6 @@ static X86CPUDefinition builtin_x86_defs[] = > { > .model_id = "Intel Xeon Processor (Cooperlake)", > }, > { > -.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, > -/* Missing: XSAVES (not supported by some Linux versions, > -* including v4.1 to v4.12). > -* KVM doesn't yet expose any XSAVES state save > component, > -* and the only one defined in Skylake (processor > tracing) > -* probably will block migration anyway. > -*/ > -.features[FEAT_XSAVE] = > -CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC | > -CPUID_XSAVE_XGETBV1, > -.features[FEAT_6_EAX] = > -