From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D3B87148832; Fri, 6 Dec 2024 14:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733496917; cv=none; b=Zw3P0hQQ2R6xm535heb7si1Q/6YEBdHLrCvknf+Uppswx1Ed+f9USPy8a2qxucuYeMxodMplTdjA+H/abDblC0T+3go7bImkdXTd3STaPYNOQRAxdF+V71ZDTfJPHO23Aa7MjUXSgtuje5t9+Tg9MKy7IXGV1wlCBzl6vOxT6T4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733496917; c=relaxed/simple; bh=7krwrZNkN+ia1qxArcojOZQhVy4+D3rSNZX6XQ+PNHc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C0DEs5GO1a+3aAEQhZVA4tOt5EBHIMcfpKKgHO2jNohTRsDQ8J5JZ/YdJDU4tOsgtWu22WK4ScIF5XvcPQrsy40iTRr9cISL03C3gZx7Nj+OOGR7WkgUjvtUFF3g6QUIGohF33eJeC2/rmMHnTAZxdcEpYiD61d2ewHeVlQ5E84= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WWmURIWm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WWmURIWm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 419CFC4CED1; Fri, 6 Dec 2024 14:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733496917; bh=7krwrZNkN+ia1qxArcojOZQhVy4+D3rSNZX6XQ+PNHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WWmURIWmcez1o4ZdoFiN9Yu3Bqi/5tDod6LmmhaIup5ENqoimZouS9uM2cob831Wg 9arBTnAeD0GRle83OvQSnomvsfUmNWRjyPVSxzIDJte6TKp7799VD8KL29QXpRb5nA Q6CykuLcpxbx90gtrxKBnvE5TivtP1FsyVmQwyUE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jinjie Ruan , Mark Brown , Sasha Levin Subject: [PATCH 6.6 112/676] spi: spi-fsl-lpspi: Use IRQF_NO_AUTOEN flag in request_irq() Date: Fri, 6 Dec 2024 15:28:51 +0100 Message-ID: <20241206143657.734948300@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jinjie Ruan [ Upstream commit 003c7e01916c5e2af95add9b0cbda2e6163873e8 ] disable_irq() after request_irq() still has a time gap in which interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will disable IRQ auto-enable when request IRQ. Fixes: 9728fb3ce117 ("spi: lpspi: disable lpspi module irq in DMA mode") Signed-off-by: Jinjie Ruan Link: https://patch.msgid.link/20240906022828.891812-1-ruanjinjie@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-fsl-lpspi.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index 13313f07839b6..514a2c5c84226 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -891,7 +891,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev) return ret; } - ret = devm_request_irq(&pdev->dev, irq, fsl_lpspi_isr, 0, + ret = devm_request_irq(&pdev->dev, irq, fsl_lpspi_isr, IRQF_NO_AUTOEN, dev_name(&pdev->dev), fsl_lpspi); if (ret) { dev_err(&pdev->dev, "can't get irq%d: %d\n", irq, ret); @@ -948,14 +948,10 @@ static int fsl_lpspi_probe(struct platform_device *pdev) ret = fsl_lpspi_dma_init(&pdev->dev, fsl_lpspi, controller); if (ret == -EPROBE_DEFER) goto out_pm_get; - if (ret < 0) + if (ret < 0) { dev_warn(&pdev->dev, "dma setup error %d, use pio\n", ret); - else - /* - * disable LPSPI module IRQ when enable DMA mode successfully, - * to prevent the unexpected LPSPI module IRQ events. - */ - disable_irq(irq); + enable_irq(irq); + } ret = devm_spi_register_controller(&pdev->dev, controller); if (ret < 0) { -- 2.43.0