From patchwork Thu Feb 13 16:45:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yazen Ghannam X-Patchwork-Id: 13973710 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2067.outbound.protection.outlook.com [40.107.94.67]) (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 4E15228A2B0; Thu, 13 Feb 2025 16:46:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739465191; cv=fail; b=JiLhrqJSbmEgVxRx0lOowQCvkQjNG7pfZGE2weDo1xPVKA4ArCGUZylW/ILYelDLZ6jYx7Gg7aGkDH/n3s547FHF3vpm4LtmovM38O6SL3cIwcCN0uW4k5SWs63k35A81sJocfBv73xN3x2N9/MqdKUfz3RJLT4AIjGOXIU+O7k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739465191; c=relaxed/simple; bh=yS1hz0+k2wyAVzW6DTMRL82hP6vaaS1ug8doKfOkouk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Rf/NqXmeIqxL/PhaaNkf62uT2203QU51ppYz9mw3oPwqykx9My9eUVnj/N68LsXrfZ23mYz1lwvG7vfUxTr0t1v6EXNCJlbGmOSiyo9PzYmvYbEwsdkIKHk/Amrha/pzGrlhBl3kXJu+0NjOVOoFNNG6mumb3vBhNZ3rNzUI7L8= 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=Vw1qGOki; arc=fail smtp.client-ip=40.107.94.67 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="Vw1qGOki" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pDmOANE6e79ZN169L0c57+LEoMpL2bG/6GFcA2uibF65nnEJa4JvIuw40FEHdtg/geu1YQUicAdqN0mUiBDwePvIHq8fRzGFDz08ytClIae4E6L9+yyPDxY4+6q930h02zcvvduQ1F1NfetxcpGUQogbSd8kF5Jcytd80XLNEwqwy4mr//nBI069+W7AditGoA3F51lI9fqhoidUJdXQLGWVg0yKVZx91O31+CONswl82udPlhDTi6dAawrCKvUVCJtN1ipqZCgvN9rBxjrNpyoZsYZrXwKGnlv1fJ2tnvqxYLqNT0ySHiNYDEG+Rww3o8hQNlehy/N3AsVtVNrKpg== 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=1m5ghx+1OVbM54phDYM7xlX5Ot/IspF10VIn1XFMwNs=; b=m8QvDI/FLTpUV+0n1HXeJNQN1CXdrzRUI77L2IUnAIy2fyGFxh7mv/kPOCIRIJX+EWbzY1IwG8cCTpFFHOlxmb/zKSFlAGkQ966wlAIA26QXVUTcYmFiOrXwjphPw0Y2blwxl4EVt3FehAuRu7z6NQmK8lGh/FgSzrtRn8GjmDm/zzNpm3Xycg9y9yiVQoHOf5Y+TV3FpEaVM0I1FlrvAdTcyn6AandAjolp6eYdSgcjiLmmT1GURidj71bhDkqFyvp0trDbhLBmPMmI/LWknzJmOS47u+NbbLP2hj3igD/b/Hw8Unp0wOjX96IEbwDne7cioFkLAvFlobEnqlPWFg== 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=1m5ghx+1OVbM54phDYM7xlX5Ot/IspF10VIn1XFMwNs=; b=Vw1qGOkix5FSq0OgWgCkil4tRMEyLnK01dXXzvalCy9gDt4PzTHi2OWRPxC55rDLzClYPRNsNv58Y6R+/zUxU/qN4Pqfb+OPanB9iNMsibEQTx0eBEdaXIj6/t6e/yT/0YG31cZrUE3QaLRSf3752b8n2rrNQWN37aCFVExn9A8= Received: from DM6PR11CA0017.namprd11.prod.outlook.com (2603:10b6:5:190::30) by MN0PR12MB5738.namprd12.prod.outlook.com (2603:10b6:208:371::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.18; Thu, 13 Feb 2025 16:46:26 +0000 Received: from DS1PEPF0001709C.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::4d) by DM6PR11CA0017.outlook.office365.com (2603:10b6:5:190::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.14 via Frontend Transport; Thu, 13 Feb 2025 16:46: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=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS1PEPF0001709C.mail.protection.outlook.com (10.167.18.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8445.10 via Frontend Transport; Thu, 13 Feb 2025 16:46:25 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 13 Feb 2025 10:46:23 -0600 From: Yazen Ghannam Date: Thu, 13 Feb 2025 16:45:51 +0000 Subject: [PATCH v2 02/16] x86/mce/amd: Remove return value for mce_threshold_create_device() Precedence: bulk X-Mailing-List: linux-edac@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20250213-wip-mca-updates-v2-2-3636547fe05f@amd.com> References: <20250213-wip-mca-updates-v2-0-3636547fe05f@amd.com> In-Reply-To: <20250213-wip-mca-updates-v2-0-3636547fe05f@amd.com> To: , Tony Luck CC: , , , Yazen Ghannam X-Mailer: b4 0.15-dev-e27d6 X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709C:EE_|MN0PR12MB5738:EE_ X-MS-Office365-Filtering-Correlation-Id: 6627f000-8fb9-4f1e-9e7a-08dd4c4df4d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?q?4MRmjL21atgEpqX93uW+oE26nNAGQs1?= =?utf-8?q?KzkUcSHsnGoNgWbJrPCuKrZRBM4NxmloIYawm6Q8XQjQlbCvCMqvJjrAmP6WT1d2U?= =?utf-8?q?WphfwnUGcUnd72+VYv01N/zoBtaF/nGEc+0oUL8nKQYBblw1ZDW2u4NBAT3JNnb+n?= =?utf-8?q?AyMqTw2U9Q0puI000O9y4RhUFOZlwgyGWVEQ559Ld0WnzxRadNRqJIR0MAkQJNjW7?= =?utf-8?q?Hzc1aBjb1Z3J+cJD9ktOjA52HQBBQWmQAltpxV8/R1zaFZaDz1WfKIL/q9Jyaf+Rl?= =?utf-8?q?yPXg8nSQlBu2yGhWCXRSQ4+bBbL8XhM0Z2XTiQsA+8xNPqLlsCHgbxV+21FPk9L6s?= =?utf-8?q?hBYz5xaDH+eMe2COvuUdi4D3nVxJk2f2b68HRNQVRO1iK5wKY+TjLaWRi1oPRuUDD?= =?utf-8?q?fiKtVVjlwnD+tX5xIjUNsOZyvU2qnR3pgBGusHYnL6T+6sZF15CUCPVNUlBWyEf+t?= =?utf-8?q?WLWKc9/6mmxrTgsJc4hhhF0KR8KSbQ4UOgajCWgfG74kukLs8Plqm+t4W+OhzhR7P?= =?utf-8?q?XXiyIlr3cw1UmxZXblTfEILgRgResh8vMcCvQTp8XpCBpfjVihAbpzhckBIdbr+Zp?= =?utf-8?q?bQxo3n1Rsx4NaUSgj7bwuHXQ+b9bmrvd6w/z592sO8LSClfd8GzeXKkwXI5TeciQK?= =?utf-8?q?DqAPn4HF5Ve4gJCtz+LrjkszPNNvk79etW2oMAb+vteX8H7Um6Kt5cjM61zckPZiF?= =?utf-8?q?AFytaH+mBCAkHf27aYzlQYM5CVxeWS6GrKIqMIUiOTcYUSRRZT3lEsPylwB6jdI2O?= =?utf-8?q?6AWkSX0CUt9yLgaBVfHb+nn9U53X5IJ3yo81WGtpsgtTn7ObHMh8M2j8rf0//oTAP?= =?utf-8?q?rSKcJEqPFc1TDWCSmNwe+7GlYit/oBXIJa0uDslSCqVGGIFcwAxK9HINO/8V+0MZf?= =?utf-8?q?JZ8DEuLcy84J2VmHHlmmxqyLcZaDLDRC9tlVohkrsxe3KmZAs4mW9lGcsQM9cji9/?= =?utf-8?q?67Ak8erAYQcJnxQQ/JYjUe6JgEunxH3kT2oURBoswl8FB4QSpBGyLn39Nk9KzTfoP?= =?utf-8?q?lUzFJ7cihA58Q/sV6anAaSLPEC9CRTT3r71N+8AgPTXrgcsYtNVxMXxvFwjhVzSA8?= =?utf-8?q?3IvF0vsCraJPhGYbKrlJqyQh/Pndf0Wzc0yxd/6rvvxb8h1bZDHJ/wI22QeLFCDYw?= =?utf-8?q?+wahole83md5r6U4HFicddtfL+Od+FXHfl5uQYrLO1umGCrjpeFGNPE8fEt1zp3it?= =?utf-8?q?a2mVTElHYO51EEyAQ2P2ddTMMUKWemsj4mWbw7s3g1G2dl+3gOwNo3LSP90sJsuGs?= =?utf-8?q?yeGcsiPaFetF7H9hqkoAtfNKTCknudQ5YwJOhToNZXDMZF7y2rIkY4ooq/zPv5iKX?= =?utf-8?q?Fvxf1qL5KOglRZfgC3jR9OLJHaFvpzAI3CxReJcXSqjTxryyIX8FKyQg+7nWWJAA7?= =?utf-8?q?35/5A0CJXtoxvg5EyN4iWF1MbJfXckGiVhQNBbMda2sPcTwv1wBKy4=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2025 16:46:25.9348 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6627f000-8fb9-4f1e-9e7a-08dd4c4df4d7 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=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001709C.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5738 The return value is no longer checked, so set return type to 'void'. Also, move function declarations to internal.h, since this function is only used within the MCE subsystem. Signed-off-by: Yazen Ghannam --- Notes: v1->v2: * New in v2. arch/x86/include/asm/mce.h | 2 -- arch/x86/kernel/cpu/mce/amd.c | 16 +++++++--------- arch/x86/kernel/cpu/mce/internal.h | 2 ++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index eb2db07ef39c..2701aca04aec 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -373,14 +373,12 @@ enum smca_bank_types { extern bool amd_mce_is_memory_error(struct mce *m); -extern int mce_threshold_create_device(unsigned int cpu); extern int mce_threshold_remove_device(unsigned int cpu); void mce_amd_feature_init(struct cpuinfo_x86 *c); enum smca_bank_types smca_get_bank_type(unsigned int cpu, unsigned int bank); #else -static inline int mce_threshold_create_device(unsigned int cpu) { return 0; }; static inline int mce_threshold_remove_device(unsigned int cpu) { return 0; }; static inline bool amd_mce_is_memory_error(struct mce *m) { return false; }; static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) { } diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c index 1075a90141da..4ea691006c3b 100644 --- a/arch/x86/kernel/cpu/mce/amd.c +++ b/arch/x86/kernel/cpu/mce/amd.c @@ -1318,36 +1318,34 @@ int mce_threshold_remove_device(unsigned int cpu) * thread running on @cpu. The callback is invoked on all CPUs which are * online when the callback is installed or during a real hotplug event. */ -int mce_threshold_create_device(unsigned int cpu) +void mce_threshold_create_device(unsigned int cpu) { unsigned int numbanks, bank; struct threshold_bank **bp; - int err; if (!mce_flags.amd_threshold) - return 0; + return; bp = this_cpu_read(threshold_banks); if (bp) - return 0; + return; numbanks = this_cpu_read(mce_num_banks); bp = kcalloc(numbanks, sizeof(*bp), GFP_KERNEL); if (!bp) - return -ENOMEM; + return; for (bank = 0; bank < numbanks; ++bank) { if (!(this_cpu_read(bank_map) & BIT_ULL(bank))) continue; - err = threshold_create_bank(bp, cpu, bank); - if (err) { + if (threshold_create_bank(bp, cpu, bank)) { __threshold_remove_device(bp); - return err; + return; } } this_cpu_write(threshold_banks, bp); if (thresholding_irq_en) mce_threshold_vector = amd_threshold_interrupt; - return 0; + return; } diff --git a/arch/x86/kernel/cpu/mce/internal.h b/arch/x86/kernel/cpu/mce/internal.h index 95a504ece43e..231ba8ca4a3e 100644 --- a/arch/x86/kernel/cpu/mce/internal.h +++ b/arch/x86/kernel/cpu/mce/internal.h @@ -265,6 +265,7 @@ void mce_prep_record_common(struct mce *m); void mce_prep_record_per_cpu(unsigned int cpu, struct mce *m); #ifdef CONFIG_X86_MCE_AMD +void mce_threshold_create_device(unsigned int cpu); extern bool amd_filter_mce(struct mce *m); bool amd_mce_usable_address(struct mce *m); @@ -293,6 +294,7 @@ static __always_inline void smca_extract_err_addr(struct mce *m) } #else +static inline void mce_threshold_create_device(unsigned int cpu) { } static inline bool amd_filter_mce(struct mce *m) { return false; } static inline bool amd_mce_usable_address(struct mce *m) { return false; } static inline void smca_extract_err_addr(struct mce *m) { }