From nobody Thu Oct 2 22:53:07 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2043.outbound.protection.outlook.com [40.107.236.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD11F335BB1; Tue, 9 Sep 2025 18:58:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444297; cv=fail; b=mr9V6/YQmbYo7n9snIJjLbt92K0ztkWCEZp8Vw1/1PkdoHVaBpqKYvbBa+F9H7dL8qGPLy5EWlzldA+E1q0L0kCFGiPxaSmdpw3zsN/tFxI5BoYc2aJWVP0LI4lKEljVBc18gBvoWZnomL7u4BWYYXgr/YVjC8wnoNFcsCIYcVs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444297; c=relaxed/simple; bh=efnK+kHiE29x15dXn55wAU2AsupMIofCqEkc750g7AU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cBJqRyBApSJDBYa1z9J9Rwkgl3AmURRNbeMCpA2OC08WbHOQMBC2TvJ8oAKTFENeiU72GjOWr0dE8j80PwfH9bkMX5O9iSdo5blcOu7alN7sY8VOwoRcGQjXCdH62Q4ADIB3MSxHt5wjU2zecf2C6l3N077a8u63zMOAew6iKbw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=lK8QoMub; arc=fail smtp.client-ip=40.107.236.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="lK8QoMub" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fs06PFDu0U6wZiYGPtAfSIfAP4fq2Zd2pAJxmQHajQgKEmO6Li6Cl0Q5KqeccCFlFJjqw5z6Gga+zGzAPR4efurAp1u7sBOhUi2jBafm+7dS745dKM/9ONYwldfsYmqidYJFxTFPhdqN6MhWWdXGgZvNs0YfT1a0brKUYdHhedRJXUquVEjcH4pMkM+bxI+9cAZOGj5/ocPJoezwQNiT+1cqBEU6RglTX6dLwnp8J9Ue21WH0CVb2BXi8oXY4Z7cfGqVg3zFIAog+WLK0Lh2Ybz54CI9JguApFDDarhpNh3y7uapgfuND30ggdxkgBdF1ckPw2jjD4gjprcsU5VVvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ncLhxJ+7XLorIo2awyopMwkuaXo0nREe3DBKLKUdu10=; b=IuVM+zlJUvjME0J3WG9BKWEgilK+I7t7IsBStFZdbXrnffXJfoTmSNBBbhEqkPJmxYXvHWV9gJEnMsuBMwXHCKT2ZDeu3smAWGtrNesYkd5AlRQ5HbOhz/V25kGQ32fdBVrnXWmVp7mLpXWa5e5IfJ//zNruC9Li0Ux9bbcmsX9mzLOILPsMUv2YPbmXFcsXIXdwh8wXcRyG7dQQRy5Ez+AN9MtsSTBu73/21yoq1yE04ZjnRd6NOaQwkfQtXKoZtBDFGlgVEdJRvLykugCiePfVaEvqxRag7MBA2i3cGQ6TraxWRIogRX+r+p7DBb9JxEHKTkr5UeBoUOcXJ0OTDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ncLhxJ+7XLorIo2awyopMwkuaXo0nREe3DBKLKUdu10=; b=lK8QoMubXlEs3tLtOzRz0d+4E5B4JGlnoLAyxpXveDiuX1OkHR4bdt8XBOxDCLtWuoiplYcbNx0wVlbsGLBmYsxPVIzCA9rv9PF1mJ0gl7ahswWkuPBxUTvsuUCB8zpm4Iari8epeCDE9NzguLP00E16c4XimHrd3zRNdWzuKWk= Received: from BN0PR04CA0209.namprd04.prod.outlook.com (2603:10b6:408:e9::34) by SA3PR12MB7832.namprd12.prod.outlook.com (2603:10b6:806:31f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Tue, 9 Sep 2025 18:58:10 +0000 Received: from BL6PEPF0001AB74.namprd02.prod.outlook.com (2603:10b6:408:e9:cafe::cb) by BN0PR04CA0209.outlook.office365.com (2603:10b6:408:e9::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9115.15 via Frontend Transport; Tue, 9 Sep 2025 18:58:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF0001AB74.mail.protection.outlook.com (10.167.242.167) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Tue, 9 Sep 2025 18:58:10 +0000 Received: from titanite-d354host.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 9 Sep 2025 11:58:04 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH v3 1/5] EDAC/amd64: Generate ctl_name string at runtime Date: Tue, 9 Sep 2025 18:53:10 +0000 Message-ID: <20250909185748.1621098-2-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250909185748.1621098-1-avadhut.naik@amd.com> References: <20250909185748.1621098-1-avadhut.naik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB74:EE_|SA3PR12MB7832:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f042946-26e6-4385-e5c4-08ddefd2d1ef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?PZAIO/WzS/dBMzZUqiKRqJvFumwUUak+yQVhtfnLSx9acCcWRui8jJeW4Z5U?= =?us-ascii?Q?mL39O6JGVCLTaWGU0KF+bsq4LpTt5dy15x1veF/4SPYM7eWq21CV3HfhMMYe?= =?us-ascii?Q?i7ZcLqBlsfg9D+0TOuVJshi9dSgkxgOqt5pn1ubOjvpGsvVKsW/1FzB7QuUt?= =?us-ascii?Q?CTRkc12279bY3B0pV2IwPsA/ZJU2xmVTz8hN3hzZ9A3S49U428Nv6NlJ41Bd?= =?us-ascii?Q?3wjThgHpEvbD8+0yK7aEWMx1+sB3veNWmuSjdOhKARoreOc3ulisqjR/sxeU?= =?us-ascii?Q?ATNgDY3U7WwGuqr3212XexwBKXaGVl6lJuMThaYZ7phdGcTsTjybYhaBLnQJ?= =?us-ascii?Q?iPlw48HRT715pLBWevjvVf/wRUaEU0rJOGEi98s3pwfkTuqANUybZReEbKGI?= =?us-ascii?Q?opozyasqh8cVjt3tMhSVo7qzdFnkE/O8X5SM+9JAzePPHHlIs1RCSI9vZpOs?= =?us-ascii?Q?R5GhnSMDXcCw58jCuUP5Wa+BPSrt2hvYmYeqiVs1gI24JLAwXpOc/TnJV6gg?= =?us-ascii?Q?U8wHjATqNgAusQZHQ7B7TbvUQD3JchZIm3cza4VmiW0ixDF26d4BO7Yol4MZ?= =?us-ascii?Q?nXoJQf4XATuZEIDFJ5vSOk9Onc0UDCQ8Oz1TdruDkF/hQc3LAUJVjEGxPs4X?= =?us-ascii?Q?EGXC18uB55U+up4M65edoySgKYQV61NwUne8mQIGSWYYz2hpK8jnyQU4fGhr?= =?us-ascii?Q?f3CwrvTcquvkx6bcHFIwfv19iUuCAcR8Yr6Wf3TMl47SnrtpAuGnG8BB5C7X?= =?us-ascii?Q?XMXuhHwIz3/34//qZ41Sua+JzhXKixxupQ2KRn9FPxbdW/mtNqYEzRc9xWPh?= =?us-ascii?Q?zcdi6Kw2Fz2WpAlwQv2ZS9cILk6Jz+vNqBnVoBzYNl7TCsPQVretwE+RWguj?= =?us-ascii?Q?6Ls33SkNQ6QtV/LG6f4lx5josmWPOPnZEBE5+BU8OV7Pw2rj57MxOoMjyVXi?= =?us-ascii?Q?DiE6xy4Ee1BkLSr2TV5oteEIegyQxU9cK47S3jvEbmrNWoZW2si2a9YMQbdQ?= =?us-ascii?Q?IIGf+SciPMDbTx8Jup8Key9Pa4abxIP2xiRAdxmsgzCJqSSdD/nOUP4XwOYl?= =?us-ascii?Q?Zh4TR2wVnO3V8f5CqEW4tVWXtFM1CsBzDJJpDlIz4E25MKBHe8aEDTM97gPA?= =?us-ascii?Q?0rWNv7pYTuykUNDw29FwhKEKmFfd9J6bOdCvFmquRlpNhfHvzzFs0ZFDJ5iU?= =?us-ascii?Q?jeFNIrPdfH+cr2VN/EnXjkKXfotdxyeyt/+O+a1Ze+7a4hrpK/AVfiU6abzL?= =?us-ascii?Q?okpw8JD90GMl9h6jUJUojFBBRD9TlfRvqwLPZPLnVFI+KgqZSAVyhVS2Vt8w?= =?us-ascii?Q?RqjVAtqPNbgEuBWTNwvmtYWnPmwEYZB/0sfiiqVB+iUURmvhw+1RS5mf4K7F?= =?us-ascii?Q?7oeJuKaTucrd5nu0wOXFPl8S3R5uSl07GmKD91UCUENONRGEXCaAwQW3ZQhr?= =?us-ascii?Q?1YPn9z8WQ1XBd7p4okE1OLVwA0ddrcP+vLZBh0x6eytDTjptGi+rttvL07vu?= =?us-ascii?Q?XkO+y7bUnn/QTp3eRoDe/SU7aX0GayE/x/Nn?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2025 18:58:10.0383 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6f042946-26e6-4385-e5c4-08ddefd2d1ef X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB74.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB7832 Content-Type: text/plain; charset="utf-8" Currently, the ctl_name string is statically assigned based on the family and model of the SOC when the amd64_edac module is loaded. The same, however, is not exactly needed as the string can be generated and assigned at runtime through scnprintf(). Remove all static assignments and generate the string at runtime. Also, cleanup the switch cases which now become defunct. Signed-off-by: Avadhut Naik --- Changes in v3: Patch introduced. --- drivers/edac/amd64_edac.c | 44 +++++++-------------------------------- drivers/edac/amd64_edac.h | 4 +++- 2 files changed, 11 insertions(+), 37 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 07f1e9dc1ca7..3989794e4f29 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3767,6 +3767,8 @@ static int per_family_init(struct amd64_pvt *pvt) pvt->model =3D boot_cpu_data.x86_model; pvt->fam =3D boot_cpu_data.x86; pvt->max_mcs =3D 2; + scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh", + pvt->fam, pvt->model); =20 /* * Decide on which ops group to use here and do any family/model @@ -3779,8 +3781,10 @@ static int per_family_init(struct amd64_pvt *pvt) =20 switch (pvt->fam) { case 0xf: - pvt->ctl_name =3D (pvt->ext_model >=3D K8_REV_F) ? - "K8 revF or later" : "K8 revE or earlier"; + if (pvt->ext_model >=3D K8_REV_F) + strscpy(pvt->ctl_name, "K8 revF or later", sizeof(pvt->ctl_name)); + else + strscpy(pvt->ctl_name, "K8 revE or earlier", sizeof(pvt->ctl_name)); pvt->f1_id =3D PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP; pvt->f2_id =3D PCI_DEVICE_ID_AMD_K8_NB_MEMCTL; pvt->ops->map_sysaddr_to_csrow =3D k8_map_sysaddr_to_csrow; @@ -3788,7 +3792,6 @@ static int per_family_init(struct amd64_pvt *pvt) break; =20 case 0x10: - pvt->ctl_name =3D "F10h"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_10H_NB_MAP; pvt->f2_id =3D PCI_DEVICE_ID_AMD_10H_NB_DRAM; pvt->ops->dbam_to_cs =3D f10_dbam_to_chip_select; @@ -3797,12 +3800,10 @@ static int per_family_init(struct amd64_pvt *pvt) case 0x15: switch (pvt->model) { case 0x30: - pvt->ctl_name =3D "F15h_M30h"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_15H_M30H_NB_F1; pvt->f2_id =3D PCI_DEVICE_ID_AMD_15H_M30H_NB_F2; break; case 0x60: - pvt->ctl_name =3D "F15h_M60h"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_15H_M60H_NB_F1; pvt->f2_id =3D PCI_DEVICE_ID_AMD_15H_M60H_NB_F2; pvt->ops->dbam_to_cs =3D f15_m60h_dbam_to_chip_select; @@ -3811,7 +3812,6 @@ static int per_family_init(struct amd64_pvt *pvt) /* Richland is only client */ return -ENODEV; default: - pvt->ctl_name =3D "F15h"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_15H_NB_F1; pvt->f2_id =3D PCI_DEVICE_ID_AMD_15H_NB_F2; pvt->ops->dbam_to_cs =3D f15_dbam_to_chip_select; @@ -3822,12 +3822,10 @@ static int per_family_init(struct amd64_pvt *pvt) case 0x16: switch (pvt->model) { case 0x30: - pvt->ctl_name =3D "F16h_M30h"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_16H_M30H_NB_F1; pvt->f2_id =3D PCI_DEVICE_ID_AMD_16H_M30H_NB_F2; break; default: - pvt->ctl_name =3D "F16h"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_16H_NB_F1; pvt->f2_id =3D PCI_DEVICE_ID_AMD_16H_NB_F2; break; @@ -3836,76 +3834,52 @@ static int per_family_init(struct amd64_pvt *pvt) =20 case 0x17: switch (pvt->model) { - case 0x10 ... 0x2f: - pvt->ctl_name =3D "F17h_M10h"; - break; case 0x30 ... 0x3f: - pvt->ctl_name =3D "F17h_M30h"; pvt->max_mcs =3D 8; break; - case 0x60 ... 0x6f: - pvt->ctl_name =3D "F17h_M60h"; - break; - case 0x70 ... 0x7f: - pvt->ctl_name =3D "F17h_M70h"; - break; default: - pvt->ctl_name =3D "F17h"; break; } break; =20 case 0x18: - pvt->ctl_name =3D "F18h"; break; =20 case 0x19: switch (pvt->model) { case 0x00 ... 0x0f: - pvt->ctl_name =3D "F19h"; pvt->max_mcs =3D 8; break; case 0x10 ... 0x1f: - pvt->ctl_name =3D "F19h_M10h"; pvt->max_mcs =3D 12; pvt->flags.zn_regs_v2 =3D 1; break; - case 0x20 ... 0x2f: - pvt->ctl_name =3D "F19h_M20h"; - break; case 0x30 ... 0x3f: if (pvt->F3->device =3D=3D PCI_DEVICE_ID_AMD_MI200_DF_F3) { - pvt->ctl_name =3D "MI200"; + memset(pvt->ctl_name, 0, sizeof(pvt->ctl_name)); + strscpy(pvt->ctl_name, "MI200", sizeof(pvt->ctl_name)); pvt->max_mcs =3D 4; pvt->dram_type =3D MEM_HBM2; pvt->gpu_umc_base =3D 0x50000; pvt->ops =3D &gpu_ops; } else { - pvt->ctl_name =3D "F19h_M30h"; pvt->max_mcs =3D 8; } break; - case 0x50 ... 0x5f: - pvt->ctl_name =3D "F19h_M50h"; - break; case 0x60 ... 0x6f: - pvt->ctl_name =3D "F19h_M60h"; pvt->flags.zn_regs_v2 =3D 1; break; case 0x70 ... 0x7f: - pvt->ctl_name =3D "F19h_M70h"; pvt->max_mcs =3D 4; pvt->flags.zn_regs_v2 =3D 1; break; case 0x90 ... 0x9f: - pvt->ctl_name =3D "F19h_M90h"; pvt->max_mcs =3D 4; pvt->dram_type =3D MEM_HBM3; pvt->gpu_umc_base =3D 0x90000; pvt->ops =3D &gpu_ops; break; case 0xa0 ... 0xaf: - pvt->ctl_name =3D "F19h_MA0h"; pvt->max_mcs =3D 12; pvt->flags.zn_regs_v2 =3D 1; break; @@ -3915,12 +3889,10 @@ static int per_family_init(struct amd64_pvt *pvt) case 0x1A: switch (pvt->model) { case 0x00 ... 0x1f: - pvt->ctl_name =3D "F1Ah"; pvt->max_mcs =3D 12; pvt->flags.zn_regs_v2 =3D 1; break; case 0x40 ... 0x4f: - pvt->ctl_name =3D "F1Ah_M40h"; pvt->flags.zn_regs_v2 =3D 1; break; } diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 17228d07de4c..56999ed3ae56 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -101,6 +101,8 @@ #define ON true #define OFF false =20 +#define MAX_CTL_NAMELEN 20 + /* * PCI-defined configuration space registers */ @@ -362,7 +364,7 @@ struct amd64_pvt { /* x4, x8, or x16 syndromes in use */ u8 ecc_sym_sz; =20 - const char *ctl_name; + char ctl_name[MAX_CTL_NAMELEN]; u16 f1_id, f2_id; /* Maximum number of memory controllers per die/node. */ u8 max_mcs; --=20 2.43.0 From nobody Thu Oct 2 22:53:07 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8FEBB31C591; Tue, 9 Sep 2025 18:58:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444302; cv=fail; b=UMYfr57SU8hh5ECYVVgk6Mw8tOyyjAYKKew14kKFxV3NYklG8o5fOuS1y9DG8qxL0V0OE6xhET4Lgz1BzCQIq4QzXqM4fAOM0HoTPLhmBoo2YjTc0KonT1lijDUhhPSqXtORA9Szz1ZDYacSv9DNWAC6NOYZuQHII/yli3+4MCE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444302; c=relaxed/simple; bh=cViyOlrRjtwLmyqvbpghQ2EO4khuiue/fyXLuELqvrI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=j6gIeWaLnr7VwMPGZSO5vF6enwfqCJ7pASGiDMUydDK/dv538g9Q5K/7sliS7x7zMsc1blU6P7I6cfojtGfQJjjNuL73bTt0mfS1WdM0giRPo8qiKr58mi4csqPKFmgVQP2qJ5SNk4l3NYnqmB/bta/wjY4pK0sUfkCoDlNXHio= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=BRI2Utot; arc=fail smtp.client-ip=40.107.236.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="BRI2Utot" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZKXn2fYGl/Fc//Oet3cKOdZFsSaXRnQEkTgOq5NkO2x16ij+X53khvEq4drpp6TgahzNARJ03CVD9HOvWkC2tvUQG8d4AaMCwprUngDPTN0OgihVQDBeimOJBRZ58BhZvrDV3FOAZy/UvQ9M3nq7lH8vcx5GsEukMQZl3dXC3Ku3taXtUpe7uvFmLt147+6IcrwKev1+1Z6vX+Wu9o6NTpaTCfXfkjaHcMIyII8EVEEIUMB5vi9QcI7WHWX/jP+REtFEOo3GtCJiBFL9WqLh6lOd8ExdHC5GW5I1CHAvi0RW4iCGKpxcjYuye+8jxfVt7yy72nzYnN/9JikQvdd/hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6FBhmayHH4Vvws/qRJuEuIPAQWSRTrspZRfYXUI9UNY=; b=QbrG3wpdZLeAUv7gckhHS/oO+AtV6bl9kHHhS1qqMk9wtHOcB/UO04801IPPJ18JEfL4NbfEncOE/kSSr+U+ubU+UfKiE1rnxcAdN/RuS6URWv40Ck+JWoR/7pFBnFuAikxDa/KnpghkT8eygmaP7HVEGKx0AExvVj7nEdLroOJRt8rS9bTsEPIqJoQ/2vU3FiNpa2Sx1xGwQcXj4/SXc2ZQ5N7XTX1z3038/a9sEIEopaMGoaNBJtuvB0GeakOK4cKAEahJhEHway4py9FJOqUABTz6dUvo8sILsj2ECCJC+ST7fxGJYeAAre6KLsWJQXzjos86BfOITNLWE0G5uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6FBhmayHH4Vvws/qRJuEuIPAQWSRTrspZRfYXUI9UNY=; b=BRI2Utot0QX7Y7reuJHWEehIfYP72SP9e0IA7nb4xU3uBSB77ALUqu1/GDFddKp4FhJAIa9JBzk2DAT6BSBaC7JsUuc/PKBXTZCqlzFpK4qzEkk54mUX6jrXNWOXD3tWPIh9nDiD9c/PAD4qkqt1Ln1ukucxLJQEwmV3FN6UQJw= Received: from BN8PR15CA0060.namprd15.prod.outlook.com (2603:10b6:408:80::37) by DM4PR12MB6400.namprd12.prod.outlook.com (2603:10b6:8:b9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Tue, 9 Sep 2025 18:58:17 +0000 Received: from BL6PEPF0001AB76.namprd02.prod.outlook.com (2603:10b6:408:80:cafe::e4) by BN8PR15CA0060.outlook.office365.com (2603:10b6:408:80::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9094.22 via Frontend Transport; Tue, 9 Sep 2025 18:58:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF0001AB76.mail.protection.outlook.com (10.167.242.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Tue, 9 Sep 2025 18:58:17 +0000 Received: from titanite-d354host.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 9 Sep 2025 11:58:15 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH v3 2/5] EDAC/amd64: Remove NUM_CONTROLLERS macro Date: Tue, 9 Sep 2025 18:53:11 +0000 Message-ID: <20250909185748.1621098-3-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250909185748.1621098-1-avadhut.naik@amd.com> References: <20250909185748.1621098-1-avadhut.naik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB76:EE_|DM4PR12MB6400:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b7d09ab-b204-4dd0-b02d-08ddefd2d674 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uAOF43NL9Vej960YcaJGHn/7Eod3nu/tWEqM7xr/jr43Lgi4WF+0kjKTJULP?= =?us-ascii?Q?dZqcdn7l5+97Qw3kEi4IwEqCoJ5gYt1Cvfykh6yHhoE2xU9cDL/+by2mOlxc?= =?us-ascii?Q?KNuIKDJWY9JLVphI4L4N44aiDLZKhf3xegzOxigjyoUU/E1pyggkRye3xL19?= =?us-ascii?Q?/xUesq/BcBWAvWEcXk2J5Or+Z3MQ1Kpa3di46cEMgc4lHVH9inkN+yz8AHq2?= =?us-ascii?Q?rLAfZT+jVVY1IUKEUz+5N5k40AARsseJTT1SZKJFmv6daWq1JeJwtK/SklEM?= =?us-ascii?Q?rJfAMFy/vWjavf3sxapDGQ2vUFTKgXyQ8CGf36/9+byoTarZHW0SY+MiiVIj?= =?us-ascii?Q?ch4Jjxrxg3ExVEesBQYWfLp0E191QLdukS3szKOW6OitMEeaQ6/NMkVGi1Za?= =?us-ascii?Q?+AxP6bjTzB1bU+CX1YZlOKAEvwiaU3dLBTCM2YaLGsd2kFXbwcehSWrXcTOg?= =?us-ascii?Q?wo7plvyFJa4HGT8yJ6h+My2nOkxbxsMzRsrZtUW15sDka+c6oQ3DvV1ieOqo?= =?us-ascii?Q?JIaHwayvjUEKOhvXjyMWvKYLuh0TrSeWlFOL/9ekeVgzAllRgaJy1H1hBi5j?= =?us-ascii?Q?qFjcZu6OfrbL1C1kBAs0fiGeOdNjpLu9SFzWvYIDr3HoCs/3MDmDEkr+4sk5?= =?us-ascii?Q?xkqyrcrUhUIndG8cg/ANaKF2q/vtsPAuwpctq0Now7uOSQIH7rjVAaQ+E20c?= =?us-ascii?Q?cwRhzcpFzzIz3MQOBq7APa5HZZb9yi+P7KmqrTsv28j7DDxOKn6enEu8h9pQ?= =?us-ascii?Q?9iQKwvgS+ZQDf1VmgULLiHNo75IwLtCrj1Qbs5tN1b+O7SBsdNDgrz+fYq2U?= =?us-ascii?Q?YO1MOUYbkQjyVE6aiucCAOmcdNNyumkNKXcOA77CgaAAqrhu1V487+BmYdT3?= =?us-ascii?Q?kYVS9lT7s/Km7aA2vuGW0INYgVJ4Rt5hkysX5yKVsfsefOWYrvgq9DJoJtI/?= =?us-ascii?Q?oh7pHIDz8e6p6YSAAPIrkby5PPdvb9biq6rVzT2QBKMYBEEi/4XWS7Yz+AIP?= =?us-ascii?Q?DlShwKlX/ABfCuV5fdzdWxupmFev1m7EqZU6kltLTB7OTLmrmVRbmCKFmco5?= =?us-ascii?Q?VKTYhbbxDUOyaFHoBPr6z5XTsOfeqyr0/l3mG1nbwnuCrntb6JTueIbbMUCz?= =?us-ascii?Q?HcYzIuz+p0q7svFTgD+hJTkQPMX2ZIAAd676S5D9BHvuRw9UkeYe/kCnMW76?= =?us-ascii?Q?clnBTC5lZlnkKWe3Wd0un2K2mui1GD8c83jO2PhGp6HUsvAzOj3xjR4YLa8s?= =?us-ascii?Q?j7WkWu/ilEu8XsT8QagMhQXDkL4B6C+CFSeEQE8W5JwUbwae5flyU64GVNFn?= =?us-ascii?Q?zyGj8It8cJMJXtrGoz2KrVzrxcrgat3PmiaAt+aAVOgJUqryXcCmzDuQxSWD?= =?us-ascii?Q?5mNreToeKg6s7IS8DOQ3IaZxaQgNHIE5uYQrci7gBKlKZUUb1pIRoIeoW8bE?= =?us-ascii?Q?UFqjDzF8jZ0fKyK2WHwfeUw8qy3srmNJJjeh2Hek+gUt5idrnCnQ99XVlI/3?= =?us-ascii?Q?T8at7ewZ4zubSf/Gyfom4CKLEaeNnNzcpue5?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2025 18:58:17.6189 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b7d09ab-b204-4dd0-b02d-08ddefd2d674 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB76.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6400 Content-Type: text/plain; charset="utf-8" Currently, the NUM_CONTROLLERS macro is only used to statically allocate the csels array of struct chip_select in struct amd64_pvt. The size of this array, however, will never exceed the number of UMCs on the SOC. Since, max_mcs variable in struct amd64_pvt already stores the number of UMCs on the SOC, the macro can be removed and the static array can be dynamically allocated instead. Signed-off-by: Avadhut Naik --- Changes in v3: Patch introduced. --- drivers/edac/amd64_edac.c | 19 +++++++++++++------ drivers/edac/amd64_edac.h | 5 ++--- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 3989794e4f29..0fade110c3fb 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -4000,30 +4000,34 @@ static int probe_one_instance(unsigned int nid) if (ret < 0) goto err_enable; =20 + pvt->csels =3D kcalloc(pvt->max_mcs, sizeof(*pvt->csels), GFP_KERNEL); + if (!pvt->csels) + goto err_enable; + ret =3D pvt->ops->hw_info_get(pvt); if (ret < 0) - goto err_enable; + goto err_csels; =20 ret =3D 0; if (!instance_has_memory(pvt)) { amd64_info("Node %d: No DIMMs detected.\n", nid); - goto err_enable; + goto err_csels; } =20 if (!pvt->ops->ecc_enabled(pvt)) { ret =3D -ENODEV; =20 if (!ecc_enable_override) - goto err_enable; + goto err_csels; =20 if (boot_cpu_data.x86 >=3D 0x17) { amd64_warn("Forcing ECC on is not recommended on newer systems. Please = enable ECC in BIOS."); - goto err_enable; + goto err_csels; } else amd64_warn("Forcing ECC on!\n"); =20 if (!enable_ecc_error_reporting(s, nid, F3)) - goto err_enable; + goto err_csels; } =20 ret =3D init_one_instance(pvt); @@ -4033,7 +4037,7 @@ static int probe_one_instance(unsigned int nid) if (boot_cpu_data.x86 < 0x17) restore_ecc_error_reporting(s, nid, F3); =20 - goto err_enable; + goto err_csels; } =20 amd64_info("%s detected (node %d).\n", pvt->ctl_name, pvt->mc_node_id); @@ -4043,6 +4047,8 @@ static int probe_one_instance(unsigned int nid) =20 return ret; =20 +err_csels: + kfree(pvt->csels); err_enable: hw_info_put(pvt); kfree(pvt); @@ -4077,6 +4083,7 @@ static void remove_one_instance(unsigned int nid) /* Free the EDAC CORE resources */ mci->pvt_info =3D NULL; =20 + kfree(pvt->csels); hw_info_put(pvt); kfree(pvt); edac_mc_free(mci); diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 56999ed3ae56..39d30255c767 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -96,7 +96,6 @@ /* Hardware limit on ChipSelect rows per MC and processors per system */ #define NUM_CHIPSELECTS 8 #define DRAM_RANGES 8 -#define NUM_CONTROLLERS 12 =20 #define ON true #define OFF false @@ -347,8 +346,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/UMC */ - struct chip_select csels[NUM_CONTROLLERS]; + /* Allocate one for each DCT/UMC */ + struct chip_select *csels; =20 /* DRAM base and limit pairs F1x[78,70,68,60,58,50,48,40] */ struct dram_range ranges[DRAM_RANGES]; --=20 2.43.0 From nobody Thu Oct 2 22:53:07 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2071.outbound.protection.outlook.com [40.107.236.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AEBE530215B; Tue, 9 Sep 2025 18:58:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444312; cv=fail; b=StKCIMXTxKt8Df5VATG6EYgMNQnN7xTvI7uC4jW5uARS5QFmhlW2sizfDeUrir+38os1N3s8XZ8aYhVbydMUCN7wH59FjIatnjklHby3cLhfuGHFXOtgy9uiakGKhg7mjeD33CC0CWBG/AaTGmQ+erhD1WjCYo/bctBZ22eja6s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444312; c=relaxed/simple; bh=QNnot6OdTndSuIJhu6/hI+rR5NW5oxpRwIrIwsfANFU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qdHXzuhuaMPxHDM23ZPeg0KTRi+mokvzMRn50vFRLmgsorIZQdGseUrugIi8JvTF5gaEyj0Ys0Hy9rZFPabNDsTiEB3UtZ7LYHErknpk9iiZYamJsCHmTIpBHnzBkKyYq0KBo3gwA9ROJoRlV/mzMkrIyAoS1eEuy1eWOwrK8e0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=aoNY9bDC; arc=fail smtp.client-ip=40.107.236.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="aoNY9bDC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=erf8jM6CIqBt9qGRnroH67tWjbOZ0nnCeJeTP5QxeIYHUMe12E2L4973nP4Kaev1K5Vag6AHrcvxL3wCHSz2gvj9veh/ZL5jq067UOowA/yE8s8sKZcBzuAvEmTV4h+ZK3EwDvv9bIGh/NWGXx93F4XgyJiRXGPFlqqo+PX38oq9tE+XuQOFUTMXfS0Pdh/vsTJFKI2bhkw2D4ZmxFsHchIydkw065tSvLfFk8ZgVUQ2Wl6/PGu9OaoyhSRNYGm579GLm3Vkfidn5hklclSfX0VV/xZDFO7rxm7ftztl+4UmpcLf9t29j6dIu4nFIbg8QUImUcj2XXAWnbTorIQ6mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PWU+KWaDH9whVs/F/vTvxorGY2iy4KkKmz74wFVw3iQ=; b=uxbD8Yct+zf3ayuUWSF9DDKV3CBy4p9JXJyMD2S9xZHF/vx7izIpZSv93GuvOnVH7SY2NPQsCOXIG8d7ZEAiCG7Vrh3a2yQtVTQYiBATxe9+dm2dysW/FzCT2byZXM/0ESf8hh6mObGGisLcv9yK80/E3QeeuEsIfafg4e3cTxngyb1EN9zbzJLQqRUxMr7DKBMZ02Z33ekmmTczRj5oJQoUagn0Kb0pwl5kMSup+8TtxPdkflMTr/kdvnWhuexRVl6uw0Ou4tIhZfSD2GbuAVi4qj+TAFBjeTgNJEffB2hBz86Il389rV5+GKNmzzbtyw783Bg6d9CeadBsnvVHDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PWU+KWaDH9whVs/F/vTvxorGY2iy4KkKmz74wFVw3iQ=; b=aoNY9bDCNBorojt/YJxq6WOT56A8fgGYdQxEee5h49oh/a+kPyesp4kA9Z/Mcl2P1QsTl1fnjcNghUZkEP+XoyLg4l45JwJan4hbheH5GunPuK5yNmq+KF+fVEdO+sYXzQal25u0YkZTGM8larg+aiBHnZ0PbEPhq8L8UYmCj8s= Received: from BN9PR03CA0743.namprd03.prod.outlook.com (2603:10b6:408:110::28) by SJ1PR12MB6337.namprd12.prod.outlook.com (2603:10b6:a03:456::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Tue, 9 Sep 2025 18:58:27 +0000 Received: from BL6PEPF0001AB73.namprd02.prod.outlook.com (2603:10b6:408:110:cafe::9f) by BN9PR03CA0743.outlook.office365.com (2603:10b6:408:110::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9094.21 via Frontend Transport; Tue, 9 Sep 2025 18:58:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF0001AB73.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Tue, 9 Sep 2025 18:58:26 +0000 Received: from titanite-d354host.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 9 Sep 2025 11:58:26 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH v3 3/5] EDAC/amd64: Add support for AMD family 1Ah-based newer models Date: Tue, 9 Sep 2025 18:53:12 +0000 Message-ID: <20250909185748.1621098-4-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250909185748.1621098-1-avadhut.naik@amd.com> References: <20250909185748.1621098-1-avadhut.naik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB73:EE_|SJ1PR12MB6337:EE_ X-MS-Office365-Filtering-Correlation-Id: cc3b31f7-ab15-4eae-0f74-08ddefd2dc01 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E5odUCJuWPUHNFwl94rHe6kjzzjHJnzsf/AIeUF2PPV/7manwAyUcc1ouyv8?= =?us-ascii?Q?JkSIaAxKWbz17p5j4mq9Vs7tTlX5ZI5B6ae2vHRQ8MRX4trLqeYj6TthbwG8?= =?us-ascii?Q?JOpiWKyxNIRNQeibU0rr6dFPgLD1PXMDFwj3/0ebfM71VHlcxGEWjAEOnZwE?= =?us-ascii?Q?z5PbdgPe8zIBbiOjF34OS3+RC8eeQleudGOk0tgt94eAAScKEAmdfmhTw4Vz?= =?us-ascii?Q?pZU5AvVGdSSjJOC8w+2ZFYceCIq6X9pLEGMBESjokIUkmeJEWF60uT2V1jYW?= =?us-ascii?Q?HOqYda4bUWxDmETetKJVYQKNvFUfbUDAv2sb+y8nwEW+NabIPsTk46rsgZuW?= =?us-ascii?Q?2pl1IOs3Xg5c9vD//XcwxCWnsWa5CmDP7udFlq73IC2A0STHCIS19Qtg9MgK?= =?us-ascii?Q?LX15h/VIN+HvCASnXdognsCaZb2eY5MrPgql4g7GNd+vOoc5SqD+emvwj8r0?= =?us-ascii?Q?atVFy9svs9mgCnAhbhrjnrNdJZ/qQQO0IlGO008P718+kEUXpzD0Q7HyB/G/?= =?us-ascii?Q?6RCrqwrVYTI2zlemKbCosHUs++i752m9vkmCGU4DUi68aaft0hao9Ru8LPuT?= =?us-ascii?Q?OG3w9DGLq1KZn5yZbjHICsa0QvrPuEBvdmj0eqb87z64JzaJ1z2g9nr7uMRs?= =?us-ascii?Q?mCkfXBPrdAIg//FbmVQidaulByEXywMChZgcjDRMGNNWhwMhXx0rGDM4fzmp?= =?us-ascii?Q?KpHnvZ2p+t7CXpu/8KA47I6ordwc6OvPaFLcxNE7GU4S5hMtkaOFopVNDC9E?= =?us-ascii?Q?4tGwxtA2/JQxy9Z7gOcdV+dHMBnWLbZQ48u+/260BA4LnPhiPcNONwJKlRgW?= =?us-ascii?Q?41Ezj/YYMdLehZh9OxCTuvqViKYhvfXAynSUL5QdV1RO4XEeuYsTbJOs8IZD?= =?us-ascii?Q?c/jtteP+iwrL5MqSyyouLdKNgB8D+Gqqpvs5OLN10vP32Q40clJi91x2Y88F?= =?us-ascii?Q?Q761V6FsKwbs2RMAWYmN4io82cImPZ4gDjBmEOvH/tK+hpAi9/b+OVn415HJ?= =?us-ascii?Q?iw5/PT/F4IaWeIZIozMVoBiDp/Q2HYdjZrz5mEj+tpuVgzfuzXqDIgAt+q9+?= =?us-ascii?Q?uI7KbF/geazR57EIKQcbk7hzfDIHG4kHi9eNfoD8xlCXFo98Q7U5szFrgRo/?= =?us-ascii?Q?+t9pfGMPSh/c0ak95w+EGxJIr8kF5znX9sJWGILXX+Dt/DvVWMgzPx9yvptI?= =?us-ascii?Q?KqKRWEYRpYOAarLLct5MW+4kYx641V1E2YZ6ZLjib4E8sLJpTbvXp5F+ASZI?= =?us-ascii?Q?Gz4Mnyrnhs0kI379e70OtLZ3iQlQMZuMwuZWpdE94XlJxi0j7FJBvY1u3Edt?= =?us-ascii?Q?J2IR8+K4zKmF8XFIEG/DALtc0J8D5gbyWOeaBchjYLJ5wLrjslhG6sD3qOU5?= =?us-ascii?Q?2LhtZ0ivWya7p5mU77D+aZYkuJgA6G7A1D2InsCb6ptFBMzV7/xhcONZIoW/?= =?us-ascii?Q?DG8bwqVfVh/cNdckqwmbm9YtUPdBtO5NKCk/xDi2xCNgJEMJTgH9PGKqVgsC?= =?us-ascii?Q?ySs6ZAaxMuSUtmj+JL9qBV/6vwSHIPQG+HV3?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2025 18:58:26.9260 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc3b31f7-ab15-4eae-0f74-08ddefd2dc01 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB73.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6337 Content-Type: text/plain; charset="utf-8" Add support for family 1Ah-based models 50h-57h, 90h-9Fh, A0h-AFh, and C0h-C7h. Signed-off-by: Avadhut Naik --- Changes in v2: 1. Remove extra tabs Changes in v3: 1. Since ctl_name string is now assigned at runtime, group similar models together. --- drivers/edac/amd64_edac.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 0fade110c3fb..804d3c4c3f14 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3895,6 +3895,16 @@ static int per_family_init(struct amd64_pvt *pvt) case 0x40 ... 0x4f: pvt->flags.zn_regs_v2 =3D 1; break; + case 0x50 ... 0x57: + case 0xc0 ... 0xc7: + pvt->max_mcs =3D 16; + pvt->flags.zn_regs_v2 =3D 1; + break; + case 0x90 ... 0x9f: + case 0xa0 ... 0xaf: + pvt->max_mcs =3D 8; + pvt->flags.zn_regs_v2 =3D 1; + break; } break; =20 --=20 2.43.0 From nobody Thu Oct 2 22:53:07 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2066.outbound.protection.outlook.com [40.107.223.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 859E01DC994; Tue, 9 Sep 2025 18:58:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444322; cv=fail; b=K8Mj9SPuRaUpkYlLVFIfLy5g3MX/2OWzMSsMlhWGYyqgEzXsTexX7Xx1mr1NC//7KwIBufjKJvF2sJv2FPobIceGzw5NXekZAsvac7p6c1Od0mtq9K5B5luyzg4bsrjm9A20sikEdQ+e0KEp/ItgG+4/4jToKUXAyUSXE1xK6Hk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444322; c=relaxed/simple; bh=EjFIwD4cnTMWdolbnEnAjLJwkRRhOrqyLDmeW9dZkDo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BUdaO1Djb+4G2U1wAWFAQBlo0pgtajCfK+hlB6w0CsM70ZMy9IFM+H0mska11nRBuXJwWKBmPPf/ZRq3XYyB6OQifr1JwQ6MKfxqwPK2THT6x5WO0PDqerH2Uzp+xAHrqQJBgX+GVAiQ/YarTj0qPdAMfKm1t9gO9wiVMVl/nW0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=dBNKIH2X; arc=fail smtp.client-ip=40.107.223.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="dBNKIH2X" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uWQnsyRedZPaP2J9h5xUgaCNhxWkWZxbG/1G1BdY1MO1mK517Cd9TF7M0dLWDRWDoCWYwD1K1hmuCkyU8fwtcr76P+ooomXm5IiXYjKIjwknLLwhIVZKiEOIq7dzcnTFn1XEBFCiA7WyxMUeontwG6hhfSE0UlvXITbAfxmvz92fM8BKURpHmglNaOtZhVi3JHtUPpoizVKRUDOIp+HPSbn+P9ZjEnxDGGcCCA66/CrxR+uVgFXjmmjwd00PcieyAz0n+Q3lLCxzsh3M3Gp20AAZDNl8Ms50Wot4oHGfyYMrMPQMC/osivNpH2tG1swWOhtoQitXf479K721mzErmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xHb2X0NMEtwK6V//n1tawxI0ANFm2XE4SJk/U7CN3WU=; b=O9sxWaobEobBEONw8g2tQW8Tz90dedj+3ofaROTjidZxVznisO1nkrjUnldvBCNxcLFQBTCGzcYLsuVKfEH37OJT9Te4XgRM3yHCOb35HBcKbrJsx6K8wws/n/O8nf8RHjzQXCf6RV+DdgDsXnzfOINUR2iwD0nAYzg9GUozyZcYkf1Rxv7BrXoauDYND3DJgLHBG+cvzJRVjRJEF0r1KL3Mi3IN1T9TIC+000K5kJWeMmvwfJJyN2YTTIwvP2A6Sz0McYY0MA5Je0FggOvDDbDaY2Npc0L/ZDi0SeCHadPrGCyU66sP4O6qYTxRW9UF11vGxRNKSbdbuGl70EMvtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xHb2X0NMEtwK6V//n1tawxI0ANFm2XE4SJk/U7CN3WU=; b=dBNKIH2Xj3x1cEBWkQilMy/Zmsi2Hv0f6z1ufXfUwFwKT41TpKRFlBsMu6/1asWjeWO0ycae3lOZdTokrG6N+YJqcimm/RDb62Cl97WtIfwxlOXV2aEayO+a/u6IIPYfqjxhrB4JutwwudQjaUW269S5OjU1UNPk0St3pn4yGKc= Received: from BN9PR03CA0741.namprd03.prod.outlook.com (2603:10b6:408:110::26) by DM6PR12MB4105.namprd12.prod.outlook.com (2603:10b6:5:217::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Tue, 9 Sep 2025 18:58:38 +0000 Received: from BL6PEPF0001AB73.namprd02.prod.outlook.com (2603:10b6:408:110:cafe::54) by BN9PR03CA0741.outlook.office365.com (2603:10b6:408:110::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9094.22 via Frontend Transport; Tue, 9 Sep 2025 18:58:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF0001AB73.mail.protection.outlook.com (10.167.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Tue, 9 Sep 2025 18:58:37 +0000 Received: from titanite-d354host.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 9 Sep 2025 11:58:37 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH v3 4/5] EDAC/mc_sysfs: Increase legacy channel support to 16 Date: Tue, 9 Sep 2025 18:53:13 +0000 Message-ID: <20250909185748.1621098-5-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250909185748.1621098-1-avadhut.naik@amd.com> References: <20250909185748.1621098-1-avadhut.naik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB73:EE_|DM6PR12MB4105:EE_ X-MS-Office365-Filtering-Correlation-Id: fc87fd2e-2b87-4402-a8ea-08ddefd2e285 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6nD29jBpmsIR9tcRvSiR99eYqNSSOQe+hpFbFE0/sZw6pIE+HR+OEVAjLhg2?= =?us-ascii?Q?v5XIRWbLNIdVvB1ZCkOs35wMqndh26OGsBAiVketzQBY1ckKg28+zuXiGX70?= =?us-ascii?Q?aipbqhKSdjXz2u5+Bv0StZZCm4DqlVSeoIyzynN7dbsJM1ZwsQ4PtFeXr/T4?= =?us-ascii?Q?G/avpORdAqKGs9jmERmjMA1o0L2Sb6QlZX8l/umWrHSLTH4WmaYDiGtRkFNw?= =?us-ascii?Q?L3Jj69qXDegp3jD+x/KHi3ns6AKRUNSoXsJn8+pOEcdFyRNnGxT713FAVCZ5?= =?us-ascii?Q?uK2EgLvPhPQS+7qfzWSn9YF1LxSWDsy5Kp5xEdI5CMhdt0RbNcjarMqbiIBb?= =?us-ascii?Q?Igyh3Y0RTcgMNSul3iSSmy3B3MCUlHTgNBd03gGhFLTByb00LMu11gvj5gzR?= =?us-ascii?Q?sQBwDkUuKYdZBRlFXGTYZm71lESeKXpaE1g47u6R083Rx3OtnBDkHWH8BHKU?= =?us-ascii?Q?RIiJKxZ5YaaHp3+KhZrBjhse5CGIDjmCqDw8xG/x7kFVlCYgbaK1K09YBSok?= =?us-ascii?Q?Rpt6uN9IJXHxFeCfpqsafmKKTNutUBPX0c7tMECBMmeCLir/TFGYSsccljd4?= =?us-ascii?Q?+51qySp3vng2uqXm7s8sOgpdXT6baTTg5klCMjT0w2WbVoerdwvU1yoMVlB0?= =?us-ascii?Q?8NV0BZwAoLvWl2Ydj+GkVrUOMaPeGEmKIcULbZnhrua8QTZo+bdgY1WUxXIQ?= =?us-ascii?Q?O65KagjXYQVljBcfwSBA+EctVryK3k25C8BdPM/BlF/9cAEh7x6HbugNQx4n?= =?us-ascii?Q?4aqUMG0b68WSlf7+kovoHgsmO0hp3ABW595LeYYPt8HFK0zcQ8NCqPohIgfq?= =?us-ascii?Q?RNad/62+b8BSbhX6KyP1hABO7eAFoIzVtjt8IellnTO2osx2EBXQBWjNJLPO?= =?us-ascii?Q?21zIUG5t2D+rNxINya8wwZMQshlPmvoiTz1kXA372eIREJg+antMNr3STCsF?= =?us-ascii?Q?eWqkSrb46caePxc6k80yurqaDX/S93xJrnpPg+scwWIyg4xBvh8dTRnMT7mj?= =?us-ascii?Q?pRRFRs90duA0773yWg8vc8TVRfS6O8bbSTOhHNAAIFYrpNMRskL2Jv0UEyyA?= =?us-ascii?Q?5Uyb4u5HKMdcE3VieP3I2fjBhT7q/5mEgS7e/INI0hQCx+isFpcYpqGHWJRU?= =?us-ascii?Q?OyeTILHFbsq1h9qZvdfca75DTHnqIz7dApk96383wrI0GlrpIU2bXMzpxFO8?= =?us-ascii?Q?8/W6djubV/00AltFMWYvfITTKOZDDo/ykD9qh1/GzXrpzOutuhp5YQnh7rjo?= =?us-ascii?Q?+4aVNA42bwK0dp7hQmJaUFe3oyn1NiYb+8R2qxiW+LUDS//zVkvypUKMvwfV?= =?us-ascii?Q?waxqp9pg5LSX7Lk5t8bNU3yVHZoWQcCtMHkF6atvySTRCU6h3zTwVUwZB/qr?= =?us-ascii?Q?3NnBMdvWyIuqgrmKM4cg7qrsoYSrtzlpugLFb2hW+ElfdoEd0TatuEb1Ksod?= =?us-ascii?Q?IGiRaEu8eh87Sj7V4RcqYd/W5U/OJrYpoXC1R0mh8zkrO2f6KbpN0ChXVca1?= =?us-ascii?Q?/F6a9QBojhO5jBq1FmzPx4S+sjJXrVPxKGoW?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2025 18:58:37.8632 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc87fd2e-2b87-4402-a8ea-08ddefd2e285 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB73.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4105 Content-Type: text/plain; charset="utf-8" Newer AMD systems can support up to 16 channels per EDAC "mc" device. These are detected by the EDAC module running on the device, and the current EDAC interface is appropriately enumerated. The legacy EDAC sysfs interface however, provides device attributes for channels 0 through 11 only. Consequently, the last four channels, 12 through 15, will not be enumerated and will not be visible through the legacy sysfs interface. Add additional device attributes to ensure that all 16 channels, if present, are enumerated by and visible through the legacy EDAC sysfs interface. Signed-off-by: Avadhut Naik --- Changes in v2: Patch introduced. Changes in v3: No changes. --- drivers/edac/edac_mc_sysfs.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 0f338adf7d93..8689631f1905 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -305,6 +305,14 @@ DEVICE_CHANNEL(ch10_dimm_label, S_IRUGO | S_IWUSR, channel_dimm_label_show, channel_dimm_label_store, 10); DEVICE_CHANNEL(ch11_dimm_label, S_IRUGO | S_IWUSR, channel_dimm_label_show, channel_dimm_label_store, 11); +DEVICE_CHANNEL(ch12_dimm_label, S_IRUGO | S_IWUSR, + channel_dimm_label_show, channel_dimm_label_store, 12); +DEVICE_CHANNEL(ch13_dimm_label, S_IRUGO | S_IWUSR, + channel_dimm_label_show, channel_dimm_label_store, 13); +DEVICE_CHANNEL(ch14_dimm_label, S_IRUGO | S_IWUSR, + channel_dimm_label_show, channel_dimm_label_store, 14); +DEVICE_CHANNEL(ch15_dimm_label, S_IRUGO | S_IWUSR, + channel_dimm_label_show, channel_dimm_label_store, 15); =20 /* Total possible dynamic DIMM Label attribute file table */ static struct attribute *dynamic_csrow_dimm_attr[] =3D { @@ -320,6 +328,10 @@ static struct attribute *dynamic_csrow_dimm_attr[] =3D= { &dev_attr_legacy_ch9_dimm_label.attr.attr, &dev_attr_legacy_ch10_dimm_label.attr.attr, &dev_attr_legacy_ch11_dimm_label.attr.attr, + &dev_attr_legacy_ch12_dimm_label.attr.attr, + &dev_attr_legacy_ch13_dimm_label.attr.attr, + &dev_attr_legacy_ch14_dimm_label.attr.attr, + &dev_attr_legacy_ch15_dimm_label.attr.attr, NULL }; =20 @@ -348,6 +360,14 @@ DEVICE_CHANNEL(ch10_ce_count, S_IRUGO, channel_ce_count_show, NULL, 10); DEVICE_CHANNEL(ch11_ce_count, S_IRUGO, channel_ce_count_show, NULL, 11); +DEVICE_CHANNEL(ch12_ce_count, S_IRUGO, + channel_ce_count_show, NULL, 12); +DEVICE_CHANNEL(ch13_ce_count, S_IRUGO, + channel_ce_count_show, NULL, 13); +DEVICE_CHANNEL(ch14_ce_count, S_IRUGO, + channel_ce_count_show, NULL, 14); +DEVICE_CHANNEL(ch15_ce_count, S_IRUGO, + channel_ce_count_show, NULL, 15); =20 /* Total possible dynamic ce_count attribute file table */ static struct attribute *dynamic_csrow_ce_count_attr[] =3D { @@ -363,6 +383,10 @@ static struct attribute *dynamic_csrow_ce_count_attr[]= =3D { &dev_attr_legacy_ch9_ce_count.attr.attr, &dev_attr_legacy_ch10_ce_count.attr.attr, &dev_attr_legacy_ch11_ce_count.attr.attr, + &dev_attr_legacy_ch12_ce_count.attr.attr, + &dev_attr_legacy_ch13_ce_count.attr.attr, + &dev_attr_legacy_ch14_ce_count.attr.attr, + &dev_attr_legacy_ch15_ce_count.attr.attr, NULL }; =20 --=20 2.43.0 From nobody Thu Oct 2 22:53:07 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2052.outbound.protection.outlook.com [40.107.96.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 515793570DE; Tue, 9 Sep 2025 18:58:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444334; cv=fail; b=g41Z1YlYWzMFB9ffP2fO+c+OWzmT199t2pbSMlpSLR3bDfzn2PA+rDrkdlO8+z5Gl1jN3vnI21vJxHOEkWlIce7Bjos8a1hNR17ELBHtRCJIbjSnf2JDLV5k/ArWFoGBxj+G7YUYzpoHFuQEAL2Uy5LdcGgP/R6ASf7MqAnWOBE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757444334; c=relaxed/simple; bh=Au2BEuRokjXsncjzqRdSuw2qay1noMoPrBaucXoRZJs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IdYFHnjMOkiYfKcnIp0Ux+AuauO2SKA9Wn7o2PqIlsIsceKQwmFfFLil2NKrPBBHNT4BbxXoEd9cpbvd0XrEC5LQj+DDu685wdKDu/0tocNfQCT0Ep6P4s3r6+C2QWB0RZ0kkEn54H3AjO8v2uPTMT0ipSCHsguXyTNhqncz3ho= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=EnENHtTC; arc=fail smtp.client-ip=40.107.96.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="EnENHtTC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b4rOfkgneD8KkOiu85GBlnGRzyT8fy5KBf10pap5Bflgw15FCEtrecED2jmJ/XV21jZrYgpajbvqL4Mh6QjgoviJMaMzjxHk5P0B5+M4PPjrP9VN8aMKjoY+vB9+7gbL6dco8hqkD2arAPCDIECRfBt2X6Yl4qwnjN9GKHUsmEc/FN4vpEtcT5n3n03KcbpX+vNX5h2c+1nxuTlvcPlxPpNL7pfU2MW7FRu4DUE3N5acJNUOZL7X5IFqBPK64DRgCrukY7sXgTw4rWZTlFTleAJiyKv+YDNOHVchUI2nfJAAlr4GhGKW2z0mvOWqNRMkfJP7QZlyDngtw65zrF135g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OgGWrbMBM3+nnPztn90kOVJVctdZCf8IodwmkDZYiHg=; b=EOT5azBPx4q/B7me8bqDSoRW5phxnhlMF5Hb5K+W/bHGsv+N9KgqyrK1CIhShB+1Wh6d1LUtjj0N75dhJo9xwq2SXwmkBIwJ5mPNItAtHB5wAma6R8CV1qgeq5l/hUiR9rZUFOwj/e+x31uAZhBD5aao6AVWzeQwSVHOKkHOuSbU2NTHZIkFiagfUHKtJEn9pojkW2Ki+GfvQq234NX8t0pISRqXTTpAoYucKdVwRYM+BxHSqXCOcTUXPeKPuT0a6h67tLRow9RUmSIzwqigfMe3NvQ5bkPDdKLIyQ28lged36HKIK78/9Tx3gZ+xx4rJAXmvOLhrR2tJntBl8wVyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OgGWrbMBM3+nnPztn90kOVJVctdZCf8IodwmkDZYiHg=; b=EnENHtTCwJkDP3OHGmu/DQFbcfLYOn4rBrJao0Z+mmYCij/GjPBYjDc35qA87nELCvy8UoawFJYYeKRsE9b88Qh9OZTNnkBpz+GOJya28QkwAo7ort0pFRYrS2deVSCZYbG63VlsA3V/oQD8qykbnsxD+dve3ssVW6bpNmz7yu4= Received: from MN2PR18CA0022.namprd18.prod.outlook.com (2603:10b6:208:23c::27) by IA0PR12MB8975.namprd12.prod.outlook.com (2603:10b6:208:48f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9094.22; Tue, 9 Sep 2025 18:58:48 +0000 Received: from BL6PEPF0001AB75.namprd02.prod.outlook.com (2603:10b6:208:23c:cafe::27) by MN2PR18CA0022.outlook.office365.com (2603:10b6:208:23c::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9094.22 via Frontend Transport; Tue, 9 Sep 2025 18:58:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL6PEPF0001AB75.mail.protection.outlook.com (10.167.242.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9115.13 via Frontend Transport; Tue, 9 Sep 2025 18:58:48 +0000 Received: from titanite-d354host.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 9 Sep 2025 11:58:48 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH v3 5/5] EDAC/mc_sysfs: Begin deprecating legacy sysfs EDAC interface Date: Tue, 9 Sep 2025 18:53:14 +0000 Message-ID: <20250909185748.1621098-6-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250909185748.1621098-1-avadhut.naik@amd.com> References: <20250909185748.1621098-1-avadhut.naik@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB75:EE_|IA0PR12MB8975:EE_ X-MS-Office365-Filtering-Correlation-Id: cdbdfc85-b895-4d42-b87f-08ddefd2e8fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?/k2bD+Ys6xS/lGKY9B3bA6E8sb7vSp0JD6y/yzNTa30D0+dT7+OKPu9V8Dq3?= =?us-ascii?Q?SVuSfk425SNkwCqU1kkU5jMB34yWi9ybXmJWgQFwBsyEUwGF6KbSOZXqgstV?= =?us-ascii?Q?CsDa30IenJ8z3TFwG2KTLvcgxrgcqcBYtYYlJ/catqV6tdiJ1OVvFGeDHtv3?= =?us-ascii?Q?98QrmZPe8CkKGlR10XUUQ8L9nlQKrpWQQtOTGm9XB4ffa9n2EjvT0A/zr9G+?= =?us-ascii?Q?VQsNr0y25fgzOpd0hCGPmiO8u9yL+5s1cWJIcxk51I2RMzLOCnga98yRWTcI?= =?us-ascii?Q?Jmzh6mhbYy1FuN6y8KHgpLlhIilOOk7o4RWCfAx67PS8yX7MK315V1J0W5sL?= =?us-ascii?Q?V8avWw5mh1grY+gXXX4y0Rb6kedor9TKAmOXbpoXfXB88mg9dnFkFKbh3ARC?= =?us-ascii?Q?+F6BeVydf/MV53yQA4JEzSJHvH9JRi8CZUedwmgL06RQshwWAvIACPsyfPxZ?= =?us-ascii?Q?9lP3BJ0KiGUU7f0diKrB9fNaAKpRo4R6LDxPIY6tnMXPuAZglv1ousEq0LED?= =?us-ascii?Q?hhvMMiV8I7kie1AHm5KbFOXnl3Kw5b8Pl3Pc8LK2AWjBgd5GfsvR7xr77yxm?= =?us-ascii?Q?kCbjZTO2c7wlM7PiYLg/nya2wi7j7qkxLew3brUkUbQU6efEwSXodTqw4G2J?= =?us-ascii?Q?K22QOaglIamJ7vjTWYnNwx9Z25JeAydfA/oCc55oAq+dVoe66AnzmhTagk+8?= =?us-ascii?Q?MmT506aUWs8gLQ/A7LH1IjR5oulwF0N9mU1PWCj7n0us3rhOA39/Hq5E5uIx?= =?us-ascii?Q?OxJypqw32FtItSS03D62dnhybVZHdCnFguns7GW6fRJhHohMfAwa/LtR5fDx?= =?us-ascii?Q?zAwbrM5CAqIsxf+HowhwD0sDDtHiH11q0nNFOQ7mkZFxs3MACEy/Q9vbk6jt?= =?us-ascii?Q?J62pPR30SaMJNsKSoNTXtHwlFeVKWDqdlwcTG3V5Y1NypSG67dSgVoJtDb7c?= =?us-ascii?Q?W6KzA72qtct4Idn81APhE50IjfIVI5VB22UhFVIFMXtLtQfo2O7sitlYNV02?= =?us-ascii?Q?S3iBGtsC7VJYRj2FhzeQPVGsCNuZxNDpgpmqKAFk3XOBG9djcN+WP2dmjgBi?= =?us-ascii?Q?Li3ydnGo9GQsc5EigQ3CCf05XCV10/Yg9jcBdCy9ItQS4v5Z7W/f9PIvDO4g?= =?us-ascii?Q?sBfgv1Bsnzc17rm1kzQ1M8eyqlhSE+wi9JNt3to7QnliLEJqd4DfUzdS1k/S?= =?us-ascii?Q?4AzlauSEz2IiONMYvlx8Yb+KcLhXJWaG+GDSU6c79iNC1iHB4+BlGhpaHga2?= =?us-ascii?Q?195tIuJnBYOKkv/4dyQ9DoKNYChlMjC8a4nwchBtbl518vttvmonWM8UgwAs?= =?us-ascii?Q?ytmIXD51LiJ9tZ4bFYzO8RulF+dDg+nvwoqH71WwS/3HaK/wzB8I9nrD1byH?= =?us-ascii?Q?ZR759pj/jyXh6wN8ZZfGX313JhrxGKGi90ShDf/Ob5l4K/2Iw8PG0aS/oLwZ?= =?us-ascii?Q?9xVJ4wRJaKeXyY11VhWls9YRxUIkar2/Ccl1dJyVpq8vc+EH8MhrL5N3mekV?= =?us-ascii?Q?lC4WnainAEduzD8KLPDRGafFK6L5CkCyvBg4?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2025 18:58:48.7093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdbdfc85-b895-4d42-b87f-08ddefd2e8fc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB75.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8975 Content-Type: text/plain; charset="utf-8" The legacy sysfs EDAC interface has been made obsolete more than a decade ago through the introduction of a new per-DIMM interface. The legacy interface however, hasn't been removed till date. Begin deprecating it so that it can eventually be removed two releases later. Signed-off-by: Avadhut Naik --- Changes in v3: Patch introduced. --- drivers/edac/Kconfig | 2 +- drivers/edac/edac_mc_sysfs.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index b824472208c4..19470f4efee7 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -25,7 +25,7 @@ if EDAC =20 config EDAC_LEGACY_SYSFS bool "EDAC legacy sysfs" - default y + default n help Enable the compatibility sysfs nodes. Use 'Y' if your edac utilities aren't ported to work with the newer diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 8689631f1905..3840eef942f8 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -144,6 +144,8 @@ struct dev_ch_attribute { static ssize_t csrow_ue_count_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); + struct csrow_info *csrow =3D to_csrow(dev); =20 return sysfs_emit(data, "%u\n", csrow->ue_count); @@ -152,6 +154,8 @@ static ssize_t csrow_ue_count_show(struct device *dev, static ssize_t csrow_ce_count_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); + struct csrow_info *csrow =3D to_csrow(dev); =20 return sysfs_emit(data, "%u\n", csrow->ce_count); @@ -160,6 +164,8 @@ static ssize_t csrow_ce_count_show(struct device *dev, static ssize_t csrow_size_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); + struct csrow_info *csrow =3D to_csrow(dev); int i; u32 nr_pages =3D 0; @@ -172,6 +178,8 @@ static ssize_t csrow_size_show(struct device *dev, static ssize_t csrow_mem_type_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); + struct csrow_info *csrow =3D to_csrow(dev); =20 return sysfs_emit(data, "%s\n", edac_mem_types[csrow->channels[0]->dimm->= mtype]); @@ -180,6 +188,8 @@ static ssize_t csrow_mem_type_show(struct device *dev, static ssize_t csrow_dev_type_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); + struct csrow_info *csrow =3D to_csrow(dev); =20 return sysfs_emit(data, "%s\n", dev_types[csrow->channels[0]->dimm->dtype= ]); @@ -189,6 +199,8 @@ static ssize_t csrow_edac_mode_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); + struct csrow_info *csrow =3D to_csrow(dev); =20 return sysfs_emit(data, "%s\n", edac_caps[csrow->channels[0]->dimm->edac_= mode]); @@ -199,6 +211,7 @@ static ssize_t channel_dimm_label_show(struct device *d= ev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); struct csrow_info *csrow =3D to_csrow(dev); unsigned int chan =3D to_channel(mattr); struct rank_info *rank =3D csrow->channels[chan]; @@ -238,6 +251,7 @@ static ssize_t channel_dimm_label_store(struct device *= dev, static ssize_t channel_ce_count_show(struct device *dev, struct device_attribute *mattr, char *data) { + pr_warn_once("Depcreated interface! Will be removed within two future rel= eases. Please switch to using the new interface!\n"); struct csrow_info *csrow =3D to_csrow(dev); unsigned int chan =3D to_channel(mattr); struct rank_info *rank =3D csrow->channels[chan]; --=20 2.43.0