diff --git a/arch/x86/events/amd/uncore.c b/arch/x86/events/amd/uncore.c
index 1c569498ce8f429b13ab8e8549082dbd12566d4d..fe3cf6e4816f77dde863737739ef77d8fbc0189f 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 >= 0x6 &&
+			    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 80d36fafcc6d9658a6640c61123d0c7c6f46b20d..08a3c81bac31f2c1b944470beb3a975d987c96e1 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -266,6 +266,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:
@@ -274,6 +275,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:
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 69307f4661be9b773735787a3c151690fc62eac5..7e7fb0066a4889a609449765476d152fa574bfdf 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3537,6 +3537,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;
 		}
 		fam_type	= &family_types[F17_CPUS];
 		pvt->ops	= &family_types[F17_CPUS].ops;