EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell

badgerious · aegl · commit 537bddd069c7 · 2021-10-11T08:28:46.000-07:00
The computation of TOHM is off by one bit. This missed bit results in too low a value for TOHM, which can cause errors in regular memory to incorrectly report: EDAC MC0: 1 CE Error at MMIOH area, on addr 0x000000207fffa680 on any memory Fixes: 50d1bb9 ("sb_edac: add support for Haswell based systems") Cc: stable@vger.kernel.org Reported-by: Meeta Saggi <msaggi@purestorage.com> Signed-off-by: Eric Badger <ebadger@purestorage.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Link: https://lore.kernel.org/r/20211010170127.848113-1-ebadger@purestorage.com
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
@@ -1052,7 +1052,7 @@ static u64 haswell_get_tohm(struct sbridge_pvt *pvt)
 	pci_read_config_dword(pvt->info.pci_vtd, HASWELL_TOHM_1, &reg);
 	rc = ((reg << 6) | rc) << 26;
 
-	return rc | 0x1ffffff;
+	return rc | 0x3ffffff;
 }
 
 static u64 knl_get_tolm(struct sbridge_pvt *pvt)

Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ static u64 haswell_get_tohm(struct sbridge_pvt *pvt)`
`1052`	`1052`	`pci_read_config_dword(pvt->info.pci_vtd, HASWELL_TOHM_1, &reg);`
`1053`	`1053`	`rc = ((reg << 6) \| rc) << 26;`
`1054`	`1054`
`1055`		`- return rc \| 0x1ffffff;`
	`1055`	`+ return rc \| 0x3ffffff;`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`static u64 knl_get_tolm(struct sbridge_pvt *pvt)`