From patchwork Thu May 9 04:44:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jay Buddhabhatti X-Patchwork-Id: 13659422 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 150E8C25B74 for ; Thu, 9 May 2024 04:44:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=WB4oHiO3ec78M7BcLakKTMbvbIQp0HSNP/vVnMNTZKo=; b=hjmYexeJ0+J2Kn C/7dvytfX3MGH3o3RKc7zUMHITZ8GX/otq8wEWUTdig9dxBk1ev+D3FUh6Wn8By0+XHXB8LDBXFSp 0JVgYabR63xAYW+6aw121gcMMcobqAJDxNg4mZg7OP6HbDG1ibskf2wVl/Ht02Nx00k8uJgFzQGNm Xwav1rr0syQ6Ow9V9X2uWmToTBCCuZq4U5m3IYlSSO/2g2fEl4c7OWbcioC4ONydva6aSZQgO8eCS k5l00nCcTvmuSPAJ+T5cGLlq7ktGtMCjc3jsRdDelQNnsvp6KSY8+jjeXdgCNqILtDb5D+gULHtPk Y+CB0Ex4Dpj4yZR4PfcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4ve0-00000000KjH-47sv; Thu, 09 May 2024 04:44:37 +0000 Received: from mail-mw2nam10on20600.outbound.protection.outlook.com ([2a01:111:f403:2412::600] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s4vdy-00000000Ki1-29V5 for linux-arm-kernel@lists.infradead.org; Thu, 09 May 2024 04:44:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XzjrnCtmWrzctjb8LHHDCxh4/4Uz+HdoOz6osnrGB5hjVrJMHknPnH/QezWy5IZig/9VTMqzFKokQRs5ux5gpBCKfgaLeF9PSyAohrHmTusGBIF6YVxITH8R+7fzRNMSsJOTxssBaX/7QSgDe2tXe8x41dRZBBalc5YKHEGYu6JA0FAu84vE4V6FqDddm1ws8Py1EQXmtPnHf6qYQcIhqLmJcuJcynXH7FchxKpWbkZGC5US3CivJ9Vc1PlUBKd/hOeOWIYSA7uxeep/5l0oBac/GX9iYOA7KLfsBj3KZbr5Jnynk9N8leSpcIz2v+L0AhomCKktXaafEWdzlzSk9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=NAj4Hl4Ej3ikJtQd+WA0hhpE8n5LNgIJcXfYekN7Jx8=; b=kXjEGGcOvEj/VE8mu+wnulAWJTgSwJwG2Y3UmL9Pw8lxGDN/dFwk8U7D0zpVwbtAJOqFcZBr9cuca+4gI29pR7PZB6vtgBUz0Oe8RtIqVmZzyg7OEHZNzlE7vcDKGEDUAy3BO+RM6hTQt6irQs0634G+GjO744h89hTBJFU6TU5f4uUqG8sUx+XaeGIXTTwB5Azx/f0h2ovWulv7PV3ZRiFIWZuyrU/kxPML4k98DAqcongkwURSYLrt/ikUYXYP2/1zr6nYAKPo06fn6fv8krardLV7aROO9bk6jaLAZSE7gdYdW1fQV05XlMc+Mj2YVQRoISzK3MjqIm0mZISqgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.infradead.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=NAj4Hl4Ej3ikJtQd+WA0hhpE8n5LNgIJcXfYekN7Jx8=; b=gjbG+/e+jAKuKxxrloLUAYUgxTQvuVDUNVW+FiE+UlfmQPoIOqcuYurnIjuB6RwjbDckgCXoVD86HKuH+Ny22hS/kNnyTe0QSzYRSiInBfy0zVAYdx6oMoYqBDLaHWe3CmlVnlWW9adU5i2X6zv5OK7sRtzeQrLH9VK8o6E7q48= Received: from MW4PR03CA0078.namprd03.prod.outlook.com (2603:10b6:303:b6::23) by DS0PR12MB9446.namprd12.prod.outlook.com (2603:10b6:8:192::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.41; Thu, 9 May 2024 04:44:13 +0000 Received: from MWH0EPF000971E2.namprd02.prod.outlook.com (2603:10b6:303:b6:cafe::fe) by MW4PR03CA0078.outlook.office365.com (2603:10b6:303:b6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.43 via Frontend Transport; Thu, 9 May 2024 04:44:12 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by MWH0EPF000971E2.mail.protection.outlook.com (10.167.243.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7544.18 via Frontend Transport; Thu, 9 May 2024 04:44:12 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 8 May 2024 23:44:11 -0500 Received: from xsjarunbala50.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Wed, 8 May 2024 23:44:11 -0500 From: Jay Buddhabhatti To: CC: , , Jay Buddhabhatti Subject: [PATCH RESEND] soc: xilinx: rename cpu_number1 to dummy_cpu_number Date: Wed, 8 May 2024 21:44:04 -0700 Message-ID: <20240509044404.21673-1-jay.buddhabhatti@amd.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Received-SPF: None (SATLEXMB03.amd.com: jay.buddhabhatti@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E2:EE_|DS0PR12MB9446:EE_ X-MS-Office365-Filtering-Correlation-Id: c8838529-34fe-4d3a-dc5e-08dc6fe2ac66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|82310400017|376005|36860700004; X-Microsoft-Antispam-Message-Info: h+MEcJXhBT1Mbxgf6ndH4ISU1Ah8N8AfhhAZTS42wboFLDSY64NWZbCHbs31f73sCLh0cfZb0+WJBRAobpnk9Py+tumtGJ8Wx9gRknm/A9FQ23GyPSgK+jZYorePnsn/gyU1vnHzjhWSdHO3uHfpg/svq/U9GLjU19J11prDrZ9pq9IzTIHG6pLuIfkyUrD4lH+WR2paPIC7but8Y/0aBzW+h6f1lhdofISKi56AiPUL2LEu6CoDSfUYRmoCeLui6mvn61Rop2vaUAaFfan8hRTf1IGv2MhrwrWNf8eC2s2JF48fxka/Gm4bFMcGl8TQt3TWdLwB/63SCUg4wtNwLazluQ45RD/S8eVAVUxBLKjG7t6wdVqdDoSz7C0imAbfXFDpUwvCHDFvMg4RBytc3td5rauyA9uZ40gfvUwUA+xMEKJUSmXsdTj2c8Rt2DfH9FC5TK/CnT5pPNsj60OkWeeXW6md/fqSWZblFu4EM46G4PCM80yF01f5vEzCkpY9iW4f3BDce6Phqn/uQuETWWgprMJc6+8CoCI8tEAzgDa8AaRwnR0RKlufWTfH2oWnlmXVyWcFoD5gORx4gPxWWYH5cNlGDHKHhuNIZrYahj9AsiX/w496JQIat6ugVg+Q61+mu+PGVrtYodXHrBzXoYtbjy4xjbp3bhyUqCdJEs1nhwhH9zvAhJj3p12C3mlM9t6Jtz6srgzcAn9+dPdvRTYNKS+8X3Itgzy7pYcfC4sO4nmyphiO6OpSJDNbs79KMfI9I6Dkn+6MrL67CZMl793DOjU6gPxNp57dvq/XMGBxRuVPD5y32l6bO+9vhWbkgxzpuXw+flb0IlwREES8JLsLHdVMTSj3v1JY0SMUV2fSz8NQ5z2Ss1HLzIzSE4/bvt+wAarEeKyzHqm2s3QhkYP/+tBo+LkA+MRNgbvr92xqqAlHyC+LOattFWrLW9+LMrgMuoHbM4TIwUW1fPWWaHsHS/To4ItkC1zMKxp0u78QAoRi5+1PY7N3CMZhC1iXlKLKqw0lPOMpeReBDHfv8v41w//jxVzMJHrdWz4xTMLkpre1l4ov7I7Y8pmwkzj3cmHnXp6FKTe2rsdkOohJF2d8o3U5gl90ruuJXcs68MDr4v4bfsq+u3e5HIBwvnkHq1tZvyB9GRu/9r+rqeqv972DW5pfKGuPVc2plr9Oefdoyk5zRzIEKTDDQJhww/7ZOCxSk2CiPQyttwIVqjpAoFG2k8TGuupzcJvSbGFu2heIV9h09J7+mZyGfE2t2V7/6Yg21BnbzpcDA16o70IM7fXVbxs6l00Zj/pIkFVm1FUmoQNqXlqVtTJWt0AtZPzChz09Yv4nwOSCNTuLDrrx+oA7kNKoBtMJlpis6Pb6ztDrqL2sRRPybVqm30vVLVIT X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(1800799015)(82310400017)(376005)(36860700004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2024 04:44:12.4075 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8838529-34fe-4d3a-dc5e-08dc6fe2ac66 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000971E2.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9446 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240508_214434_577906_0EBE293C X-CRM114-Status: GOOD ( 18.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The per cpu variable cpu_number1 is passed to xlnx_event_handler as argument "dev_id", but it is not used in this function. So drop the initialization of this variable and rename it to dummy_cpu_number. This patch is to fix the following call trace when the kernel option CONFIG_DEBUG_ATOMIC_SLEEP is enabled: BUG: sleeping function called from invalid context at include/linux/sched/mm.h:274 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1, name: swapper/0 preempt_count: 1, expected: 0 CPU: 0 PID: 1 Comm: swapper/0 Not tainted 6.1.0 #53 Hardware name: Xilinx Versal vmk180 Eval board rev1.1 (QSPI) (DT) Call trace: dump_backtrace+0xd0/0xe0 show_stack+0x18/0x40 dump_stack_lvl+0x7c/0xa0 dump_stack+0x18/0x34 __might_resched+0x10c/0x140 __might_sleep+0x4c/0xa0 __kmem_cache_alloc_node+0xf4/0x168 kmalloc_trace+0x28/0x38 __request_percpu_irq+0x74/0x138 xlnx_event_manager_probe+0xf8/0x298 platform_probe+0x68/0xd8 Fixes: daed80ed0758 ("soc: xilinx: Fix for call trace due to the usage of smp_processor_id()") Signed-off-by: Jay Buddhabhatti --- drivers/soc/xilinx/xlnx_event_manager.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/soc/xilinx/xlnx_event_manager.c b/drivers/soc/xilinx/xlnx_event_manager.c index 253299e4214d..366018f6a0ee 100644 --- a/drivers/soc/xilinx/xlnx_event_manager.c +++ b/drivers/soc/xilinx/xlnx_event_manager.c @@ -3,6 +3,7 @@ * Xilinx Event Management Driver * * Copyright (C) 2021 Xilinx, Inc. + * Copyright (C) 2024 Advanced Micro Devices, Inc. * * Abhyuday Godhasara */ @@ -19,7 +20,7 @@ #include #include -static DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number1); +static DEFINE_PER_CPU_READ_MOSTLY(int, dummy_cpu_number); static int virq_sgi; static int event_manager_availability = -EACCES; @@ -570,7 +571,6 @@ static void xlnx_disable_percpu_irq(void *data) static int xlnx_event_init_sgi(struct platform_device *pdev) { int ret = 0; - int cpu; /* * IRQ related structures are used for the following: * for each SGI interrupt ensure its mapped by GIC IRQ domain @@ -607,11 +607,8 @@ static int xlnx_event_init_sgi(struct platform_device *pdev) sgi_fwspec.param[0] = sgi_num; virq_sgi = irq_create_fwspec_mapping(&sgi_fwspec); - cpu = get_cpu(); - per_cpu(cpu_number1, cpu) = cpu; ret = request_percpu_irq(virq_sgi, xlnx_event_handler, "xlnx_event_mgmt", - &cpu_number1); - put_cpu(); + &dummy_cpu_number); WARN_ON(ret); if (ret) { @@ -627,16 +624,12 @@ static int xlnx_event_init_sgi(struct platform_device *pdev) static void xlnx_event_cleanup_sgi(struct platform_device *pdev) { - int cpu = smp_processor_id(); - - per_cpu(cpu_number1, cpu) = cpu; - cpuhp_remove_state(CPUHP_AP_ONLINE_DYN); on_each_cpu(xlnx_disable_percpu_irq, NULL, 1); irq_clear_status_flags(virq_sgi, IRQ_PER_CPU); - free_percpu_irq(virq_sgi, &cpu_number1); + free_percpu_irq(virq_sgi, &dummy_cpu_number); irq_dispose_mapping(virq_sgi); }