From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52900C73C5E for ; Tue, 9 Jul 2019 21:57:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11F2A20861 for ; Tue, 9 Jul 2019 21:57:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="r9tvzIjK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726666AbfGIV5Y (ORCPT ); Tue, 9 Jul 2019 17:57:24 -0400 Received: from mail-eopbgr720088.outbound.protection.outlook.com ([40.107.72.88]:41787 "EHLO NAM05-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729594AbfGIV5B (ORCPT ); Tue, 9 Jul 2019 17:57:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VHQHIZ0dvTDHTXrKhLe4JZSpTD1/in7YP6W8ZFwIyHE=; b=r9tvzIjK3QABqfnR9iJEwTaLMujmUEj/Q7PfpJ2Qerbhh2u43JgiKvmVhN0aD+ebDNDr+6Z2ZRekTGURuZM7yZsGWGnrM82E2S5oDeb4tVz17Z+DNZhEAzygf35WbrSQPgIpYTR+LuWLKn/OmrAQt7EYZi++4i/GNyRscnQti9s= Received: from SN6PR12MB2639.namprd12.prod.outlook.com (52.135.103.16) by SN6PR12MB2637.namprd12.prod.outlook.com (52.135.103.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2052.19; Tue, 9 Jul 2019 21:56:54 +0000 Received: from SN6PR12MB2639.namprd12.prod.outlook.com ([fe80::fd06:e03b:2b06:e8d7]) by SN6PR12MB2639.namprd12.prod.outlook.com ([fe80::fd06:e03b:2b06:e8d7%6]) with mapi id 15.20.2052.020; Tue, 9 Jul 2019 21:56:54 +0000 From: "Ghannam, Yazen" To: "linux-edac@vger.kernel.org" CC: "Ghannam, Yazen" , "linux-kernel@vger.kernel.org" , "bp@alien8.de" Subject: [PATCH v2 1/7] EDAC/amd64: Support more than two controllers for chip selects handling Thread-Topic: [PATCH v2 1/7] EDAC/amd64: Support more than two controllers for chip selects handling Thread-Index: AQHVNqE4oirUNEimHEy0KqOPoRGXhw== Date: Tue, 9 Jul 2019 21:56:54 +0000 Message-ID: <20190709215643.171078-2-Yazen.Ghannam@amd.com> References: <20190709215643.171078-1-Yazen.Ghannam@amd.com> In-Reply-To: <20190709215643.171078-1-Yazen.Ghannam@amd.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: SN4PR0401CA0034.namprd04.prod.outlook.com (2603:10b6:803:2a::20) To SN6PR12MB2639.namprd12.prod.outlook.com (2603:10b6:805:6f::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Yazen.Ghannam@amd.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [165.204.78.2] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 86872ae6-1bb0-47bc-5cbc-08d704b85b15 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:SN6PR12MB2637; x-ms-traffictypediagnostic: SN6PR12MB2637: x-ms-exchange-purlcount: 2 x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:390; x-forefront-prvs: 0093C80C01 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(396003)(39860400002)(346002)(136003)(376002)(366004)(199004)(189003)(14444005)(50226002)(2906002)(256004)(81166006)(81156014)(8676002)(53936002)(5660300002)(36756003)(26005)(386003)(6916009)(102836004)(66446008)(5640700003)(6506007)(478600001)(966005)(6436002)(6486002)(6306002)(6512007)(316002)(54906003)(8936002)(52116002)(71200400001)(71190400001)(76176011)(486006)(2351001)(99286004)(25786009)(446003)(2616005)(2501003)(86362001)(11346002)(186003)(476003)(6116002)(3846002)(7736002)(68736007)(1076003)(66066001)(66476007)(66946007)(4326008)(64756008)(66556008)(305945005)(14454004);DIR:OUT;SFP:1101;SCL:1;SRVR:SN6PR12MB2637;H:SN6PR12MB2639.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: rCTjdH4JnveA6TwVE4sWU0T+rcwTl2Y5bPD8o9SCHdTt8amhawEzENxJKgto3ri9ZyxUoOXg9TYOnz1redO8VDE04aO8buv8SbwB3oMUtpOBm5PyzM8mJnPdzQOl4FhGfHGMWQdhGVqTGzyw6AMJnCfFEsnpin3GJHtLneNlzDPGmG8ocVdI6Yh7Kz1Z7bdQSHfmDy/GZbtum/nKLBxo6PgTb1XeDex6hfsua+MIgRSd2bvBxMuAC3uG6v9UV9wOlFGxjHLCL1FX8jmYH9mEA4KPJpx2It2FZwm2LiPAJsaS9bqJAkdVGrtDfGlf0pMfVP6ti6TZdUez8GI82j3aiqf5RtsTgH1W7kk7aOL6gVz/UhvOwJkEYDZ6ia1kpE5sGWtU+pInBvC1jrKqRk4L4JcZazy6KlIL3mwSkguki20= 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: 86872ae6-1bb0-47bc-5cbc-08d704b85b15 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jul 2019 21:56:54.7613 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: yghannam@amd.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2637 Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Yazen Ghannam The struct chip_select array that's used for saving chip select bases and masks is fixed at length of two. There should be one struct chip_select for each controller, so this array should be increased to support systems that may have more than two controllers. Increase the size of the struct chip_select array to eight, which is the largest number of controllers per die currently supported on AMD systems. Fix number of DIMMs and Chip Select bases/masks on Family17h, because AMD Family 17h systems support 2 DIMMs, 4 CS bases, and 2 CS masks per channel. Also, carve out the Family 17h+ reading of the bases/masks into a separate function. This effectively reverts the original bases/masks reading code to before Family 17h support was added. This is a second version of a commit that was reverted. Fixes: 07ed82ef93d6 ("EDAC, amd64: Add Fam17h debug output") Fixes: 8de9930a4618 ("Revert "EDAC/amd64: Support more than two controllers= for chip select handling"") Signed-off-by: Yazen Ghannam --- Link: https://lkml.kernel.org/r/20190531234501.32826-2-Yazen.Ghannam@amd.com https://lkml.kernel.org/r/20190531234501.32826-3-Yazen.Ghannam@amd.com v1->v2: * Patches 1 and 2 squashed together. drivers/edac/amd64_edac.c | 123 +++++++++++++++++++++----------------- drivers/edac/amd64_edac.h | 5 +- 2 files changed, 71 insertions(+), 57 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 873437be86d9..dd60cf5a3d96 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -810,7 +810,7 @@ static void debug_display_dimm_sizes_df(struct amd64_pv= t *pvt, u8 ctrl) =20 edac_printk(KERN_DEBUG, EDAC_MC, "UMC%d chip selects:\n", ctrl); =20 - for (dimm =3D 0; dimm < 4; dimm++) { + for (dimm =3D 0; dimm < 2; dimm++) { size0 =3D 0; cs0 =3D dimm * 2; =20 @@ -942,89 +942,102 @@ static void prep_chip_selects(struct amd64_pvt *pvt) } else if (pvt->fam =3D=3D 0x15 && pvt->model =3D=3D 0x30) { pvt->csels[0].b_cnt =3D pvt->csels[1].b_cnt =3D 4; pvt->csels[0].m_cnt =3D pvt->csels[1].m_cnt =3D 2; + } else if (pvt->fam >=3D 0x17) { + int umc; + + for_each_umc(umc) { + pvt->csels[umc].b_cnt =3D 4; + pvt->csels[umc].m_cnt =3D 2; + } + } else { pvt->csels[0].b_cnt =3D pvt->csels[1].b_cnt =3D 8; pvt->csels[0].m_cnt =3D pvt->csels[1].m_cnt =3D 4; } } =20 +static void read_umc_base_mask(struct amd64_pvt *pvt) +{ + u32 umc_base_reg, umc_mask_reg; + u32 base_reg, mask_reg; + u32 *base, *mask; + int cs, umc; + + for_each_umc(umc) { + umc_base_reg =3D get_umc_base(umc) + UMCCH_BASE_ADDR; + + for_each_chip_select(cs, umc, pvt) { + base =3D &pvt->csels[umc].csbases[cs]; + + base_reg =3D umc_base_reg + (cs * 4); + + if (!amd_smn_read(pvt->mc_node_id, base_reg, base)) + edac_dbg(0, " DCSB%d[%d]=3D0x%08x reg: 0x%x\n", + umc, cs, *base, base_reg); + } + + umc_mask_reg =3D get_umc_base(umc) + UMCCH_ADDR_MASK; + + for_each_chip_select_mask(cs, umc, pvt) { + mask =3D &pvt->csels[umc].csmasks[cs]; + + mask_reg =3D umc_mask_reg + (cs * 4); + + if (!amd_smn_read(pvt->mc_node_id, mask_reg, mask)) + edac_dbg(0, " DCSM%d[%d]=3D0x%08x reg: 0x%x\n", + umc, cs, *mask, mask_reg); + } + } +} + /* * Function 2 Offset F10_DCSB0; read in the DCS Base and DCS Mask register= s */ static void read_dct_base_mask(struct amd64_pvt *pvt) { - int base_reg0, base_reg1, mask_reg0, mask_reg1, cs; + int cs; =20 prep_chip_selects(pvt); =20 - if (pvt->umc) { - base_reg0 =3D get_umc_base(0) + UMCCH_BASE_ADDR; - base_reg1 =3D get_umc_base(1) + UMCCH_BASE_ADDR; - mask_reg0 =3D get_umc_base(0) + UMCCH_ADDR_MASK; - mask_reg1 =3D get_umc_base(1) + UMCCH_ADDR_MASK; - } else { - base_reg0 =3D DCSB0; - base_reg1 =3D DCSB1; - mask_reg0 =3D DCSM0; - mask_reg1 =3D DCSM1; - } + if (pvt->umc) + return read_umc_base_mask(pvt); =20 for_each_chip_select(cs, 0, pvt) { - int reg0 =3D base_reg0 + (cs * 4); - int reg1 =3D base_reg1 + (cs * 4); + int reg0 =3D DCSB0 + (cs * 4); + int reg1 =3D DCSB1 + (cs * 4); u32 *base0 =3D &pvt->csels[0].csbases[cs]; u32 *base1 =3D &pvt->csels[1].csbases[cs]; =20 - if (pvt->umc) { - if (!amd_smn_read(pvt->mc_node_id, reg0, base0)) - edac_dbg(0, " DCSB0[%d]=3D0x%08x reg: 0x%x\n", - cs, *base0, reg0); - - if (!amd_smn_read(pvt->mc_node_id, reg1, base1)) - edac_dbg(0, " DCSB1[%d]=3D0x%08x reg: 0x%x\n", - cs, *base1, reg1); - } else { - if (!amd64_read_dct_pci_cfg(pvt, 0, reg0, base0)) - edac_dbg(0, " DCSB0[%d]=3D0x%08x reg: F2x%x\n", - cs, *base0, reg0); + if (!amd64_read_dct_pci_cfg(pvt, 0, reg0, base0)) + edac_dbg(0, " DCSB0[%d]=3D0x%08x reg: F2x%x\n", + cs, *base0, reg0); =20 - if (pvt->fam =3D=3D 0xf) - continue; + if (pvt->fam =3D=3D 0xf) + continue; =20 - if (!amd64_read_dct_pci_cfg(pvt, 1, reg0, base1)) - edac_dbg(0, " DCSB1[%d]=3D0x%08x reg: F2x%x\n", - cs, *base1, (pvt->fam =3D=3D 0x10) ? reg1 - : reg0); - } + if (!amd64_read_dct_pci_cfg(pvt, 1, reg0, base1)) + edac_dbg(0, " DCSB1[%d]=3D0x%08x reg: F2x%x\n", + cs, *base1, (pvt->fam =3D=3D 0x10) ? reg1 + : reg0); } =20 for_each_chip_select_mask(cs, 0, pvt) { - int reg0 =3D mask_reg0 + (cs * 4); - int reg1 =3D mask_reg1 + (cs * 4); + int reg0 =3D DCSM0 + (cs * 4); + int reg1 =3D DCSM1 + (cs * 4); u32 *mask0 =3D &pvt->csels[0].csmasks[cs]; u32 *mask1 =3D &pvt->csels[1].csmasks[cs]; =20 - if (pvt->umc) { - if (!amd_smn_read(pvt->mc_node_id, reg0, mask0)) - edac_dbg(0, " DCSM0[%d]=3D0x%08x reg: 0x%x\n", - cs, *mask0, reg0); - - if (!amd_smn_read(pvt->mc_node_id, reg1, mask1)) - edac_dbg(0, " DCSM1[%d]=3D0x%08x reg: 0x%x\n", - cs, *mask1, reg1); - } else { - if (!amd64_read_dct_pci_cfg(pvt, 0, reg0, mask0)) - edac_dbg(0, " DCSM0[%d]=3D0x%08x reg: F2x%x\n", - cs, *mask0, reg0); + if (!amd64_read_dct_pci_cfg(pvt, 0, reg0, mask0)) + edac_dbg(0, " DCSM0[%d]=3D0x%08x reg: F2x%x\n", + cs, *mask0, reg0); =20 - if (pvt->fam =3D=3D 0xf) - continue; + if (pvt->fam =3D=3D 0xf) + continue; =20 - if (!amd64_read_dct_pci_cfg(pvt, 1, reg0, mask1)) - edac_dbg(0, " DCSM1[%d]=3D0x%08x reg: F2x%x\n", - cs, *mask1, (pvt->fam =3D=3D 0x10) ? reg1 - : reg0); - } + if (!amd64_read_dct_pci_cfg(pvt, 1, reg0, mask1)) + edac_dbg(0, " DCSM1[%d]=3D0x%08x reg: F2x%x\n", + cs, *mask1, (pvt->fam =3D=3D 0x10) ? reg1 + : reg0); } } =20 diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 8f66472f7adc..4dce6a2ac75f 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -96,6 +96,7 @@ /* Hardware limit on ChipSelect rows per MC and processors per system */ #define NUM_CHIPSELECTS 8 #define DRAM_RANGES 8 +#define NUM_CONTROLLERS 8 =20 #define ON true #define OFF false @@ -351,8 +352,8 @@ struct amd64_pvt { u32 dbam0; /* DRAM Base Address Mapping reg for DCT0 */ u32 dbam1; /* DRAM Base Address Mapping reg for DCT1 */ =20 - /* one for each DCT */ - struct chip_select csels[2]; + /* one for each DCT/UMC */ + struct chip_select csels[NUM_CONTROLLERS]; =20 /* DRAM base and limit pairs F1x[78,70,68,60,58,50,48,40] */ struct dram_range ranges[DRAM_RANGES]; --=20 2.17.1