diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index cb0aa2e93d06d67935139f3e8c3d590eb34a023d..c7831fdef5cc5436279b4986cc1939b2b1980477 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;
 		}
 
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 30750716814ac79af39f93b013e57f85fb8cbf4b..826e7ea041e06dabd825c5164a988f918c0c8bd5 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -23,10 +23,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
 
 static u32 *flush_words;
@@ -49,6 +51,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) },
 	{}
 };
 
@@ -57,6 +60,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) },
 	{}
 };
 
@@ -65,6 +69,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/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 18ea110a1d74b66a5e3a9f9770bb24e5f1f5afef..a69d9ebf94724a60440379dd5e5383883995f6f7 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
  */
@@ -2053,8 +2076,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);
 
@@ -3543,8 +3566,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);
 
@@ -4481,28 +4504,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:
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index cc3ae64e25aea7581c8a33e5d7ce4b708fbe421f..52bfeb8713e1a958afe94e41c6381e4f9754a52f 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -653,6 +653,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);
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 24bdc26f354b2ca94f218a1c112b90a135b8cb37..4738c8e7f00764f51944205a103a34b595df7cee 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -3074,7 +3074,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;
diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
index eb8f427f9770d52106b84d8882d41f56b065d5fb..2f24859580b4b74d28542227d901cbe2ff7e7dd6 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);
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c
index 2ea5357e3bf0eab9cfdaa940ff56f1a071e1fade..47d3e6640b7aca919c6f7c72c29fe403576426fe 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 */ },
diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
index 805264c9c65c6518af56163faa5d6ae6e01a55ff..6a2222290b52eed720a7a782cd78a1bde6e99d7b 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);
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 71e84110fcdc1a8f126d2d18373d8ff672ef47c6..b6f881d330bccf7cced3648fcd547a6fb56112ae 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2603,8 +2603,10 @@
 #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
+#define PCI_DEVICE_ID_HYGON_18H_M18H_DF_F3	0x2013
 
 #define PCI_VENDOR_ID_FUNGIBLE		0x1dad
 
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 11d8d0134a26d3ad6ac7c266ae55f9c9e23ead59..133a5610b3f3371446c7d858594be737069cc381 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2870,6 +2870,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);