Add support for Hygon Dhyana Family 18h processor
v5 cover Add support for Hygon Dhyana Family 18h processor
As a new x86 CPU vendor, Chengdu Haiguang IC Design Co., Ltd (Hygon) is a joint venture between AMD and Haiguang Information Technology Co., Ltd., aims at providing high performance x86 processors for China server market.
The first generation Hygon processor(Dhyana) originates from AMD technology and shares most of the architecture with AMD's family 17h, but with different CPU vendor ID("HygonGenuine") and family series number 18h (Hygon negotiated with AMD to make sure that only Hygon will use family 18h).
To enable support of Xen to Hygon Dhyana CPU, add a new vendor type (X86_VENDOR_HYGON, with value of 5), and share most of the code with AMD family 17h.
The MSRs and CPUIDs which are used by this patch series are all defined in this PPR[1].
This patch series have been applied and tested successfully on Hygon Dhyana processor, also been tested on AMD EPYC (family 17h) processor. It works fine and makes no harm to the existing code.
Reference:
[1] https://www.amd.com/system/files/TechDocs/54945_PPR_Family_17h_Models_00h-0Fh.pdf
v4->v5:
- Rebased over https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=0763cd26
to fit the new x86 vendor lookup mechanism.
- Rework patch 15/15 to fit the new x86 vendor lookup mechanism.
- Add Acked-by from Jan Beulich for patch 02/15 and 04/15.
- Retain more conditionals from amd.c.
- Refine coding style.
v3->v4:
- Revert opt_cpuid_mask_l7s0_(eax/ebx) to amd.c.
- Create a separate patch to fix common cpuid faulting probing issue for AMD and Hygon.
- Rename _vpmu_init() to common_init() and move the default case into it.
- Coding style refine.
v2->v3:
- Rebased on 4.13-unstable and tested against it.
- Simplify code of hygon.c by re-using early_init_amd().
- Return false in the function probe_cpuid_faulting().
- Adjust code for calculating phys_proc_id for Hygon.
- Abstract common function _vpmu_init() and add hygon_vpmu_init().
- Refine some comments and descriptions.
- Add Acked-by from Jan Beulich for x86/cpu/mtrr, x86/cpu/mce,
x86/spec_ctrl, x86/apic, x86/acpi, x86/iommu, x86/pv, x86/domain,
x86/domctl and x86/cpuid.v1->v2:
- Rebased on 4.12.0-rc3 and tested against it.
- Move opt_cpuid_mask_l7s0_(eax/ebx) to common.c.
- Insert Hygon cases after AMD ones instead of above.
- Remove (rd/wr)msr_hygon_safe and use (rd/wr)msr_safe instead.
- Remove wrmsr_hygon and use wrmsrl instead.
- Remove the unnecessary change to xstate.
- Refine some codes and comments.
- Add Acked-by from Jan Beulich for x86/traps.
- Add Acked-by from Wei Liu for tools/libxc.
Pu Wen (15):
x86/cpu: Create Hygon Dhyana architecture support file x86/cpu: Fix common cpuid faulting probing for AMD and Hygon x86/cpu/mtrr: Add Hygon Dhyana support to get TOP_MEM2 x86/cpu/vpmu: Add Hygon Dhyana and AMD Zen support for vPMU x86/cpu/mce: Add Hygon Dhyana support to the MCA infrastructure x86/spec_ctrl: Add Hygon Dhyana to the respective mitigation machinery x86/apic: Add Hygon Dhyana support
x86/acpi: Add Hygon Dhyana support
x86/iommu: Add Hygon Dhyana support
x86/pv: Add Hygon Dhyana support to emulate MSRs access x86/domain: Add Hygon Dhyana support
x86/domctl: Add Hygon Dhyana support
x86/traps: Add Hygon Dhyana support
x86/cpuid: Add Hygon Dhyana support
tools/libxc: Add Hygon Dhyana support
tools/libxc/xc_cpuid_x86.c | 11 ++-- xen/arch/x86/acpi/cpu_idle.c | 3 +- xen/arch/x86/acpi/cpufreq/cpufreq.c | 8 ++- xen/arch/x86/acpi/cpufreq/powernow.c | 3 +- xen/arch/x86/apic.c | 5 ++ xen/arch/x86/cpu/Makefile | 1 + xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 9 ++- xen/arch/x86/cpu/cpu.h | 3 + xen/arch/x86/cpu/hygon.c | 114 +++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/mcheck/amd_nonfatal.c | 5 +- xen/arch/x86/cpu/mcheck/mce.c | 6 +- xen/arch/x86/cpu/mcheck/mce_amd.c | 5 +- xen/arch/x86/cpu/mcheck/non-fatal.c | 3 +- xen/arch/x86/cpu/mcheck/vmce.c | 2 + xen/arch/x86/cpu/mtrr/generic.c | 5 +- xen/arch/x86/cpu/vpmu.c | 8 +++ xen/arch/x86/cpu/vpmu_amd.c | 61 ++++++++++++------ xen/arch/x86/cpuid.c | 10 ++- xen/arch/x86/dom0_build.c | 3 +- xen/arch/x86/domain.c | 9 +-- xen/arch/x86/domctl.c | 13 +++- xen/arch/x86/pv/emul-priv-op.c | 19 ++++-- xen/arch/x86/spec_ctrl.c | 6 +- xen/arch/x86/traps.c | 3 + xen/include/asm-x86/iommu.h | 1 + xen/include/asm-x86/vpmu.h | 1 + xen/include/asm-x86/x86-vendors.h | 7 +- xen/lib/x86/cpuid.c | 6 ++ 29 files changed, 275 insertions(+), 57 deletions(-) create mode 100644 xen/arch/x86/cpu/hygon.c
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 1/15 x86/cpu: Create Hygon Dhyana architecture support file
Add x86 architecture support for a new processor: Hygon Dhyana Family 18h. To make Hygon initialization flow more clear, carve out code from amd.c into a separate file hygon.c, and remove unnecessary code for Hygon Dhyana.
To identify Hygon Dhyana CPU, add a new vendor type X86_VENDOR_HYGON and vendor ID "HygonGenuine" for system recognition, and fit the new x86 vendor lookup mechanism.
Hygon can fully use the function early_init_amd(), so make this common function non-static and direct call it from Hygon code.
Add a separate hygon_get_topology(), which calculate phys_proc_id from AcpiId[6](see reference [1]).
Reference:
[1] https://git.kernel.org/tip/e0ceeae708cebf22c990c3d703a4ca187dc837f5
--- xen/arch/x86/cpu/Makefile | 1 + xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 1 + xen/arch/x86/cpu/cpu.h | 3 + xen/arch/x86/cpu/hygon.c | 114 ++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/x86-vendors.h | 7 ++- xen/lib/x86/cpuid.c | 6 ++ 7 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 xen/arch/x86/cpu/hygon.c
xen/arch/x86/cpu/Makefile +1 -0
@@ -4,6 +4,7 @@ subdir-y += mtrr obj-y += amd.o obj-y += centaur.o obj-y += common.o +obj-y += hygon.o obj-y += intel.o obj-y += intel_cacheinfo.o obj-y += mwait-idle.o
xen/arch/x86/cpu/amd.c +1 -1
@@ -526,7 +526,7 @@ static void amd_get_topology(struct cpuinfo_x86 *c) : c->cpu_core_id); } -static void early_init_amd (struct cpuinfo_x86 *c) +void early_init_amd (struct cpuinfo_x86 *c) {if (c == &boot_cpu_data)amd_init_levelling ();
xen/arch/x86/cpu/common.c +1 -0
@@ -691,6 +691,7 @@ void __init early_cpu_init(void)amd_init_cpu ();centaur_init_cpu ();shanghai_init_cpu (); +hygon_init_cpu ();early_cpu_detect (); }
xen/arch/x86/cpu/cpu.h +3 -0
@@ -16,7 +16,10 @@ extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx;extern int get_model_name (struct cpuinfo_x86 *c);extern void display_cacheinfo (struct cpuinfo_x86 *c); +void early_init_amd (struct cpuinfo_x86 *c); +int intel_cpu_init (void );int amd_init_cpu (void );int centaur_init_cpu (void );int shanghai_init_cpu (void ); +int hygon_init_cpu (void );
xen/arch/x86/cpu/hygon.c new file +114 -0
114 lines not on this page · raw message
xen/include/asm-x86/x86-vendors.h +6 -1
@@ -30,6 +30,11 @@#define X86_VENDOR_SHANGHAI_ECX 0x20206961U#define X86_VENDOR_SHANGHAI_EDX 0x68676e61U -#define X86_VENDOR_NUM 5 +#define X86_VENDOR_HYGON 5 +#define X86_VENDOR_HYGON_EBX 0x6f677948/* "HygonGenuine" */ +#define X86_VENDOR_HYGON_ECX 0x656e6975 +#define X86_VENDOR_HYGON_EDX 0x6e65476e + +#define X86_VENDOR_NUM 6#endif /* __XEN_X86_VENDORS_H__ */
xen/lib/x86/cpuid.c +6 -0
@@ -29,6 +29,12 @@ unsigned int x86_cpuid_lookup_vendor(uint32_t ebx, uint32_t ecx, uint32_t edx) edx == X86_VENDOR_SHANGHAI_EDX )return X86_VENDOR_SHANGHAI ;break ; + +case X86_VENDOR_HYGON_EBX : +if ( ecx ==X86_VENDOR_HYGON_ECX && + edx ==X86_VENDOR_HYGON_EDX ) +return X86_VENDOR_HYGON ; +break ; }return X86_VENDOR_UNKNOWN ;
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 23 lines · Pu Wen
index 774ceac..75fefcf 100644
xen/include/asm-x86/x86-vendors.h +6
-1@@ -30,6 +30,11 @@#define X86_VENDOR_SHANGHAI_ECX 0x20206961U#define X86_VENDOR_SHANGHAI_EDX 0x68676e61U -#define X86_VENDOR_NUM 5 +#define X86_VENDOR_HYGON 5 +#define X86_VENDOR_HYGON_EBX 0x6f677948/* "HygonGenuine" */ +#define X86_VENDOR_HYGON_ECX 0x656e6975 +#define X86_VENDOR_HYGON_EDX 0x6e65476e + +#define X86_VENDOR_NUM 6#endif /* __XEN_X86_VENDORS_H__ */ xen/lib/x86/cpuid.c +0
-0@@ -29,6 +29,12 @@ unsigned int x86_cpuid_lookup_vendor(uint32_t ebx, uint32_t ecx, uint32_t edx) edx == X86_VENDOR_SHANGHAI_EDX )return X86_VENDOR_SHANGHAI ;
xen/lib/x86/cpuid.c unsigned int x86_cpuid_lookup_vendor(uint32_t ebx, uint32_t ecx, uint32_t edx) · line 40
Quoted 10 lines
xen/lib/x86/cpuid.c +6
-0break ; + +case X86_VENDOR_HYGON_EBX : +if ( ecx ==X86_VENDOR_HYGON_ECX && + edx ==X86_VENDOR_HYGON_EDX ) +return X86_VENDOR_HYGON ; +break ; }return X86_VENDOR_UNKNOWN ;
This needs the following hunk folding in
(quoted diff) +0 -0
b/tools/tests/cpu-policy/test-cpu-policy.c
index beced5e..88f5121 100644
tools/tests/cpu-policy/test-cpu-policy.c +0 -0
@@ -35,6 +35,7 @@ static void test_vendor_identification(void)
{ { "AuthenticAMD" }, X86_VENDOR_AMD }, { { "CentaurHauls" }, X86_VENDOR_CENTAUR }, { { " Shanghai " }, X86_VENDOR_SHANGHAI }, + { { "HygonGenuine" }, X86_VENDOR_HYGON },
{ { "" }, X86_VENDOR_UNKNOWN }, { { " " }, X86_VENDOR_UNKNOWN },
which can be done on commit to avoid sending yet another version.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 43 lines · Andrew Cooper
Quoted 23 lines · Pu Wen
index 774ceac..75fefcf 100644
xen/include/asm-x86/x86-vendors.h +6
-1@@ -30,6 +30,11 @@#define X86_VENDOR_SHANGHAI_ECX 0x20206961U#define X86_VENDOR_SHANGHAI_EDX 0x68676e61U -#define X86_VENDOR_NUM 5 +#define X86_VENDOR_HYGON 5 +#define X86_VENDOR_HYGON_EBX 0x6f677948/* "HygonGenuine" */ +#define X86_VENDOR_HYGON_ECX 0x656e6975 +#define X86_VENDOR_HYGON_EDX 0x6e65476e + +#define X86_VENDOR_NUM 6#endif /* __XEN_X86_VENDORS_H__ */ xen/lib/x86/cpuid.c +0
-0@@ -29,6 +29,12 @@ unsigned int x86_cpuid_lookup_vendor(uint32_t ebx, uint32_t ecx, uint32_t edx) edx == X86_VENDOR_SHANGHAI_EDX )return X86_VENDOR_SHANGHAI ;xen/lib/x86/cpuid.c unsigned int x86_cpuid_lookup_vendor(uint32_t ebx, uint32_t ecx, uint32_t edx) · line 40
Quoted 10 lines
xen/lib/x86/cpuid.c +6
-0break ; + +case X86_VENDOR_HYGON_EBX : +if ( ecx ==X86_VENDOR_HYGON_ECX && + edx ==X86_VENDOR_HYGON_EDX ) +return X86_VENDOR_HYGON ; +break ; }return X86_VENDOR_UNKNOWN ;This needs the following hunk folding in
tools/tests/cpu-policy/test-cpu-policy.c +0
-0
tools/tests/cpu-policy/test-cpu-policy.c static void test_vendor_identification(void) · line 41
Quoted 7 lines
tools/tests/cpu-policy/test-cpu-policy.c +1
-0@@ -35,6 +35,7 @@ static void test_vendor_identification(void) { { "AuthenticAMD" }, X86_VENDOR_AMD }, { { "CentaurHauls" }, X86_VENDOR_CENTAUR }, { { " Shanghai " }, X86_VENDOR_SHANGHAI }, + { { "HygonGenuine" }, X86_VENDOR_HYGON }, { { "" }, X86_VENDOR_UNKNOWN }, { { " " }, X86_VENDOR_UNKNOWN },
I'm sorry for missing this file.
Quoted 1 line
which can be done on commit to avoid sending yet another version.
Do you mean I need to send a individual patch for this file instead of reworking the whole series?
Signature · 7 lines
Regards, Pu Wen _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 20 lines
Quoted 1 line
Quoted 1 line · On 04.04.19 at 18:39, <[email protected]> wrote:
Quoted 8 lines · Andrew Cooper
This needs the following hunk folding in
tools/tests/cpu-policy/test-cpu-policy.c +0
-0tools/tests/cpu-policy/test-cpu-policy.c static void test_vendor_identification(void) · line 41
Quoted 7 lines
tools/tests/cpu-policy/test-cpu-policy.c +1
-0@@ -35,6 +35,7 @@ static void test_vendor_identification(void) { { "AuthenticAMD" }, X86_VENDOR_AMD }, { { "CentaurHauls" }, X86_VENDOR_CENTAUR }, { { " Shanghai " }, X86_VENDOR_SHANGHAI }, + { { "HygonGenuine" }, X86_VENDOR_HYGON }, { { "" }, X86_VENDOR_UNKNOWN }, { { " " }, X86_VENDOR_UNKNOWN },I'm sorry for missing this file.
Quoted 4 lines
Quoted 1 line
which can be done on commit to avoid sending yet another version.
Do you mean I need to send a individual patch for this file instead of reworking the whole series?
I don't think that's necessary, unless other reasons arise for there to be yet another round necessary. As Andrew says - this can easily be done while committing.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 11 lines · Jan Beulich
Quoted 6 lines · On 04.04.19 at 18:39, <[email protected]> wrote:
Quoted 2 lines · Andrew Cooper
This needs the following hunk folding in
which can be done on commit to avoid sending yet another version.Do you mean I need to send a individual patch for this file instead of reworking the whole series?
I don't think that's necessary, unless other reasons arise for there to be yet another round necessary. As Andrew says - this can easily be done while committing.
Hi Jan and Andrew,
How about the patches till now? Are they acceptable to commit?
Thx.
Signature · 7 lines
Regards, Pu Wen _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 9 lines · Pu Wen
Quoted 8 lines · Jan Beulich
Quoted 6 lines · On 04.04.19 at 18:39, <[email protected]> wrote:
Quoted 2 lines · Andrew Cooper
This needs the following hunk folding in
which can be done on commit to avoid sending yet another version.Do you mean I need to send a individual patch for this file instead of reworking the whole series?
Quoted 7 lines
Quoted 3 lines
I don't think that's necessary, unless other reasons arise for there to be yet another round necessary. As Andrew says - this can easily be done while committing.
Hi Jan and Andrew,
How about the patches till now? Are they acceptable to commit?
FYI we're trying to sort out issues with upstream CI system, so committing these patches need to wait a bit. But don't worry, they will eventually be committed (assuming all the acks and Rbs are in place).
Wei.
Quoted 6 lines
Thx.
Signature · 2 lines
Regards, Pu Wen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 14 lines · Wei Liu
Quoted 13 lines · Pu Wen
Quoted 11 lines · Jan Beulich
Quoted 6 lines · On 04.04.19 at 18:39, <[email protected]> wrote:
Quoted 2 lines · Andrew Cooper
This needs the following hunk folding in
which can be done on commit to avoid sending yet another version.Do you mean I need to send a individual patch for this file instead of reworking the whole series?
I don't think that's necessary, unless other reasons arise for there to be yet another round necessary. As Andrew says - this can easily be done while committing.
Quoted 7 lines
Quoted 3 lines
Hi Jan and Andrew,
How about the patches till now? Are they acceptable to commit?
FYI we're trying to sort out issues with upstream CI system, so committing these patches need to wait a bit. But don't worry, they will eventually be committed (assuming all the acks and Rbs are in place).
Okay, thanks! But there's still no acks for this patch of the whole series, so I just worry about it. Could someone offer Acked-by tag for it?
Signature · 7 lines
Regards, Pu Wen _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 01/15] x86/cpu: Create Hygon Dhyana architecture support file
Quoted 17 lines · Pu Wen
Quoted 16 lines · Wei Liu
Quoted 15 lines · Pu Wen
Quoted 11 lines · Jan Beulich
Quoted 6 lines · On 04.04.19 at 18:39, <[email protected]> wrote:
Quoted 2 lines · Andrew Cooper
This needs the following hunk folding in
which can be done on commit to avoid sending yet another version.Do you mean I need to send a individual patch for this file instead of reworking the whole series?
I don't think that's necessary, unless other reasons arise for there to be yet another round necessary. As Andrew says - this can easily be done while committing.
Hi Jan and Andrew,
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
How about the patches till now? Are they acceptable to commit?
FYI we're trying to sort out issues with upstream CI system, so committing these patches need to wait a bit. But don't worry, they will eventually be committed (assuming all the acks and Rbs are in place).
Okay, thanks! But there's still no acks for this patch of the whole series, so I just worry about it. Could someone offer Acked-by tag for it?
It would be either Jan or Andrew who needs to ack this patch. Jan is away at the moment. And a lot of us in Europe have a long Easter weekend this week.
From my reading of their comments, you don't need to worry about getting an ack.
Wei.
Quoted 4 lines
Signature · 3 lines
-- Regards, Pu Wen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 2/15 x86/cpu: Fix common cpuid faulting probing for AMD and Hygon
In reply to Pu WenThere is no MSR_INTEL_PLATFORM_INFO for AMD and Hygon families. Read this MSR will stop the Xen initialization process in some Hygon systems or produce GPF(0). So directly return false in the function probe_cpuid_faulting() if !cpu_has_hypervisor.
--- xen/arch/x86/cpu/common.c | 5 +++++ 1 file changed, 5 insertions(+)
xen/arch/x86/cpu/common.c +5 -0
@@ -116,6 +116,11 @@ bool __init probe_cpuid_faulting(void)uint64_t val;int rc; +if ((boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON || + boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) && + !cpu_has_hypervisor) +return false; +if ((rc =rdmsr_safe (MSR_INTEL_PLATFORM_INFO , val)) ==0 ) raw_msr_policy.plaform_info.cpuid_faulting = val &MSR_PLATFORM_INFO_CPUID_FAULTING ;
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 3/15 x86/cpu/mtrr: Add Hygon Dhyana support to get TOP_MEM2
In reply to Pu WenThe Hygon Dhyana CPU supports the MSR way to get TOP_MEM2. So add Hygon Dhyana support to print the value of TOP_MEM2.
--- xen/arch/x86/cpu/mtrr/generic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
xen/arch/x86/cpu/mtrr/generic.c +3 -2
@@ -217,8 +217,9 @@ static void __init print_mtrr_state(const char *level)printk ("%s %u disabled\n" , level, i); } -if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD - && boot_cpu_data.x86 >=0xf ) { +if ((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && + boot_cpu_data.x86 >=0xf ) || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) {uint64_t syscfg, tom2;rdmsrl (MSR_K8_SYSCFG , syscfg);
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 4/15 x86/cpu/vpmu: Add Hygon Dhyana and AMD Zen support for vPMU
In reply to Pu WenAs Hygon Dhyana CPU share similar PMU architecture with AMD family 17h one, so add Hygon Dhyana support in vpmu_arch_initialise() and vpmu_init() by sharing AMD code path.
Split the common part in amd_vpmu_init() to a static function _vpmu_init(), making AMD and Hygon to call the shared function to initialize vPMU.
As current vPMU still not support AMD Zen(family 17h), add 0x17 support to amd_vpmu_init().
Also create a function hygon_vpmu_init() for Hygon vPMU initialization.
Both of AMD 17h and Hygon 18h have the same performance event select and counter MSRs as AMD 15h has, so reuse the 15h definitions for them.
--- xen/arch/x86/cpu/vpmu.c | 8 ++++++ xen/arch/x86/cpu/vpmu_amd.c | 61 ++++++++++++++++++++++++++++++++------------- xen/include/asm-x86/vpmu.h | 1 + 3 files changed, 52 insertions(+), 18 deletions(-)
xen/arch/x86/cpu/vpmu.c +8 -0
@@ -456,6 +456,7 @@ static int vpmu_arch_initialise(struct vcpu *v)switch ( vendor ) {case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : ret =svm_vpmu_initialise (v);break ;
@@ -876,10 +877,17 @@ static int __init vpmu_init(void)if (amd_vpmu_init () ) vpmu_mode =XENPMU_MODE_OFF ;break ; + +case X86_VENDOR_HYGON : +if (hygon_vpmu_init () ) + vpmu_mode =XENPMU_MODE_OFF ; +break ; +case X86_VENDOR_INTEL :if (core2_vpmu_init () ) vpmu_mode =XENPMU_MODE_OFF ;break ; +default :printk (XENLOG_WARNING "VPMU: Unknown CPU vendor: %d. " "Turning VPMU off.\n" , vendor);
xen/arch/x86/cpu/vpmu_amd.c +43 -18
74 lines not on this page · raw message
xen/include/asm-x86/vpmu.h +1 -0
@@ -52,6 +52,7 @@ struct arch_vpmu_ops {int core2_vpmu_init (void );int vmx_vpmu_initialise (struct vcpu *);int amd_vpmu_init (void ); +int hygon_vpmu_init (void );int svm_vpmu_initialise (struct vcpu *);struct vpmu_struct {
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 5/15 x86/cpu/mce: Add Hygon Dhyana support to the MCA infrastructure
In reply to Pu WenThe machine check architecture for Hygon Dhyana CPU is similar to the AMD family 17h one. Add vendor checking for Hygon Dhyana to share the code path of AMD family 17h.
--- xen/arch/x86/cpu/common.c | 3 ++- xen/arch/x86/cpu/mcheck/amd_nonfatal.c | 5 +++-- xen/arch/x86/cpu/mcheck/mce.c | 6 ++++-- xen/arch/x86/cpu/mcheck/mce_amd.c | 5 ++++- xen/arch/x86/cpu/mcheck/non-fatal.c | 3 ++- xen/arch/x86/cpu/mcheck/vmce.c | 2 ++ 6 files changed, 17 insertions(+), 7 deletions(-)
xen/arch/x86/cpu/common.c +2 -1
@@ -326,7 +326,8 @@ static void __init early_cpu_detect(void) hap_paddr_bits =PADDR_BITS ; } -if (c->x86_vendor !=X86_VENDOR_AMD ) +if (c->x86_vendor !=X86_VENDOR_AMD && + c->x86_vendor !=X86_VENDOR_HYGON ) park_offline_cpus = opt_mce;initialize_cpu_data (0 );
xen/arch/x86/cpu/mcheck/amd_nonfatal.c +3 -2
@@ -203,10 +203,11 @@ static void mce_amd_work_fn(void *data)void __init amd_nonfatal_mcheck_init (struct cpuinfo_x86 *c) { -if (c->x86_vendor !=X86_VENDOR_AMD ) +if (c->x86_vendor !=X86_VENDOR_AMD && + c->x86_vendor !=X86_VENDOR_HYGON )return ; -/* Assume we are on K8 or newer AMD CPU here */ +/* Assume we are on K8 or newer AMD or Hygon CPU here */ /* The threshold bitfields in MSR_IA32_MC4_MISC has * been introduced along with the SVME feature bit. */
xen/arch/x86/cpu/mcheck/mce.c +4 -2
@@ -778,6 +778,7 @@ void mcheck_init(struct cpuinfo_x86 *c, bool bsp)switch ( c->x86_vendor ) {case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : inited =amd_mcheck_init (c);break ;
@@ -1172,10 +1173,11 @@ static bool x86_mc_msrinject_verify(struct xen_mc_msrinject *mci)/* MSRs that the HV will take care of */ case MSR_K8_HWCR : -if ( c->x86_vendor ==X86_VENDOR_AMD ) +if ( c->x86_vendor ==X86_VENDOR_AMD || + c->x86_vendor ==X86_VENDOR_HYGON ) reason ="HV will operate HWCR" ;else - reason ="only supported on AMD" ; + reason ="only supported on AMD or Hygon" ;break ;default :
xen/arch/x86/cpu/mcheck/mce_amd.c +4 -1
@@ -286,7 +286,10 @@ enum mcheck_type amd_mcheck_init(struct cpuinfo_x86 *ci) {uint32_t i; -enum mcequirk_amd_flags quirkflag =mcequirk_lookup_amd_quirkdata (ci); +enum mcequirk_amd_flags quirkflag =0 ; + +if (ci->x86_vendor !=X86_VENDOR_HYGON ) + quirkflag =mcequirk_lookup_amd_quirkdata (ci);/* Assume that machine check support is available. * The minimum provided support is at least the K8. */
xen/arch/x86/cpu/mcheck/non-fatal.c +2 -1
@@ -101,7 +101,8 @@ static int __init init_nonfatal_mce_checker(void)*/ switch (c->x86_vendor) {case X86_VENDOR_AMD : -/* Assume we are on K8 or newer AMD CPU here */ +case X86_VENDOR_HYGON : +/* Assume we are on K8 or newer AMD or Hygon CPU here */ amd_nonfatal_mcheck_init (c);break ;
xen/arch/x86/cpu/mcheck/vmce.c +2 -0
@@ -154,6 +154,7 @@ static int bank_mce_rdmsr(const struct vcpu *v, uint32_t msr, uint64_t *val)break ;case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : ret =vmce_amd_rdmsr (v, msr, val);break ;
@@ -284,6 +285,7 @@ static int bank_mce_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val)break ;case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : ret =vmce_amd_wrmsr (v, msr, val);break ;
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 6/15 x86/spec_ctrl: Add Hygon Dhyana to the respective mitigation machinery
In reply to Pu WenThe Hygon Dhyana CPU has the same speculative execution as AMD family 17h, so share AMD Retpoline and PTI mitigation code with Hygon Dhyana.
--- xen/arch/x86/spec_ctrl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
xen/arch/x86/spec_ctrl.c +4 -2
@@ -306,7 +306,8 @@ static bool __init retpoline_safe(uint64_t caps) {unsigned int ucode_rev =this_cpu (ucode_cpu_info).cpu_sig.rev; -if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON )return true; if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ||
@@ -632,7 +633,8 @@ int8_t __read_mostly opt_xpti_domu = -1;static __init void xpti_init_default (uint64_t caps) { -if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) caps =ARCH_CAPS_RDCL_NO ;if ( caps &ARCH_CAPS_RDCL_NO )
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 7/15 x86/apic: Add Hygon Dhyana support
In reply to Pu WenAdd Hygon Dhyana support to use modern APIC.
--- xen/arch/x86/apic.c | 5 +++++ 1 file changed, 5 insertions(+)
xen/arch/x86/apic.c +5 -0
@@ -92,6 +92,11 @@ static int modern_apic(void)if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && boot_cpu_data.x86 >=0xf )return 1 ; + +/* Hygon systems use modern APIC */ +if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) +return 1 ; + lvr =apic_read (APIC_LVR ); version =GET_APIC_VERSION (lvr);return version >=0x14 ;
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 8/15 x86/acpi: Add Hygon Dhyana support
In reply to Pu WenAdd Hygon Dhyana support to the acpi cpufreq and cpuidle subsystems by using the code path of AMD.
--- xen/arch/x86/acpi/cpu_idle.c | 3 ++- xen/arch/x86/acpi/cpufreq/cpufreq.c | 8 +++++--- xen/arch/x86/acpi/cpufreq/powernow.c | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-)
xen/arch/x86/acpi/cpu_idle.c +2 -1
@@ -796,7 +796,8 @@ void acpi_dead_idle(void)__mwait (cx->address,0 ); } } -else if ( current_cpu_data.x86_vendor ==X86_VENDOR_AMD && +else if ( (current_cpu_data.x86_vendor ==X86_VENDOR_AMD || + current_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) && cx->entry_method ==ACPI_CSTATE_EM_SYSIO ) {/* Intel prefers not to use SYSIO */
xen/arch/x86/acpi/cpufreq/cpufreq.c +5 -3
@@ -649,7 +649,8 @@ static int __init cpufreq_driver_init(void) (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) ret =cpufreq_register_driver (&acpi_cpufreq_driver); else if ((cpufreq_controller == FREQCTL_xen) && - (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)) + (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || + boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)) ret =powernow_register_driver ();return ret;
@@ -660,9 +661,10 @@ int cpufreq_cpu_init(unsigned int cpuid) {int ret; -/* Currently we only handle Intel and AMD processor */ +/* Currently we only handle Intel, AMD and Hygon processor */ if ( (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL ) || - (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) ) + (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) || + (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) ) ret =cpufreq_add_cpu (cpuid);else ret = -EFAULT ;
xen/arch/x86/acpi/cpufreq/powernow.c +2 -1
@@ -360,7 +360,8 @@ unsigned int __init powernow_register_driver()for_each_online_cpu (i) {struct cpuinfo_x86 *c = &cpu_data[i]; -if (c->x86_vendor !=X86_VENDOR_AMD ) +if (c->x86_vendor !=X86_VENDOR_AMD && + c->x86_vendor !=X86_VENDOR_HYGON ) ret = -ENODEV ;else {
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 9/15 x86/iommu: Add Hygon Dhyana support
In reply to Pu WenThe IOMMU architecture for the Hygon Dhyana CPU is similar to the AMD family 17h one. So add Hygon Dhyana support to it by sharing the code path of AMD.
--- xen/include/asm-x86/iommu.h | 1 + 1 file changed, 1 insertion(+)
xen/include/asm-x86/iommu.h +1 -0
@@ -74,6 +74,7 @@ static inline int iommu_hardware_setup(void)case X86_VENDOR_INTEL :return intel_vtd_setup ();case X86_VENDOR_AMD : +case X86_VENDOR_HYGON :return amd_iov_detect (); }
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 10/15 x86/pv: Add Hygon Dhyana support to emulate MSRs access
In reply to Pu WenThe Hygon Dhyana CPU supports lots of MSRs(such as perf event select and counter MSRs, hardware configuration MSR, MMIO configuration base address MSR, MPERF/APERF MSRs) as AMD CPU does, so add Hygon Dhyana support to the PV emulation infrastructure by using the code path of AMD.
--- xen/arch/x86/pv/emul-priv-op.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
xen/arch/x86/pv/emul-priv-op.c +13 -6
@@ -924,7 +924,9 @@ static int read_msr(unsigned int reg, uint64_t *val,/* fall through */ case MSR_AMD_FAM15H_EVNTSEL0 ... MSR_AMD_FAM15H_PERFCTR5: case MSR_K7_EVNTSEL0 ... MSR_K7_PERFCTR3: -if ( vpmu_msr || (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) ) +if ( vpmu_msr || + (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) || + (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) ) {if (vpmu_do_rdmsr (reg, val) )break ;
@@ -1006,7 +1008,8 @@ static int write_msr(unsigned int reg, uint64_t val,case MSR_K8_PSTATE6 :case MSR_K8_PSTATE7 :case MSR_K8_HWCR : -if ( boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +if ( boot_cpu_data.x86_vendor !=X86_VENDOR_AMD && + boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON )break ;if (likely (!is_cpufreq_controller (currd)) ||wrmsr_safe (reg, val) ==0 )
@@ -1027,8 +1030,9 @@ static int write_msr(unsigned int reg, uint64_t val,break ;case MSR_FAM10H_MMIO_CONF_BASE : -if ( boot_cpu_data.x86_vendor !=X86_VENDOR_AMD || - boot_cpu_data.x86 <0x10 || boot_cpu_data.x86 >0x17 ) +if ( (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD || + boot_cpu_data.x86 <0x10 || boot_cpu_data.x86 >0x17 ) && + boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON )break ;if ( !is_hwdom_pinned_vcpu (curr) )return X86EMUL_OKAY ;
@@ -1067,7 +1071,8 @@ static int write_msr(unsigned int reg, uint64_t val,case MSR_IA32_MPERF :case MSR_IA32_APERF :if ( (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL ) && - (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) ) + (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) && + (boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON ) )break ;if (likely (!is_cpufreq_controller (currd)) ||wrmsr_safe (reg, val) ==0 )
@@ -1099,7 +1104,9 @@ static int write_msr(unsigned int reg, uint64_t val, vpmu_msr = true; case MSR_AMD_FAM15H_EVNTSEL0 ... MSR_AMD_FAM15H_PERFCTR5: case MSR_K7_EVNTSEL0 ... MSR_K7_PERFCTR3: -if ( vpmu_msr || (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) ) +if ( vpmu_msr || + (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) || + (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) ) {if ( (vpmu_mode &XENPMU_MODE_ALL ) && !is_hardware_domain (currd) )
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 11/15 x86/domain: Add Hygon Dhyana support
In reply to Pu WenAdd Hygon Dhyana support to handle HyperTransport range.
Also loading a nul selector does not clear bases and limits on Hygon CPUs, so add Hygon Dhyana support to the function preload_segment.
--- xen/arch/x86/dom0_build.c | 3 ++- xen/arch/x86/domain.c | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-)
xen/arch/x86/dom0_build.c +2 -1
@@ -542,7 +542,8 @@ int __init dom0_setup_permissions(struct domain *d)paddr_to_pfn (MSI_ADDR_BASE_LO + MSI_ADDR_DEST_ID_MASK));/* HyperTransport range. */ -if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) rc |=iomem_deny_access (d,paddr_to_pfn (0xfdULL <<32 ),paddr_to_pfn ((1ULL <<40 ) -1 ));
xen/arch/x86/domain.c +5 -4
@@ -1253,13 +1253,14 @@ arch_do_vcpu_op( }/* -* Loading a nul selector does not clear bases and limits on AMD CPUs. Be on -* the safe side and re-initialize both to flat segment values before loading -* a nul selector. +* Loading a nul selector does not clear bases and limits on AMD or Hygon +* CPUs. Be on the safe side and re-initialize both to flat segment values +* before loading a nul selector. */ #define preload_segment (seg, value) do { \ if ( !((value) & ~3) && \ - boot_cpu_data.x86_vendor == X86_VENDOR_AMD ) \ + (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || \ + boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) ) \ asm volatile ( "movl %k0, %%" #seg \ :: "r" (FLAT_USER_DS32) ); \ } while ( false )
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 12/15 x86/domctl: Add Hygon Dhyana support
In reply to Pu WenAdd Hygon Dhyana support to update cpuid info for creating PV guest.
--- xen/arch/x86/domctl.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
xen/arch/x86/domctl.c +10 -3
@@ -176,6 +176,7 @@ static int update_domain_cpuid_info(struct domain *d,break ;case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : mask &= ((uint64_t )ecx <<32 ) | edx;/*
@@ -220,7 +221,8 @@ static int update_domain_cpuid_info(struct domain *d,uint32_t eax = ctl->eax;uint32_t ebx = p->feat._7b0; -if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +if ( boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) mask &= ((uint64_t )eax <<32 ) | ebx; d->arch.pv.cpuidmasks->_7ab0 = mask;
@@ -281,8 +283,12 @@ static int update_domain_cpuid_info(struct domain *d,if ( cpu_has_cmp_legacy ) ecx |=cpufeat_mask (X86_FEATURE_CMP_LEGACY ); -/* If not emulating AMD, clear the duplicated features in e1d. */ -if ( p->x86_vendor !=X86_VENDOR_AMD ) +/* +* If not emulating AMD or Hygon, clear the duplicated features +* in e1d. +*/ +if ( p->x86_vendor !=X86_VENDOR_AMD && + p->x86_vendor !=X86_VENDOR_HYGON ) edx &= ~CPUID_COMMON_1D_FEATURES ; switch ( boot_cpu_data.x86_vendor )
@@ -292,6 +298,7 @@ static int update_domain_cpuid_info(struct domain *d,break ;case X86_VENDOR_AMD : +case X86_VENDOR_HYGON : mask &= ((uint64_t )ecx <<32 ) | edx;/*
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Hi,
I am not sure why I end up to be CCed on the cover letter when I am not CCed on the rest of series.
Cheers,
Quoted 113 lines · Pu Wen
As a new x86 CPU vendor, Chengdu Haiguang IC Design Co., Ltd (Hygon) is a joint venture between AMD and Haiguang Information Technology Co., Ltd., aims at providing high performance x86 processors for China server market.
The first generation Hygon processor(Dhyana) originates from AMD technology and shares most of the architecture with AMD's family 17h, but with different CPU vendor
ID("HygonGenuine")and family series number 18h (Hygon negotiated with AMD to make sure that only Hygon will use family 18h).To enable support of Xen to Hygon Dhyana CPU, add a new vendor type (
X86_VENDOR_HYGON, with value of 5), and share most of the code with AMD family 17h.The MSRs and CPUIDs which are used by this patch series are all defined in this PPR[1].
This patch series have been applied and tested successfully on Hygon Dhyana processor, also been tested on AMD EPYC (family 17h) processor. It works fine and makes no harm to the existing code.
Reference:
[1] https://www.amd.com/system/files/TechDocs/54945_PPR_Family_17h_Models_00h-0Fh.pdf
v4->v5:
- Rebased over https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=0763cd26
to fit the new x86 vendor lookup mechanism.
- Rework patch 15/15 to fit the new x86 vendor lookup mechanism.
- Add Acked-by from Jan Beulich for patch 02/15 and 04/15.
- Retain more conditionals fromamd.c.
- Refine coding style.
v3->v4:
- Revertopt_cpuid_mask_l7s0_(eax/ebx)toamd.c.
- Create a separate patch to fix common cpuid faulting probing issue for AMD and Hygon.
- Rename_vpmu_init()tocommon_init()and move the default case into it.
- Coding style refine.
v2->v3:
- Rebased on 4.13-unstable and tested against it.
- Simplify code ofhygon.cby re-usingearly_init_amd().
- Return false in the functionprobe_cpuid_faulting().
- Adjust code for calculatingphys_proc_idfor Hygon.
- Abstract common function_vpmu_init()and addhygon_vpmu_init().
- Refine some comments and descriptions.
- Add Acked-by from Jan Beulich for x86/cpu/mtrr, x86/cpu/mce,x86/spec_ctrl, x86/apic, x86/acpi, x86/iommu, x86/pv, x86/domain, x86/domctl and x86/cpuid.
v1->v2:
- Rebased on 4.12.0-rc3 and tested against it.
- Moveopt_cpuid_mask_l7s0_(eax/ebx)tocommon.c.
- Insert Hygon cases after AMD ones instead of above.
- Remove (rd/wr)msr_hygon_safe and use (rd/wr)msr_safe instead.
- Removewrmsr_hygonand use wrmsrl instead.
- Remove the unnecessary change to xstate.
- Refine some codes and comments.
- Add Acked-by from Jan Beulich for x86/traps.
- Add Acked-by from Wei Liu fortools/libxc.Pu Wen (15):
x86/cpu: Create Hygon Dhyana architecture support file x86/cpu: Fix common cpuid faulting probing for AMD and Hygon x86/cpu/mtrr: Add Hygon Dhyana support to getTOP_MEM2x86/cpu/vpmu: Add Hygon Dhyana and AMD Zen support for vPMU x86/cpu/mce: Add Hygon Dhyana support to the MCA infrastructure x86/spec_ctrl: Add Hygon Dhyana to the respective mitigation machinery x86/apic: Add Hygon Dhyana support
x86/acpi: Add Hygon Dhyana support
x86/iommu: Add Hygon Dhyana support
x86/pv: Add Hygon Dhyana support to emulate MSRs access x86/domain: Add Hygon Dhyana support
x86/domctl: Add Hygon Dhyana support
x86/traps: Add Hygon Dhyana support
x86/cpuid: Add Hygon Dhyana support
tools/libxc: Add Hygon Dhyana supporttools/libxc/xc_cpuid_x86.c | 11 ++-- xen/arch/x86/acpi/cpu_idle.c | 3 +- xen/arch/x86/acpi/cpufreq/cpufreq.c | 8 ++- xen/arch/x86/acpi/cpufreq/powernow.c | 3 +- xen/arch/x86/apic.c | 5 ++ xen/arch/x86/cpu/Makefile | 1 + xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 9 ++- xen/arch/x86/cpu/cpu.h | 3 + xen/arch/x86/cpu/hygon.c | 114 +++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/mcheck/amd_nonfatal.c | 5 +- xen/arch/x86/cpu/mcheck/mce.c | 6 +- xen/arch/x86/cpu/mcheck/mce_amd.c | 5 +- xen/arch/x86/cpu/mcheck/non-fatal.c | 3 +- xen/arch/x86/cpu/mcheck/vmce.c | 2 + xen/arch/x86/cpu/mtrr/generic.c | 5 +- xen/arch/x86/cpu/vpmu.c | 8 +++ xen/arch/x86/cpu/vpmu_amd.c | 61 ++++++++++++------ xen/arch/x86/cpuid.c | 10 ++- xen/arch/x86/dom0_build.c | 3 +- xen/arch/x86/domain.c | 9 +-- xen/arch/x86/domctl.c | 13 +++- xen/arch/x86/pv/emul-priv-op.c | 19 ++++-- xen/arch/x86/spec_ctrl.c | 6 +- xen/arch/x86/traps.c | 3 + xen/include/asm-x86/iommu.h | 1 + xen/include/asm-x86/vpmu.h | 1 + xen/include/asm-x86/x86-vendors.h | 7 +- xen/lib/x86/cpuid.c | 6 ++ 29 files changed, 275 insertions(+), 57 deletions(-)create mode 100644
xen/arch/x86/cpu/hygon.c
Signature · 6 lines
Julien Grall _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 4 lines · Julien Grall
Hi,
I am not sure why I end up to be CCed on the cover letter when I am not CCed on the rest of series.
The patch 01/15 of the series is CCed to you. :)
Signature · 7 lines
Regards, Pu Wen _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 7 lines · Pu Wen
Quoted 4 lines · Julien Grall
Hi,
I am not sure why I end up to be CCed on the cover letter when I am not CCed on the rest of series.
The patch 01/15 of the series is CCed to you. :)
I did notice it afterwards. But the code is only x86 specific...
It looks like xen/lib/x86 was not falling under the x86 maintainership. I have sent a patch to avoid the "REST" maintainers to be CCed on it.
Cheers,
Signature · 6 lines
Julien Grall _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 13/15 x86/traps: Add Hygon Dhyana support
In reply to Pu WenThe Hygon Dhyana processor has the methold to get the last exception source IP from MSR0000_01DD. So add support for it if the boot param ler is true.
--- xen/arch/x86/traps.c | 3 +++ 1 file changed, 3 insertions(+)
xen/arch/x86/traps.c +3 -0
@@ -1973,6 +1973,9 @@ static unsigned int calc_ler_msr(void)return MSR_IA32_LASTINTFROMIP ; }break ; + +case X86_VENDOR_HYGON : +return MSR_IA32_LASTINTFROMIP ; }return 0 ;
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 14/15 x86/cpuid: Add Hygon Dhyana support
In reply to Pu WenThe Hygon Dhyana family 18h processor shares the same cpuid leaves as the AMD family 17h one. So add Hygon Dhyana support to caculate the cpuid policies as the AMD CPU does.
--- xen/arch/x86/cpuid.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
xen/arch/x86/cpuid.c +7 -3
@@ -240,6 +240,7 @@ static void recalculate_misc(struct cpuid_policy *p)break ;case X86_VENDOR_AMD : +case X86_VENDOR_HYGON :zero_leaves (p->basic.raw,0x2 ,0x3 );memset (p->cache.raw,0 ,sizeof (p->cache.raw));zero_leaves (p->basic.raw,0x9 ,0xa );
@@ -391,7 +392,8 @@ static void __init calculate_hvm_max_policy(void)* long mode (and init_amd() has cleared it out of host capabilities), but * HVM guests are able if running in protected mode. */ -if ( (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) && +if ( (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) && raw_cpuid_policy.basic.sep )__set_bit (X86_FEATURE_SEP , hvm_featureset);
@@ -466,7 +468,8 @@ void recalculate_cpuid_policy(struct domain *d) p->basic.max_leaf =min (p->basic.max_leaf, max->basic.max_leaf); p->feat.max_subleaf =min (p->feat.max_subleaf, max->feat.max_subleaf); p->extd.max_leaf =0x80000000 |min (p->extd.max_leaf &0xffff , - (p->x86_vendor ==X86_VENDOR_AMD + ((p->x86_vendor ==X86_VENDOR_AMD || + p->x86_vendor ==X86_VENDOR_HYGON ) ?CPUID_GUEST_NR_EXTD_AMD :CPUID_GUEST_NR_EXTD_INTEL ) -1 );
@@ -508,7 +511,8 @@ void recalculate_cpuid_policy(struct domain *d)if (is_pv_32bit_domain (d) ) {__clear_bit (X86_FEATURE_LM , max_fs); -if ( boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +if ( boot_cpu_data.x86_vendor !=X86_VENDOR_AMD && + boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON )__clear_bit (X86_FEATURE_SYSCALL , max_fs); }
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v5 15/15 tools/libxc: Add Hygon Dhyana support
In reply to Pu WenAdd Hygon Dhyana support to caculate the cpuid policies for creating PV or HVM guest by using the code path of AMD.
--- tools/libxc/xc_cpuid_x86.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
tools/libxc/xc_cpuid_x86.c +7 -4
@@ -556,7 +556,8 @@ static void xc_cpuid_hvm_policy(const struct cpuid_domain_info *info,break ; } -if ( info->vendor ==X86_VENDOR_AMD ) +if ( info->vendor ==X86_VENDOR_AMD || + info->vendor ==X86_VENDOR_HYGON )amd_xc_cpuid_policy (info, input, regs);else intel_xc_cpuid_policy (info, input, regs);
@@ -618,7 +619,8 @@ static void xc_cpuid_pv_policy(const struct cpuid_domain_info *info,case 0x80000000 : { -unsigned int max = info->vendor ==X86_VENDOR_AMD +unsigned int max = (info->vendor ==X86_VENDOR_AMD || + info->vendor ==X86_VENDOR_HYGON ) ?DEF_MAX_AMDEXT :DEF_MAX_INTELEXT ;if ( regs[0 ] > max )
@@ -724,7 +726,8 @@ static void sanitise_featureset(struct cpuid_domain_info *info)if ( !info->pv64 ) {clear_bit (X86_FEATURE_LM , info->featureset); -if ( info->vendor !=X86_VENDOR_AMD ) +if ( info->vendor !=X86_VENDOR_AMD && + info->vendor !=X86_VENDOR_HYGON )clear_bit (X86_FEATURE_SYSCALL , info->featureset); }
@@ -775,7 +778,7 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, input[0 ] =0x80000000 ;cpuid (input, regs); -if ( info.vendor ==X86_VENDOR_AMD ) +if ( info.vendor ==X86_VENDOR_AMD || info.vendor ==X86_VENDOR_HYGON ) ext_max = (regs[0 ] <=DEF_MAX_AMDEXT ) ? regs[0 ] :DEF_MAX_AMDEXT ;else ext_max = (regs[0 ] <=DEF_MAX_INTELEXT ) ? regs[0 ] :DEF_MAX_INTELEXT ;
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 15/15] tools/libxc: Add Hygon Dhyana support
Quoted 4 lines · Pu Wen
Add Hygon Dhyana support to caculate the cpuid policies for creating PV or HVM guest by using the code path of AMD.
Signed-off-by Pu Wen <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [PATCH v5 15/15] tools/libxc: Add Hygon Dhyana support
Quoted 7 lines · Wei Liu
Quoted 4 lines · Pu Wen
Add Hygon Dhyana support to caculate the cpuid policies for creating PV or HVM guest by using the code path of AMD.
Signed-off-by Pu Wen <[email protected]>Acked-by Wei Liu <[email protected]>
Thanks.
Signature · 7 lines
Regards, Pu Wen _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 3 lines · Pu Wen
This patch series have been applied and tested successfully on Hygon Dhyana processor, also been tested on AMD EPYC (family 17h) processor. It works fine and makes no harm to the existing code.
Hello,
Sorry for the delay.
I've rebased the patches over my CPUID work, and pushed the ones which still apply cleanly to staging. However, some don't apply cleanly any more, so I left those alone.
Please could you check the current staging build (and in particular, that I didn't accidentally break anything with the rebase), and rebase the remainder of the series onto staging.
Thanks,
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines · Andrew Cooper
I've rebased the patches over my CPUID work, and pushed the ones which still apply cleanly to staging. However, some don't apply cleanly any
Thanks a lot.
Quoted 4 lines
more, so I left those alone.
Please could you check the current staging build (and in particular, that I didn't accidentally break anything with the rebase), and rebase
Yes, the current staging build is OK and works on Hygon platform. I'll check the functionalities more carefully.
Quoted 1 line
the remainder of the series onto staging.
I'll do this later on.
--
Regards,
Pu Wen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 7 lines · Andrew Cooper
I've rebased the patches over my CPUID work, and pushed the ones which still apply cleanly to staging. However, some don't apply cleanly any more, so I left those alone.
Please could you check the current staging build (and in particular, that I didn't accidentally break anything with the rebase), and rebase the remainder of the series onto staging.
I rebased the patches x86/acpi and x86/pv over 0cd07414 "x86/cpu:
Renumber X86_VENDOR_* to form a bitmap", and sent them out with version v6. I dropped the patch x86/iommu for Hygon because it's no needed any more since the commit 1b3cc800 "x86/IOMMU: introduce init-ops structure" removed the vendor check.
I still hold Jan's Acked-by tags however the code is changed. Are the tags still valid?
Thx.
--
Regards,
Pu Wen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 9 lines · Pu Wen
Quoted 7 lines · Andrew Cooper
I've rebased the patches over my CPUID work, and pushed the ones which still apply cleanly to staging. However, some don't apply cleanly any more, so I left those alone.
Please could you check the current staging build (and in particular, that I didn't accidentally break anything with the rebase), and rebase the remainder of the series onto staging.
Quoted 8 lines
I rebased the patches x86/acpi and x86/pv over
0cd07414"x86/cpu:
Renumber X86_VENDOR_* to form a bitmap", and sent them out with version v6. I dropped the patch x86/iommu for Hygon because it's no needed any more since the commit1b3cc800"x86/IOMMU: introduce init-ops structure" removed the vendor check.I still hold Jan's Acked-by tags however the code is changed. Are the tags still valid?
Yes. The tags were still valid, because you're not fundamentally changing the patch from how it was before.
I've committed the patches now.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel