From d63e3e19706c8b57b37b176a78706f8058450f79 Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Thu, 29 Jan 2026 17:34:33 +0800 Subject: [PATCH 01/11] EDAC/amd64: Convert Hygon family 18h model checks to switch-case commit 41369fd13d4c2193c8ecb92a8072b705e38aabac anolis ANBZ: #30343 Replaces a chain of if-else statements with a switch statement for handling Hygon family 18h models processors. Hygon-SIG: commit none hygon anolis: EDAC/amd64: Convert Hygon family 18h model checks to switch-case Hygon-SIG: commit 41369fd13d4c anolis anolis: EDAC/amd64: Convert Hygon family 18h model checks to switch-case Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by: Xiaochen Shen Reviewed-by: Ruidong Tian Reviewed-by: Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6454 [ YuntongJin : amend commit log ] Signed-off-by: YuntongJin --- drivers/edac/amd64_edac.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 4555f027398e4..1a805ed455c6c 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4210,28 +4210,31 @@ static int per_family_init(struct amd64_pvt *pvt) break; case 0x18: - if (pvt->model == 0x4) { + switch (pvt->model) { + case 0x4: pvt->ctl_name = "F18h_M04h"; pvt->max_mcs = 3; break; - } else if (pvt->model == 0x5) { + case 0x5: pvt->ctl_name = "F18h_M05h"; pvt->max_mcs = 1; break; - } else if (pvt->model == 0x6) { + case 0x6: pvt->ctl_name = "F18h_M06h"; break; - } else if (pvt->model == 0x7) { + case 0x7: pvt->ctl_name = "F18h_M07h"; break; - } else if (pvt->model == 0x8) { + case 0x8: pvt->ctl_name = "F18h_M08h"; break; - } else if (pvt->model == 0x10) { + case 0x10: pvt->ctl_name = "F18h_M10h"; break; + default: + pvt->ctl_name = "F18h"; + break; } - pvt->ctl_name = "F18h"; break; case 0x19: From a5c78331ba5deacd758ef722c7849ade5d651c79 Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Mon, 16 Mar 2026 11:42:42 +0800 Subject: [PATCH 02/11] EDAC/amd64: Add support for Hygon family 18h model 18h commit eb162a81e5007122e42bab182a9807dbe34fc029 anolis. ANBZ: #30343 Add Hygon family 18h model 18h processor support for amd64_edac. For Hygon family 18h model 0x18h-0x1fh processors, the UMC base are identical, so modify them uniformly. Meanwhile, code for Hygon UMC base calculations has been moved to a dedicated function. Hygon-SIG: commit none hygon anolis: EDAC/amd64: Add support for Hygon family 18h model 18h Hygon-SIG: commit eb162a81e500 anolis anolis: EDAC/amd64: Add support for Hygon family 18h model 18h Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by: Xiaochen Shen Reviewed-by: Ruidong Tian Reviewed-by: Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6454 [ YuntongJin : amend commit log, fix conflict ] Signed-off-by: YuntongJin --- drivers/edac/amd64_edac.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 1a805ed455c6c..4b934896dd095 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -107,6 +107,29 @@ static u32 get_umc_base_f18h_m4h(u16 node, u8 channel) return get_umc_base(channel) + (0x80000000 + (0x10000000 * df_id)); } +static u32 get_umc_base_f18h_m18h(u8 channel) +{ + return 0x70000000 + (channel << 20); +} + +static u32 hygon_get_umc_base(struct amd64_pvt *pvt, u8 channel) +{ + u32 umc_base; + + if (hygon_f18h_m4h()) + umc_base = get_umc_base_f18h_m4h(pvt->mc_node_id, channel); + /* + * For Hygon family 18h model 0x18h-0x1fh processors, the UMC base + * are identical. + */ + else if (hygon_f18h_m10h() && boot_cpu_data.x86_model >= 0x18) + umc_base = get_umc_base_f18h_m18h(channel); + else + umc_base = get_umc_base(channel); + + return umc_base; +} + /* * Select DCT to which PCI cfg accesses are routed */ @@ -1812,8 +1835,8 @@ static void umc_read_base_mask(struct amd64_pvt *pvt) if (!hygon_umc_channel_enabled(pvt, umc)) continue; - if (hygon_f18h_m4h()) - umc_base = get_umc_base_f18h_m4h(pvt->mc_node_id, umc); + if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) + umc_base = hygon_get_umc_base(pvt, umc); else umc_base = get_umc_base(umc); @@ -3286,8 +3309,8 @@ static void umc_read_mc_regs(struct amd64_pvt *pvt) if (!hygon_umc_channel_enabled(pvt, i)) continue; - if (hygon_f18h_m4h()) - umc_base = get_umc_base_f18h_m4h(pvt->mc_node_id, i); + if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) + umc_base = hygon_get_umc_base(pvt, i); else umc_base = get_umc_base(i); From 0069ab2cbb90534c734668ecc8d4c257ad9091d7 Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Wed, 25 Mar 2026 16:52:02 +0800 Subject: [PATCH 03/11] EDAC/amd64: Adjust the maximum number of memory controllers per node to 1 for Hygon family 18h model 18h commit 301061b5a9bf685af46b38f3ec512ae690d22f9e anolis. ANBZ: #31970 Adjust max_mcs for Hygon Family 18h Model 18h processors to reflect the correct number of memory controllers per node. Set to 1 as this CPU model hasa single memory controller per node. Hygon-SIG: commit none hygon anolis: EDAC/amd64: Adjust the maximum number of memory controllers per node to 1 for Hygon family 18h model 18h Hygon-SIG: commit 301061b5a9bf anolis anolis: EDAC/amd64: Adjust the maximum number of memory controllers per node to 1 for Hygon family 18h model 18h Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by: Xiaochen Shen Reviewed-by: Yuanhe Shu Reviewed-by: Ruidong Tian Reviewed-by: Shuai Xue Link: https://gitee.com/anolis/cloud-kernel/pulls/6671 [ YuntongJin : amend commit log,fix conflict ] Signed-off-by: YuntongJin --- drivers/edac/amd64_edac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 4b934896dd095..68beb5b05a6b6 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4254,6 +4254,10 @@ static int per_family_init(struct amd64_pvt *pvt) case 0x10: pvt->ctl_name = "F18h_M10h"; break; + case 0x18: + pvt->ctl_name = "F18h_M18h"; + pvt->max_mcs = 1; + break; default: pvt->ctl_name = "F18h"; break; From d1b21e60fa2c2b88c2fa161daac5f8eac0b14cac Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 15:08:42 +0800 Subject: [PATCH 04/11] ALSA: hda: Add support for Hygon family 18h model 18h HD-Audio commit f8f6147fddc76fe44c4ca6a82241b5772afc0860 anolis. ANBZ: #30096 Add the new PCI ID 0x1d94 0x2007 for Hygon family 18h model 18h HDA controller. Hygon-SIG: commit none hygon anolis: ALSA: hda: Add support for Hygon family 18h model 18h HD-Audio Hygon-SIG: commit f8f6147fddc7 anolis anolis: ALSA: hda: Add support for Hygon family 18h model 18h HD-Audio Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Xiaochen Shen Reviewed-by Guixin Liu Reviewed-by: Xunlei Pang Link: https://gitee.com/anolis/cloud-kernel/pulls/6459 [ YuntongJin : amend commit log and add PCI_DEVICE_ID_HYGON_18H_M18H_HDA in pci_ids.h ] Signed-off-by: YuntongJin --- include/linux/pci_ids.h | 1 + sound/pci/hda/hda_intel.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c5495a819ab15..c9dd73b5c11e7 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2602,6 +2602,7 @@ #define PCI_VENDOR_ID_HYGON 0x1d94 #define PCI_DEVICE_ID_HYGON_18H_M05H_HDA 0x14a9 #define PCI_DEVICE_ID_HYGON_18H_M10H_HDA 0x14c9 +#define PCI_DEVICE_ID_HYGON_18H_M18H_HDA 0x2007 #define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3 0x14b3 #define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F3 0x14d3 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 394d654caf8ea..6cf492735ff2c 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2926,6 +2926,8 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_HYGON | AZX_DCAPS_POSFIX_LPIB | AZX_DCAPS_NO_MSI }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_HDA), .driver_data = AZX_DRIVER_HYGON }, + { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M18H_HDA), + .driver_data = AZX_DRIVER_HYGON | AZX_DCAPS_POSFIX_LPIB }, { 0, } }; MODULE_DEVICE_TABLE(pci, azx_ids); From 6ac8660a351587d72c603e947b4ca7f17f9532fa Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Mon, 26 Jan 2026 16:23:14 +0800 Subject: [PATCH 05/11] x86/amd_nb: Add Hygon family 18h model 18h PCI IDs commit 903e3d7834e2c901fe6371d79d45493c9ca23f9a anolis. ANBZ: #30093 Add the PCI device IDs for Hygon family 18h model 18h processors. Hygon-SIG: commit none hygon anolis: x86/amd_nb: Add Hygon family 18h model 18h PCI IDs Hygon-SIG: commit 903e3d7834e2 anolis anolis: x86/amd_nb: Add Hygon family 18h model 18h PCI IDs Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6456 [ YuntongJin : amend commit log ] Signed-off-by: YuntongJin --- arch/x86/kernel/amd_nb.c | 5 +++++ include/linux/pci_ids.h | 1 + 2 files changed, 6 insertions(+) diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index 488a184034d46..01373bee919b2 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -47,10 +47,12 @@ #define PCI_DEVICE_ID_HYGON_18H_M05H_ROOT 0x14a0 #define PCI_DEVICE_ID_HYGON_18H_M10H_ROOT 0x14c0 +#define PCI_DEVICE_ID_HYGON_18H_M18H_ROOT 0x2000 #define PCI_DEVICE_ID_HYGON_18H_M04H_DF_F1 0x1491 #define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F1 0x14b1 #define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F4 0x14b4 #define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F4 0x14d4 +#define PCI_DEVICE_ID_HYGON_18H_M18H_DF_F4 0x2014 #define PCI_DEVICE_ID_HYGON_18H_M06H_DF_F5 0x14b5 /* Protect the PCI config register pairs used for SMN. */ @@ -139,6 +141,7 @@ static const struct pci_device_id hygon_root_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_ROOT) }, { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_ROOT) }, + { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M18H_ROOT) }, {} }; @@ -147,6 +150,7 @@ static const struct pci_device_id hygon_nb_misc_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3) }, { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_DF_F3) }, + { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M18H_DF_F3) }, {} }; @@ -155,6 +159,7 @@ static const struct pci_device_id hygon_nb_link_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_DF_F4) }, { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_HYGON, PCI_DEVICE_ID_HYGON_18H_M18H_DF_F4) }, {} }; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c9dd73b5c11e7..dcacad7f81d31 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2605,6 +2605,7 @@ #define PCI_DEVICE_ID_HYGON_18H_M18H_HDA 0x2007 #define PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3 0x14b3 #define PCI_DEVICE_ID_HYGON_18H_M10H_DF_F3 0x14d3 +#define PCI_DEVICE_ID_HYGON_18H_M18H_DF_F3 0x2013 #define PCI_VENDOR_ID_FUNGIBLE 0x1dad From 2249df638712616edcc47f533cc8a787ba90d2bf Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 11:20:51 +0800 Subject: [PATCH 06/11] hwmon/k10temp: Add support for Hygon family 18h model 18h commit 017d6e72deb966de1cbc6b608f1386a07f26ae2d anolis. ANBZ: #30094 Add 18H_M18H DF F3 device ID to get the temperature for Hygon family 18h model 18h processor. Hygon-SIG: commit none hygon anolis: hwmon/k10temp: Add support for Hygon family 18h model 18h Hygon-SIG: commit 017d6e72deb9 anolis anolis: hwmon/k10temp: Add support for Hygon family 18h model 18h Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Reviewed-by Xiaochen Shen Link: https://gitee.com/anolis/cloud-kernel/pulls/6457 [ YuntongJin: amend commit log ] Signed-off-by: YuntongJin --- drivers/hwmon/k10temp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 0c67ef699dc07..0212f81b5f020 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -652,6 +652,7 @@ static const struct pci_device_id k10temp_id_table[] = { { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_HYGON_18H_M05H_DF_F3) }, { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_HYGON_18H_M10H_DF_F3) }, + { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_HYGON_18H_M18H_DF_F3) }, {} }; MODULE_DEVICE_TABLE(pci, k10temp_id_table); From adae0b354c72474e8203bf4331131bb55f2a128d Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 11:42:48 +0800 Subject: [PATCH 07/11] iommu/hygon: Add support for Hygon family 18h model 18h IOAPIC commit ec8b426005d02f1cff53e599d9a5aa1f7a85f920 anolis. ANBZ: #30095 The SB IOAPIC for Hygon family 18h model 18h processors is also on the device 0xb. Hygon-SIG: commit none hygon anolis: iommu/hygon: Add support for Hygon family 18h model 18h IOAPIC Hygon-SIG: commit ec8b426005d0 anolis anolis: iommu/hygon: Add support for Hygon family 18h model 18h IOAPIC Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6458 [ YuntongJin : amend commit log ] Signed-off-by: YuntongJin --- drivers/iommu/amd/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c index 34c82941ef802..e89b48a6f1851 100644 --- a/drivers/iommu/amd/init.c +++ b/drivers/iommu/amd/init.c @@ -3054,7 +3054,7 @@ static bool __init check_ioapic_information(void) (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON && boot_cpu_data.x86 == 0x18 && boot_cpu_data.x86_model >= 0x4 && - boot_cpu_data.x86_model <= 0x10 && + boot_cpu_data.x86_model <= 0x18 && devid == IOAPIC_SB_DEVID_FAM18H_M4H)) { has_sb_ioapic = true; ret = true; From f20332b07489203c5547af4b5deae3bed6cef3ac Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 15:31:37 +0800 Subject: [PATCH 08/11] mmc: sdhci-acpi: Add device HID for Hygon eMMC controller commit 42c9284c729ea71b3d363c8c4160b796b738c9f7 anolis. ANBZ: #30151 Add HID HYGO0040 to support Hygon eMMC controller. Hygon-SIG: commit none hygon anolis: mmc: sdhci-acpi: Add device HID for Hygon eMMC controller Hygon-SIG: commit 42c9284c729e anolis anolis: mmc: sdhci-acpi: Add device HID for Hygon eMMC controller Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6462 [ YuntongJin : amend commit log,fix conflict ] Signed-off-by: YuntongJin --- drivers/mmc/host/sdhci-acpi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index eb8f427f9770d..2f24859580b4b 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -700,6 +700,7 @@ static const struct sdhci_acpi_uid_slot sdhci_acpi_uids[] = { { "QCOM8052", NULL, &sdhci_acpi_slot_qcom_sd }, { "AMDI0040", NULL, &sdhci_acpi_slot_amd_emmc }, { "AMDI0041", NULL, &sdhci_acpi_slot_amd_emmc }, + { "HYGO0040", NULL, &sdhci_acpi_slot_amd_emmc }, { }, }; @@ -718,6 +719,7 @@ static const struct acpi_device_id sdhci_acpi_ids[] = { { "QCOM8052" }, { "AMDI0040" }, { "AMDI0041" }, + { "HYGO0040" }, { }, }; MODULE_DEVICE_TABLE(acpi, sdhci_acpi_ids); From 4f1852d8100409beefe87dd274835d9b5146800a Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 17:17:57 +0800 Subject: [PATCH 09/11] mmc: sdhci-pci: Add support for Hygon SD controller commit 40cf687b108d607faea96aa28265a77d7b9aa38a anolis. ANBZ: #30151 Add PCI ID for Hygon SD controller. Hygon-SIG: commit none hygon anolis: mmc: sdhci-pci: Add support for Hygon SD controller Hygon-SIG: commit 40cf687b108d anolis anolis: mmc: sdhci-pci: Add support for Hygon SD controller Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6465 [ YuntongJin: amend commit log and fix conflict ] Signed-off-by: YuntongJin --- drivers/mmc/host/sdhci-pci-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 2ea5357e3bf0e..47d3e6640b7ac 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -1942,6 +1942,7 @@ static const struct pci_device_id pci_ids[] = { SDHCI_PCI_DEVICE(GLI, 9763E, gl9763e), SDHCI_PCI_DEVICE(GLI, 9767, gl9767), SDHCI_PCI_DEVICE_CLASS(AMD, SYSTEM_SDHCI, PCI_CLASS_MASK, amd), + SDHCI_PCI_DEVICE_CLASS(HYGON, SYSTEM_SDHCI, PCI_CLASS_MASK, amd), /* Generic SD host controller */ {PCI_DEVICE_CLASS(SYSTEM_SDHCI, PCI_CLASS_MASK)}, { /* end: all zeroes */ }, From c8241cf7cd8299f12bbb475d4da8a490d1a3d9d9 Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 16:43:41 +0800 Subject: [PATCH 10/11] spi: dw: Add device HID for Hygon SPI controller commit 4bf4507e1cf3c59031c12d2b7c5e93043dd11c69 anolis. ANBZ: #30152 Add HID HYGO0062 to support Hygon SPI controller. Hygon-SIG: commit none hygon anolis: spi: dw: Add device HID for Hygon SPI controller Hygon-SIG: commit 4bf4507e1cf3 anolis anolis: spi: dw: Add device HID for Hygon SPI controller Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6463 [ YuntongJin : amend commit log, fix conflict ] Signed-off-by: YuntongJin --- drivers/spi/spi-dw-mmio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c index 805264c9c65c6..6a2222290b52e 100644 --- a/drivers/spi/spi-dw-mmio.c +++ b/drivers/spi/spi-dw-mmio.c @@ -439,6 +439,7 @@ MODULE_DEVICE_TABLE(of, dw_spi_mmio_of_match); #ifdef CONFIG_ACPI static const struct acpi_device_id dw_spi_mmio_acpi_match[] = { {"HISI0173", (kernel_ulong_t)dw_spi_pssi_init}, + {"HYGO0062", (kernel_ulong_t)dw_spi_hssi_init}, {}, }; MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match); From 111396b183c3812ae8d07e52ba30bfee5601636f Mon Sep 17 00:00:00 2001 From: Liao Xuan Date: Tue, 27 Jan 2026 16:51:57 +0800 Subject: [PATCH 11/11] perf/x86/uncore: Add DF PMU support for Hygon family 18h model 18h commit dbab1265fda0034466e3d7b1d7c4e1877fbf84d2 anolis. ANBZ: #30150 Adjust the DF PMU event and umask for Hygon family 18h model 18h processor. Hygon-SIG: commit none hygon anolis: perf/x86/uncore: Add DF PMU support for Hygon family 18h model 18h Hygon-SIG: commit dbab1265fda0 anolis anolis: perf/x86/uncore: Add DF PMU support for Hygon family 18h model 18h Backport from anolis to support Hygon family 18h model 18h Signed-off-by: Liao Xuan Cc: hygon-arch@list.openanolis.cn Reviewed-by Guixin Liu Link: https://gitee.com/anolis/cloud-kernel/pulls/6464 [ YuntongJin: amend commit log, fix conflict ] Signed-off-by: YuntongJin --- arch/x86/events/amd/uncore.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c index cb0aa2e93d06d..1bb69e0fe5a9a 100644 --- a/arch/x86/events/amd/uncore.c +++ b/arch/x86/events/amd/uncore.c @@ -742,10 +742,8 @@ static int __init amd_uncore_init(void) if (boot_cpu_data.x86_model == 0x4 || boot_cpu_data.x86_model == 0x5) *df_attr++ = &format_attr_umask10f18h.attr; - else if (boot_cpu_data.x86_model == 0x6 || - boot_cpu_data.x86_model == 0x7 || - boot_cpu_data.x86_model == 0x8 || - boot_cpu_data.x86_model == 0x10) + else if (boot_cpu_data.x86_model >= 0x6 && + boot_cpu_data.x86_model <= 0x18) *df_attr++ = &format_attr_umask12f18h.attr; }