From patchwork Wed Sep 4 02:19:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13789596 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) (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 1E9812562E; Wed, 4 Sep 2024 02:11:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415908; cv=none; b=cdpvUvitmzexPPeTNPJ+cI4h5GByQkxV+/L5jttXY824CMK8GHdyDsUcU5Cahnt2qzg83CV39MIpXNYHJiyN3vhI11ViacVBnbkJow22gcAb58bLsN2ETX5p625izooJ0OWSEwEww/PHfJpgJYsgG9UDg+IA7c+v/SV8BpPcLAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415908; c=relaxed/simple; bh=x2wcp+sdmH3AWGmRf9oC1sVPRcOtcLzGqP5+iZgBo38=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DxCoz3cy4krJ0vdhLdZ2QvO//byaalQa/3eLrPqLFcq96uD3Iy41o+Zq/fD27UiL6xBPhs/SXn+xCcR0TugPsV76QC5ILBlXonTnpsRHkPhJjhYivMqiqZphifTG3GjwdvRgWAwVXh9kUHC/XrTZ4loCqqvzUReNI2HkNatKIqk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.254]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4Wz5Xc4C3kzgYvQ; Wed, 4 Sep 2024 10:09:36 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 9F2E4180105; Wed, 4 Sep 2024 10:11:43 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 4 Sep 2024 10:11:43 +0800 From: Jinjie Ruan To: , , , , CC: Subject: [PATCH -next 1/3] spi: geni-qcom: Use devm_request_irq() helper Date: Wed, 4 Sep 2024 10:19:41 +0800 Message-ID: <20240904021943.2076343-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240904021943.2076343-1-ruanjinjie@huawei.com> References: <20240904021943.2076343-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemh500013.china.huawei.com (7.202.181.146) Since spi_geni_probe() use managed function in most places, also use devm_request_irq() to request the interrupt, so we can avoid having to manually clean this up. Signed-off-by: Jinjie Ruan --- drivers/spi/spi-geni-qcom.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 37ef8c40b276..77eb874e4f54 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -1144,17 +1144,15 @@ static int spi_geni_probe(struct platform_device *pdev) if (mas->cur_xfer_mode == GENI_GPI_DMA) spi->flags = SPI_CONTROLLER_MUST_TX; - ret = request_irq(mas->irq, geni_spi_isr, 0, dev_name(dev), spi); + ret = devm_request_irq(dev, mas->irq, geni_spi_isr, 0, dev_name(dev), spi); if (ret) goto spi_geni_release_dma; ret = spi_register_controller(spi); if (ret) - goto spi_geni_probe_free_irq; + goto spi_geni_release_dma; return 0; -spi_geni_probe_free_irq: - free_irq(mas->irq, spi); spi_geni_release_dma: spi_geni_release_dma_chan(mas); spi_geni_probe_runtime_disable: @@ -1172,7 +1170,6 @@ static void spi_geni_remove(struct platform_device *pdev) spi_geni_release_dma_chan(mas); - free_irq(mas->irq, spi); pm_runtime_disable(&pdev->dev); } From patchwork Wed Sep 4 02:19:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13789597 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (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 72E2D7E6; Wed, 4 Sep 2024 02:11:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415909; cv=none; b=C/HZjtFmc4pzoIqie1fLhSqZJdvs7DdCYo4iJ/2jnLv3MrapeZACxAjIEy2F1r7XvqMF+T4tn9aTcI/DWqU8Dd0YjaEj0pX5Jveh0Ne5FpH0fJPK9UOq3mw5Hl7MEx2GMyHm3Pfct37mVC25HgPSd0GRTpe7gXcS7U62FpTL5iI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415909; c=relaxed/simple; bh=Eaimopo3jk9/9ZlEpbVh/7v5+tOlWPuS2H1A3DF6kWw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Nv1TGuk0mYN5ceLLVPTew23wAeMjdrW06GnDMdK4JSJSM909/Yc3uV/Bj5sjYVyyrkIYxckdvN0Mk6CtK9G9j2jhAmyFS46mzOZchX+FwpkLQYlN+2/wAxSf2zC9Qn8gGR8RxOnfFUNp1e3NMMqHwzU83VbAojKpuz1gJRi5RC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Wz5TM69cDz69Ny; Wed, 4 Sep 2024 10:06:47 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id EF92F18005F; Wed, 4 Sep 2024 10:11:44 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 4 Sep 2024 10:11:44 +0800 From: Jinjie Ruan To: , , , , CC: Subject: [PATCH -next 2/3] spi: geni-qcom: Undo runtime PM changes at driver exit time Date: Wed, 4 Sep 2024 10:19:42 +0800 Message-ID: <20240904021943.2076343-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240904021943.2076343-1-ruanjinjie@huawei.com> References: <20240904021943.2076343-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemh500013.china.huawei.com (7.202.181.146) It's important to undo pm_runtime_use_autosuspend() with pm_runtime_dont_use_autosuspend() at driver exit time unless driver initially enabled pm_runtime with devm_pm_runtime_enable() (which handles it for you). Hence, switch to devm_pm_runtime_enable() to fix it. Fixes: cfdab2cd85ec ("spi: spi-geni-qcom: Set an autosuspend delay of 250 ms") Signed-off-by: Jinjie Ruan --- drivers/spi/spi-geni-qcom.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 77eb874e4f54..e5bece7be892 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -1110,25 +1110,25 @@ static int spi_geni_probe(struct platform_device *pdev) spin_lock_init(&mas->lock); pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_set_autosuspend_delay(&pdev->dev, 250); - pm_runtime_enable(dev); + devm_pm_runtime_enable(dev); if (device_property_read_bool(&pdev->dev, "spi-slave")) spi->target = true; ret = geni_icc_get(&mas->se, NULL); if (ret) - goto spi_geni_probe_runtime_disable; + return ret; /* Set the bus quota to a reasonable value for register access */ mas->se.icc_paths[GENI_TO_CORE].avg_bw = Bps_to_icc(CORE_2X_50_MHZ); mas->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW; ret = geni_icc_set_bw(&mas->se); if (ret) - goto spi_geni_probe_runtime_disable; + return ret; ret = spi_geni_init(mas); if (ret) - goto spi_geni_probe_runtime_disable; + return ret; /* * check the mode supported and set_cs for fifo mode only @@ -1153,10 +1153,9 @@ static int spi_geni_probe(struct platform_device *pdev) goto spi_geni_release_dma; return 0; + spi_geni_release_dma: spi_geni_release_dma_chan(mas); -spi_geni_probe_runtime_disable: - pm_runtime_disable(dev); return ret; } @@ -1169,8 +1168,6 @@ static void spi_geni_remove(struct platform_device *pdev) spi_unregister_controller(spi); spi_geni_release_dma_chan(mas); - - pm_runtime_disable(&pdev->dev); } static int __maybe_unused spi_geni_runtime_suspend(struct device *dev) From patchwork Wed Sep 4 02:19:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13789598 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (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 3C5567E6; Wed, 4 Sep 2024 02:12:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415923; cv=none; b=Tm9wDtcqo27Dc/rRHgeMqlTCFp42cD3yOPWrbQ52Otmdo0k4/89CXUWl/GZwGvvCHzA2738r++uP1mQhxoNjPaw0v0grOLsaOgL+wyEocteCGHzXWjnTvX3oITxk6KTJo7oc/74xxa9luNUMWrH+J4kdJvslzOs7bz0l9hhNZVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725415923; c=relaxed/simple; bh=HBci+jvwt7HfiuzVJeXuxIAHWk8z/lip14lvhCRHDGE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YDqFVaOPtOQod+NtTndQK7QSfVedoq72CU3AUdfGh/+Up+3yul/x7yPG5jiv+x9XNeFYoBVC1FulhQgtn0U7FlcvmsnXVqZkhnVHoydswScDOLQOxN7wVTCOMAIE5/Bvl3P7WzK30ATGrdh0o2e/WX0fD6JcUWEhSOsxZKu70O8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Wz5Tf0JRqz69Yp; Wed, 4 Sep 2024 10:07:02 +0800 (CST) Received: from kwepemh500013.china.huawei.com (unknown [7.202.181.146]) by mail.maildlp.com (Postfix) with ESMTPS id 280B41400CA; Wed, 4 Sep 2024 10:11:59 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemh500013.china.huawei.com (7.202.181.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 4 Sep 2024 10:11:58 +0800 From: Jinjie Ruan To: , , , , CC: Subject: [PATCH -next 3/3] spi: geni-qcom: Use devm_spi_register_controller() Date: Wed, 4 Sep 2024 10:19:43 +0800 Message-ID: <20240904021943.2076343-4-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240904021943.2076343-1-ruanjinjie@huawei.com> References: <20240904021943.2076343-1-ruanjinjie@huawei.com> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemh500013.china.huawei.com (7.202.181.146) Use devm_spi_register_controller() in the Qualcomm GENI based SPI controller driver, which avoid having to manually call spi_unregister_controller() in the remove function. Signed-off-by: Jinjie Ruan --- drivers/spi/spi-geni-qcom.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index e5bece7be892..fecb6f15de7b 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -1148,7 +1148,7 @@ static int spi_geni_probe(struct platform_device *pdev) if (ret) goto spi_geni_release_dma; - ret = spi_register_controller(spi); + ret = devm_spi_register_controller(dev, spi); if (ret) goto spi_geni_release_dma; @@ -1164,9 +1164,6 @@ static void spi_geni_remove(struct platform_device *pdev) struct spi_controller *spi = platform_get_drvdata(pdev); struct spi_geni_master *mas = spi_controller_get_devdata(spi); - /* Unregister _before_ disabling pm_runtime() so we stop transfers */ - spi_unregister_controller(spi); - spi_geni_release_dma_chan(mas); }