From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010027.outbound.protection.outlook.com [40.93.198.27]) (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 EB1361E9B3D for ; Wed, 8 Jul 2026 01:21:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.27 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783473705; cv=fail; b=UVh7egp+1KvkyaNH3U6RJpE7dnGSvn3el+iMvpirtkUY2wyNCwA5YEttkcEwrWVhim3dx6iOhfrUaLf2e5qKC49ihAdDuwW8mOWDHPagt7k7o2ADWrJy4GBE2LX4GZIbAvP1ivAzK+HHl8k3YKgOmVR7/UQEgshImNTA7wROZ8I= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783473705; c=relaxed/simple; bh=MP60Xhce07m5VfZ7W+LXT0V0XGCXhIbUYixc0WigqxU=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=i5zL+qgtrKN+ZZbokle4GtN68jU+NSzOc4Z7BTeOIT9AGhKroEiiXqnkY0RAZLrAsVznB166eL2z2JmJRAzaALYtlS266EToFy12xRYwjVGXBBsWGJD2kwoEBuJG8ODTmbsQjmzSSWdtH3P8zokX2BOGT7XJS6q1Aa4a2XKFoDo= 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=2ClAENVC; arc=fail smtp.client-ip=40.93.198.27 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="2ClAENVC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UeqF82Tv6WuaUYfQnl/4DYv8Y2yIEhWYt3PVkPa9Av6J+KiW+OivQ4pq5SbRoyLLDF6+8N6ugOgY20B0k7j2JPXNgcH76NUTZvBCw5BmMSLPW3pviGe+pILAgliyuxvt15v19ajQ3s57KookEaB1TRJuTdurWCBs6cF/j5D8rEl84sXYXyx6JNEVXcpUPPN32PWL3WwUFp+NTZ4oH1qFFNvkgdCOgHLHL84a32WauCRFlvg7osFvZRkAjGyQuhtrS4w5w3QkywRCT2vixjFSjHgUaKPY0FlVkkRo9PWWKTpjeXaJIriwl+PC7JIQyZenCvPA2IzrcX2yjC4K6kpP7Q== 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=XwjmZQ2yYINmBZP8oFsZ7tH0e4cYbliHEnF5YJ5dSwY=; b=UjbNyOrLwUtPCuk00goemJJ8bmpJkciLXePor6taNiPDn3yEjXBUqzNKBBlCJO6nU6u/He0KkjlsUDpg9jQFK14KYcK6R8VDIqRpbkVGD/6J7BA3wyWAnO5rQGbixxR9BoVo+M8CN23zCL8UAW0ZtuPFfFjMWIAy6QTBhJDWKr3cdpkknpg9DrhaLoqO7evVtGhK9ItcBy0fclw1XWSao/9vj29bw72XmSEHdpWtT9V0s9VA/LPyOcI9CCgIGhDEOt1JOjglH+tU30LDafXrOMv+jVwP9QdY/hoCema/LCkwbi9NkjV4iBOYU/4C4Gnfm1fPAdVpTZVeNODnae3rTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=XwjmZQ2yYINmBZP8oFsZ7tH0e4cYbliHEnF5YJ5dSwY=; b=2ClAENVCFbqL/5plj5w0ZeTiD377MaFAcruu+s4n0oqghRSY/tofa5cF3Opdlj5ySXNbDZzbtbeVsJuU96p17YhukW5Bv/HlAPzB8idS0zlxkt1ARQ4nwR+VmSeeclGpVBbiE2JGhOyLlS2m+jk2rJLNg7269SS2f3tzyO6ATU0= Received: from BY3PR05CA0010.namprd05.prod.outlook.com (2603:10b6:a03:254::15) by DS7PR12MB6022.namprd12.prod.outlook.com (2603:10b6:8:86::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.10; Wed, 8 Jul 2026 01:21:39 +0000 Received: from SJ5PEPF000001F4.namprd05.prod.outlook.com (2603:10b6:a03:254:cafe::7a) by BY3PR05CA0010.outlook.office365.com (2603:10b6:a03:254::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.181.8 via Frontend Transport; Wed, 8 Jul 2026 01:21:39 +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 SJ5PEPF000001F4.mail.protection.outlook.com (10.167.242.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.6 via Frontend Transport; Wed, 8 Jul 2026 01:21:38 +0000 Received: from purico-9dcchost.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.41; Tue, 7 Jul 2026 20:21:38 -0500 From: Melody Wang To: CC: LKML , Melody Wang Subject: [PATCH] x86/apic: Ensure ICR register write value is handled as 32 bits Date: Wed, 8 Jul 2026 01:21:17 +0000 Message-ID: <20260708012117.177959-1-huibo.wang@amd.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: SJ5PEPF000001F4:EE_|DS7PR12MB6022:EE_ X-MS-Office365-Filtering-Correlation-Id: 13a11ed3-9add-44f9-9afe-08dedc8f42b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|23010399003|36860700016|18002099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: u1eaAYInnt2xSMftwDih+Z1m+LMN7qsQESyrPJk7UjmwQPb8FPQoAELsFLmCtP4U/PukcMxWKCbS5BChLtjqeB/0g/Y0dSrZ4pfQCEhbyLrzGQsyVohHqmaIWwYKSiq1gnfXTzvk+SLwDjquuH868ZEUGnAhdSVLowUVWvQGNy6bwZoBsIfpzaD5dZ1vlNA4DaPiBLRfUOxu0apoBHX7ot/M5VhWF/VuFG+dBVPvhQGeIKZwbNsIWINvah355uZ5L+K+dmUWbspI3rrNU9OI4nkX+rFfkaObIO3kMXPpQNCP49qNk0y3cySJ/OF43zLeo2MXWHYIQFP8gbwkUE6GNkHbGtOVACJ1PCazBHmJsLOfcU2bYyuBoq1ynZvRWm9AZufY7e8bey3xWl05fY6ZdxjmUZmErxJizk+qilV+sWodUXpLAmbph9Z1oR+RLOZwNuKX+b7e2ZJdqEKrq2o5lwsTphp56xB+a4pA57cUMEdN4hLXfnN6/5cyJ4VNSvvx4MDvISqWYsAJoIS68vopkiZRQ9bNfi1cWpZpw3vsRKjPs0aJlUu94bvLXPXZZUdw8pRU+aqxlJS08gzdVX7JEpe3EMbxEZpuWIbgt1wszraW/x4yNb/0nCf8AcIK8On81uF+tstV6unYj7g1FaxbFUTME3YH/rD9+OtPGc7zyjIf+oxssFkgmoOFRy8/EgMQeXXwAbKEn5kcFxRPeiMJRA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(23010399003)(36860700016)(18002099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DBXOQvVvIFGY1QSgTw6BihG4XZeRfThfvVlO30adlUPu5zRu2soX+YQUfRRZDkbG27yFn7xyEuE71y6AiVwTmHkgfM9TWeElhD5Jt0GuoxlzcVKa6lrKW7beepCAsfzUfOOLloorfpINvfVRIbdOLOd9t1pMrQftOuNNCh9P02Jy0vniDcTA0aKbVlFWAkuNUTGLOFOpl3wiyxRde7o4A7mrsY4zHjdPZUd1Qv8yVS8UMRIROmS85EXvEDZxtyf5l1EUui21CRNaOCbFGbYZaHiOqDjkyVDMw393Vqa6IErfI0tKCkov64oXYHQXekW16SOudYB+I7c5Qs68uyU7yVIMtxGu7nDdZcZpkf1NOpa2DX2+JuGgjy9mEi5Lo8taHuYfJDf0M2OmHvd7gFjyuAc8dHCCmZT+CixgddP/Fcj5hkkRrzfRyV0DWEqsDBop X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2026 01:21:38.9425 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13a11ed3-9add-44f9-9afe-08dedc8f42b3 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: SJ5PEPF000001F4.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6022 The low 32-bit ICR data is prepared by __prepare_ICR(), which returns a 32-bit value. However, when this value is assigned to a new variable, it's easy to mistakenly declare that variable with a different width. To avoid this class of mistakes, use __prepare_ICR() directly as the function argument instead of storing its result in an intermediate variable. This also shaves off a bunch of lines in the code. There should be no functionality change resulting from this patch. Signed-off-by: Melody Wang --- arch/x86/kernel/apic/local.h | 4 +--- arch/x86/kernel/apic/x2apic_phys.c | 4 +--- arch/x86/kernel/apic/x2apic_savic.c | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/apic/local.h b/arch/x86/kernel/apic/local.h index 998efd442063..090dd71837aa 100644 --- a/arch/x86/kernel/apic/local.h +++ b/arch/x86/kernel/apic/local.h @@ -44,9 +44,7 @@ static inline unsigned int __prepare_ICR(unsigned int shortcut, int vector, #ifdef CONFIG_X86_X2APIC static inline void __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest) { - unsigned long cfg = __prepare_ICR(0, vector, dest); - - native_x2apic_icr_write(cfg, apicid); + native_x2apic_icr_write(__prepare_ICR(0, vector, dest), apicid); } #endif diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index 10f79026e8e3..090647cc5a78 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -85,11 +85,9 @@ static void static void __x2apic_send_IPI_shorthand(int vector, u32 which) { - unsigned long cfg = __prepare_ICR(which, vector, 0); - /* x2apic MSRs are special and need a special fence: */ weak_wrmsr_fence(); - native_x2apic_icr_write(cfg, 0); + native_x2apic_icr_write(__prepare_ICR(which, vector, 0), 0); } void x2apic_send_IPI_allbutself(int vector) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2apic_savic.c index dbc5678bc3b6..4bc6d7e018a5 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -243,10 +243,7 @@ static void savic_write(u32 reg, u32 data) static void send_ipi(u32 dest, unsigned int vector, unsigned int dsh) { - unsigned int icr_low; - - icr_low = __prepare_ICR(dsh, vector, APIC_DEST_PHYSICAL); - savic_icr_write(icr_low, dest); + savic_icr_write(__prepare_ICR(dsh, vector, APIC_DEST_PHYSICAL), dest); } static void savic_send_ipi(int cpu, int vector) -- 2.43.0