From nobody Fri Dec 19 15:34:46 2025 Received: from DM5PR21CU001.outbound.protection.outlook.com (mail-centralusazon11011046.outbound.protection.outlook.com [52.101.62.46]) (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 919FF2FBDEB; Mon, 13 Oct 2025 17:37:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.62.46 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377026; cv=fail; b=fj2JitGD2biX4C83Wzg1w0xJjeTOE4ywp7zk8f1BHqnRXMxau/V3gt7Rc5EFglSOQ0Wv7MfOxpNHeQw/yLkvVfOno073feNWgvf1EmG3cjLk492PHVWGzvIA/tioPW9o6eJ1+VGZUvusotPL3a2GoOZJ+eJXG/IMXpi3Ojq0TvM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377026; c=relaxed/simple; bh=2VwYgme0YtmU/PphCcXLy5I2Rd/AJqtOKrLySsdl8xw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vGNtqJZfyBuSpuzQHdzLP2Gjgthy0zh5/q/2cwk2110/9OtnguAYY6C59dj0aVEBCbAvkkv0GMi34nohtFb7bV82QfgEuq1n00Wcl29E+q5XbplDsil1WXyqZ6zKr+WbV9XSS1sKn0FqfcnoHaVqjbmd53QJjIw9Q6MMZMyKLHI= 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=XWzhq/Rp; arc=fail smtp.client-ip=52.101.62.46 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="XWzhq/Rp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YiTv0sMU/dXEK2VyyU6NBzTq4z7TXpKTSjAbtpBtzym/+7On6m+gzO9y6x4fW2H0IkGJbMIYslSkka+apT92IS1AlRO+SfcOxjW8F42+Ew0Rl9YHKC9SMimwjHSOp2+cXpuhQNytgO6fiPX9hHjdStRoMsbPeR4I66zdkZKNWaZ1AQ4oQwV/bJpq5ZAJc7YmXgOzQikv39NCS4259XwJGSMUdCQdOa731MYgDfw6pXfihfqvAM5a0URdTt2zU/+Q7G5se9AadYpe9iVsOVyGAGKVquJ+xKsHRduPfqSJO1dgIIzyF2kHRFo5gf1IX2jwEptcO3hIN6WniCjQ2X6cwg== 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=tkwLHieeEjZZCm9PHDeWsK8RgFcflo5m1e0qZtTEN10=; b=cZ2d7SWN2CjNS6CizDKeURatV6i3gEcG008MvzGGw9yy7Y31XCYTT7Ywq4BOANjBrAKwmjvVGAv0KXPa4mz+zL/GkvY6qRwK7nbR4GmoenD+ujJEkroRBIsxZNP7pmH2HOyqu0ha+TmLXv8/DG6KEOEv1g9ej3RaGBNtne+Kam1IZjxKBJg6T0LC3s/Pip3eUDD9N+tJDtjPlF3rg3WPVjyaETvvgvkg8LpYUDnvhyQGixweP3drnnNMNpvEzET8A5+YfbZF5qy+xvggJ7Ie51ao0l9KMEi0pfJo8kTzMZF0fCOUw0tVuj6m0qnkbNCuIl3jQsl7D1xM0AwLCSFuRg== 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=tkwLHieeEjZZCm9PHDeWsK8RgFcflo5m1e0qZtTEN10=; b=XWzhq/RphtbCN2ZJgQcEnYThDXFMY8Mu0zfCbEyobElejGVUzFP/uj0PJhHhzGCSzYboSrLqZ8IdGZXQijp7ztVj5l2y9xRBKUIlQYX7SoZ6jLvuWZ7FeDRO5vnDA4Bs2DeZOT3nnUbTFwRzCIkrmwyyFhv4rwlEelWeaX7lh5U= Received: from CH2PR07CA0046.namprd07.prod.outlook.com (2603:10b6:610:5b::20) by MW3PR12MB4476.namprd12.prod.outlook.com (2603:10b6:303:2d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9203.10; Mon, 13 Oct 2025 17:37:01 +0000 Received: from CH2PEPF00000140.namprd02.prod.outlook.com (2603:10b6:610:5b:cafe::aa) by CH2PR07CA0046.outlook.office365.com (2603:10b6:610:5b::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9203.12 via Frontend Transport; Mon, 13 Oct 2025 17:37:00 +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 CH2PEPF00000140.mail.protection.outlook.com (10.167.244.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.7 via Frontend Transport; Mon, 13 Oct 2025 17:37:00 +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; Mon, 13 Oct 2025 10:36:59 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH 1/4] EDAC/amd64: Generate ctl_name string at runtime Date: Mon, 13 Oct 2025 17:30:40 +0000 Message-ID: <20251013173632.1449366-2-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251013173632.1449366-1-avadhut.naik@amd.com> References: <20251013173632.1449366-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: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000140:EE_|MW3PR12MB4476:EE_ X-MS-Office365-Filtering-Correlation-Id: aed3c72d-3b11-4880-6f1f-08de0a7f1dbb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ANzUxdwXVNupoY1fY0RqqXd38x64LdZIIAT/PYa2C0yqvnvQKJCPB1f31Au6?= =?us-ascii?Q?2Xskhp+wsH+8cl4USGZIJUY2xfzXIiN+nzme0e2R+Go+ZB/msxWuyWZa+Lc2?= =?us-ascii?Q?/TyWd37AgsCk1l77DeUX5VkfkZTNG+Ig3XgAIc5ukhkmHYCew8XFw61eFLBP?= =?us-ascii?Q?m9XxrVnL/myzb15E7dHwPytQOqXGfjWfY6Uus3OchI0j2ip+Li0+fpfyTTkX?= =?us-ascii?Q?BhUOoJaqQegs41FPlkO5ktc4o2JxBCycaeDK9rmyIbjKi57Ae2eiEz5JobDP?= =?us-ascii?Q?3FN07zbJmMavka0rR8zAQUF60eWm9QtFUs//Cyqt/iG0o/qAOs6kwKypjXHA?= =?us-ascii?Q?f3I569mdmKiHClkImOwooNZWSVRGGBVwUmz7FiwloySxFBCmX0hOx4bdIBJY?= =?us-ascii?Q?nwI9VOcu6EU8eoZG97OpPGL8ZIlpWQLCCXO8uz2J1S3YNPgNLTb5RV/OFqzF?= =?us-ascii?Q?tdez0ZEOqJCQD6jR+6X+1dK1IdbdbQZQsf5+J5CnFRLq3WSaWwagBCder1qe?= =?us-ascii?Q?tsXPopVjZ9HdAN1rCkacqfc1eScRwFW7fw5KQm2qVo6w07hJeGiAKDRjuWc9?= =?us-ascii?Q?7HhlTzOxsogHZBUqO/vLdWuoybFQ05v+9Uqg7hSkFMft0jKyd1tjMLpd2rF2?= =?us-ascii?Q?7IB+aW1FnceOyVYK/UGKVhBCDT0fmy7EMjuB2l12Byzyktx2u1wPpbB/Ql7j?= =?us-ascii?Q?m4MGs7orxUhJIbFGCDA/k1cvZyHuYWaJK3sWtzuce8dFpCHCZTVDxtP5fDOZ?= =?us-ascii?Q?BiG23fKj7wdGHiDlNsQSpjIwrB/R+TuNMPWKvT4mEce0++gyrcHfQPc2u8XO?= =?us-ascii?Q?Gg/oppD9LKK+JjSj+3tiqOfLjRdendTrAf640jP5dN57XRrBenH8I3uRyrwT?= =?us-ascii?Q?fIgDkCdKQ0ndpaOgbt03uBwptayMWg0FxpIbOL0igh27uR+fGz31qSo71VQa?= =?us-ascii?Q?e/R8uSzvk03Zaf0v4+t3tHVTNGSRE1qiDKJptPa2xhFLQqID688r+B52D8AC?= =?us-ascii?Q?IwRD1ri0zScBSMYM0B/6q+O6dvLvy7XOUcrxynP50lOJLPpZpl+k7B3wzF/d?= =?us-ascii?Q?z05zFlz2lX+3utkEeiJgYSvmUjytaZQkbm2VfYb+d0MAFfiq3jSrwMh5j0/S?= =?us-ascii?Q?3jZsJM3iNx9joI62qJidi18SYy6D0C0Vpp5lIPHoYQOBzvR44PrIpB39dJ3J?= =?us-ascii?Q?Fi/ZLoRO5D6LyoAahdlAZfr1ZidrlUw76eT7shJd5NJ1h7v7SOjm1x73wSgf?= =?us-ascii?Q?w9eKOIGKKf+eGQS4GRyrY5SFBqiemZUmguBSYD9G8LDiCebbmgySYns9phaI?= =?us-ascii?Q?+3VoXBbryUSbf1ptuqMM/AbkMht5TsPx1/oDH0cG9b/EtykTkQDt6MfxZ9Hs?= =?us-ascii?Q?ni4+8P1Rnd+sATVrH0WwkxHv1y3hXKxpH8BD6MA2dwOUzgsL1QSwvTCHJsh5?= =?us-ascii?Q?tWY+4U6VFTfnGLgVIAUH6u+mI4R9EWVwoXeKIUMJNcOuEOdHlub/HCZPLeWv?= =?us-ascii?Q?9IfR9A/mu8pLy3PU3z+IAtTQ1D9y2RsksFm/A5uO177u7+A40pazMQE5RQ?= =?us-ascii?Q?=3D=3D?= 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)(82310400026)(36860700013)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2025 17:37:00.8484 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aed3c72d-3b11-4880-6f1f-08de0a7f1dbb 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: CH2PEPF00000140.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4476 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 became defunct and consolidate identical cases. Signed-off-by: Avadhut Naik --- drivers/edac/amd64_edac.c | 56 +++++++-------------------------------- drivers/edac/amd64_edac.h | 4 ++- 2 files changed, 13 insertions(+), 47 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 2f6ab783bf20..886ad075d222 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3766,6 +3766,7 @@ static int per_family_init(struct amd64_pvt *pvt) pvt->stepping =3D boot_cpu_data.x86_stepping; pvt->model =3D boot_cpu_data.x86_model; pvt->fam =3D boot_cpu_data.x86; + char *tmp_name =3D NULL; pvt->max_mcs =3D 2; =20 /* @@ -3779,7 +3780,7 @@ 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) ? + tmp_name =3D (pvt->ext_model >=3D K8_REV_F) ? "K8 revF or later" : "K8 revE or earlier"; pvt->f1_id =3D PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP; pvt->f2_id =3D PCI_DEVICE_ID_AMD_K8_NB_MEMCTL; @@ -3788,7 +3789,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 +3797,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 +3809,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 +3819,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 +3831,51 @@ 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"; + tmp_name =3D "MI200"; 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,34 +3885,22 @@ 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; case 0x50 ... 0x57: - pvt->ctl_name =3D "F1Ah_M50h"; + case 0xc0 ... 0xc7: pvt->max_mcs =3D 16; pvt->flags.zn_regs_v2 =3D 1; break; case 0x90 ... 0x9f: - pvt->ctl_name =3D "F1Ah_M90h"; - pvt->max_mcs =3D 8; - pvt->flags.zn_regs_v2 =3D 1; - break; case 0xa0 ... 0xaf: - pvt->ctl_name =3D "F1Ah_MA0h"; pvt->max_mcs =3D 8; pvt->flags.zn_regs_v2 =3D 1; break; - case 0xc0 ... 0xc7: - pvt->ctl_name =3D "F1Ah_MC0h"; - pvt->max_mcs =3D 16; - pvt->flags.zn_regs_v2 =3D 1; - break; } break; =20 @@ -3951,6 +3909,12 @@ static int per_family_init(struct amd64_pvt *pvt) return -ENODEV; } =20 + if (tmp_name) + scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), tmp_name); + else + scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh", + pvt->fam, pvt->model); + return 0; } =20 diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index d70b8a8d0b09..bb6cf4b1ab77 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 Fri Dec 19 15:34:46 2025 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010043.outbound.protection.outlook.com [52.101.193.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 68D4F3081C7; Mon, 13 Oct 2025 17:37:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377039; cv=fail; b=XYhCABwvMgmqQdbl1GxKhOJkkHEdnrdU2Gkmu5Xu74BmTUBM8dJ2HyZSQIIfZfQMJoZiRoe/5WKASkrQp6Gp775VBFcOet0id1tgU6Soz2N7/L1hHgo7cZFSXL48zhufao7vwdojGaeDupVE0dWqnzzNGIxj2FWTEBBS7l2M6x0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377039; c=relaxed/simple; bh=qDM761Qw+KG7I1fLTeTU1Pr/UTvZZRF9dnMWUBN/GGI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IaB3cM6NguyNKAwj8AOxOZ9dCx+vWwYcyr3bv0HTYqj6HOZGuPLxo7ZQAtMJJtHRFA/alQxFr83UEvUW/b6UpF7ELlSxE+0gNgcE8JiMKqJCTcfLGR8Lq9vFZ9MV7DGdhTgsKVhzHTdMWI+n7DDGAf6gGHDfrrvAxrP7xO9KgUw= 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=Oyn3uh2k; arc=fail smtp.client-ip=52.101.193.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="Oyn3uh2k" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u23qWBNJuSqgJZfNzwJgPAUiVrg6uCtw/sm9gjrkwUP3XloO1t1vHAYJJ/klFBICUW2xJzA5rfH6X3rubXtON52PwNom4S41io9UfsFuvxyH7ZOnIFkJXJUMq0PIaTg1FPszhTtRy+xPQ/abZmniCbgGvFIFV4BNJ20jnowxr4ampHkPg0LGQhXNTaWSi3JbjgZZNyPJ66uXM+fAuHegdOXkcv3VYIjbXxX3lRR4oOTwJzNNSN/qBhNb9yNahO1/qO9rJaXPYX671LIQaWjdCrDZvEu927617cQ5zQCN+rW5bukE4eLjpOltqPNYdwimavMaeWlCcOXtRJ+gLfRmNA== 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=riwvS37vTSfyX2rZ7q1x55lnvyALiTZxBOR6O80IZL4=; b=sLtsVdyxRAtZDqOHPIPOX8ILWSgIjOXBftqozCk3e8IxeDzVTofEZlK2Qt+IGkzSmyXmLq6d5P8wi3LSSvk7jfVmODd+XygWDMj26VUd88DXM2HqPDFTGToHsZjB2CaQUSQMNuigSE8HPUQ9uoq7UnblKY4chGziyOIiio2BocfwxO+XOweGGVQGw27rQyn7MA22edGCwRTCBTEeBkvK1MDKFuMJKfLmNT6bzM0NE9LkgsmFFLFn/7Sx3GEss8zOQBGk3Vrf5wfstNDwNyzhhzVSRDcfNOZnG0NaUdMoJKC5Lz3U1sRuiJ2uqM8mXQdJPDr/aID8xSLAUFyLGdYGkw== 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=riwvS37vTSfyX2rZ7q1x55lnvyALiTZxBOR6O80IZL4=; b=Oyn3uh2keooa9yIaq76DpALzn8p+gwEl24JU0qbpXEXh1WLKB7fprIR6CUNfAZTlpFb4ULba1QAamvOn9hSHCi0U5/Awr0LxTf1rZluOkJCNLxW8pu3ixYW72pEkIwyzysrxA4L4mB5ll/1NdEiIiLAiLsOiDIrQe9CX7GTQJgM= Received: from CH2PR07CA0044.namprd07.prod.outlook.com (2603:10b6:610:5b::18) by LV3PR12MB9330.namprd12.prod.outlook.com (2603:10b6:408:217::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9203.12; Mon, 13 Oct 2025 17:37:12 +0000 Received: from CH2PEPF00000140.namprd02.prod.outlook.com (2603:10b6:610:5b:cafe::6) by CH2PR07CA0044.outlook.office365.com (2603:10b6:610:5b::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9203.12 via Frontend Transport; Mon, 13 Oct 2025 17:36:51 +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 CH2PEPF00000140.mail.protection.outlook.com (10.167.244.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.7 via Frontend Transport; Mon, 13 Oct 2025 17:37:12 +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; Mon, 13 Oct 2025 10:37:10 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH 2/4] EDAC/amd64: Remove NUM_CONTROLLERS macro Date: Mon, 13 Oct 2025 17:30:41 +0000 Message-ID: <20251013173632.1449366-3-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251013173632.1449366-1-avadhut.naik@amd.com> References: <20251013173632.1449366-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: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000140:EE_|LV3PR12MB9330:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ff1b6d7-ee94-460c-a0ac-08de0a7f24c3 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?0nmYI9B0i1A/th+fR5xoCWkyyga3wQu7H0VHNa2KHvPKnNODPZCU/hiYZar9?= =?us-ascii?Q?49rglGeffmGvXaN0S4GiFse+BGvi/jEHwC895m7tWXrtw50eklLPnO1KulSy?= =?us-ascii?Q?nMHjLtPXlpsDllt4b47dntH8U19WhNqvEQtfMsjn78OZKP6Is94e1xFfngg9?= =?us-ascii?Q?tCnBnzPQ0nWh77VkrVHNpsJ5qg1KnDC5PMuBgw5BpTIPtBUxqEEILqK/7Dtz?= =?us-ascii?Q?+dYCUd0r4ex6/la00lrx9RuKncpBYZTj8JPYV39Ug3/1uSsG/kHbCJdpenWz?= =?us-ascii?Q?BFZUR117TkiucCFfSDqDiRp52NDkf0u6Ijfaq0z0aw4WIvLr6gES8qNX8xrL?= =?us-ascii?Q?Ommld2NnCahRo1C3wdApdWljiLF+qEWda8AMGCG1qVKnxl4/kRQ7IR5BwbOG?= =?us-ascii?Q?JPxO6cC6Z/H2LlDgerzWuj+z8VPdHScIDcWM5l62ex6k0Qc2PzENiqZx8rxR?= =?us-ascii?Q?1G6Yjmtg0XYh0KkEQhbRwqLuZhBNdjr3TXSzvzaZxrt3vNn4g9kBdlfKKNpe?= =?us-ascii?Q?dBxgmJma0fjcw44/TKjwAcioVaVKK4wFlj8TDUcifUZ4KH32Qe6Xc4IiRVCr?= =?us-ascii?Q?zlB9HRX9gMpB9ubv4aovD8VtVA2FuvCKXm5S3+4Td/kCGg3a1hYNLvUFCAio?= =?us-ascii?Q?7NioeYYNaHnyqT7UH9U4IOn/ogWNWEKXA5jNMnAMTkarXypyzbWDVQv6C4f6?= =?us-ascii?Q?Zyv6BhVwzrQFNWspIJkH6v0ut5UoCYMrINFaj4nVf/ARU2H9cMdWep9FDOev?= =?us-ascii?Q?e5FTPJBM3OvUQmuaull/9hQ252NXChIwJ3980N8Ma79Yt2CQ1MQnF0AVlHkK?= =?us-ascii?Q?aB5jGqwOMjjangbBh+gynBRJi4CPsWeUVKCE1GFo8xfpCztYqoS1Wqnq5AGy?= =?us-ascii?Q?QtaOIDgny9ezQKyMION/ORUgGkm78sNZZiqmxemDzisa8nZEK0psbJSTmtaH?= =?us-ascii?Q?i+Vvff2jUoKxFs88y4yzGjRw4Z7YZ4djsC/BZd08vCoI1kad9x9pkw5jutv4?= =?us-ascii?Q?mf8vFtQGxCTZ6MnqSNuRp2Yn4IrFfy9rIuMzbWAMOlqeL5QS9JJUicbvD44O?= =?us-ascii?Q?rV5pyPPCUnV9FpaRwKLdPiOKNlldX0WujIXLEOVjm8+ANmm4cfc4GiMaUmYM?= =?us-ascii?Q?D5+H56Y8VKgtkv+SdXmd3f7fDCC5thTRlqzljKCFdhPHp3pdA9guwV0C+tIR?= =?us-ascii?Q?/m73hYzS1Th7u3izv/CjLd0Af6EtpUEiNJrWtI+1cq9RF4181TjJMV6kb4aQ?= =?us-ascii?Q?P//12CHxX8oYIiybBCJ7FXtZ3ZX6bJefwy3hflz3KPNiSn53bz2M4cgBj1yj?= =?us-ascii?Q?VUThjuFzLslEWfSlrEKp8p3T23jKxjlmzebdcIdH1k4uNYNnl6seukiSIzOv?= =?us-ascii?Q?BYtklhmQtn5HIhD63ZAKIeeiHkgfuPhf+vZ/zoTpi9PNypeiyAyUkjVeOdIr?= =?us-ascii?Q?FgL43fwbLL3Qn46LJlCdzY/+58W7+UNlQTfZ/s2tHplWG2yKxFCJumqlw5sx?= =?us-ascii?Q?CzEW9t+RqCN1G8N52bNL5Cdzi/s9ow7KkRkVj3XKsQnxdgXjlauUSkLwm8dA?= =?us-ascii?Q?0iwHR9IWZh9KarLZcpM=3D?= 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: 13 Oct 2025 17:37:12.6488 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4ff1b6d7-ee94-460c-a0ac-08de0a7f24c3 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: CH2PEPF00000140.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9330 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. The max_mcs variable and the csels array are used for legacy systems too. These systems have a max of 2 controllers (DCTs). Since the default value of max_mcs, set in per_family_init(), is 2, these legacy system are also covered by this change. Signed-off-by: Avadhut Naik --- drivers/edac/amd64_edac.c | 5 +++++ drivers/edac/amd64_edac.h | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 886ad075d222..2391f3469961 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3732,6 +3732,7 @@ static void hw_info_put(struct amd64_pvt *pvt) pci_dev_put(pvt->F1); pci_dev_put(pvt->F2); kfree(pvt->umc); + kfree(pvt->csels); } =20 static struct low_ops umc_ops =3D { @@ -3915,6 +3916,10 @@ static int per_family_init(struct amd64_pvt *pvt) scnprintf(pvt->ctl_name, sizeof(pvt->ctl_name), "F%02Xh_M%02Xh", pvt->fam, pvt->model); =20 + pvt->csels =3D kcalloc(pvt->max_mcs, sizeof(*pvt->csels), GFP_KERNEL); + if (!pvt->csels) + return -ENOMEM; + return 0; } =20 diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index bb6cf4b1ab77..5f61631c8a7d 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 16 =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 Fri Dec 19 15:34:46 2025 Received: from SN4PR2101CU001.outbound.protection.outlook.com (mail-southcentralusazon11012019.outbound.protection.outlook.com [40.93.195.19]) (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 5ABDA305062; Mon, 13 Oct 2025 17:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.195.19 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377048; cv=fail; b=CZ+zheZNdjfDYPmuE/ZWznXJ71nLStj0RVcu0eNH2ISedxaE7GpRii+3q/qXkfqX9k7jV9lYlnRvAeiEnSjG17DHl7d8F145MDl7DirdTyyNOWifv1H58DlmNEFJLxLSNzDHVMEONDafKd+0pJob7Ekd9ZqRaDWyHuMDIywesbw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377048; c=relaxed/simple; bh=RolwOF54I5Q9OIpsFTVd3oZ/fd5rjkKC4hh8toaMLqI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sU8mrQlMQ4PKG9VL+UTChzkle3tqn2dhN1oyB1wA/4lkNZabZ8fYtpB0+CQ+v5oU8RJ7S0h6lBI6DnlQjqh2hp8qDgYd13wLlkmuNrLtY4SVh4tnFjAy/5HJgYa1WlYvd4tRNtfX1SmII6O0XdUmCtTO51OXO2D9mNktIDY1PoE= 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=U0MdMlX4; arc=fail smtp.client-ip=40.93.195.19 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="U0MdMlX4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=S8xXPBqzPBANaCz3yfsQX6RLB+CL9sMhrjG3SJsCHlejCsDpzcENXzB9veA3TYMUbYhaejYbL7KoWXN/rT13pSRxeLUXFAQKhylVcXxVF3Zklb1zp3IDbAaI6to3qBI+Oyk6VIR1xoyIExBhKGI3R6PgSi4rVzhz0fSh9uNq91OnFtHryRx7LQgSRVblA2j4GzTGrg5rXsJiF/NQ0N9cFVo/5QmpzZ1bAXjkErh/wVDOz56SCAKepobiMYP1x2MLX+Y2fMuHOSqBQBQI06ZYEuc7qBEhGdeYTfkkiSnHwAvC/17Bii/wkw5DCsPcH34/wryTyM4J/uEQfoWVb1wWJw== 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=tnWJ+kb+rLaHvM7iTs/o5H/qks1N2kR/t1GjaZl796M=; b=CfsRJuDdJ6AIlqZxor24PZNA51WGFYgCYb4NLgso9YcVRiHxfveVER0yRqAjQKNVunLjGgK5ZHd7bgHnHdgaFaRqBPo/+swn87+Lv15skI+n6XzCasCyRJWzbe47i22PfAiOodaJdmRXMjNIFOJ8DeSyQvaI6kU6Eg1W40nUUu2zl+10H1UagEdX9/cgF2Q+C3rBsSrjh6223O5zTzm6tW6nAfpEftJkooh9e3nFh1uHAYl6L2O3rKDrT3E2Q/kiEzfeCdH0C92KeNTmluGNbvCWGZpBaX9jSI2LJ/O5PnENlkxUvYjUGabxb9S7F34Z1Ee3zJ1Rjq8iSqnfwUWdkA== 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=tnWJ+kb+rLaHvM7iTs/o5H/qks1N2kR/t1GjaZl796M=; b=U0MdMlX4ZqTHevivuLyRsWxKp02IQRg3GyOqmqZea9ncvGS9bTi4a2iV1LaIHXlc+flxxxdSoYn/KoShsqcREqfI8bFC6x4zLVzvzF49/TpfAlTkzaugJWRf8GxkWXbvGvudVfqq0d0gopU4osYbFCbyKxPPjau9/kS/UdGwXCQ= Received: from CH2PR07CA0041.namprd07.prod.outlook.com (2603:10b6:610:5b::15) by PH0PR12MB8800.namprd12.prod.outlook.com (2603:10b6:510:26f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9203.11; Mon, 13 Oct 2025 17:37:23 +0000 Received: from CH2PEPF00000140.namprd02.prod.outlook.com (2603:10b6:610:5b:cafe::1f) by CH2PR07CA0041.outlook.office365.com (2603:10b6:610:5b::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9203.12 via Frontend Transport; Mon, 13 Oct 2025 17:37:22 +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 CH2PEPF00000140.mail.protection.outlook.com (10.167.244.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.7 via Frontend Transport; Mon, 13 Oct 2025 17:37:22 +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; Mon, 13 Oct 2025 10:37:21 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH 3/4] EDAC/amd64: Set zn_regs_v2 flag for all AMD Family 1Ah-based SOCs Date: Mon, 13 Oct 2025 17:30:42 +0000 Message-ID: <20251013173632.1449366-4-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251013173632.1449366-1-avadhut.naik@amd.com> References: <20251013173632.1449366-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: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000140:EE_|PH0PR12MB8800:EE_ X-MS-Office365-Filtering-Correlation-Id: 01586a4e-b33e-4cd2-4117-08de0a7f2ac3 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?ZWiP1TRN8gooU/t2TRtbcWA3GZxRbiTK5sxXAjcQG8HQuWE0NMwNVj/YjjTK?= =?us-ascii?Q?QSkjXPi3cMpvJFz3HdeeeFSa+LW5gkn+67onlHV9Sp4EpC1ui8s9Gpkx8x2e?= =?us-ascii?Q?Gpz3+bUbCiAC2sjWFUV7/BRlV1unkoIH6FGPnMc1C+eZ2KJ0+SoWQONk7Efi?= =?us-ascii?Q?ytoa8zGnAXLd9pwFb1PHAnka329zZZyzCq5TLnTSFAZWUSP2PEpnSeDfKbR3?= =?us-ascii?Q?oqVoVDZQ3vzFhAK2dQ9OrfBp7VlAGs9iwEOIC7lFAqlmmztgVqQ2ynD11HxV?= =?us-ascii?Q?cFcB2DGWdgaQc0TaIvZcMaIHp33LSlkXKGl7t74lsEx7Jt89cPOwTxaeO78O?= =?us-ascii?Q?w+tQ08M5YzDZ+9yQwa5u1j6QPXXEmgaZYNUe3UKqasQXHBj0FlwtPPTEYJOq?= =?us-ascii?Q?EmdXrP27kFTgaRwKGJcZf4pcwB3tW+Y3mT/6F4gekwIfMNK4R7xy6qolFTIX?= =?us-ascii?Q?Djp6RBwwsx6dXCh+PviC7GAnPsPCdJzY2J7DzffYwlcQ42yxIPi+p3ggz9XL?= =?us-ascii?Q?+Bz33FIn2Kau5pqDs/qVe0p/SLnMyp3cVKMKf0/SnKss9DcKeX7RXtCxVOss?= =?us-ascii?Q?uSoigrt2J2PQpq73XECvB6JJzEktDIif7fdbUkHi2jXyRHxBCFjXswBWN3db?= =?us-ascii?Q?k9Bffct8VvrIU/X4+RJNf0M8d9fq8ol33KRdo5bhshuppEaD86kAIFa9Xobb?= =?us-ascii?Q?UOy57N2N9JUgUbbbkZtx+gPwzN2H2dphM/3gtu/1Yqafo1YuoPgDmRMThncF?= =?us-ascii?Q?O8sfQEVDoqC8ME6LPIiDP7qJ4eI9/KiWq7uuvzh+Cx/pL4MZAlnbMkWMy5e0?= =?us-ascii?Q?Kcrzp2lRLeE5Ijk+NWEveVZPFZ/if5GL0XZD0QQNFDqSNjlPSUlni6NKirix?= =?us-ascii?Q?5M1AnaForM8ovwDEB+zqeW65YmjVpCFpxUt/MtoEBGXHjLMg7dLtTa5nOCoP?= =?us-ascii?Q?3DrbWe0BG1mgL8zNIf5RfOr3FNBljtLF72j5wyWH6MoOB8ff9HMqYHqwVHaL?= =?us-ascii?Q?75Q5Ny/uDFw1S3ke6uMyFA0AfoJeyiJV8l5F8B+OMdjSrnKANw89xqK8PMUY?= =?us-ascii?Q?EJpNmQCIxZiQ7g1k36e9kW1WkQeZfmrueHSfqZW9TrsLlLgBlno+5dSaaAjt?= =?us-ascii?Q?rl1DIL1qJH0Nfw66ihDgL7Et/98HutYBYsTWyofSmZzdPgv7Ij5Sl1vEOzHy?= =?us-ascii?Q?5UXDBxLORRY0ACMfyxKKxtwf00Zv50/XN5Z0H3bleSFXIW7IBEplJyu4A2iA?= =?us-ascii?Q?0X33aYc+cA8ml1eForRAAkKwWsVkSsCqS32jHUfi4GNZprA6+a2wc6wAlrj3?= =?us-ascii?Q?/jSWNHx25C53IgRzBNIkR9Iz5W4bJmngQa0j7FFg6UCX+y9oc1bjPeITf7wR?= =?us-ascii?Q?Eh3ktr717Andm9iUV9SQCxlbPPJpfT2UiHXv/9QXnBvv+TBoigPMwmrfGZ0h?= =?us-ascii?Q?E+u4TXcywB6zu78kI98RftNnPPUaXHIAGjWJlax1EOYGlmc2YqJqq78/pWFn?= =?us-ascii?Q?m08/QAvxZkXDqJGrDnMo9TIr3uWfB5/J3+Jmi5DeHgFlZL9qL6W/GZV3Kgnr?= =?us-ascii?Q?L3RjuIGc2Mvfs7Wu7ro=3D?= 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: 13 Oct 2025 17:37:22.7130 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01586a4e-b33e-4cd2-4117-08de0a7f2ac3 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: CH2PEPF00000140.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8800 Content-Type: text/plain; charset="utf-8" The zn_regs_v2 flag should be set for all AMD Family 1Ah-based SOCs. Set the flag once for all 1Ah-based SOCs and avoid repetetive assignment. Signed-off-by: Avadhut Naik --- drivers/edac/amd64_edac.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 2391f3469961..832f9675e7b0 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -3779,6 +3779,8 @@ static int per_family_init(struct amd64_pvt *pvt) else pvt->ops =3D &dct_ops; =20 + pvt->flags.zn_regs_v2 =3D (pvt->fam >=3D 0x1A) ? 1 : 0; + switch (pvt->fam) { case 0xf: tmp_name =3D (pvt->ext_model >=3D K8_REV_F) ? @@ -3887,20 +3889,14 @@ static int per_family_init(struct amd64_pvt *pvt) switch (pvt->model) { case 0x00 ... 0x1f: pvt->max_mcs =3D 12; - pvt->flags.zn_regs_v2 =3D 1; - break; - 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 2.43.0 From nobody Fri Dec 19 15:34:46 2025 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013018.outbound.protection.outlook.com [40.107.201.18]) (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 B43B021D596; Mon, 13 Oct 2025 17:37:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377060; cv=fail; b=F5BgT01sc5TTTU79gdZwlxGAjmyVV/2krHvnbwvQCvvYyZ+TSafkx4GHUJdni51tb3RxEIPZ6CKWH/jqyNgJfPwnzZR1FBARs+samcvK/1unWsZW+PZ7Hgu7p+dhqeeW6p/lFaJCGg9PeNd9dLJHG4XekHp+sNp5LUFu28cXTi0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760377060; c=relaxed/simple; bh=7y+dRSebsWw8gPc0uCb22KSByNDnL1NFRBtT95RlvuQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jk/RQDf8gsN/xY+/WjY7CV2MnkB7WXVqCuSE5pSvAk6K5uLE4d9P40Ob2o6TnEk62Oufb1PEFpr5RC40u4akmp9t3sL4Nj1gWK19AVRBUpVS5OVpynOrwRFfVEL09VLce/UTdz/Jk2wrEZvLuVqquax9XvUME0cgz8j6mivBrNo= 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=3Zh/cZVY; arc=fail smtp.client-ip=40.107.201.18 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="3Zh/cZVY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Lo9MehgGATThZxsXcB/x7KNyr8f6Qxffzde7FVN6DlQvkLuVZN8wALeCbTQtMG8gNzef6FezhObsrEtt5tfG7iqkAFsWE53+Y193cH9pHECbfIWVVI+vNq3tIgpGlwr3mZDFVsRrom71Y2xrJlM1gVeNHXsPHSWiw27h+3HjQ9fdHmkrQxzGUGSnwwEUIHrIWp4Y0YR1Nojip+F3mKEuZgUrb4jp8L0XaG1AudNjq6i3ZBnBqW+7eg4BTAwGeCkAGUuH/tTHcWNr4J9siUs7DHVhYsnN8rn6sqQfOT0Sr4N7a4SaHfH4AWqx2a2CP3912vEFpqii+lk0aRf26esJ0A== 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=ptUrY+Ih7/8qPeH1o6ORIgHFbJLt6AhGxN/XRqZEjeA=; b=sMca096//iOjNdU+xH9702od88V+py9X1DbXWDPZPsP16ylYyaTXmLHeEne31e5ooOuS7Y14O1spgzWiWJeR8VlFEPGdSJL4vuMpKix2DONPaAQSytwb5Tqq5PuiUFHsXuEnekXHME/GVsyIFABrDcPOVQRS74Ka6ZI8yLPRjmnAHoA7T2zhHBzftFfKsUr/IcQgHHydnNPYor5sei6PCAchoovBI+iw958kuy5Los1p6DjAhUtN8bwUOt/H4BZx1AsOUC+IiBXjArVINAdwGjeL+/L5GJmYyO87srDk8UtGzgffpPb8rcMRsB4LQ6sj8t/Z9w2ygtt0ybY/CEO6Fw== 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=ptUrY+Ih7/8qPeH1o6ORIgHFbJLt6AhGxN/XRqZEjeA=; b=3Zh/cZVYCnc9Vbi7CwZnCN7PntIC0mxDqOxngKjiipjQr4oQYfhetT3e5Nakd/FUfESj7UlZ+EkwAe0ME5qX7k2qecqczP0nyNjKisTrceJ57mRoQ8+b/EME4qNmjFfRdp0eRMCj5/BtA/ihhZyL/ZaiLX2sEAtTZb+miboZaQ0= Received: from CH2PR10CA0019.namprd10.prod.outlook.com (2603:10b6:610:4c::29) by CH3PR12MB7667.namprd12.prod.outlook.com (2603:10b6:610:14f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9203.13; Mon, 13 Oct 2025 17:37:33 +0000 Received: from CH2PEPF0000013C.namprd02.prod.outlook.com (2603:10b6:610:4c:cafe::72) by CH2PR10CA0019.outlook.office365.com (2603:10b6:610:4c::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9203.12 via Frontend Transport; Mon, 13 Oct 2025 17:37:33 +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 CH2PEPF0000013C.mail.protection.outlook.com (10.167.244.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.7 via Frontend Transport; Mon, 13 Oct 2025 17:37:33 +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; Mon, 13 Oct 2025 10:37:32 -0700 From: Avadhut Naik To: CC: , , , Subject: [PATCH 4/4] EDAC/mc_sysfs: Begin deprecating legacy sysfs EDAC interface Date: Mon, 13 Oct 2025 17:30:43 +0000 Message-ID: <20251013173632.1449366-5-avadhut.naik@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251013173632.1449366-1-avadhut.naik@amd.com> References: <20251013173632.1449366-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: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF0000013C:EE_|CH3PR12MB7667:EE_ X-MS-Office365-Filtering-Correlation-Id: bdc62663-2622-43a1-b984-08de0a7f3152 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4hxG4bzKnPPJPyccBHIRIduwD9QeBBzULQmv6drgCQh6JG5stVQVLk+P4hoo?= =?us-ascii?Q?MPu2/BsPTSlIoymsbM4/P4LiJDtPGqhGUJUXjklQTrKA46xjlVpwJ7jcZbLz?= =?us-ascii?Q?6gvYhJchZje2ObMuzF4AWtib9kSaTzuxwSHPIK3hn6NQdkB5DfkQAc6EQN7o?= =?us-ascii?Q?41OWdYCpxZUMUZUfgaWPFBEdTFDhWgEoS7gFy4/BBg6ZkgPYLUDguazxwtRr?= =?us-ascii?Q?g30h99Jqk4nIv0R0wIF8UKKqVbUfTWVv/+CfFHGYN1QrWXS+eAlNzuQCA8yP?= =?us-ascii?Q?os+Go84uPLM+y/y7h42URrzLna12tC3tOk3dDcz3nO4wvtlK4yDxBXJlUU8p?= =?us-ascii?Q?fQdi9kPetA2Iu+OXnQ1jkIRhBFiCT+2XTEnsHPr/5Mq7u9Yn98J7c22ZvrbU?= =?us-ascii?Q?KVKgAD/95fd2psrhcQPUlc18R2TzEtgdAfx7jaZDyFW6tn52B23i8Mjllfg3?= =?us-ascii?Q?y/Aj+KYT0cw2rz8WVmrFC1wasOxcbwI0kgZ4jYyTwTpuaK/knZk4PGxcriEr?= =?us-ascii?Q?MCUk0DY0nM/7mqRPZjxtaHkfK8caHskVJqqeNR6QhWEuRNwP308wO+uPyLYN?= =?us-ascii?Q?XoTB869O4h8+dHHYJyitEh20llMZMiaElL2jzxRQbwfa8axCm3dPQWrtDHsE?= =?us-ascii?Q?S36WG/2y5DXy0xpdYMKg7OPbJrJar+vOaiIrZ1XodZoBKkTk3kUWz/R2FbI7?= =?us-ascii?Q?nBYv9MSe9QRQtYAQh+v6pMG3HnNS1mAxWqIu4XwKg++UDguUcjkuBX/+13jD?= =?us-ascii?Q?fm1y7wcV1+6F4UV0+rC+f2hdfOfmxQbJJYiQS2Jjsa6Dn4DMNhb92YxMwA2m?= =?us-ascii?Q?FdBxhGGHUKZj8TETtmumpovl2J69ShYDgBDNVNidk9nDbycDzT/0vUFnOFws?= =?us-ascii?Q?4E/kYJbW4cavA8VL0KbtTIbWXvfAPJIUZArpTnHXEGMLJFh3XdsyHdGoIn/j?= =?us-ascii?Q?xU1ij9M66r/DHUTT4PooGpLtt6TRdvNtcDdkW0BYqu90PDqLHQ8IsFEkdL4X?= =?us-ascii?Q?ZOfjmG7a6buqKOw14oPcNdLjcwN5Q+0DVM8GoFvHWqa8mjmiO2vYPb2gFOaK?= =?us-ascii?Q?3aDMy5UC31MyyelWaJLL4WZFDPX98tu3/hZs6qygWsypzR89ueyY0DbpyyCe?= =?us-ascii?Q?KCU6Bvcg/l/uO2Gbbs6ooOFMKwv8JwYvqO23xe6+hWrnUodw8hposPolhzrE?= =?us-ascii?Q?CYr25VwyFBixNDrzp2f6F/Wt4+FctX5vaWDw7VYD5wGHHf8ij2MHT036gM2p?= =?us-ascii?Q?g8TRk/8LzD9SNWgP0g/TCs1Udlmog0l8bOGArAzIyJUGt2BqxR0bgJrt6MCo?= =?us-ascii?Q?LmZIOVUtWD8Y9419gGaVMe4NFH2vnQJYQ0cCXcTBBP1+EoLZniqphpjcCeoP?= =?us-ascii?Q?iELp6ULaj4HjuYPzwJYfoCFfwAzLa4UqXZw8aS0tJdzja/z9R8yuu7u78H6j?= =?us-ascii?Q?6HAiXKkbiQltBTTLpueJN0cOBxdNz1MmyIQXXhN/cNkj1NMxJ5KqviaNffBt?= =?us-ascii?Q?LHNFaWdkQbx+cpYQWadCn/JE7W7kH0Is+6XPaMSzvWxWiPp2dhIf2dNT0v3J?= =?us-ascii?Q?x0J1N3jrUyMAyuwyHx8=3D?= 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)(82310400026)(1800799024)(36860700013)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2025 17:37:33.7181 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bdc62663-2622-43a1-b984-08de0a7f3152 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: CH2PEPF0000013C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7667 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 by v6.21. Signed-off-by: Avadhut Naik --- drivers/edac/Kconfig | 2 +- drivers/edac/edac_mc.h | 5 +++++ drivers/edac/edac_mc_sysfs.c | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 39352b9b7a7e..fdfeba848114 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.h b/drivers/edac/edac_mc.h index 881b00eadf7a..78b49d6906fd 100644 --- a/drivers/edac/edac_mc.h +++ b/drivers/edac/edac_mc.h @@ -95,6 +95,11 @@ do { \ =20 #define to_mci(k) container_of(k, struct mem_ctl_info, dev) =20 +static inline void deprecate_interface(void) +{ + pr_warn_once("NOTICE: The legacy EDAC sysfs interface has been deprecated= and will be removed by v6.21. Please switch to the new interface!\n"); +} + /** * edac_mc_alloc() - Allocate and partially fill a struct &mem_ctl_info. * diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 8689631f1905..8ed4b239b7f1 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) { + deprecate_interface(); + 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) { + deprecate_interface(); + 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) { + deprecate_interface(); + 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) { + deprecate_interface(); + 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) { + deprecate_interface(); + 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) { + deprecate_interface(); + 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,8 @@ static ssize_t channel_dimm_label_show(struct device *d= ev, struct device_attribute *mattr, char *data) { + deprecate_interface(); + 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 +252,8 @@ 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) { + deprecate_interface(); + 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