diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 3961ffe9eec0810b19d51428df4bc7977452ded4..238803562870ea7f2767e45d08728bd940080338 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -270,8 +270,7 @@ static int get_df_register(struct pci_dev *misc, u8 func, int offset, u32 *value
 			else
 				device = PCI_DEVICE_ID_HYGON_18H_M04H_DF_F1;
 			break;
-		case 0x6:
-		case 0x7:
+		case 0x6 ... 0x8:
 			device = PCI_DEVICE_ID_HYGON_18H_M05H_DF_F1;
 			break;
 		default:
@@ -279,8 +278,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:
+		case 0x6 ... 0x8:
 			device = PCI_DEVICE_ID_HYGON_18H_M06H_DF_F5;
 			break;
 		default:
@@ -313,7 +311,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 <= 0xf) {
 		/* 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 03553ceaf12e7ed7fbb48a1f547852fe774c5968..f62534e61ee8c420f636bbd57e2d0a21175b0aaf 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3552,6 +3552,11 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
 			pvt->ops = &family_types[F18_M06H_CPUS].ops;
 			family_types[F18_M06H_CPUS].ctl_name = "F18h_M07h";
 			break;
+		} else if (pvt->model == 0x8) {
+			fam_type = &family_types[F18_M06H_CPUS];
+			pvt->ops = &family_types[F18_M06H_CPUS].ops;
+			family_types[F18_M06H_CPUS].ctl_name = "F18h_M08h";
+			break;
 		} else if (pvt->model == 0x10) {
 			fam_type = &family_types[F18_M10H_CPUS];
 			pvt->ops = &family_types[F18_M10H_CPUS].ops;