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

[ Upstream commit 6c13d7ff81e6d2f01f62ccbfa49d1b8d87f274d0 ]

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 <bugrprt21882@online.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Don Curtis <bugrprt21882@online.de>
Link: http://bugzilla.opensuse.org/show_bug.cgi?id=1179763
Link: https://lkml.kernel.org/r/20201218160622.20146-1-bp@alien8.de
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 620f7041db6b5f3efce2fedd38a5ee1a910c02da..b36d5879b91e05df07052721339541fcf2130c55 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -3350,10 +3350,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:
@@ -3547,6 +3550,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;