Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "Ghannam, Yazen" <Yazen.Ghannam@amd.com>
To:     "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>
CC:     "Ghannam, Yazen" <Yazen.Ghannam@amd.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "bp@alien8.de" <bp@alien8.de>
Subject: [PATCH 1/5] EDAC/amd64: Add Fam17hMod30h PCI IDs
Thread-Topic: [PATCH 1/5] EDAC/amd64: Add Fam17hMod30h PCI IDs
Thread-Index: AQHUyJFO2kTGZslcCUS37hwB/bq0XQ==
Date:   Tue, 19 Feb 2019 20:25:51 +0000
Message-ID: <20190219202536.15462-1-Yazen.Ghannam@amd.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-messagesentrepresentingtype: 1
x-mailer: git-send-email 2.17.1
x-originating-ip: [165.204.77.1]
x-ms-publictraffictype: Email
x-ms-office365-filtering-correlation-id: 65777d7b-2344-4398-96ac-08d696a8712c
x-ms-office365-filtering-ht: Tenant
x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:SN6PR12MB2829;
x-ms-traffictypediagnostic: SN6PR12MB2829:
x-microsoft-exchange-diagnostics: 1;SN6PR12MB2829;20:DDNFsrba3prPNsOUlP4ZrbZrnxTuRyXq3ZT+f+CFg8iwVMKJ+cnRYZM40uGKYcN3yPj31zqmU9AsmT12aRSR9auKnF96AcLk24o2z9ReOw/RjjJEFIUAs3sVEF+RKqWHbpH7lOdVDDI7Cjf57upwZpysnqQiJLTgdJuKXE6Ib9ZxsAFRFECi2zVh4sK1lDs0VpA5zNnx06+VJbz//tB9FP6SiGOpMhgwhewKDyqUdVExoHFGArZx3bIdQLaZUmXE
x-microsoft-antispam-prvs: <SN6PR12MB28294A1D7F549268EA23A647F87C0@SN6PR12MB2829.namprd12.prod.outlook.com>
x-forefront-prvs: 09538D3531
x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(366004)(396003)(376002)(39860400002)(346002)(189003)(199004)(36756003)(476003)(68736007)(86362001)(486006)(6486002)(26005)(14454004)(72206003)(478600001)(3846002)(6116002)(6512007)(6346003)(6506007)(102836004)(316002)(2616005)(25786009)(6436002)(6916009)(54906003)(4326008)(186003)(2906002)(5640700003)(5660300002)(386003)(53936002)(2501003)(99286004)(97736004)(305945005)(105586002)(52116002)(1076003)(50226002)(71190400001)(66066001)(8936002)(106356001)(2351001)(81166006)(71200400001)(81156014)(14444005)(8676002)(256004)(7736002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR12MB2829;H:SN6PR12MB2639.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1;
received-spf: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
authentication-results: spf=none (sender IP is )
 smtp.mailfrom=Yazen.Ghannam@amd.com; 
x-ms-exchange-senderadcheck: 1
x-microsoft-antispam-message-info: r+N31OtVaxmVZd9FecFxd48XklsV7sApzeaF9Sl+oWW644pEOgAz4kpGyJjvGu5vdjHzKZn2DDI7q/nPs+cJoP0j0WFxP+2Ngwrp1b5myzkPPkAc1Fw7cnEHNbioI8JcVTydOcxNs/UcnC0N/le/BBskaPprnU+JJFHkWONeGKqSsvDK0yzNZoBSjHSfSmxk6FGH5DFLZVMPMryW81XdihKehlqV9ba6EStQFS1kk8cWJW15tmfEpC3Kh3flXlE+V3+NMZZc51X1wbsRm+w+VX9qDXOlqk66730N5n9uCr0nSDc95H/iLGMUpiIeWjVY44sg1ozrHM+HQx4Y8ofyhxQvOCl74B7uBVyVm2SvRysfEzALSKnnW3pttNQaC3ojlsEKAhlpcWO4hYjmFq37xdBvBHbZS2prk1fIiI/xCe0=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 65777d7b-2344-4398-96ac-08d696a8712c
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Feb 2019 20:25:50.0561
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2829
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Yazen Ghannam <yazen.ghannam@amd.com>

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 Fam17hMod30h were added to the AMD NB code.

Fixes: be3518a16ef2 (x86/amd_nb: Add PCI device IDs for family 17h, model 3=
0h)
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
 drivers/edac/amd64_edac.c | 15 ++++++++++++++-
 drivers/edac/amd64_edac.h |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 6ea98575a402..9947437d9574 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2211,6 +2211,15 @@ static struct amd64_family_type family_types[] =3D {
 			.dbam_to_cs		=3D f17_base_addr_to_cs_size,
 		}
 	},
+	[F17_M30H_CPUS] =3D {
+		.ctl_name =3D "F17h_M30h",
+		.f0_id =3D PCI_DEVICE_ID_AMD_17H_M30H_DF_F0,
+		.f6_id =3D PCI_DEVICE_ID_AMD_17H_M30H_DF_F6,
+		.ops =3D {
+			.early_channel_count	=3D f17_early_channel_count,
+			.dbam_to_cs		=3D f17_base_addr_to_cs_size,
+		}
+	},
 };
=20
 /*
@@ -3199,7 +3208,11 @@ static struct amd64_family_type *per_family_init(str=
uct amd64_pvt *pvt)
 		break;
=20
 	case 0x17:
-		if (pvt->model >=3D 0x10 && pvt->model <=3D 0x2f) {
+		if (pvt->model >=3D 0x30 && pvt->model <=3D 0x3f) {
+			fam_type =3D &family_types[F17_M30H_CPUS];
+			pvt->ops =3D &family_types[F17_M30H_CPUS].ops;
+			break;
+		} else if (pvt->model >=3D 0x10 && pvt->model <=3D 0x2f) {
 			fam_type =3D &family_types[F17_M10H_CPUS];
 			pvt->ops =3D &family_types[F17_M10H_CPUS].ops;
 			break;
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index 4242f8e39c18..de8dbb0b42b5 100644
--- 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
=20
 /*
  * Function 1 - Address Map
@@ -284,6 +286,7 @@ enum amd_families {
 	F16_M30H_CPUS,
 	F17_CPUS,
 	F17_M10H_CPUS,
+	F17_M30H_CPUS,
 	NUM_FAMILIES,
 };
=20
--=20
2.17.1