Skip to contentSkip to conversation

EDAC/amd64: Do not load on family 0x15, model 0x13

PATCH New Borislav Petkov 1 participant 1 message Dec 18, 2020

Subsystems (2)
EDAC-core EDAC-AMD64
lore
Share & tools
lore

Borislav Petkov

author maintainer
#0 lore raw

PATCH 1/1 EDAC/amd64: Do not load on family 0x15, model 0x13

From: Borislav Petkov <[email protected]>

Those were only laptops and are very very unlikely to have ECC memory. Currently, when the driver attempts to load, it issues:

EDAC amd64: Error: F1 not found: device 0x1601 (broken BIOS?)

because the PCI device is the wrong one (it uses the F15h default one).

So do not load the driver on them as that is pointless.

Reported-by Don Curtis <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Tested-by Don Curtis <[email protected]>
Link http://bugzilla.opensuse.org/show_bug.cgi?id=1179763
---
 drivers/edac/amd64_edac.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/edac/amd64_edac.c +7 -3
index f7087ddddb90..5754f429a8d2 100644
@@ -3342,10 +3342,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
 			fam_type = &family_types[F15_M60H_CPUS];
 			pvt->ops = &family_types[F15_M60H_CPUS].ops;
 			break;
+		/* Richland is only client */
+		} else if (pvt->model == 0x13) {
+			return NULL;
+		} else {
+			fam_type	= &family_types[F15_CPUS];
+			pvt->ops	= &family_types[F15_CPUS].ops;
 		}
-
-		fam_type	= &family_types[F15_CPUS];
-		pvt->ops	= &family_types[F15_CPUS].ops;
 		break;
 
 	case 0x16:

@@ -3539,6 +3542,7 @@ static int probe_one_instance(unsigned int nid)
 	pvt->mc_node_id	= nid;
 	pvt->F3 = F3;
 
+	ret = -ENODEV;
 	fam_type = per_family_init(pvt);
 	if (!fam_type)
 		goto err_enable;
Signature · 1 line
2.29.2