diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 426e24d8ae75867a00566baa3aaa107490121485..96a44a4a539d8b7ff89239601724ee79f23dd2c3 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -1049,7 +1049,10 @@ static int hygon_umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sy
 		break;
 
 	case 8:
-		intlv_num_chan = 1;
+		if (boot_cpu_data.x86_model >= 0x6)
+			intlv_num_chan = 2;
+		else
+			intlv_num_chan = 1;
 		hash_enabled = true;
 		break;
 	default:
@@ -1164,10 +1167,16 @@ static int hygon_umc_normaddr_to_sysaddr(u64 norm_addr, u16 nid, u8 umc, u64 *sy
 				(ret_addr >> 30) ^
 				cs_id;
 
-		hashed_bit &= BIT(0);
-
-		if (hashed_bit != ((ret_addr >> intlv_addr_bit) & BIT(0)))
-			ret_addr ^= BIT(intlv_addr_bit);
+		if (boot_cpu_data.x86_model >= 0x6) {
+			hashed_bit &= 0x3;
+			if (hashed_bit != ((ret_addr >> intlv_addr_bit) & 0x3))
+				ret_addr = (ret_addr & ~((u64)3 << intlv_addr_bit)) |
+						(hashed_bit << intlv_addr_bit);
+		} else {
+			hashed_bit &= BIT(0);
+			if (hashed_bit != ((ret_addr >> intlv_addr_bit) & BIT(0)))
+				ret_addr ^= BIT(intlv_addr_bit);
+		}
 	}
 
 	/* Is calculated system address is above DRAM limit address? */