EDAC/amd64: Add Family 17h Model 30h PCI IDs

[ Upstream commit 6e846239e5487cbb89ac8192d5f11437d010130e ]

Add the new Family 17h Model 30h PCI IDs to the AMD64 EDAC module.

This also fixes a probe failure that appeared when some other PCI IDs
for Family 17h Model 30h were added to the AMD NB code.

Fixes: be3518a16ef2 (x86/amd_nb: Add PCI device IDs for family 17h, model 30h)
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Kim Phillips <kim.phillips@amd.com>
Cc: James Morse <james.morse@arm.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: https://lkml.kernel.org/r/20190228153558.127292-1-Yazen.Ghannam@amd.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 05d6f9c86ac3873e330e46b911f1bf08d77451c7..268ada29cd9878310de9fb5dd82018fc5f084fc6 100644 (file)
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2209,6 +2209,15 @@ static struct amd64_family_type family_types[] = {
                        .dbam_to_cs             = f17_base_addr_to_cs_size,
                }
        },
+       [F17_M30H_CPUS] = {
+               .ctl_name = "F17h_M30h",
+               .f0_id = PCI_DEVICE_ID_AMD_17H_M30H_DF_F0,
+               .f6_id = PCI_DEVICE_ID_AMD_17H_M30H_DF_F6,
+               .ops = {
+                       .early_channel_count    = f17_early_channel_count,
+                       .dbam_to_cs             = f17_base_addr_to_cs_size,
+               }
+       },
 };
 
 /*
@@ -3212,6 +3221,10 @@ static struct amd64_family_type *per_family_init(struct amd64_pvt *pvt)
                        fam_type = &family_types[F17_M10H_CPUS];
                        pvt->ops = &family_types[F17_M10H_CPUS].ops;
                        break;
+               } else if (pvt->model >= 0x30 && pvt->model <= 0x3f) {
+                       fam_type = &family_types[F17_M30H_CPUS];
+                       pvt->ops = &family_types[F17_M30H_CPUS].ops;
+                       break;
                }
                fam_type        = &family_types[F17_CPUS];
                pvt->ops        = &family_types[F17_CPUS].ops;

diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 4242f8e39c18fef057f8ae096a097f02a7add378..de8dbb0b42b5513c2d5ef0f033a4f0a68e87735b 100644 (file)
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -117,6 +117,8 @@
 #define PCI_DEVICE_ID_AMD_17H_DF_F6    0x1466
 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F0 0x15e8
 #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee
+#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490
+#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496
 
 /*
  * Function 1 - Address Map
@@ -284,6 +286,7 @@ enum amd_families {
        F16_M30H_CPUS,
        F17_CPUS,
        F17_M10H_CPUS,
+       F17_M30H_CPUS,
        NUM_FAMILIES,
 };