Add support for Hygon Dhyana Family 18h processor
Pu Wen
maintainerv3 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., and aims at providing high performance x86 processor for China server market.
The first generation Hygon's processor(Dhyana) originates from AMD technology and shares most of the architecture with AMD's family 17h, but with different CPU Vendor ID("HygonGenuine")/PCIE Device Vendor ID (0x1D94)/Family series number (Family 18h).
To enable the support of Linux kernel to Hygon's CPU, we added a new vendor type (X86_VENDOR_HYGON, with value of 9) in arch/x86/include/ asm/processor.h, and shared most of kernel support codes with AMD family 17h.
This patch series have been applied and tested successfully in Hygon's Dhyana SoC silicon. Also tested on AMD's EPYC (Family 17h) processor works fine and makes no harm to existing codes.
v2->v3:
- Rebased on 4.18-rc8 and tested against it.
- Rework vendor checking codes to improve consistency.
v1->v2:
- Rebased on 4.18-rc6 and tested against it.
- Split the patchset to small series of patches.
- Rework patch descriptions.
- Create a separated arch/x86/kernel/cpu/hygon.c for Dhyana CPU initialization to reduce long-term maintenance effort.
Pu Wen (17):
x86/cpu: create Dhyana init file and register new cpu_dev to system x86/cache: get cache size/leaves and setup cache cpumap for Dhyana x86/mtrr: get MTRR number and support TOP_MEM2 x86/smpboot: smp init nodelay and no flush caches before sleep x86/perfctr: return perf counter and event selection bit offset x86/nops: init ideal_nops for Hygon
x86/pci: add Hygon PCI vendor and northbridge support x86/apic: add modern APIC support for Hygon
x86/bugs: add lfence mitigation to spectre v2 and no meltdown for
Hygon
x86/events: enable Hygon support to PMU infrastructure x86/mce: enable Hygon support to MCE infrastructure x86/kvm: enable Hygon support to KVM infrastructure x86/xen: enable Hygon support to Xen
driver/acpi: enable Hygon support to ACPI driver driver/cpufreq: enable Hygon support to cpufreq driver driver/edac: enable Hygon support to AMD64 EDAC driver tools/cpupower: enable Hygon support to cpupower tool
MAINTAINERS | 6 + arch/x86/Kconfig | 2 +- arch/x86/Kconfig.cpu | 13 + arch/x86/events/amd/core.c | 6 + arch/x86/events/amd/uncore.c | 15 +- arch/x86/events/core.c | 4 + arch/x86/include/asm/cacheinfo.h | 1 + arch/x86/include/asm/kvm_emulate.h | 4 + arch/x86/include/asm/mce.h | 5 + arch/x86/include/asm/nospec-branch.h | 4 +- arch/x86/include/asm/processor.h | 3 +- arch/x86/include/asm/virtext.h | 5 +- arch/x86/kernel/alternative.c | 4 + arch/x86/kernel/amd_nb.c | 51 ++- arch/x86/kernel/apic/apic.c | 19 +- arch/x86/kernel/apic/probe_32.c | 1 + arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/bugs.c | 28 +- arch/x86/kernel/cpu/cacheinfo.c | 31 +- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/hygon.c | 404 +++++++++++++++++++++ arch/x86/kernel/cpu/mcheck/mce-severity.c | 3 +- arch/x86/kernel/cpu/mcheck/mce.c | 21 +- arch/x86/kernel/cpu/mtrr/cleanup.c | 3 +- arch/x86/kernel/cpu/mtrr/generic.c | 5 +- arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- arch/x86/kernel/cpu/perfctr-watchdog.c | 2 + arch/x86/kernel/smpboot.c | 6 +- arch/x86/kvm/emulate.c | 11 +- arch/x86/pci/amd_bus.c | 6 +- arch/x86/xen/pmu.c | 15 +- drivers/acpi/acpi_pad.c | 1 + drivers/acpi/processor_idle.c | 1 + drivers/cpufreq/acpi-cpufreq.c | 5 + drivers/cpufreq/amd_freq_sensitivity.c | 9 +- drivers/edac/amd64_edac.c | 45 ++- drivers/edac/amd64_edac.h | 5 + drivers/edac/mce_amd.c | 12 +- include/linux/pci_ids.h | 2 + tools/power/cpupower/utils/cpufreq-info.c | 6 +- tools/power/cpupower/utils/helpers/amd.c | 4 +- tools/power/cpupower/utils/helpers/cpuid.c | 8 +- tools/power/cpupower/utils/helpers/helpers.h | 2 +- tools/power/cpupower/utils/helpers/misc.c | 3 +- .../cpupower/utils/idle_monitor/mperf_monitor.c | 3 +- 46 files changed, 719 insertions(+), 70 deletions(-) create mode 100644 arch/x86/kernel/cpu/hygon.c
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 1/17 x86/cpu: create Dhyana init file and register new cpu_dev to system
Add x86 architecture support for new processor Hygon Dhyana Family 18h. Rework to create a separated file(arch/x86/kernel/cpu/hygon.c) from the AMD init one(arch/x86/kernel/cpu/amd.c) to initialize Dhyana CPU. In this way we can remove old AMD architecture support codes from Hygon code path and generate a clear initialization flow for Hygon processors. It also reduce long-term maintenance effort.
Also add Maintainer information for hygon.c in accordance.
To identify Hygon processors, add a new vendor type X86_VENDOR_HYGON(9) for system recognition.
To enable Hygon processor config, add a separated Kconfig entry (CPU_SUP_HYGON) for Dhyana CPU in kernel config setup.
--- MAINTAINERS | 6 + arch/x86/Kconfig.cpu | 13 ++ arch/x86/include/asm/processor.h | 3 +- arch/x86/kernel/cpu/Makefile | 1 + arch/x86/kernel/cpu/hygon.c | 401 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 423 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/cpu/hygon.c
MAINTAINERS +6 -0
@@ -6605,6 +6605,12 @@ S: Maintained F: mm/memory-failure.c F: mm/hwpoison-inject.c +HYGON PROCESSOR SUPPORT +M: Pu Wen <[email protected]> +L: [email protected] +S: Supported +F: arch/x86/kernel/cpu/hygon.c + Hyper-V CORE AND DRIVERS M: "K. Y. Srinivasan" <[email protected]> M: Haiyang Zhang <[email protected]>
arch/x86/Kconfig.cpu +13 -0
@@ -426,6 +426,19 @@ config CPU_SUP_AMD If unsure, say N. +config CPU_SUP_HYGON + default y + bool "Support Hygon processors" if PROCESSOR_SELECT + help + This enables detection, tunings and quirks for Hygon processors + + You need this enabled if you want your kernel to run on an + Hygon CPU. Disabling this option on other types of CPUs + makes the kernel a tiny bit smaller. Disabling it on an Hygon + CPU might render the kernel unbootable. + + If unsure, say N. + config CPU_SUP_CENTAUR default y bool "Support Centaur processors" if PROCESSOR_SELECT
arch/x86/include/asm/processor.h +2 -1
@@ -153,7 +153,8 @@ enum cpuid_regs_idx {#define X86_VENDOR_CENTAUR 5#define X86_VENDOR_TRANSMETA 7#define X86_VENDOR_NSC 8 -#define X86_VENDOR_NUM 9 +#define X86_VENDOR_HYGON 9 +#define X86_VENDOR_NUM 10#define X86_VENDOR_UNKNOWN 0xff
arch/x86/kernel/cpu/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o obj-$(CONFIG_CPU_SUP_INTEL) += intel.o intel_pconfig.o obj-$(CONFIG_CPU_SUP_AMD) += amd.o +obj-$(CONFIG_CPU_SUP_HYGON) += hygon.o obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
arch/x86/kernel/cpu/hygon.c new file +401 -0
401 lines not on this page · raw message
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 2/17 x86/cache: get cache size/leaves and setup cache cpumap for Dhyana
In reply to Pu WenHygon Dhyana processor has the topology extensions bit in CPUID. With this bit kernel can get the cache info. So add support in cpuid4_cache_lookup_regs() to get the correct cache size.
Dhyana also find num_cache_leaves via CPUID leaf 0x8000001d, so add Hygon support in find_num_cache_leaves().
Also add cacheinfo_hygon_init_llc_id() and init_hygon_cacheinfo() functions to initialize Dhyana cache info. Setup cache cpumap in the same way as AMD does.
--- arch/x86/include/asm/cacheinfo.h | 1 + arch/x86/kernel/cpu/cacheinfo.c | 31 +++++++++++++++++++++++++++++-- arch/x86/kernel/cpu/cpu.h | 1 + arch/x86/kernel/cpu/hygon.c | 3 +++ 4 files changed, 34 insertions(+), 2 deletions(-)
arch/x86/include/asm/cacheinfo.h +1 -0
@@ -3,5 +3,6 @@#define _ASM_X86_CACHEINFO_Hvoid cacheinfo_amd_init_llc_id (struct cpuinfo_x86 *c,int cpu,u8 node_id); +void cacheinfo_hygon_init_llc_id (struct cpuinfo_x86 *c,int cpu,u8 node_id);#endif /* _ASM_X86_CACHEINFO_H */
arch/x86/kernel/cpu/cacheinfo.c +29 -2
@@ -602,6 +602,10 @@ cpuid4_cache_lookup_regs(int index, struct _cpuid4_info_regs *this_leaf)else amd_cpuid4 (index, &eax, &ebx, &ecx);amd_init_l3_cache (this_leaf, index); + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { +cpuid_count (0x8000001d , index, &eax.full, + &ebx.full, &ecx.full, &edx); +amd_init_l3_cache (this_leaf, index); }else {cpuid_count (4 , index, &eax.full, &ebx.full, &ecx.full, &edx); }
@@ -625,7 +629,8 @@ static int find_num_cache_leaves(struct cpuinfo_x86 *c)union _cpuid4_leaf_eax cache_eax;int i =-1 ; -if (c->x86_vendor ==X86_VENDOR_AMD ) +if (c->x86_vendor ==X86_VENDOR_AMD || + c->x86_vendor ==X86_VENDOR_HYGON ) op =0x8000001d ;else op =4 ;
@@ -678,6 +683,22 @@ void cacheinfo_amd_init_llc_id(struct cpuinfo_x86 *c, int cpu, u8 node_id) } } +void cacheinfo_hygon_init_llc_id (struct cpuinfo_x86 *c,int cpu,u8 node_id) +{ +/* +* We may have multiple LLCs if L3 caches exist, so check if we +* have an L3 cache by looking at the L3 cache CPUID leaf. +*/ +if (!cpuid_edx (0x80000006 )) +return ; + +/* +* LLC is at the core complex level. +* Core complex ID is ApicId[3] for these processors. +*/ +per_cpu (cpu_llc_id, cpu) = c->apicid >>3 ; +} +void init_amd_cacheinfo (struct cpuinfo_x86 *c) {
@@ -691,6 +712,11 @@ void init_amd_cacheinfo(struct cpuinfo_x86 *c) } } +void init_hygon_cacheinfo (struct cpuinfo_x86 *c) +{ + num_cache_leaves =find_num_cache_leaves (c); +} +void init_intel_cacheinfo (struct cpuinfo_x86 *c) {/* Cache sizes */
@@ -913,7 +939,8 @@ static void __cache_cpumap_setup(unsigned int cpu, int index,int index_msb, i;struct cpuinfo_x86 *c = &cpu_data (cpu); -if (c->x86_vendor ==X86_VENDOR_AMD ) { +if (c->x86_vendor ==X86_VENDOR_AMD || + c->x86_vendor ==X86_VENDOR_HYGON ) {if (__cache_amd_cpumap_setup (cpu, index, base))return ; }
arch/x86/kernel/cpu/cpu.h +1 -0
@@ -53,6 +53,7 @@ extern u32 get_scattered_cpuid_leaf(unsigned int level, enum cpuid_regs_idx reg);extern void init_intel_cacheinfo (struct cpuinfo_x86 *c);extern void init_amd_cacheinfo (struct cpuinfo_x86 *c); +extern void init_hygon_cacheinfo (struct cpuinfo_x86 *c);extern void detect_num_cpu_cores (struct cpuinfo_x86 *c);extern int detect_extended_topology (struct cpuinfo_x86 *c);
arch/x86/kernel/cpu/hygon.c +3 -0
@@ -85,6 +85,7 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)if (!err) c->x86_coreid_bits =get_count_order (c->x86_max_cores); +cacheinfo_amd_init_llc_id (c, cpu, node_id); }else if (cpu_has (c,X86_FEATURE_NODEID_MSR )) {u64 value;
@@ -315,6 +316,8 @@ static void init_hygon(struct cpuinfo_x86 *c)srat_detect_node (c); } +init_hygon_cacheinfo (c); +set_cpu_cap (c,X86_FEATURE_K8 );if (cpu_has (c,X86_FEATURE_XMM2 )) {
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 3/17 x86/mtrr: get MTRR number and support TOP_MEM2
In reply to Pu WenHygon CPU have a special magic MSR way to force WB for memory >4GB, and also support TOP_MEM2. Therefore, it is necessary to add Hygon support in amd_special_default_mtrr().
The MtrrFixDramModEn bit on Hygon platform should also be set to 1 during BIOS initialization of the fixed MTRRs, then cleared to 0 for operation.
The number of variable MTRRs for Hygon is 2 as AMD's.
--- arch/x86/kernel/cpu/mtrr/cleanup.c | 3 ++- arch/x86/kernel/cpu/mtrr/generic.c | 5 +++-- arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/mtrr/cleanup.c +2 -1
@@ -831,7 +831,8 @@ int __init amd_special_default_mtrr(void) {u32 l, h; -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 0 ;if (boot_cpu_data.x86 <0xf )return 0 ;
arch/x86/kernel/cpu/mtrr/generic.c +3 -2
@@ -49,8 +49,9 @@ static inline void k8_check_syscfg_dram_mod_en(void) {u32 lo, hi; -if (!((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) && - (boot_cpu_data.x86 >=0x0f ))) +if (!((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && + boot_cpu_data.x86 >=0x0f ) || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ))return ;rdmsr (MSR_K8_SYSCFG , lo, hi);
arch/x86/kernel/cpu/mtrr/mtrr.c +1 -1
@@ -127,7 +127,7 @@ static void __init set_num_var_ranges(void)if (use_intel ())rdmsr (MSR_MTRRcap, config, dummy); -else if (is_cpu (AMD )) +else if (is_cpu (AMD ) ||is_cpu (HYGON )) config =2 ;else if (is_cpu (CYRIX ) ||is_cpu (CENTAUR )) config =8 ;
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 4/17 x86/smpboot: smp init nodelay and no flush caches before sleep
In reply to Pu WenDhyana use no delay in smp_quirk_init_udelay(), and return in mwait_play_dead() as AMD does.
--- arch/x86/kernel/smpboot.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/smpboot.c +4 -2
@@ -658,7 +658,8 @@ static void __init smp_quirk_init_udelay(void)/* if modern processor, use no delay */ if (((boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL ) && (boot_cpu_data.x86 ==6 )) || - ((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) && (boot_cpu_data.x86 >=0xF ))) { + ((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) && (boot_cpu_data.x86 >=0xF )) || + (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON )) { init_udelay =0 ;return ; }
@@ -1574,7 +1575,8 @@ static inline void mwait_play_dead(void)void *mwait_ptr;int i; -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 ;if (!this_cpu_has (X86_FEATURE_MWAIT ))return ;
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 5/17 x86/perfctr: return perf counter and event selection bit offset
In reply to Pu WenHygon Dhyana shares similar perfctr arch with AMD family 17h. It returns the bit offset of the performance counter register and the event selection register for Hygon CPU in the similar way as AMD does.
--- arch/x86/kernel/cpu/perfctr-watchdog.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kernel/cpu/perfctr-watchdog.c +2 -0
@@ -46,6 +46,7 @@ static inline unsigned int nmi_perfctr_msr_to_bit(unsigned int msr) {/* returns the bit offset of the performance counter register */ switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :if (msr >=MSR_F15H_PERF_CTR )return (msr -MSR_F15H_PERF_CTR ) >>1 ;
@@ -74,6 +75,7 @@ static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr) {/* returns the bit offset of the event selection register */ switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :if (msr >=MSR_F15H_PERF_CTL )return (msr -MSR_F15H_PERF_CTL ) >>1 ;
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 6/17 x86/nops: init ideal_nops for Hygon
In reply to Pu WenThe ideal_nops for Dhyana processors should be p6_nops.
--- arch/x86/kernel/alternative.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kernel/alternative.c +4 -0
@@ -222,6 +222,10 @@ void __init arch_init_ideal_nops(void) }break ; +case X86_VENDOR_HYGON : + ideal_nops = p6_nops; +return ; +case X86_VENDOR_AMD :if (boot_cpu_data.x86 >0xf ) { ideal_nops = p6_nops;
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 7/17 x86/pci: add Hygon PCI vendor and northbridge support
In reply to Pu WenAs Hygon register its PCI Vendor ID as a new one "0x1d94", so add a new definition PCI_VENDOR_ID_HYGON in include/linux/pci_ids.h.
Also Hygon PCI Device ID(0x1450/0x1463/0x1464) for Host bridge is added to amd_nb.c. And it need to define new arrays for Hygon:
hygon_root_ids[], hygon_nb_misc_ids[], hygon_nb_link_ids[].
To enable Hygon north bridge support, add new variable root_ids, and assign its value based on whether CPU vendor is AMD or Hygon. Modify the CONFIG_AMD_NB to depends on either AMD or Hygon.
Add Hygon support in amd_postcore_init(), early_root_info_init().
--- arch/x86/Kconfig | 2 +- arch/x86/kernel/amd_nb.c | 51 ++++++++++++++++++++++++++++++++++++++++++------ arch/x86/pci/amd_bus.c | 6 ++++-- include/linux/pci_ids.h | 2 ++ 4 files changed, 52 insertions(+), 9 deletions(-)
arch/x86/Kconfig +1 -1
@@ -2822,7 +2822,7 @@ endif # X86_32 config AMD_NB def_bool y - depends on CPU_SUP_AMD && PCI + depends on (CPU_SUP_AMD || CPU_SUP_HYGON) && PCI source "drivers/pcmcia/Kconfig"
arch/x86/kernel/amd_nb.c +45 -6
96 lines not on this page · raw message
arch/x86/pci/amd_bus.c +4 -2
@@ -93,7 +93,8 @@ static int __init early_root_info_init(void) vendor = id &0xffff ; device = (id>>16 ) &0xffff ; -if (vendor !=PCI_VENDOR_ID_AMD ) +if (vendor !=PCI_VENDOR_ID_AMD && + vendor !=PCI_VENDOR_ID_HYGON )continue ;if (hb_probes[i].device == device) {
@@ -390,7 +391,8 @@ static int __init pci_io_ecs_init(void)static int __init amd_postcore_init (void ) { -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 0 ;early_root_info_init ();
include/linux/pci_ids.h +2 -0
@@ -511,6 +511,8 @@#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060 +#define PCI_VENDOR_ID_HYGON 0x1d94 +#define PCI_VENDOR_ID_AMD 0x1022#define PCI_DEVICE_ID_AMD_K8_NB 0x1100#define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101
Signature · 1 line
2.7.4
Re: [PATCH v3 07/17] x86/pci: add Hygon PCI vendor and northbridge support
Quoted 26 lines · Pu Wen
As Hygon register its PCI Vendor ID as a new one "
0x1d94", so add a new definitionPCI_VENDOR_ID_HYGONininclude/linux/pci_ids.h.Also Hygon PCI Device ID(0x1450/0x1463/0x1464) for Host bridge is added to
amd_nb.c. And it need to define new arrays for Hygon:
hygon_root_ids[], hygon_nb_misc_ids[], hygon_nb_link_ids[].To enable Hygon north bridge support, add new variable
root_ids, and assign its value based on whether CPU vendor is AMD or Hygon. Modify theCONFIG_AMD_NBto depends on either AMD or Hygon.Add Hygon support in
amd_postcore_init(),early_root_info_init().Signed-off-by Pu Wen <[email protected]>--- arch/x86/Kconfig | 2 +- arch/x86/kernel/amd_nb.c | 51 ++++++++++++++++++++++++++++++++++++++++++------ arch/x86/pci/amd_bus.c | 6 ++++-- include/linux/pci_ids.h | 2 ++ 4 files changed, 52 insertions(+), 9 deletions(-)include/linux/pci_ids.h +0
-0
include/linux/pci_ids.h line 514
Quoted 4 lines
include/linux/pci_ids.h +1
-0@@ -511,6 +511,8 @@#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060 +#define PCI_VENDOR_ID_HYGON 0x1d94
Please add this entry so pci_ids.h remains sorted by Vendor ID, then Device ID, as the comment at the top suggests.
With that changed,
Quoted 6 lines
include/linux/pci_ids.h +0
-0#define PCI_VENDOR_ID_AMD 0x1022#define PCI_DEVICE_ID_AMD_K8_NB 0x1100#define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101Signature · 1 line
2.7.4
Pu Wen
maintainerRe: [PATCH v3 07/17] x86/pci: add Hygon PCI vendor and northbridge support
Quoted 9 lines · Bjorn Helgaas
Quoted 8 lines · Pu Wen
include/linux/pci_ids.h +0
-0@@ -511,6 +511,8 @@#define PCI_DEVICE_ID_AMI_MEGARAID 0x9010#define PCI_DEVICE_ID_AMI_MEGARAID2 0x9060
Quoted 4 lines
include/linux/pci_ids.h line 514
Quoted 1 line
include/linux/pci_ids.h +1
-0+#define PCI_VENDOR_ID_HYGON 0x1d94Please add this entry so
pci_ids.hremains sorted by Vendor ID, then Device ID, as the comment at the top suggests.
Thanks for the suggestion. Will place PCI_VENDOR_ID_HYGON between PCI_VENDOR_ID_AMAZON(0x1d0f) and PCI_VENDOR_ID_TEKRAM(0x1de1) in next patch set.
Pu Wen
Quoted 11 lines
With that changed,
Quoted 6 lines
include/linux/pci_ids.h +0
-0#define PCI_VENDOR_ID_AMD 0x1022#define PCI_DEVICE_ID_AMD_K8_NB 0x1100#define PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP 0x1101Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 8/17 x86/apic: add modern APIC support for Hygon
In reply to Pu WenHygon processors use modern APIC, so just return in modern_apic() and sync_Arb_IDs(). And should break in switch case in detect_init_API().
When running on 32 bit mode, should set bigsmp if there are more than 8 cores.
--- arch/x86/kernel/apic/apic.c | 19 ++++++++++++++----- arch/x86/kernel/apic/probe_32.c | 1 + 2 files changed, 15 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/apic.c +14 -5
@@ -219,10 +219,15 @@ static inline int lapic_is_integrated(void)*/ static int modern_apic (void ) { -/* AMD systems use old APIC versions, so check the CPU */ -if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && - boot_cpu_data.x86 >=0xf ) +/* +* Old AMD systems use old APIC versions, newer AMD systems +* and Hygon systems use modern APIC, so check the CPU +*/ +if ((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && + boot_cpu_data.x86 >=0xf ) || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON )return 1 ; +return lapic_get_version () >=0x14 ; }
@@ -1210,9 +1215,11 @@ void __init sync_Arb_IDs(void) {/* * Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 And not -* needed on AMD. +* needed on AMD or Hygon. */ -if (modern_apic () || boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) +if (modern_apic () || + boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON )return ;/*
@@ -1911,6 +1918,8 @@ static int __init detect_init_APIC(void) (boot_cpu_data.x86 >= 15))break ; goto no_apic; +case X86_VENDOR_HYGON : +break ;case X86_VENDOR_INTEL :if (boot_cpu_data.x86 ==6 || boot_cpu_data.x86 ==15 || (boot_cpu_data.x86 ==5 &&boot_cpu_has (X86_FEATURE_APIC )))
arch/x86/kernel/apic/probe_32.c +1 -0
@@ -185,6 +185,7 @@ void __init default_setup_apic_routing(void)break ; }/* If P4 and above fall through */ +case X86_VENDOR_HYGON :case X86_VENDOR_AMD : def_to_bigsmp =1 ; }
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 9/17 x86/bugs: add lfence mitigation to spectre v2 and no meltdown for Hygon
In reply to Pu WenTo share codes between AMD and Hygon to mitigate Spectre V2 Retpoline vulnerability, rename macros SPECTRE_V2_RETPOLINE_MINIMAL_AMD to SPECTRE_V2_RETPOLINE_MINIMAL_LFENCE, and SPECTRE_V2_CMD_RETPOLINE_AMD to SPECTRE_V2_CMD_RETPOLINE_LFENCE.
As Hygon processors are not affected by meltdown vulnerability as AMD's, so add exception in array cpu_no_meltdown[] for Hygon.
--- arch/x86/include/asm/nospec-branch.h | 4 ++-- arch/x86/kernel/cpu/bugs.c | 28 +++++++++++++++------------- arch/x86/kernel/cpu/common.c | 1 + 3 files changed, 18 insertions(+), 15 deletions(-)
arch/x86/include/asm/nospec-branch.h +2 -2
@@ -211,9 +211,9 @@enum spectre_v2_mitigation {SPECTRE_V2_NONE ,SPECTRE_V2_RETPOLINE_MINIMAL , -SPECTRE_V2_RETPOLINE_MINIMAL_AMD , +SPECTRE_V2_RETPOLINE_MINIMAL_LFENCE ,SPECTRE_V2_RETPOLINE_GENERIC , -SPECTRE_V2_RETPOLINE_AMD , +SPECTRE_V2_RETPOLINE_LFENCE ,SPECTRE_V2_IBRS , };
arch/x86/kernel/cpu/bugs.c +15 -13
@@ -121,15 +121,15 @@ enum spectre_v2_mitigation_cmd {SPECTRE_V2_CMD_FORCE ,SPECTRE_V2_CMD_RETPOLINE ,SPECTRE_V2_CMD_RETPOLINE_GENERIC , - SPECTRE_V2_CMD_RETPOLINE_AMD, + SPECTRE_V2_CMD_RETPOLINE_LFENCE, };static const char *spectre_v2_strings[] = { [SPECTRE_V2_NONE ] ="Vulnerable" , [SPECTRE_V2_RETPOLINE_MINIMAL ] ="Vulnerable: Minimal generic ASM retpoline" , - [SPECTRE_V2_RETPOLINE_MINIMAL_AMD ] ="Vulnerable: Minimal AMD ASM retpoline" , + [SPECTRE_V2_RETPOLINE_MINIMAL_LFENCE ] ="Vulnerable: Minimal LFENCE ASM retpoline" , [SPECTRE_V2_RETPOLINE_GENERIC ] ="Mitigation: Full generic retpoline" , - [SPECTRE_V2_RETPOLINE_AMD ] ="Mitigation: Full AMD retpoline" , + [SPECTRE_V2_RETPOLINE_LFENCE ] ="Mitigation: Full LFENCE retpoline" , };#undef pr_fmt
@@ -260,7 +260,7 @@ static const struct { { "off", SPECTRE_V2_CMD_NONE, false }, { "on", SPECTRE_V2_CMD_FORCE, true }, { "retpoline", SPECTRE_V2_CMD_RETPOLINE, false }, - { "retpoline,amd", SPECTRE_V2_CMD_RETPOLINE_AMD, false }, + { "retpoline,lfence", SPECTRE_V2_CMD_RETPOLINE_LFENCE, false }, { "retpoline,generic", SPECTRE_V2_CMD_RETPOLINE_GENERIC, false }, { "auto", SPECTRE_V2_CMD_AUTO, false }, };
@@ -292,16 +292,17 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) }if ((cmd ==SPECTRE_V2_CMD_RETPOLINE || - cmd ==SPECTRE_V2_CMD_RETPOLINE_AMD || + cmd ==SPECTRE_V2_CMD_RETPOLINE_LFENCE || cmd ==SPECTRE_V2_CMD_RETPOLINE_GENERIC ) && !IS_ENABLED (CONFIG_RETPOLINE )) {pr_err ("%s selected but not compiled in. Switching to AUTO select\n" , mitigation_options[i].option);return SPECTRE_V2_CMD_AUTO ; } -if (cmd ==SPECTRE_V2_CMD_RETPOLINE_AMD && +if (cmd ==SPECTRE_V2_CMD_RETPOLINE_LFENCE && + boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON && boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) { -pr_err ("retpoline,amd selected but CPU is not AMD. Switching to AUTO select\n" ); +pr_err ("retpoline,lfence selected but CPU is not AMD or Hygon. Switching to AUTO select\n" );return SPECTRE_V2_CMD_AUTO ; }
@@ -352,9 +353,9 @@ static void __init spectre_v2_select_mitigation(void)if (IS_ENABLED (CONFIG_RETPOLINE )) goto retpoline_auto;break ; -case SPECTRE_V2_CMD_RETPOLINE_AMD : +case SPECTRE_V2_CMD_RETPOLINE_LFENCE :if (IS_ENABLED (CONFIG_RETPOLINE )) - goto retpoline_amd; + goto retpoline_lfence;break ;case SPECTRE_V2_CMD_RETPOLINE_GENERIC :if (IS_ENABLED (CONFIG_RETPOLINE ))
@@ -369,14 +370,15 @@ static void __init spectre_v2_select_mitigation(void)return ; retpoline_auto: -if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) { - retpoline_amd: +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + retpoline_lfence:if (!boot_cpu_has (X86_FEATURE_LFENCE_RDTSC )) {pr_err ("Spectre mitigation: LFENCE not serializing, switching to generic retpoline\n" ); goto retpoline_generic; } - mode =retp_compiler () ?SPECTRE_V2_RETPOLINE_AMD : -SPECTRE_V2_RETPOLINE_MINIMAL_AMD ; + mode =retp_compiler () ?SPECTRE_V2_RETPOLINE_LFENCE : +SPECTRE_V2_RETPOLINE_MINIMAL_LFENCE ;setup_force_cpu_cap (X86_FEATURE_RETPOLINE_AMD );setup_force_cpu_cap (X86_FEATURE_RETPOLINE ); }else {
arch/x86/kernel/cpu/common.c +1 -0
@@ -968,6 +968,7 @@ static const __initconst struct x86_cpu_id cpu_no_speculation[] = {static const __initconst struct x86_cpu_id cpu_no_meltdown[] = { {X86_VENDOR_AMD }, + {X86_VENDOR_HYGON }, {} };
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 10/17 x86/events: enable Hygon support to PMU infrastructure
In reply to Pu WenHygon PMU arch is similar to AMD Family 17h. To support Hygon PMU, the initialization flow for it just call amd_pmu_init() and change PMU name to "HYGON". To share AMD's flow, add code check for Hygon family ID 18h to run the code path of AMD family 17h in core/uncore functions.
--- arch/x86/events/amd/core.c | 6 ++++++ arch/x86/events/amd/uncore.c | 15 ++++++++++----- arch/x86/events/core.c | 4 ++++ 3 files changed, 20 insertions(+), 5 deletions(-)
arch/x86/events/amd/core.c +6 -0
@@ -669,6 +669,12 @@ static int __init amd_core_pmu_init(void)* We fallback to using default amd_get_event_constraints. */ break ; +case 0x18 : +if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { +pr_cont ("Fam18h " ); +/* Using default amd_get_event_constraints. */ +break ; + }default :pr_err ("core perfctr but no constraints; unknown hardware!\n" );return -ENODEV ;
arch/x86/events/amd/uncore.c +10 -5
@@ -507,17 +507,22 @@ static int __init amd_uncore_init(void) {int ret = -ENODEV ; -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 -ENODEV ;if (!boot_cpu_has (X86_FEATURE_TOPOEXT ))return -ENODEV ; -if (boot_cpu_data.x86 ==0x17 ) { +if ((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD && + boot_cpu_data.x86 ==0x17 ) || + (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON && + boot_cpu_data.x86 ==0x18 )) {/* -* For F17h, the Northbridge counters are repurposed as Data -* Fabric counters. Also, L3 counters are supported too. The PMUs -* are exported based on family as either L2 or L3 and NB or DF. +* For AMD F17h or Hygon F18h, the Northbridge counters are +* repurposed as DataFabric counters. Also, L3 counters +* are supported too. The PMUs are exported based on +* family as either L2 or L3 and NB or DF. */ num_counters_nb =NUM_COUNTERS_NB ; num_counters_llc =NUM_COUNTERS_L3 ;
arch/x86/events/core.c +4 -0
@@ -1776,6 +1776,10 @@ static int __init init_hw_perf_events(void)case X86_VENDOR_AMD : err =amd_pmu_init ();break ; +case X86_VENDOR_HYGON : + err =amd_pmu_init (); + x86_pmu.name ="HYGON" ; +break ;default : err = -ENOTSUPP ; }
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 11/17 x86/mce: enable Hygon support to MCE infrastructure
In reply to Pu WenHygon machine check arch is similar to AMD family 17h. To enable the MCE infrastructure support, add CPU vendor check for Hygon to share the code path of AMD.
Add hygon mce init function mce_hygon_feature_init() to minimize further maintenance effort.
--- arch/x86/include/asm/mce.h | 5 +++++ arch/x86/kernel/cpu/mcheck/mce-severity.c | 3 ++- arch/x86/kernel/cpu/mcheck/mce.c | 21 +++++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-)
arch/x86/include/asm/mce.h +5 -0
@@ -213,6 +213,11 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { }static inline int umc_normaddr_to_sysaddr (u64 norm_addr,u16 nid,u8 umc,u64 *sys_addr) {return -EINVAL ; };#endif +static inline void mce_hygon_feature_init (struct cpuinfo_x86 *c) +{ +return mce_amd_feature_init (c); +} +int mce_available (struct cpuinfo_x86 *c);bool mce_is_memory_error (struct mce *m);
arch/x86/kernel/cpu/mcheck/mce-severity.c +2 -1
@@ -336,7 +336,8 @@ int (*mce_severity)(struct mce *m, int tolerant, char **msg, bool is_excp) =void __init mcheck_vendor_init_severity (void ) { -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 ) mce_severity = mce_severity_amd; }
arch/x86/kernel/cpu/mcheck/mce.c +15 -6
@@ -274,7 +274,8 @@ static void print_mce(struct mce *m) {__print_mce (m); -if (m->cpuvendor !=X86_VENDOR_AMD ) +if (m->cpuvendor !=X86_VENDOR_AMD && + m->cpuvendor !=X86_VENDOR_HYGON )pr_emerg_ratelimited (HW_ERR "Run the above through 'mcelog --ascii'\n" ); }
@@ -512,9 +513,9 @@ static int mce_usable_address(struct mce *m)bool mce_is_memory_error (struct mce *m) { -if (m->cpuvendor ==X86_VENDOR_AMD ) { +if (m->cpuvendor ==X86_VENDOR_AMD || + m->cpuvendor ==X86_VENDOR_HYGON ) {return amd_mce_is_memory_error (m); - }else if (m->cpuvendor ==X86_VENDOR_INTEL ) {/* * Intel SDM Volume 3B - 15.9.2 Compound Error Codes
@@ -540,7 +541,9 @@ EXPORT_SYMBOL_GPL(mce_is_memory_error);static bool mce_is_correctable (struct mce *m) { -if (m->cpuvendor ==X86_VENDOR_AMD && m->status &MCI_STATUS_DEFERRED ) +if ((m->cpuvendor ==X86_VENDOR_AMD || + m->cpuvendor ==X86_VENDOR_HYGON ) && + (m->status &MCI_STATUS_DEFERRED ))return false;if (m->status &MCI_STATUS_UC )
@@ -1725,7 +1728,8 @@ static int __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)*/ static void __mcheck_cpu_init_early (struct cpuinfo_x86 *c) { -if (c->x86_vendor ==X86_VENDOR_AMD ) { +if (c->x86_vendor ==X86_VENDOR_AMD || + c->x86_vendor ==X86_VENDOR_HYGON ) { mce_flags.overflow_recov = !!cpu_has (c,X86_FEATURE_OVERFLOW_RECOV ); mce_flags.succor = !!cpu_has (c,X86_FEATURE_SUCCOR ); mce_flags.smca = !!cpu_has (c,X86_FEATURE_SMCA );
@@ -1766,6 +1770,9 @@ static void __mcheck_cpu_init_vendor(struct cpuinfo_x86 *c)mce_amd_feature_init (c);break ; } +case X86_VENDOR_HYGON : +mce_hygon_feature_init (c); +break ;case X86_VENDOR_CENTAUR :mce_centaur_feature_init (c);break ;
@@ -1991,12 +1998,14 @@ static void mce_disable_error_reporting(void)static void vendor_disable_error_reporting (void ) {/* -* Don't clear on Intel or AMD CPUs. Some of these MSRs are socket-wide. +* Don't clear on Intel or AMD or Hygon CPUs. Some of these MSRs +* are socket-wide. * Disabling them for just a single offlined CPU is bad, since it will * inhibit reporting for all shared resources on the socket like the * last level cache (LLC), the integrated memory controller (iMC), etc. */ if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL || + boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON || boot_cpu_data.x86_vendor ==X86_VENDOR_AMD )return ;
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 12/17 x86/kvm: enable Hygon support to KVM infrastructure
In reply to Pu WenHygon Dhyana CPU has the SVM feature as AMD family 17h does. Add Hygon support in the KVM infrastructure.
--- arch/x86/include/asm/kvm_emulate.h | 4 ++++ arch/x86/include/asm/virtext.h | 5 +++-- arch/x86/kvm/emulate.c | 11 ++++++++++- 3 files changed, 17 insertions(+), 3 deletions(-)
arch/x86/include/asm/kvm_emulate.h +4 -0
@@ -364,6 +364,10 @@ struct x86_emulate_ctxt {#define X86EMUL_CPUID_VENDOR_AMDisbetterI_ecx 0x21726574#define X86EMUL_CPUID_VENDOR_AMDisbetterI_edx 0x74656273 +#define X86EMUL_CPUID_VENDOR_HygonGenuine_ebx 0x6f677948 +#define X86EMUL_CPUID_VENDOR_HygonGenuine_ecx 0x656e6975 +#define X86EMUL_CPUID_VENDOR_HygonGenuine_edx 0x6e65476e +#define X86EMUL_CPUID_VENDOR_GenuineIntel_ebx 0x756e6547#define X86EMUL_CPUID_VENDOR_GenuineIntel_ecx 0x6c65746e#define X86EMUL_CPUID_VENDOR_GenuineIntel_edx 0x49656e69
arch/x86/include/asm/virtext.h +3 -2
@@ -83,9 +83,10 @@ static inline void cpu_emergency_vmxoff(void)*/ static inline int cpu_has_svm (const char **msg) { -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 ) {if (msg) - *msg ="not amd" ; + *msg ="not amd or hygon" ;return 0 ; }
arch/x86/kvm/emulate.c +10 -1
@@ -2711,7 +2711,16 @@ static bool em_syscall_is_enabled(struct x86_emulate_ctxt *ctxt) edx == X86EMUL_CPUID_VENDOR_AMDisbetterI_edx)return true; -/* default: (not Intel, not AMD), apply Intel's stricter rules... */ +/* Hygon ("HygonGenuine") */ +if (ebx == X86EMUL_CPUID_VENDOR_HygonGenuine_ebx && + ecx == X86EMUL_CPUID_VENDOR_HygonGenuine_ecx && + edx == X86EMUL_CPUID_VENDOR_HygonGenuine_edx) +return true; + +/* +* default: (not Intel, not AMD, not Hygon), apply Intel's +* stricter rules... +*/ return false; }
Signature · 1 line
2.7.4
Pu Wen
maintainerPATCH v3 13/17 x86/xen: enable Hygon support to Xen
In reply to Pu WenTo make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/x86/xen/pmu.c +12 -3
@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ; + amd_counters_base =MSR_K7_PERFCTR0 ; + amd_ctrls_base =MSR_K7_EVNTSEL0 ; + amd_msr_step =1 ; + k7_counters_mirrored =0 ; }else {uint32_t eax, ebx, ecx, edx;
@@ -285,7 +291,8 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read)bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err) { -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 ) {if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, val,1 )) *val =native_read_msr_safe (msr, err);
@@ -308,7 +315,8 @@ bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err) {uint64_t val = ((uint64_t )high <<32 ) | low; -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 ) {if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, &val,0 )) *err =native_write_msr_safe (msr, low, high);
@@ -379,7 +387,8 @@ static unsigned long long xen_intel_read_pmc(int counter)unsigned long long xen_read_pmc (int counter) { -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 xen_amd_read_pmc (counter);else return xen_intel_read_pmc (counter);
Signature · 1 line
2.7.4
Boris Ostrovsky
reviewerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
Quoted 13 lines · Pu Wen
To make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
Signed-off-by Pu Wen <[email protected]>--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)arch/x86/xen/pmu.c +0
-0
arch/x86/xen/pmu.c static void xen_pmu_arch_init(void) · line 94
Quoted 5 lines
arch/x86/xen/pmu.c +2
-0@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ;
I haven't looked in details at Zen's PMU but the PMC section in the spec starts with
"There are six core performance events counters per thread..."
Quoted 8 lines
arch/x86/xen/pmu.c +4
-0+ amd_counters_base =MSR_K7_PERFCTR0 ; + amd_ctrls_base =MSR_K7_EVNTSEL0 ; + amd_msr_step =1 ; + k7_counters_mirrored =0 ; }else {uint32_t eax, ebx, ecx, edx;
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 6 lines
arch/x86/xen/pmu.c +2
-1@@ -285,7 +291,8 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read)bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err) { -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 ) {
'if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)' please.
-boris
Quoted 14 lines
arch/x86/xen/pmu.c +2
-1if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, val,1 )) *val =native_read_msr_safe (msr, err);@@ -308,7 +315,8 @@ bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err) {uint64_t val = ((uint64_t )high <<32 ) | low; -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 ) {if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, &val,0 )) *err =native_write_msr_safe (msr, low, high);
arch/x86/xen/pmu.c static unsigned long long xen_intel_read_pmc(int counter) · line 394
Quoted 9 lines
arch/x86/xen/pmu.c +2
-1@@ -379,7 +387,8 @@ static unsigned long long xen_intel_read_pmc(int counter)unsigned long long xen_read_pmc (int counter) { -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 xen_amd_read_pmc (counter);else return xen_intel_read_pmc (counter);
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Boris Ostrovsky
reviewerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Pu WenQuoted 13 lines · Pu Wen
To make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
Signed-off-by Pu Wen <[email protected]>--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)arch/x86/xen/pmu.c +0
-0
arch/x86/xen/pmu.c static void xen_pmu_arch_init(void) · line 94
Quoted 5 lines
arch/x86/xen/pmu.c +2
-0@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ;
I haven't looked in details at Zen's PMU but the PMC section in the spec starts with
"There are six core performance events counters per thread..."
Quoted 8 lines
arch/x86/xen/pmu.c +4
-0+ amd_counters_base =MSR_K7_PERFCTR0 ; + amd_ctrls_base =MSR_K7_EVNTSEL0 ; + amd_msr_step =1 ; + k7_counters_mirrored =0 ; }else {uint32_t eax, ebx, ecx, edx;
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 6 lines
arch/x86/xen/pmu.c +2
-1@@ -285,7 +291,8 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read)bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err) { -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 ) {
'if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)' please.
-boris
Quoted 23 lines
arch/x86/xen/pmu.c +4
-2if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, val,1 )) *val =native_read_msr_safe (msr, err);@@ -308,7 +315,8 @@ bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err) {uint64_t val = ((uint64_t )high <<32 ) | low; -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 ) {if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, &val,0 )) *err =native_write_msr_safe (msr, low, high);@@ -379,7 +387,8 @@ static unsigned long long xen_intel_read_pmc(int counter)unsigned long long xen_read_pmc (int counter) { -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 xen_amd_read_pmc (counter);else return xen_intel_read_pmc (counter);
Juergen Gross
maintainerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
Quoted 35 lines · Boris Ostrovsky
Quoted 13 lines · Pu Wen
To make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
Signed-off-by Pu Wen <[email protected]>--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)arch/x86/xen/pmu.c +0
-0arch/x86/xen/pmu.c static void xen_pmu_arch_init(void) · line 94
Quoted 5 lines
arch/x86/xen/pmu.c +2
-0@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ;I haven't looked in details at Zen's PMU but the PMC section in the spec starts with
"There are six core performance events counters per thread..."Quoted 9 lines
arch/x86/xen/pmu.c +4
-0+ amd_counters_base =MSR_K7_PERFCTR0 ; + amd_ctrls_base =MSR_K7_EVNTSEL0 ; + amd_msr_step =1 ; + k7_counters_mirrored =0 ; }else {uint32_t eax, ebx, ecx, edx;@@ -285,7 +291,8 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read)
Quoted 8 lines
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 5 lines
arch/x86/xen/pmu.c +2
-1bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err) { -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 ) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.
Really? Xen supports Centaur, too.
Juergen
Boris Ostrovsky
reviewerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
Quoted 4 lines · Juergen Gross
Quoted 3 lines · Boris Ostrovsky
Quoted 1 line · Pu Wen
Quoted 8 lines
Quoted 7 lines
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 5 lines
bool
pmu_msr_read(unsigned int msr, uint64_t *val, int *err){arch/x86/xen/pmu.c +2
-1-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 ) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.Really? Xen supports Centaur, too.
VPMU doesn't --- hypervisor will not initialize it. Besides, the existing code will steer non-AMD execution to Intel, which is not right either.
I'll add a check to bail if VPMU is not initialized properly, we seem to ignore xen_pmu_init() failures. Which, BTW, makes this patch rather pointless until there is support for Hygon Xen.
-boris
Pu Wen
maintainerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
Quoted 12 lines · Boris Ostrovsky
Quoted 10 lines · Juergen Gross
Quoted 8 lines · Boris Ostrovsky
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 5 lines · Pu Wen
bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err) {arch/x86/xen/pmu.c +2
-1-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 ) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.Really? Xen supports Centaur, too.
Quoted 7 lines
VPMU doesn't --- hypervisor will not initialize it. Besides, the existing code will steer non-AMD execution to Intel, which is not right either.
I'll add a check to bail if VPMU is not initialized properly, we seem to ignore
xen_pmu_init()failures. Which, BTW, makes this patch rather pointless until there is support for Hygon Xen.
So should it still need to test vendor Hygon here or wait for your check done?
Thanks,
Pu Wen
Boris Ostrovsky
reviewerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
Quoted 17 lines · Pu Wen
Quoted 16 lines · Boris Ostrovsky
Quoted 10 lines · Juergen Gross
Quoted 8 lines · Boris Ostrovsky
Quoted 5 lines · Pu Wen
bool
pmu_msr_read(unsigned int msr, uint64_t *val, int *err){
- 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) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.Really? Xen supports Centaur, too.
VPMU doesn't --- hypervisor will not initialize it. Besides, the existing code will steer non-AMD execution to Intel, which is not right either.
Quoted 6 lines
Quoted 3 lines
I'll add a check to bail if VPMU is not initialized properly, we seem to ignore
xen_pmu_init()failures. Which, BTW, makes this patch rather pointless until there is support for Hygon Xen.So should it still need to test vendor Hygon here or wait for your check done?
I'd prefer checking for !Intel, as I suggested above. Centaur will fail either way, but because we use safe versions of MSR access I now think we don't need any extra checks for xen_pmu_init() result.
-boris
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Boris Ostrovsky
reviewerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Pu WenQuoted 17 lines · Pu Wen
Quoted 16 lines · Boris Ostrovsky
Quoted 10 lines · Juergen Gross
Quoted 8 lines · Boris Ostrovsky
Quoted 5 lines · Pu Wen
bool
pmu_msr_read(unsigned int msr, uint64_t *val, int *err){
- 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) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.Really? Xen supports Centaur, too.
VPMU doesn't --- hypervisor will not initialize it. Besides, the existing code will steer non-AMD execution to Intel, which is not right either.
Quoted 6 lines
Quoted 3 lines
I'll add a check to bail if VPMU is not initialized properly, we seem to ignore
xen_pmu_init()failures. Which, BTW, makes this patch rather pointless until there is support for Hygon Xen.So should it still need to test vendor Hygon here or wait for your check done?
I'd prefer checking for !Intel, as I suggested above. Centaur will fail either way, but because we use safe versions of MSR access I now think we don't need any extra checks for xen_pmu_init() result.
-boris
Pu Wen
maintainerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Boris OstrovskyQuoted 12 lines · Boris Ostrovsky
Quoted 10 lines · Juergen Gross
Quoted 8 lines · Boris Ostrovsky
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 5 lines · Pu Wen
bool pmu_msr_read(unsigned int msr, uint64_t *val, int *err) {arch/x86/xen/pmu.c +2
-1-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 ) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.Really? Xen supports Centaur, too.
Quoted 7 lines
VPMU doesn't --- hypervisor will not initialize it. Besides, the existing code will steer non-AMD execution to Intel, which is not right either.
I'll add a check to bail if VPMU is not initialized properly, we seem to ignore
xen_pmu_init()failures. Which, BTW, makes this patch rather pointless until there is support for Hygon Xen.
So should it still need to test vendor Hygon here or wait for your check done?
Thanks,
Pu Wen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Boris Ostrovsky
reviewerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Juergen GrossQuoted 4 lines · Juergen Gross
Quoted 3 lines · Boris Ostrovsky
Quoted 1 line · Pu Wen
Quoted 8 lines
Quoted 7 lines
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 5 lines
bool
pmu_msr_read(unsigned int msr, uint64_t *val, int *err){arch/x86/xen/pmu.c +2
-1-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 ) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.Really? Xen supports Centaur, too.
VPMU doesn't --- hypervisor will not initialize it. Besides, the existing code will steer non-AMD execution to Intel, which is not right either.
I'll add a check to bail if VPMU is not initialized properly, we seem to ignore xen_pmu_init() failures. Which, BTW, makes this patch rather pointless until there is support for Hygon Xen.
-boris
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Juergen Gross
maintainerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Boris OstrovskyQuoted 35 lines · Boris Ostrovsky
Quoted 13 lines · Pu Wen
To make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
Signed-off-by Pu Wen <[email protected]>--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)arch/x86/xen/pmu.c +0
-0arch/x86/xen/pmu.c static void xen_pmu_arch_init(void) · line 94
Quoted 5 lines
arch/x86/xen/pmu.c +2
-0@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ;I haven't looked in details at Zen's PMU but the PMC section in the spec starts with
"There are six core performance events counters per thread..."Quoted 9 lines
arch/x86/xen/pmu.c +4
-0+ amd_counters_base =MSR_K7_PERFCTR0 ; + amd_ctrls_base =MSR_K7_EVNTSEL0 ; + amd_msr_step =1 ; + k7_counters_mirrored =0 ; }else {uint32_t eax, ebx, ecx, edx;@@ -285,7 +291,8 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read)
Quoted 8 lines
arch/x86/xen/pmu.c static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read) · line 295
Quoted 5 lines
arch/x86/xen/pmu.c +2
-1bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err) { -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 ) {'if (boot_cpu_data.x86_vendor !=
X86_VENDOR_INTEL)' please.
Really? Xen supports Centaur, too.
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Pu Wen
maintainerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Boris OstrovskyQuoted 9 lines · Boris Ostrovsky
Quoted 8 lines · Pu Wen
To make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
Signed-off-by Pu Wen <[email protected]>--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
Quoted 14 lines
arch/x86/xen/pmu.c static void xen_pmu_arch_init(void) · line 94
Quoted 10 lines
arch/x86/xen/pmu.c +2
-0@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ;I haven't looked in details at Zen's PMU but the PMC section in the spec starts with
"There are six core performance events counters per thread..."
There are six core performance events counters per thread, so there are six MSRs for these counters(0-5). Also there are four legacy PMC MSRs, they are alias of the counters(0-3).
In this version of kernel Zen use the lagacy version of PMU MSRs for Xen. For safety consideration, Dhyana just fullow this stategy. And it works fine when VPMU enabled in Xen on Hygon platforms by testing with perf.
Thanks,
Pu Wen
Pu Wen
maintainerRe: [PATCH v3 13/17] x86/xen: enable Hygon support to Xen
In reply to Boris OstrovskyQuoted 9 lines · Boris Ostrovsky
Quoted 8 lines · Pu Wen
To make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
Signed-off-by Pu Wen <[email protected]>--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
Quoted 14 lines
arch/x86/xen/pmu.c static void xen_pmu_arch_init(void) · line 94
Quoted 10 lines
arch/x86/xen/pmu.c +2
-0@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ;I haven't looked in details at Zen's PMU but the PMC section in the spec starts with
"There are six core performance events counters per thread..."
There are six core performance events counters per thread, so there are six MSRs for these counters(0-5). Also there are four legacy PMC MSRs, they are alias of the counters(0-3).
In this version of kernel Zen use the lagacy version of PMU MSRs for Xen. For safety consideration, Dhyana just fullow this stategy. And it works fine when VPMU enabled in Xen on Hygon platforms by testing with perf.
Thanks,
Pu Wen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Pu Wen
maintainerPATCH v3 13/17 x86/xen: enable Hygon support to Xen
In reply to Pu WenTo make Xen work correctly on Hygon platforms, reuse AMD's Xen support code path and add vendor check for Hygon along with AMD.
--- arch/x86/xen/pmu.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/x86/xen/pmu.c +12 -3
@@ -90,6 +90,12 @@ static void xen_pmu_arch_init(void) k7_counters_mirrored =0 ;break ; } + }else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) { + amd_num_counters =F10H_NUM_COUNTERS ; + amd_counters_base =MSR_K7_PERFCTR0 ; + amd_ctrls_base =MSR_K7_EVNTSEL0 ; + amd_msr_step =1 ; + k7_counters_mirrored =0 ; }else {uint32_t eax, ebx, ecx, edx;
@@ -285,7 +291,8 @@ static bool xen_amd_pmu_emulate(unsigned int msr, u64 *val, bool is_read)bool pmu_msr_read (unsigned int msr,uint64_t *val,int *err) { -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 ) {if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, val,1 )) *val =native_read_msr_safe (msr, err);
@@ -308,7 +315,8 @@ bool pmu_msr_write(unsigned int msr, uint32_t low, uint32_t high, int *err) {uint64_t val = ((uint64_t )high <<32 ) | low; -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 ) {if (is_amd_pmu_msr (msr)) {if (!xen_amd_pmu_emulate (msr, &val,0 )) *err =native_write_msr_safe (msr, low, high);
@@ -379,7 +387,8 @@ static unsigned long long xen_intel_read_pmc(int counter)unsigned long long xen_read_pmc (int counter) { -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 xen_amd_read_pmc (counter);else return xen_intel_read_pmc (counter);
Signature · 7 lines
2.7.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Pu Wen
maintainerPATCH v3 14/17 driver/acpi: enable Hygon support to ACPI driver
In reply to Pu WenFor Dhyana processors have NONSTOP TSC feature, so enable the support to ACPI driver.
--- drivers/acpi/acpi_pad.c | 1 + drivers/acpi/processor_idle.c | 1 + 2 files changed, 2 insertions(+)
drivers/acpi/acpi_pad.c +1 -0
@@ -70,6 +70,7 @@ static void power_saving_mwait_init(void)#if defined(CONFIG_X86 )switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :case X86_VENDOR_INTEL :/*
drivers/acpi/processor_idle.c +1 -0
@@ -205,6 +205,7 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr,static void tsc_check_state (int state) {switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :case X86_VENDOR_INTEL :case X86_VENDOR_CENTAUR :
Signature · 1 line
2.7.4
Re: [PATCH v3 14/17] driver/acpi: enable Hygon support to ACPI driver
Quoted 5 lines · Pu Wen
For Dhyana processors have NONSTOP TSC feature, so enable the support to ACPI driver.
Signed-off-by Pu Wen <[email protected]>
This patch is fine by me, but I'm assuming that the series will be handled as a whole, so
Quoted 32 lines
--- drivers/acpi/acpi_pad.c | 1 + drivers/acpi/processor_idle.c | 1 + 2 files changed, 2 insertions(+)drivers/acpi/acpi_pad.c +1
-0@@ -70,6 +70,7 @@ static void power_saving_mwait_init(void)#if defined(CONFIG_X86 )switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :case X86_VENDOR_INTEL :/* drivers/acpi/processor_idle.c +1
-1@@ -205,6 +205,7 @@ static void lapic_timer_state_broadcast(struct acpi_processor *pr,static void tsc_check_state (int state) {switch (boot_cpu_data.x86_vendor) { +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :case X86_VENDOR_INTEL :case X86_VENDOR_CENTAUR : --2.7.4
Pu Wen
maintainerPATCH v3 15/17 driver/cpufreq: enable Hygon support to cpufreq driver
In reply to Pu WenEnable ACPI cpufreq driver support for Hygon by adding family ID check along with AMD.
As Hygon platforms have SMBus device(PCI device ID 0x790b), enable Hygon support to function amd_freq_sensitivity_init().
--- drivers/cpufreq/acpi-cpufreq.c | 5 +++++ drivers/cpufreq/amd_freq_sensitivity.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +5 -0
@@ -61,6 +61,7 @@ enum {#define INTEL_MSR_RANGE (0xffff)#define AMD_MSR_RANGE (0x7) +#define HYGON_MSR_RANGE (0x7)#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)
@@ -95,6 +96,7 @@ static bool boost_state(unsigned int cpu)rdmsr_on_cpu (cpu,MSR_IA32_MISC_ENABLE , &lo, &hi); msr = lo | ((u64 )hi <<32 );return !(msr &MSR_IA32_MISC_ENABLE_TURBO_DISABLE ); +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :rdmsr_on_cpu (cpu,MSR_K7_HWCR , &lo, &hi); msr = lo | ((u64 )hi <<32 );
@@ -113,6 +115,7 @@ static int boost_set_msr(bool enable) msr_addr =MSR_IA32_MISC_ENABLE ; msr_mask =MSR_IA32_MISC_ENABLE_TURBO_DISABLE ;break ; +case X86_VENDOR_HYGON :case X86_VENDOR_AMD : msr_addr =MSR_K7_HWCR ; msr_mask =MSR_K7_HWCR_CPB_DIS ;
@@ -225,6 +228,8 @@ static unsigned extract_msr(struct cpufreq_policy *policy, u32 msr)if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) msr &=AMD_MSR_RANGE ; +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) + msr &=HYGON_MSR_RANGE ;else msr &=INTEL_MSR_RANGE ;
drivers/cpufreq/amd_freq_sensitivity.c +7 -2
@@ -111,11 +111,16 @@ static int __init amd_freq_sensitivity_init(void) {u64 val;struct pci_dev *pcidev; +unsigned int pci_vendor; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) + pci_vendor =PCI_VENDOR_ID_AMD ; +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) + pci_vendor =PCI_VENDOR_ID_HYGON ; +else return -ENODEV ; - pcidev =pci_get_device (PCI_VENDOR_ID_AMD , + pcidev =pci_get_device (pci_vendor,PCI_DEVICE_ID_AMD_KERNCZ_SMBUS ,NULL );if (!pcidev) {
Signature · 1 line
2.7.4
Rafael J. Wysocki
maintainerRe: [PATCH v3 15/17] driver/cpufreq: enable Hygon support to cpufreq driver
Quoted 8 lines · Pu Wen
Enable ACPI cpufreq driver support for Hygon by adding family ID check along with AMD.
As Hygon platforms have SMBus device(PCI device ID
0x790b), enable Hygon support to functionamd_freq_sensitivity_init().Signed-off-by Pu Wen <[email protected]>
Is there any technical difference between HYGON and AMD?
You seem to be mechanically adding X86_VENDOR_HYGON wherever X86_VENDOR_AMD is used.
Quoted 68 lines
--- drivers/cpufreq/acpi-cpufreq.c | 5 +++++ drivers/cpufreq/amd_freq_sensitivity.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)drivers/cpufreq/acpi-cpufreq.c +5
-0@@ -61,6 +61,7 @@ enum {#define INTEL_MSR_RANGE (0xffff)#define AMD_MSR_RANGE (0x7) +#define HYGON_MSR_RANGE (0x7)#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)@@ -95,6 +96,7 @@ static bool boost_state(unsigned int cpu)rdmsr_on_cpu (cpu,MSR_IA32_MISC_ENABLE , &lo, &hi); msr = lo | ((u64 )hi <<32 );return !(msr &MSR_IA32_MISC_ENABLE_TURBO_DISABLE ); +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :rdmsr_on_cpu (cpu,MSR_K7_HWCR , &lo, &hi); msr = lo | ((u64 )hi <<32 );@@ -113,6 +115,7 @@ static int boost_set_msr(bool enable) msr_addr =MSR_IA32_MISC_ENABLE ; msr_mask =MSR_IA32_MISC_ENABLE_TURBO_DISABLE ;break ; +case X86_VENDOR_HYGON :case X86_VENDOR_AMD : msr_addr =MSR_K7_HWCR ; msr_mask =MSR_K7_HWCR_CPB_DIS ;@@ -225,6 +228,8 @@ static unsigned extract_msr(struct cpufreq_policy *policy, u32 msr)if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) msr &=AMD_MSR_RANGE ; +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) + msr &=HYGON_MSR_RANGE ;else msr &=INTEL_MSR_RANGE ;drivers/cpufreq/amd_freq_sensitivity.c +7
-3@@ -111,11 +111,16 @@ static int __init amd_freq_sensitivity_init(void) {u64 val;struct pci_dev *pcidev; +unsigned int pci_vendor; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) + pci_vendor =PCI_VENDOR_ID_AMD ; +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) + pci_vendor =PCI_VENDOR_ID_HYGON ; +else return -ENODEV ; - pcidev =pci_get_device (PCI_VENDOR_ID_AMD , + pcidev =pci_get_device (pci_vendor,PCI_DEVICE_ID_AMD_KERNCZ_SMBUS ,NULL );if (!pcidev) { --2.7.4
Pu Wen
maintainerRe: [PATCH v3 15/17] driver/cpufreq: enable Hygon support to cpufreq driver
Quoted 11 lines · Rafael J. Wysocki
Quoted 8 lines · Pu Wen
Enable ACPI cpufreq driver support for Hygon by adding family ID check along with AMD.
As Hygon platforms have SMBus device(PCI device ID
0x790b), enable Hygon support to functionamd_freq_sensitivity_init().Signed-off-by Pu Wen <[email protected]>Is there any technical difference between HYGON and AMD?
For ACPI cpufreq patch, you are right. But for the whole point of view, there has some technical difference between Hygon Dhyana and AMD Family 17h.
For cpufreq if not added X86_VENDOR_HYGON codes, this driver will not work functionally on Hygon platforms.
Quoted 3 lines
You seem to be mechanically adding
X86_VENDOR_HYGONwhereverX86_VENDOR_AMDis used.
X86_VENDOR_HYGON is not mechanically added wherever X86_VENDOR_AMD is used, we have reviewed and tested the features wherever X86_VENDOR_HYGON is needed.
As Hygon Dhyana can share code path with AMD family 17h, to minimize the code duplication, we choose to reuse the AMD's codes here.
Thanks,
Pu Wen
Quoted 26 lines
Quoted 26 lines
--- drivers/cpufreq/acpi-cpufreq.c | 5 +++++ drivers/cpufreq/amd_freq_sensitivity.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)drivers/cpufreq/acpi-cpufreq.c +2
-0@@ -61,6 +61,7 @@ enum {#define INTEL_MSR_RANGE (0xffff)#define AMD_MSR_RANGE (0x7) +#define HYGON_MSR_RANGE (0x7)#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)@@ -95,6 +96,7 @@ static bool boost_state(unsigned int cpu)rdmsr_on_cpu (cpu,MSR_IA32_MISC_ENABLE , &lo, &hi); msr = lo | ((u64 )hi <<32 );return !(msr &MSR_IA32_MISC_ENABLE_TURBO_DISABLE ); +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :rdmsr_on_cpu (cpu,MSR_K7_HWCR , &lo, &hi); msr = lo | ((u64 )hi <<32 );
Re: [PATCH v3 15/17] driver/cpufreq: enable Hygon support to cpufreq driver
Quoted 23 lines · CEST Pu Wen
Quoted 11 lines · Rafael J. Wysocki
Quoted 8 lines · Pu Wen
Enable ACPI cpufreq driver support for Hygon by adding family ID check along with AMD.
As Hygon platforms have SMBus device(PCI device ID
0x790b), enable Hygon support to functionamd_freq_sensitivity_init().Signed-off-by Pu Wen <[email protected]>Is there any technical difference between HYGON and AMD?
For ACPI cpufreq patch, you are right. But for the whole point of view, there has some technical difference between Hygon Dhyana and AMD Family 17h.
For cpufreq if not addedX86_VENDOR_HYGONcodes, this driver will not work functionally on Hygon platforms.Quoted 3 lines
You seem to be mechanically adding
X86_VENDOR_HYGONwhereverX86_VENDOR_AMDis used.
Quoted 6 lines
X86_VENDOR_HYGONis not mechanically added whereverX86_VENDOR_AMDis used, we have reviewed and tested the features whereverX86_VENDOR_HYGONis needed.As Hygon Dhyana can share code path with AMD family 17h, to minimize the code duplication, we choose to reuse the AMD's codes here.
OK
The cpufreq changes are fine by me.
Thanks!
Re: [PATCH v3 15/17] driver/cpufreq: enable Hygon support to cpufreq driver
In reply to Pu WenQuoted 63 lines · CEST Pu Wen
Enable ACPI cpufreq driver support for Hygon by adding family ID check along with AMD.
As Hygon platforms have SMBus device(PCI device ID
0x790b), enable Hygon support to functionamd_freq_sensitivity_init().Signed-off-by Pu Wen <[email protected]>--- drivers/cpufreq/acpi-cpufreq.c | 5 +++++ drivers/cpufreq/amd_freq_sensitivity.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)drivers/cpufreq/acpi-cpufreq.c +5
-0@@ -61,6 +61,7 @@ enum {#define INTEL_MSR_RANGE (0xffff)#define AMD_MSR_RANGE (0x7) +#define HYGON_MSR_RANGE (0x7)#define MSR_K7_HWCR_CPB_DIS (1ULL << 25)@@ -95,6 +96,7 @@ static bool boost_state(unsigned int cpu)rdmsr_on_cpu (cpu,MSR_IA32_MISC_ENABLE , &lo, &hi); msr = lo | ((u64 )hi <<32 );return !(msr &MSR_IA32_MISC_ENABLE_TURBO_DISABLE ); +case X86_VENDOR_HYGON :case X86_VENDOR_AMD :rdmsr_on_cpu (cpu,MSR_K7_HWCR , &lo, &hi); msr = lo | ((u64 )hi <<32 );@@ -113,6 +115,7 @@ static int boost_set_msr(bool enable) msr_addr =MSR_IA32_MISC_ENABLE ; msr_mask =MSR_IA32_MISC_ENABLE_TURBO_DISABLE ;break ; +case X86_VENDOR_HYGON :case X86_VENDOR_AMD : msr_addr =MSR_K7_HWCR ; msr_mask =MSR_K7_HWCR_CPB_DIS ;@@ -225,6 +228,8 @@ static unsigned extract_msr(struct cpufreq_policy *policy, u32 msr)if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) msr &=AMD_MSR_RANGE ; +else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) + msr &=HYGON_MSR_RANGE ;else msr &=INTEL_MSR_RANGE ;drivers/cpufreq/amd_freq_sensitivity.c +3
-1@@ -111,11 +111,16 @@ static int __init amd_freq_sensitivity_init(void) {u64 val;struct pci_dev *pcidev; +unsigned int pci_vendor; -if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD ) +if (boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) + pci_vendor =PCI_VENDOR_ID_AMD ;
drivers/cpufreq/amd_freq_sensitivity.c static int __init amd_freq_sensitivity_init(void) · line 126
Quoted 10 lines
drivers/cpufreq/amd_freq_sensitivity.c +4
-1+else if (boot_cpu_data.x86_vendor ==X86_VENDOR_HYGON ) + pci_vendor =PCI_VENDOR_ID_HYGON ; +else return -ENODEV ; - pcidev =pci_get_device (PCI_VENDOR_ID_AMD , + pcidev =pci_get_device (pci_vendor,PCI_DEVICE_ID_AMD_KERNCZ_SMBUS ,NULL );if (!pcidev) {
Pu Wen
maintainerPATCH v3 16/17 driver/edac: enable Hygon support to AMD64 EDAC driver
In reply to Pu WenTo make AMD64 EDAC and MCE drivers working on Hygon platforms, add vendor checking for Hygon by using the code path of AMD 0x17. Add a vendor field to struct amd64_pvt and initialize it in per_family_init for vendor checking.
Also Hygon PCI Device ID DF_F0/DF_F6(0x1460/0x1466) of Host bridges is needed for edac driver.
--- drivers/edac/amd64_edac.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- drivers/edac/amd64_edac.h | 5 +++++ drivers/edac/mce_amd.c | 12 +++++++++++- 3 files changed, 60 insertions(+), 2 deletions(-)
drivers/edac/amd64_edac.c +44 -1
@@ -211,7 +211,7 @@ static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) scrubval = scrubrates[i].scrubval; -if (pvt->fam ==0x17 ) { +if (pvt->fam ==0x17 || pvt->vendor ==X86_VENDOR_HYGON ) {__f17h_set_scrubval (pvt, scrubval); }else if (pvt->fam ==0x15 && pvt->model ==0x60 ) {f15h_select_dct (pvt,0 );
@@ -273,6 +273,20 @@ static int get_scrub_rate(struct mem_ctl_info *mci) scrubval =0 ; }break ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) { +amd64_read_pci_cfg (pvt->F6, +F17H_SCR_BASE_ADDR , &scrubval); +if (scrubval &BIT (0 )) { +amd64_read_pci_cfg (pvt->F6, +F17H_SCR_LIMIT_ADDR , &scrubval); + scrubval &=0xF ; + scrubval +=0x5 ; + }else { + scrubval =0 ; + } +break ; + }default :amd64_read_pci_cfg (pvt->F3,SCRCTRL , &scrubval);
@@ -1051,6 +1065,16 @@ static void determine_memory_type(struct amd64_pvt *pvt)else pvt->dram_type =MEM_DDR4 ;return ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) { +if ((pvt->umc[0 ].dimm_cfg | pvt->umc[1 ].dimm_cfg) &BIT (5 )) + pvt->dram_type =MEM_LRDDR4 ; +else if ((pvt->umc[0 ].dimm_cfg | pvt->umc[1 ].dimm_cfg) &BIT (4 )) + pvt->dram_type =MEM_RDDR4 ; +else + pvt->dram_type =MEM_DDR4 ; +return ; + }default :WARN (1 ,KERN_ERR "%s: Family??? 0x%x\n" , __func__, pvt->fam);
@@ -2200,6 +2224,16 @@ static struct amd64_family_type family_types[] = { .dbam_to_cs = f17_base_addr_to_cs_size, } }, + [HYGON_F18_CPUS ] = { +/* Hygon F18h uses the same AMD F17h support */ + .ctl_name ="Hygon_F18h" , + .f0_id =PCI_DEVICE_ID_HYGON_18H_DF_F0 , + .f6_id =PCI_DEVICE_ID_HYGON_18H_DF_F6 , + .ops = { + .early_channel_count = f17_early_channel_count, + .dbam_to_cs = f17_base_addr_to_cs_size, + } + }, };/*
@@ -3149,6 +3183,7 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) pvt->ext_model = boot_cpu_data.x86_model >>4 ; pvt->stepping = boot_cpu_data.x86_stepping; pvt->model = boot_cpu_data.x86_model; + pvt->vendor = boot_cpu_data.x86_vendor; pvt->fam = boot_cpu_data.x86;switch (pvt->fam) {
@@ -3192,6 +3227,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) pvt->ops = &family_types[F17_CPUS ].ops;break ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) { + fam_type = &family_types[HYGON_F18_CPUS ]; + pvt->ops = &family_types[HYGON_F18_CPUS ].ops; +break ; + } +default :amd64_err ("Unsupported family!\n" );return NULL ;
@@ -3428,6 +3470,7 @@ static const struct x86_cpu_id amd64_cpuids[] = { { X86_VENDOR_AMD, 0x15, X86_MODEL_ANY, X86_FEATURE_ANY, 0 }, { X86_VENDOR_AMD, 0x16, X86_MODEL_ANY, X86_FEATURE_ANY, 0 }, { X86_VENDOR_AMD, 0x17, X86_MODEL_ANY, X86_FEATURE_ANY, 0 }, + { X86_VENDOR_HYGON, 0x18, X86_MODEL_ANY, X86_FEATURE_ANY, 0 }, { } };MODULE_DEVICE_TABLE (x86cpu, amd64_cpuids);
drivers/edac/amd64_edac.h +5 -0
@@ -116,6 +116,9 @@#define PCI_DEVICE_ID_AMD_17H_DF_F0 0x1460#define PCI_DEVICE_ID_AMD_17H_DF_F6 0x1466 +#define PCI_DEVICE_ID_HYGON_18H_DF_F0 0x1460 +#define PCI_DEVICE_ID_HYGON_18H_DF_F6 0x1466 +/* * Function 1 - Address Map */
@@ -281,6 +284,7 @@ enum amd_families {F16_CPUS ,F16_M30H_CPUS ,F17_CPUS , +HYGON_F18_CPUS , NUM_FAMILIES, };
@@ -328,6 +332,7 @@ struct amd64_pvt {struct pci_dev *F0 , *F1 , *F2 , *F3 , *F6 ;u16 mc_node_id;/* MC index of this MC node */ +u8 vendor;/* CPU vendor */ u8 fam;/* CPU family */ u8 model;/* ... model */ u8 stepping;/* ... stepping */
drivers/edac/mce_amd.c +11 -1
@@ -1059,7 +1059,8 @@ static int __init mce_amd_init(void) {struct cpuinfo_x86 *c = &boot_cpu_data; -if (c->x86_vendor !=X86_VENDOR_AMD ) +if (c->x86_vendor !=X86_VENDOR_AMD && + c->x86_vendor !=X86_VENDOR_HYGON )return -ENODEV ; fam_ops =kzalloc (sizeof (struct amd_decoder_ops ),GFP_KERNEL );
@@ -1119,6 +1120,15 @@ static int __init mce_amd_init(void) goto err_out; }break ; +case 0x18 : +if (c->x86_vendor ==X86_VENDOR_HYGON ) { + xec_mask =0x3f ; +if (!boot_cpu_has (X86_FEATURE_SMCA )) { +pr_warn ("Decoding supported only on Scalable MCA processors.\n" ); + goto err_out; + } +break ; + }default :printk (KERN_WARNING "Huh? What family is it: 0x%x?!\n" , c->x86);
Signature · 1 line
2.7.4
Re: [PATCH v3 16/17] driver/edac: enable Hygon support to AMD64 EDAC driver
drivers/edac/amd64_edac.c static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) · line 215
Quoted 11 lines · Pu Wen
drivers/edac/amd64_edac.c +1
-1@@ -211,7 +211,7 @@ static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) scrubval = scrubrates[i].scrubval; -if (pvt->fam ==0x17 ) { +if (pvt->fam ==0x17 || pvt->vendor ==X86_VENDOR_HYGON ) {__f17h_set_scrubval (pvt, scrubval);
Separating the vendor check as an "else if (pvt->vendor == X86_VENDOR_HYGON)" block would make architectural changes (future hygon models, i.e. 19h, 20h, etc) less confusing.
drivers/edac/amd64_edac.c static int get_scrub_rate(struct mem_ctl_info *mci) · line 281
Quoted 4 lines
drivers/edac/amd64_edac.c +4
-0+amd64_read_pci_cfg (pvt->F6, +F17H_SCR_BASE_ADDR , &scrubval); +if (scrubval &BIT (0 )) { + amd64_read_pci_cfg(pvt->F6,
The new lines after "amd64_read_pci_cfg(pvt->F6," can be removed.
drivers/edac/amd64_edac.c static void determine_memory_type(struct amd64_pvt *pvt) · line 1069
Quoted 6 lines
drivers/edac/amd64_edac.c +2
-0@@ -1051,6 +1065,16 @@ static void determine_memory_type(struct amd64_pvt *pvt)else pvt->dram_type =MEM_DDR4 ;return ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) {
This vendor checking is not necessary as there are no other known family 18h processors.
drivers/edac/amd64_edac.c static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) · line 3235
Quoted 11 lines
drivers/edac/amd64_edac.c +6
-0switch (pvt->fam) {@@ -3192,6 +3227,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) pvt->ops = &family_types[F17_CPUS ].ops;break ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) { + fam_type = &family_types[HYGON_F18_CPUS ]; + pvt->ops = &family_types[HYGON_F18_CPUS ].ops; +break ; + }
There is a missing second 'break' statement after the "if (pvt->vendor == X86_VENDOR_HYGON)" block for case 0x18, see case 0x15 and case 0x16 for comparison.
drivers/edac/mce_amd.c static int __init mce_amd_init(void) · line 1131
Quoted 11 lines
drivers/edac/mce_amd.c +9
-0+case 0x18 : +if (c->x86_vendor ==X86_VENDOR_HYGON ) { + xec_mask =0x3f ; +if (!boot_cpu_has (X86_FEATURE_SMCA )) { +pr_warn ("Decoding supported only on Scalable MCA processors.\n" ); + goto err_out; + } +break ; + }
The 'break' statement could be moved outside of the "if (c->x86_vendor == X86_VENDOR_HYGON)" block, this is to allow case 0x18 to reach the 'break' statement if the vendor is not X86_VENDOR_HYGON.
Re: [PATCH v3 16/17] driver/edac: enable Hygon support to AMD64 EDAC driver
Quoted 10 lines · Michael Jin
drivers/edac/amd64_edac.c static void determine_memory_type(struct amd64_pvt *pvt) · line 1069
Quoted 6 lines · Pu Wen
drivers/edac/amd64_edac.c +2
-0@@ -1051,6 +1065,16 @@ static void determine_memory_type(struct amd64_pvt *pvt)else pvt->dram_type =MEM_DDR4 ;return ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) {This vendor checking is not necessary as there are no other known family 18h processors.
Actually, vendor checking works here. Although, AMD has not released a family 18h yet.
Pu Wen
maintainerRe: [PATCH v3 16/17] driver/edac: enable Hygon support to AMD64 EDAC driver
Quoted 12 lines · Michael Jin
Quoted 10 lines · Michael Jin
drivers/edac/amd64_edac.c static void determine_memory_type(struct amd64_pvt *pvt) · line 1069
Quoted 6 lines · Pu Wen
drivers/edac/amd64_edac.c +2
-0@@ -1051,6 +1065,16 @@ static void determine_memory_type(struct amd64_pvt *pvt)else pvt->dram_type =MEM_DDR4 ;return ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) {This vendor checking is not necessary as there are no other known family 18h processors.
Quoted 2 lines
Actually, vendor checking works here. Although, AMD has not released a family 18h yet.
Yes, that's the case.
Thanks,
Pu Wen
Pu Wen
maintainerRe: [PATCH v3 16/17] driver/edac: enable Hygon support to AMD64 EDAC driver
In reply to Michael JinQuoted 9 lines · Michael Jin
Quoted 8 lines · Pu Wen
drivers/edac/amd64_edac.c +0
-0@@ -211,7 +211,7 @@ static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) scrubval = scrubrates[i].scrubval;
Quoted 7 lines
drivers/edac/amd64_edac.c static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) · line 215
Quoted 3 lines
drivers/edac/amd64_edac.c +1
-1-if (pvt->fam ==0x17 ) { +if (pvt->fam ==0x17 || pvt->vendor ==X86_VENDOR_HYGON ) {__f17h_set_scrubval (pvt, scrubval);Separating the vendor check as an "else if (
pvt->vendor==X86_VENDOR_HYGON)" block would make architectural changes (future hygon models, i.e. 19h, 20h, etc) less confusing.
Your suggestion is reasonable, but that might make the branch a little complicated.If we explicitly testing Hygon family in condition case, will that be ok?
+ if (pvt->fam == 0x17 ||
+ (pvt->vendor == X86_VENDOR_HYGON && pvt->fam == 0x18))
Quoted 7 lines
drivers/edac/amd64_edac.c static int get_scrub_rate(struct mem_ctl_info *mci) · line 281
Quoted 5 lines
drivers/edac/amd64_edac.c +4
-0+amd64_read_pci_cfg (pvt->F6, +F17H_SCR_BASE_ADDR , &scrubval); +if (scrubval &BIT (0 )) { + amd64_read_pci_cfg(pvt->F6,The new lines after "amd64_read_pci_cfg(pvt->F6," can be removed.
To fix the warning "line over 80 characters" reported by running the checking script checkpatch.pl, I added the new line.
But your sugesstion is reasonable, remove the new line will make the codes much easier to read.
Quoted 16 lines
drivers/edac/amd64_edac.c static void determine_memory_type(struct amd64_pvt *pvt) · line 1069
Quoted 6 lines
drivers/edac/amd64_edac.c +2
-0@@ -1051,6 +1065,16 @@ static void determine_memory_type(struct amd64_pvt *pvt)else pvt->dram_type =MEM_DDR4 ;return ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) {This vendor checking is not necessary as there are no other known family 18h processors.
Quoted 5 lines
drivers/edac/amd64_edac.c +0
-0switch (pvt->fam) {@@ -3192,6 +3227,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) pvt->ops = &family_types[F17_CPUS ].ops;break ;
Quoted 10 lines
drivers/edac/amd64_edac.c static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) · line 3235
Quoted 6 lines
drivers/edac/amd64_edac.c +6
-0+case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) { + fam_type = &family_types[HYGON_F18_CPUS ]; + pvt->ops = &family_types[HYGON_F18_CPUS ].ops; +break ; + }There is a missing second 'break' statement after the "if (
pvt->vendor==X86_VENDOR_HYGON)" block for case0x18, see case0x15and case0x16for comparison.
The missed second 'break' is on purpose. Thinking that if BIOS report a vendor AMD and family 18h processor(which is not in case now), the code will fall through and print out "Unsupported family".
Quoted 16 lines
drivers/edac/mce_amd.c static int __init mce_amd_init(void) · line 1131
Quoted 12 lines
drivers/edac/mce_amd.c +9
-0+case 0x18 : +if (c->x86_vendor ==X86_VENDOR_HYGON ) { + xec_mask =0x3f ; +if (!boot_cpu_has (X86_FEATURE_SMCA )) { +pr_warn ("Decoding supported only on Scalable MCA processors.\n" ); + goto err_out; + } +break ; + }The 'break' statement could be moved outside of the "if (
c->x86_vendor==X86_VENDOR_HYGON)" block, this is to allow case0x18to reach the 'break' statement if the vendor is notX86_VENDOR_HYGON.
For the same reason as previous, if the vendor is not X86_VENDOR_HYGON, it's not a valid vendor by now, and should fall through to the default case and print out error message.
Thanks,
Pu Wen
Re: [PATCH v3 16/17] driver/edac: enable Hygon support to AMD64 EDAC driver
Quoted 18 lines · Pu Wen
Quoted 12 lines · Michael Jin
drivers/edac/amd64_edac.c static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) · line 215
Quoted 5 lines · Pu Wen
drivers/edac/amd64_edac.c +1
-1-if (pvt->fam ==0x17 ) { +if (pvt->fam ==0x17 || pvt->vendor ==X86_VENDOR_HYGON ) {__f17h_set_scrubval (pvt, scrubval);Separating the vendor check as an "else if (
pvt->vendor==X86_VENDOR_HYGON)" block would make architectural changes (future hygon models, i.e. 19h, 20h, etc) less confusing.Your suggestion is reasonable, but that might make the branch a little complicated.If we explicitly testing Hygon family in condition case, will that be ok?
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (pvt->fam == 0x17 || + (pvt->vendor == X86_VENDOR_HYGON && pvt->fam == 0x18))
The condition case for family 18h and vendor Hygon looks better because it is more clear.
Michael
Pu Wen
maintainerRe: [PATCH v3 16/17] driver/edac: enable Hygon support to AMD64 EDAC driver
In reply to Michael JinQuoted 9 lines · Michael Jin
Quoted 8 lines · Pu Wen
drivers/edac/amd64_edac.c +0
-0@@ -211,7 +211,7 @@ static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) scrubval = scrubrates[i].scrubval;
Quoted 7 lines
drivers/edac/amd64_edac.c static int __set_scrub_rate(struct amd64_pvt *pvt, u32 new_bw, u32 min_rate) · line 215
Quoted 3 lines
drivers/edac/amd64_edac.c +1
-1-if (pvt->fam ==0x17 ) { +if (pvt->fam ==0x17 || pvt->vendor ==X86_VENDOR_HYGON ) {__f17h_set_scrubval (pvt, scrubval);Separating the vendor check as an "else if (
pvt->vendor==X86_VENDOR_HYGON)" block would make architectural changes (future hygon models, i.e. 19h, 20h, etc) less confusing.
Your suggestion is reasonable, but that might make the branch a little complicated.If we explicitly testing Hygon family in condition case, will that be ok?
+ if (pvt->fam == 0x17 ||
+ (pvt->vendor == X86_VENDOR_HYGON && pvt->fam == 0x18))
Quoted 7 lines
drivers/edac/amd64_edac.c static int get_scrub_rate(struct mem_ctl_info *mci) · line 281
Quoted 5 lines
drivers/edac/amd64_edac.c +4
-0+amd64_read_pci_cfg (pvt->F6, +F17H_SCR_BASE_ADDR , &scrubval); +if (scrubval &BIT (0 )) { + amd64_read_pci_cfg(pvt->F6,The new lines after "amd64_read_pci_cfg(pvt->F6," can be removed.
To fix the warning "line over 80 characters" reported by running the checking script checkpatch.pl, I added the new line.
But your sugesstion is reasonable, remove the new line will make the codes much easier to read.
Quoted 16 lines
drivers/edac/amd64_edac.c static void determine_memory_type(struct amd64_pvt *pvt) · line 1069
Quoted 6 lines
drivers/edac/amd64_edac.c +2
-0@@ -1051,6 +1065,16 @@ static void determine_memory_type(struct amd64_pvt *pvt)else pvt->dram_type =MEM_DDR4 ;return ; +case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) {This vendor checking is not necessary as there are no other known family 18h processors.
Quoted 5 lines
drivers/edac/amd64_edac.c +0
-0switch (pvt->fam) {@@ -3192,6 +3227,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) pvt->ops = &family_types[F17_CPUS ].ops;break ;
Quoted 10 lines
drivers/edac/amd64_edac.c static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) · line 3235
Quoted 6 lines
drivers/edac/amd64_edac.c +6
-0+case 0x18 : +if (pvt->vendor ==X86_VENDOR_HYGON ) { + fam_type = &family_types[HYGON_F18_CPUS ]; + pvt->ops = &family_types[HYGON_F18_CPUS ].ops; +break ; + }There is a missing second 'break' statement after the "if (
pvt->vendor==X86_VENDOR_HYGON)" block for case0x18, see case0x15and case0x16for comparison.
The missed second 'break' is on purpose. Thinking that if BIOS report a vendor AMD and family 18h processor(which is not in case now), the code will fall through and print out "Unsupported family".
Quoted 16 lines
drivers/edac/mce_amd.c static int __init mce_amd_init(void) · line 1131
Quoted 12 lines
drivers/edac/mce_amd.c +9
-0+case 0x18 : +if (c->x86_vendor ==X86_VENDOR_HYGON ) { + xec_mask =0x3f ; +if (!boot_cpu_has (X86_FEATURE_SMCA )) { +pr_warn ("Decoding supported only on Scalable MCA processors.\n" ); + goto err_out; + } +break ; + }The 'break' statement could be moved outside of the "if (
c->x86_vendor==X86_VENDOR_HYGON)" block, this is to allow case0x18to reach the 'break' statement if the vendor is notX86_VENDOR_HYGON.
For the same reason as previous, if the vendor is not X86_VENDOR_HYGON, it's not a valid vendor by now, and should fall through to the default case and print out error message.
Thanks,
Pu Wen
Pu Wen
maintainerPATCH v3 17/17 tools/cpupower: enable Hygon support to cpupower tool
In reply to Pu WenTool cpupower is useful to get CPU frequency information and monitor power stats on Hygon platforms. So enable platform support to cpupower for Hygon Dhyana Family 18h processors by checking vendor ID and vendor string.
--- tools/power/cpupower/utils/cpufreq-info.c | 6 ++++-- tools/power/cpupower/utils/helpers/amd.c | 4 ++-- tools/power/cpupower/utils/helpers/cpuid.c | 8 +++++--- tools/power/cpupower/utils/helpers/helpers.h | 2 +- tools/power/cpupower/utils/helpers/misc.c | 3 ++- tools/power/cpupower/utils/idle_monitor/mperf_monitor.c | 3 ++- 6 files changed, 16 insertions(+), 10 deletions(-)
tools/power/cpupower/utils/cpufreq-info.c +4 -2
@@ -170,6 +170,7 @@ static int get_boost_mode(unsigned int cpu)unsigned long pstates[MAX_HW_PSTATES ] = {0 ,};if (cpupower_cpu_info.vendor !=X86_VENDOR_AMD && + cpupower_cpu_info.vendor !=X86_VENDOR_HYGON && cpupower_cpu_info.vendor !=X86_VENDOR_INTEL )return 0 ;
@@ -190,8 +191,9 @@ static int get_boost_mode(unsigned int cpu)printf (_ (" Supported: %s\n" ), support ?_ ("yes" ) :_ ("no" ));printf (_ (" Active: %s\n" ), active ?_ ("yes" ) :_ ("no" )); -if (cpupower_cpu_info.vendor ==X86_VENDOR_AMD && - cpupower_cpu_info.family >=0x10 ) { +if ((cpupower_cpu_info.vendor ==X86_VENDOR_AMD && + cpupower_cpu_info.family >=0x10 ) || + cpupower_cpu_info.vendor ==X86_VENDOR_HYGON ) { ret =decode_pstates (cpu, cpupower_cpu_info.family, b_states, pstates, &pstate_no);if (ret)
tools/power/cpupower/utils/helpers/amd.c +2 -2
@@ -45,7 +45,7 @@ static int get_did(int family, union msr_pstate pstate)if (family ==0x12 ) t = pstate.val &0xf ; -else if (family ==0x17 ) +else if (family ==0x17 || cpupower_cpu_info.vendor ==X86_VENDOR_HYGON ) t = pstate.fam17h_bits.did;else t = pstate.bits.did;
@@ -59,7 +59,7 @@ static int get_cof(int family, union msr_pstate pstate)int fid, did, cof; did =get_did (family, pstate); -if (family ==0x17 ) { +if (family ==0x17 || cpupower_cpu_info.vendor ==X86_VENDOR_HYGON ) { fid = pstate.fam17h_bits.fid; cof =200 * fid / did; }else {
tools/power/cpupower/utils/helpers/cpuid.c +5 -3
@@ -8,7 +8,7 @@#include "helpers/helpers.h" static const char *cpu_vendor_table[X86_VENDOR_MAX ] = { -"Unknown" ,"GenuineIntel" ,"AuthenticAMD" , +"Unknown" ,"GenuineIntel" ,"AuthenticAMD" ,"HygonGenuine" , };#if defined(__i386__) || defined(__x86_64__)
@@ -109,6 +109,7 @@ int get_cpu_info(struct cpupower_cpu_info *cpu_info)fclose (fp);/* Get some useful CPU capabilities from cpuid */ if (cpu_info->vendor !=X86_VENDOR_AMD && + cpu_info->vendor !=X86_VENDOR_HYGON && cpu_info->vendor !=X86_VENDOR_INTEL )return ret;
@@ -124,8 +125,9 @@ int get_cpu_info(struct cpupower_cpu_info *cpu_info)if (cpuid_level >=6 && (cpuid_ecx (6 ) &0x1 )) cpu_info->caps |=CPUPOWER_CAP_APERF ; -/* AMD Boost state enable/disable register */ -if (cpu_info->vendor ==X86_VENDOR_AMD ) { +/* AMD or Hygon Boost state enable/disable register */ +if (cpu_info->vendor ==X86_VENDOR_AMD || + cpu_info->vendor ==X86_VENDOR_HYGON ) {if (ext_cpuid_level >=0x80000007 && (cpuid_edx (0x80000007 ) & (1 <<9 ))) cpu_info->caps |=CPUPOWER_CAP_AMD_CBP ;
tools/power/cpupower/utils/helpers/helpers.h +1 -1
@@ -61,7 +61,7 @@ extern int be_verbose;/* cpuid and cpuinfo helpers **************************/ enum cpupower_cpu_vendor {X86_VENDOR_UNKNOWN =0 ,X86_VENDOR_INTEL , -X86_VENDOR_AMD ,X86_VENDOR_MAX }; +X86_VENDOR_AMD ,X86_VENDOR_HYGON ,X86_VENDOR_MAX };#define CPUPOWER_CAP_INV_TSC 0x00000001#define CPUPOWER_CAP_APERF 0x00000002
tools/power/cpupower/utils/helpers/misc.c +2 -1
@@ -26,7 +26,8 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active,* has Hardware determined variable increments instead. */ -if (cpu_info.family ==0x17 ) { +if (cpu_info.family ==0x17 || + cpu_info.vendor ==X86_VENDOR_HYGON ) {if (!read_msr (cpu,MSR_AMD_HWCR , &val)) {if (!(val &CPUPOWER_AMD_CPBDIS )) *active =1 ;
tools/power/cpupower/utils/idle_monitor/mperf_monitor.c +2 -1
@@ -241,7 +241,8 @@ static int init_maxfreq_mode(void)if (!(cpupower_cpu_info.caps &CPUPOWER_CAP_INV_TSC )) goto use_sysfs; -if (cpupower_cpu_info.vendor ==X86_VENDOR_AMD ) { +if (cpupower_cpu_info.vendor ==X86_VENDOR_AMD || + cpupower_cpu_info.vendor ==X86_VENDOR_HYGON ) {/* MSR_AMD_HWCR tells us whether TSC runs at P0/mperf * freq. * A test whether hwcr is accessable/available would be:
Signature · 1 line
2.7.4