From patchwork Mon Apr 28 10:06:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bough Chen X-Patchwork-Id: 885685 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012031.outbound.protection.outlook.com [52.101.66.31]) (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 D7997262FF9; Mon, 28 Apr 2025 10:05:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.31 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745834724; cv=fail; b=P1I06rN/m6wvICgFq3iGhsGSA386BrFtJaxhfFpcl8HBPKXqhLvB2jfqHwurwJdeWR+3l2VRMK/IP5GHHYhJH8yc4TLVsU2kNY45lsc5B2vTgLK8E47D5/suMuOAMwLyYI9o13KQcmpDFM5HppuYNepBLNzjqzZA4lXuWHvcL5w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745834724; c=relaxed/simple; bh=irZFSSYx/TvKG4jJ6voT+6bplOW3bJqw8kZoUAKk26Y=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=UJCusW9MDgIQ2dtewE32cewHXKkWFR7xQk3nst+ZWTftsfnlNZHfbLmWeAx0FyHBbdAyMIlLX956tUEPinEdMnqrSf+kbtIRWAaBPTW5nbjcX0riY544EC3KleH4XegFjQlMbrrZf5eeeLLCWP02tkbIFctGgH+kyM9YuLr+sMw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=nqc1ZUOI; arc=fail smtp.client-ip=52.101.66.31 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="nqc1ZUOI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ShAnvj1h4g5X01cPOaRd9zbRoIEo96dM+Jn4OrZXtf3gvO7H3AVfLkWZxCyOXNJ/4dbSykBdWbA5ZmWVigdFg6aSKaCHchCtdy7d3E2wjevxSXrZWx2WdaYi7LnSAb/kyPhtqlu2OjcaHyQ9/wwd7lDEcQSjxg/hP98css+jCRwnyHaf+PZxzVTgkDIBxcrgrg+SaG7MAfBAp91v8/CGVoYifFUXGiBs4Od81BrJjQYXGrq0PSQwVLkvt40TO4xWiqsy1T+ox+wK+ke7IzaA47bW6ixjrKIRQFNz4DFAS36f8bi3vIIJlNERmrkRJOcXsYdVHuMGq2JEXSdZiSTd4w== 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=RFMmYH8Qt8INTnib5oq7NC8c1iRdxUfjfS25apuO0w8=; b=uFLOMFTuXbXZw/2aOP85r2x5IWYDjjdhGWQ6xy7rfk21BoGpzk7zs1g82AYZVKM1vyhipzdIWpxRGwiUFstw9vJqLc7x7ycMBuIiNyZ1yyj7tl4zpe1YLWaDMTCzYVV1lEtLqQMKHvSqrSqVy/KFV+u37SetERCgQdRMUBF8lgpifVcnRyQNl0dIic+dwWgXSWJ6F41t4aurVnLaO+zKKX+XWpcHit7AhGEtjIeyMA1yB57/i2wbRxzIUdMTk38hV7F+GodQxNpl+OJXOitgik8nHVH08m9b/OTa6co+TRVvM/oDDv6FqcuIT1ecil6Q5JoZMgJW2CWZnkd+CaGp/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RFMmYH8Qt8INTnib5oq7NC8c1iRdxUfjfS25apuO0w8=; b=nqc1ZUOIfdItEG0daxAYcPt+D5U/gvCxc6lau/Ix+ydifdLdXta26o6Zdg/vju3GhSaPb11GphbbEyA0U11xQFWi02BMxeXyLHX0mjZh7AtbXVUb2UzU7BFatXrQkfF2gIdRf/j1f1dVNysaWy4s1/vtoIKrciYNR10vm8+wOc5+sCE1u3Sa3hX26GA4S5jOLCQ2T0icdp4l4qFzn3gb2ggRY2AAYtYeNSpFtleHVuLzmwiEJnwWJF4V/gECmf/Wx8NVWt5ZQrNOrJdV76lmqjqoYjsr72KpCeEf4wiKzCOC1Cri4a1XlMVvIExgVgF5qW7CFixcI+FcmSdN25sdAw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU0PR04MB9496.eurprd04.prod.outlook.com (2603:10a6:10:32d::19) by PAWPR04MB9862.eurprd04.prod.outlook.com (2603:10a6:102:391::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Mon, 28 Apr 2025 10:05:17 +0000 Received: from DU0PR04MB9496.eurprd04.prod.outlook.com ([fe80::4fa3:7420:14ed:5334]) by DU0PR04MB9496.eurprd04.prod.outlook.com ([fe80::4fa3:7420:14ed:5334%5]) with mapi id 15.20.8678.027; Mon, 28 Apr 2025 10:05:17 +0000 From: Haibo Chen Date: Mon, 28 Apr 2025 18:06:47 +0800 Subject: [PATCH v3 5/5] spi: nxp-fspi: use devm instead of remove for driver detach Message-Id: <20250428-flexspipatch-v3-5-61d5e8f591bc@nxp.com> References: <20250428-flexspipatch-v3-0-61d5e8f591bc@nxp.com> In-Reply-To: <20250428-flexspipatch-v3-0-61d5e8f591bc@nxp.com> To: Haibo Chen , Han Xu , Yogesh Gaur , Mark Brown Cc: linux-spi@vger.kernel.org, imx@lists.linux.dev, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1745834827; l=2590; i=haibo.chen@nxp.com; s=20250421; h=from:subject:message-id; bh=7KgkJglDrufn/lmGSDkrryOQqmavlyoLMs7rvN6cm1I=; b=tJtlkLjONGR2jTwr/28TP8D1iNOIplaJLQzdzAeFnNSfPih3ZoHO9vtZOgI+yIxhsZSIj3JvZ kwc/OEMw+bcAUM5Oqqcq73d+K1WrQxNCfz7wANEcEfLDcVjifo2v3i+ X-Developer-Key: i=haibo.chen@nxp.com; a=ed25519; pk=HR9LLTuVOg3BUNeAf4/FNOIkMaZvuwVJdNrGpvKDKaI= X-ClientProxiedBy: MA0PR01CA0011.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:80::9) To DU0PR04MB9496.eurprd04.prod.outlook.com (2603:10a6:10:32d::19) Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9496:EE_|PAWPR04MB9862:EE_ X-MS-Office365-Filtering-Correlation-Id: 0a9ad8b5-8861-4bb7-685e-08dd863c2d60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?uv7zG9xUFytmshxCvSn0WrYPHwH+O/A?= =?utf-8?q?Kxb4C6NW7B5hp+vSCvpbeSXCLtFzlgk9XTlnzWMVohoIdT6cuPmL9Alg7JPZ2kx/L?= =?utf-8?q?frH2RnE2epDNlOeQKFdIgffhGvaiYQVgOy8BOM2p41wzbrWmxE7c/v13h/8gT/AMS?= =?utf-8?q?JJmhZvJRs2GbANXGIlw9xBc7HCEfIfz/PG81rAKBpvC8oTF1DZPYtagmBSZ1y/dvY?= =?utf-8?q?c8FjUb2E9lSrje50+r63URtZgc3qd8UUzb8a4F8ld1EvljyL3LDswiirFKiMtY2oz?= =?utf-8?q?iMLy45hin8JaeivArXzy6EKgIX8nCVT/rIEeNbDn4M31iO65HcWNNmyK1Xqz0H+Vp?= =?utf-8?q?OyO/boOaMFwZuYpvKVu7Xx14eII84gxtW9N/UjM0T105V0R7Dlx7C+jSTcFs1FrDY?= =?utf-8?q?m+dFiW/vHG3WskreqC8n/J3RyW4PTqc72nZ73Z+dUnpL4k5iBuhoXHkZKmBqiQVce?= =?utf-8?q?pFx3DlJRO5W//yXgjbUkvCGCLDQnK2cqmut5JbY9flOraHbu6qrWu2C4inKJKBBVQ?= =?utf-8?q?Sytwl0wvtiAGEmOuyparFBugNIuiinWq2/EqCPdXpICR5HeaMl02wh/Nv1Y5JP6Ts?= =?utf-8?q?SBIFjMJ3FZ5xfrWOYOpJhk1tVy8mjXRhdwBph3GgM8FEkXaZQwLRLNZBf4NHE2gmy?= =?utf-8?q?pr5hP3Isq83PJ0V3CetrdN1kBPEMHntyWwE6iyJYXNmL3pLRnFb8i/3DHpoG4p/0m?= =?utf-8?q?ZaTm0c3NI9EdbEouAODKbHArkAi9NwAsoLBXYKNtkYLhEQbmA9sCCfcVJsEtQZl5q?= =?utf-8?q?NS6q/z3ZvQhV+sXY6OWdmYCN6BtB8R/D4ZfA5uGvITR6naVfA0QHomNVFfK2FUOW1?= =?utf-8?q?5hxf7G05RNShpChjkaM0QClcwVFV7BagLWzvnwMp301iiR3kWELwkvENrYS7//BY1?= =?utf-8?q?+huThR9VsfprLCfBOUkSPHLtNb5HX7+7PPxGYqRTLOAe+vffo5N5zv6BpRFllxhtq?= =?utf-8?q?jX14qU9GfRjMiH8I1BzNmBYgTP3hvkEx/PeEJeU6e1ivwzeEtEV0vdA4L2R5JVhek?= =?utf-8?q?PHJnJGVu7RUhl8j8iS5yr7stRXB/fygxbxY+Ifcqi9PM/X4DJKQyISWzMq7IXOEnh?= =?utf-8?q?ZvJFDuV9uC6ELPFxvVQQDXSOVQYBg99nl9lO2LscTTVKANM2movmkiyO1lKwjZvM0?= =?utf-8?q?mfB7NvcqiICHBfelP2GosmLym09GQ9FlkDaAvMZgNUEkZP7wYvA9OXh2pAuQEV6gd?= =?utf-8?q?44RaQ/UgmGzvVEOJGGVbtVNmE4fEWSVoDDa+mTwGGUN6bL7pjQsn3800K2mF0VnoP?= =?utf-8?q?MOyCCoEEck9NmQHxiJp3s6EN+N7VZObrMTKwAifTDEVshNQBOj3D5jDTP0SmOFXyx?= =?utf-8?q?JqnhsZ0KC8kLFq5gchHMOlE/FaOrT9cU1V65VNvUqAJ2CBfuJvET9szywi2RjeqrA?= =?utf-8?q?cOoqP72AH2Ne86TeAJgyEgJiTSelauZBA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9496.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(376014)(52116014)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?hQK0dczzobvJpKyp7hQzsYIO6QbR?= =?utf-8?q?AIOQGyftay+0X15b5OV5mvc0wlLclccTMssTS1kElsDrXoxxPI0cgk6TgOOP1Jx7f?= =?utf-8?q?Y8qE8pr2m+OQDF3LUziH7nMHU/zFr1aZ0r+iPhfGZv94xWX9QHJtzu0nhcvW7sW//?= =?utf-8?q?5PObw6hQ/zhb11b7Nt3e++rX7gRQ0rI+IvtWc7hP+y/zkfOc7eQHV9M94/yo9oBYm?= =?utf-8?q?zXqj6fqEwXXqZ91Igg2rsZsaTZN/do6/+jxJb9FwRs+qWE6JQHePC99tlI4OIUU+r?= =?utf-8?q?kSmZefDISxUl4qUKcMEPl64wAYgWN6B62EBWoqEAKNkYu4BKmBup+CR/53itUh3Qh?= =?utf-8?q?5odCmDre5UtRzgxbv0JfkZBOQMe9R5zBalHGr6oOY0gycnxx9njedKowHc/7vZf+G?= =?utf-8?q?cGvh6r0kcxLkV9JrbzxEBZb7u1ktJgby7KRS6Vbp6w1d3bQPrtycNGlPPtZq9k+FX?= =?utf-8?q?vy/EMy6BDel7o3zgkkTDqE6ydxA1mXdrEoxKonztJVxXNYbJPHlIGfrw1rXQOaUEG?= =?utf-8?q?HGZiMYbAIwWlceLToYNZ38TO2Mg6hhMesvGbg2yCwMhaYMW8rW0pLSj+9zRpxX50n?= =?utf-8?q?rLE452BMJ+SDLdDZg3JxpAMp/xhFOFF5jf45/ERe4h+r/lDdgXvHAlKirsXk06zLi?= =?utf-8?q?+zVX+xhYPUn4o3sxu8vz4iXGgixtGqq9FbT2dIE/q7FxY6AiAA7lidBxnSmk9MhtT?= =?utf-8?q?wtx9SCWDa6sFFIhQZKYv0JlBxGsjW7tXTcIPsHAOkH3uHHf4qnEULoFwO/wDYeODt?= =?utf-8?q?bxnFE6W+yYmvSKsJx51Wh1vC/p/0O4rR7e9KFPzTNY8hNPSpbiEkc07Yl+jEFOwWB?= =?utf-8?q?RG7jGlSaIScf3dGFA7lm2hN/Fnehe3F+u5Qr4oQfk+ijfj4bKnn1KanmdtTID/l24?= =?utf-8?q?M70/o/lVLBx62ALEoLAQDPobgVqRyqdsOqE6DB3228+u0I4KiHTnENzqG+rYA6Ola?= =?utf-8?q?WOLtRgaSquh3SGgcz5smgStcUfqGRALJsQ3+h0DZolHg+efUY7N4OwNI/UphoCZaC?= =?utf-8?q?hxwJfA2m/qYXuv2QErq02K321YGMTo75QO89MR9TWF0J98oORtTnCQfqCTcq6ZBmi?= =?utf-8?q?aX649m/Gcy762+UDp8KHdfH8eWk6+DysXs/3fxxtGTtIKb1CWl6+GouP7uEEnaoPt?= =?utf-8?q?lsqtihs/i+KBhEZkrZ4BtEixTveIq/nGx6WFP2clJ3WE9KhSjEZuepfqb68OxZEdc?= =?utf-8?q?sfP3JTznf97yFW74XBKJ8UjBvwsIX7FRjLt+FNf6D3VvKrrETnNYhaknOAtbwbr2e?= =?utf-8?q?1I+j30udkYOHQvyaytMJ2QD5WueZtelczS7mvfT06hL9GKIt4wQpqtqeBBg0vbN1s?= =?utf-8?q?V5e5ck9Qi5II31FAcwbnFFh2l2io12IXdJlOUsGpWpzwtUBDuJKUr2GlbPbbT9p/k?= =?utf-8?q?wSILxHdz6A0F12qMKZs90ME8yZE7rRxvm//KujceCvN/TswG8Ta3FweDh7bqnooJ9?= =?utf-8?q?vaYmvGejzuJZgexYvc5cT5WszeRpRUVryDdSg5ZSui/IpkggygGVEl2OieGeVLmpy?= =?utf-8?q?MVFANZEm2VDY?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a9ad8b5-8861-4bb7-685e-08dd863c2d60 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9496.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2025 10:05:17.5379 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lQRwylI6uFGZxnp4Ahah20/iqlbOqHCCs8ncQc4BrBVLFN6Ocul5ZQT9a0TtVvGygiXgjqDY/FAcZsLjo3eOkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9862 From: Han Xu fspi driver use devm APIs to manage clk/irq/resources and register the spi controller, but the legacy remove function will be called first during device detach and trigger kernel panic. Drop the remove function and use devm_add_action_or_reset() for driver cleanup to ensure the release sequence. Signed-off-by: Han Xu Signed-off-by: Haibo Chen --- drivers/spi/spi-nxp-fspi.c | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/drivers/spi/spi-nxp-fspi.c b/drivers/spi/spi-nxp-fspi.c index 0ea04e77a968b9c8dbd73a76984022a8f9e9b178..e63c77e418231cd0698ffb73eeeebfbe63cc3065 100644 --- a/drivers/spi/spi-nxp-fspi.c +++ b/drivers/spi/spi-nxp-fspi.c @@ -1168,6 +1168,24 @@ static const struct spi_controller_mem_caps nxp_fspi_mem_caps = { .per_op_freq = true, }; +static void nxp_fspi_cleanup(void *data) +{ + struct nxp_fspi *f = data; + + /* enable clock first since there is register access */ + pm_runtime_get_sync(f->dev); + + /* disable the hardware */ + fspi_writel(f, FSPI_MCR0_MDIS, f->iobase + FSPI_MCR0); + + pm_runtime_disable(f->dev); + pm_runtime_put_noidle(f->dev); + nxp_fspi_clk_disable_unprep(f); + + if (f->ahb_addr) + iounmap(f->ahb_addr); +} + static int nxp_fspi_probe(struct platform_device *pdev) { struct spi_controller *ctlr; @@ -1263,25 +1281,11 @@ static int nxp_fspi_probe(struct platform_device *pdev) ctlr->mem_caps = &nxp_fspi_mem_caps; ctlr->dev.of_node = np; - return devm_spi_register_controller(&pdev->dev, ctlr); -} - -static void nxp_fspi_remove(struct platform_device *pdev) -{ - struct nxp_fspi *f = platform_get_drvdata(pdev); - - /* enable clock first since there is reigster access */ - pm_runtime_get_sync(f->dev); - - /* disable the hardware */ - fspi_writel(f, FSPI_MCR0_MDIS, f->iobase + FSPI_MCR0); - - pm_runtime_disable(f->dev); - pm_runtime_put_noidle(f->dev); - nxp_fspi_clk_disable_unprep(f); + ret = devm_add_action_or_reset(dev, nxp_fspi_cleanup, f); + if (ret) + return dev_err_probe(dev, ret, "Failed to register nxp_fspi_cleanup\n"); - if (f->ahb_addr) - iounmap(f->ahb_addr); + return devm_spi_register_controller(&pdev->dev, ctlr); } static int nxp_fspi_runtime_suspend(struct device *dev) @@ -1361,7 +1365,6 @@ static struct platform_driver nxp_fspi_driver = { .pm = pm_ptr(&nxp_fspi_pm_ops), }, .probe = nxp_fspi_probe, - .remove = nxp_fspi_remove, }; module_platform_driver(nxp_fspi_driver);