From patchwork Thu Jan 6 13:20:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrice CHOTARD X-Patchwork-Id: 12705421 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 8E4FBC433F5 for ; Thu, 6 Jan 2022 13:24:32 +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=GRV3cFfbd+59wvwvqEJ+sfh+7/zv4xj5QkCMShBtStE=; b=fiE94McWCwI+2t vSqABTU3hP1jIzzjwDAfnNO4+PABA+/uR6yuUGcbud8XGFZycdB7UFwUm89eo98zePF1HFtOY5+Yu M8qp2/Du8w3OQ13DdAx3oAt/L0IHPM2pKRBECuPzyHRUp0TrTlzNTyA+WyD8siEHVR6dMsQrrJjfJ Va+pGP8anXNP2ZuUF0WCxf/h/J4TieUObLCl1YH4vD7JSBfxwsP+AurKBI2evu2WlzuQ3FT3k0n8d l7lk3V3hbV3fwIn/HdFEMo16L/w1fMpIl0cKlq8jErFzmIf3PZpO76hHXa3h/eAGeHv8YTyK9iRHP Z2o/ClbE9C8DA/Y5H+Bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5SjQ-000A7U-8l; Thu, 06 Jan 2022 13:23:04 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n5SjM-000A51-B5 for linux-arm-kernel@lists.infradead.org; Thu, 06 Jan 2022 13:23:02 +0000 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 20683sij011437; Thu, 6 Jan 2022 14:22:51 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=selector1; bh=GXNow/WGCNS6VVfniMqNqO7XFYKxdCU9IcX7ReUi5Ig=; b=7WCqrJph1nk6Rds7gdVixNTL61WhNlAQ+8j0n33ji7P9yRQ8jqTl/WVDzJknzvC5riLT JzVrzPGjIPLFWEnfNKS4ECYgbbxalb0pEOnU0OaVhlG0tsnC0m5hFk5Uwi1gzB44IFWE pRL0lVNYuC9MacEMHVlykogS2pD2qDrhCc+cGfhO9Xx+DaWmztDPA0w6WVliG0GO5kUm rbHRnGFxU9hBwJwY31QTf1OVcI/MD9lqT1tugu4p9hkN6GXXiWGpPPT08mhxY4PAgJZH pij525yUn4f20kraWJ2hYGqqxaKi5SvJJAzeyteu2hiQYxxM7i10ymHvMz9M3E0Rk9GJ vg== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3ddmqubbfb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Jan 2022 14:22:50 +0100 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9766B10002A; Thu, 6 Jan 2022 14:22:49 +0100 (CET) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 8C5C924DE9D; Thu, 6 Jan 2022 14:22:49 +0100 (CET) Received: from localhost (10.75.127.44) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.26; Thu, 6 Jan 2022 14:22:49 +0100 From: To: Mark Brown , Alexandre Torgue CC: , , , , , Subject: spi: stm32-qspi: Update spi registering Date: Thu, 6 Jan 2022 14:20:52 +0100 Message-ID: <20220106132052.7227-1-patrice.chotard@foss.st.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.75.127.44] X-ClientProxiedBy: SFHDAG2NODE2.st.com (10.75.127.5) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-06_05,2022-01-06_01,2021-12-02_01 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220106_052301_241197_961D1A69 X-CRM114-Status: GOOD ( 16.89 ) 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 From: Patrice Chotard Replace devm_spi_register_master() by spi_register_master() to ensure that spi sub-nodes are unregistered in the correct order when qspi driver is removed. This issue was put in evidence using kernel v5.11 and later with a spi-nor which supports the software reset feature introduced by commit d73ee7534cc5 ("mtd: spi-nor: core: perform a Soft Reset on shutdown") Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 514337c86d2c..db005443aa7c 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -784,7 +784,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) pm_runtime_enable(dev); pm_runtime_get_noresume(dev); - ret = devm_spi_register_master(dev, ctrl); + ret = spi_register_master(ctrl); if (ret) goto err_pm_runtime_free; @@ -817,6 +817,7 @@ static int stm32_qspi_remove(struct platform_device *pdev) struct stm32_qspi *qspi = platform_get_drvdata(pdev); pm_runtime_get_sync(qspi->dev); + spi_unregister_master(qspi->ctrl); /* disable qspi */ writel_relaxed(0, qspi->io_base + QSPI_CR); stm32_qspi_dma_free(qspi);