From mboxrd@z Thu Jan 1 00:00:00 1970 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 05697C433F5 for ; Mon, 30 May 2022 14:17:48 +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:References:In-Reply-To: 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: List-Owner; bh=p3OKNXYSxZ9DC4ziC4ccn9aJNZ85+WFgWJRd/BD94jI=; b=dkig2xIY/5hpk0 oE7qR0thhv331PiUOZytRd46UKeHalKOjf07L2CcRHYEfgwRGKbsTRMQj/LS0SXz05Q4VcmNurKkH qe1/8WGHm+KZ5yVxqmH7aELir3iGwHNaq78naEnPuH/cPGE9Ei/NmQ6dqYzaiWZ+7mEUlQ0G1Swjl p8f9DHKfr5uSGrHINVMizK2JXxCr6t0IkOkuYIOApjb4zx1C61EkcMOXXhTRK8hEnwE5Z5O8IVU3j Zf72KCPGkzItNM4rH8wyOIhaw6R/3Deh7gyd9KAr7ckF6fXdM+ktlWiwET6b4nd3FxLTRmoWd6IlH 1rq28k27mgOFj6+FI9eA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvgC1-0077h5-UY; Mon, 30 May 2022 14:16:26 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nvfl7-006t7L-Vt for linux-arm-kernel@lists.infradead.org; Mon, 30 May 2022 13:48:41 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7988060FD6; Mon, 30 May 2022 13:48:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F71CC36AE5; Mon, 30 May 2022 13:48:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918517; bh=NA4E3y1t021we4LSyaOq70PfxfQjsWhyAXt2a1xl6e8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MutjqjbtACnvaXtECRHTIb0SuwBPiVt8Bd6TnSnQgfdsPMc9Bwc0RvkB70GfGRSdi p6fPc/a70FdWU6yn0p+sL4nPbw2xqP/Sa9x9x1yZrfQUsO1nu+Bsdd0pPzJbK+4l6b hLA9FfOusC8cWwRzuN0jWd50fRR+JGPM2YMCO2fvxi3+ifsAr8RtNh57UO79toOGnQ HOFqPDhZcfMbCRXAAMsgi/REbHxrLMMpQ1opOMsKHex6f9CZZV29dHABAg4Svj1/HS CRiA5Bmbde8Cmlpmdfqa1bJzuiPzbh8my+LiN1yBOkdtPG6O+ZZt1rFJqeyi4ZQuh4 LIS/TbkTvITtg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Patrice Chotard , eberhard.stoll@kontron.de, Mark Brown , Sasha Levin , mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, linux-spi@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 36/55] spi: stm32-qspi: Fix wait_cmd timeout in APM mode Date: Mon, 30 May 2022 09:46:42 -0400 Message-Id: <20220530134701.1935933-36-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> References: <20220530134701.1935933-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220530_064838_157778_9D7D59AD X-CRM114-Status: GOOD ( 12.06 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Patrice Chotard [ Upstream commit d83d89ea68b4726700fa87b22db075e4217e691c ] In APM mode, TCF and TEF flags are not set. To avoid timeout in stm32_qspi_wait_cmd(), don't check if TCF/TEF are set. Signed-off-by: Patrice Chotard Reported-by: eberhard.stoll@kontron.de Link: https://lore.kernel.org/r/20220511074644.558874-2-patrice.chotard@foss.st.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- 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 ea77d915216a..8070b7420217 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -293,7 +293,8 @@ static int stm32_qspi_wait_cmd(struct stm32_qspi *qspi, if (!op->data.nbytes) goto wait_nobusy; - if (readl_relaxed(qspi->io_base + QSPI_SR) & SR_TCF) + if ((readl_relaxed(qspi->io_base + QSPI_SR) & SR_TCF) || + qspi->fmode == CCR_FMODE_APM) goto out; reinit_completion(&qspi->data_completion); -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel