diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 2a2ed580aa380c6090380d1a12f62cefaaebc28d..e436978ad324e76343e677b0397d40ac0211b148 100644
--- a/arch/x86/events/amd/uncore.c
+++ b/arch/x86/events/amd/uncore.c
@@ -196,7 +196,8 @@ static u64 l3_thread_slice_mask(u64 config)
 
 	if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON &&
 	    boot_cpu_data.x86 == 0x18) {
-		if (boot_cpu_data.x86_model == 0x6)
+		if (boot_cpu_data.x86_model >= 0x6 &&
+		    boot_cpu_data.x86_model <= 0xf)
 			return ((config & HYGON_L3_SLICE_MASK) ? : HYGON_L3_SLICE_MASK) |
 			       ((config & HYGON_L3_THREAD_MASK) ? : HYGON_L3_THREAD_MASK);
 		else
@@ -642,7 +643,8 @@ static int __init amd_uncore_init(void)
 			   boot_cpu_data.x86 == 0x18) {
 			*l3_attr++ = &format_attr_event8.attr;
 			*l3_attr++ = &format_attr_umask.attr;
-			if (boot_cpu_data.x86_model == 6) {
+			if (boot_cpu_data.x86_model >= 6 &&
+			    boot_cpu_data.x86_model <= 0xf) {
 				*l3_attr++ = &format_attr_slicemask4.attr;
 				*l3_attr++ = &format_attr_threadmask32.attr;
 			} else {
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 383a5cead23ddf641a811bfff00fc6e207de67fb..59f08eb3e5e9bb3a1c6760f072cf888a6d2e4b64 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -281,6 +281,7 @@ static int get_df_register(struct pci_dev *misc, u8 func, int offset, u32 *value
 				device = PCI_DEVICE_ID_HYGON_18H_M04H_DF_F1;
 			break;
 		case 0x6:
+		case 0x7:
 			device = PCI_DEVICE_ID_HYGON_18H_M05H_DF_F1;
 			break;
 		default:
@@ -289,6 +290,7 @@ static int get_df_register(struct pci_dev *misc, u8 func, int offset, u32 *value
 	} else if (func == 5) {
 		switch (boot_cpu_data.x86_model) {
 		case 0x6:
+		case 0x7:
 			device = PCI_DEVICE_ID_HYGON_18H_M06H_DF_F5;
 			break;
 		default:
@@ -321,7 +323,8 @@ int get_df_id(struct pci_dev *misc, u8 *id)
 	u32 value;
 	int ret;
 
-	if (boot_cpu_data.x86_model == 0x6) {
+	if (boot_cpu_data.x86_model >= 0x6 &&
+	    boot_cpu_data.x86_model <= 0x7) {
 		/* F5x180[19:16]: DF ID */
 		ret = get_df_register(misc, 5, 0x180, &value);
 		*id = (value >> 16) & 0xf;
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index a4e5b97a58adece37bcd51a01c8d8a844840b769..8d9f4100628733f7902d6771a56299099d086739 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3568,6 +3568,11 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
 			fam_type = &family_types[F18_M06H_CPUS];
 			pvt->ops = &family_types[F18_M06H_CPUS].ops;
 			break;
+		} else if (pvt->model == 0x7) {
+			fam_type = &family_types[F18_M06H_CPUS];
+			pvt->ops = &family_types[F18_M06H_CPUS].ops;
+			family_types[F18_M06H_CPUS].ctl_name = "F18h_M07h";
+			break;
 		} else if (pvt->model == 0x10) {
 			fam_type = &family_types[F18_M10H_CPUS];
 			pvt->ops = &family_types[F18_M10H_CPUS].ops;