提交 4cfd741c 编写于 作者: B Borislav Petkov 提交者: Zheng Zengkai

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

stable inclusion
from stable-5.10.21
commit a03583775a5f3e0171e15692159cdbf7816ddf6f
bugzilla: 50609

--------------------------------

[ Upstream commit 6c13d7ff ]

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: NDon Curtis <bugrprt21882@online.de>
Signed-off-by: NBorislav Petkov <bp@suse.de>
Tested-by: NDon 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.deSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 8bcdf862
...@@ -3350,10 +3350,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt) ...@@ -3350,10 +3350,13 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
fam_type = &family_types[F15_M60H_CPUS]; fam_type = &family_types[F15_M60H_CPUS];
pvt->ops = &family_types[F15_M60H_CPUS].ops; pvt->ops = &family_types[F15_M60H_CPUS].ops;
break; break;
} /* Richland is only client */
} else if (pvt->model == 0x13) {
return NULL;
} else {
fam_type = &family_types[F15_CPUS]; fam_type = &family_types[F15_CPUS];
pvt->ops = &family_types[F15_CPUS].ops; pvt->ops = &family_types[F15_CPUS].ops;
}
break; break;
case 0x16: case 0x16:
...@@ -3547,6 +3550,7 @@ static int probe_one_instance(unsigned int nid) ...@@ -3547,6 +3550,7 @@ static int probe_one_instance(unsigned int nid)
pvt->mc_node_id = nid; pvt->mc_node_id = nid;
pvt->F3 = F3; pvt->F3 = F3;
ret = -ENODEV;
fam_type = per_family_init(pvt); fam_type = per_family_init(pvt);
if (!fam_type) if (!fam_type)
goto err_enable; goto err_enable;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册