Received: by 2002:a19:771d:0:0:0:0:0 with SMTP id s29csp1246811lfc; Wed, 1 Jun 2022 12:59:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7tV/TlRZeHM6B+Fx46yr7Nku0saPAeuUaV2ucQ7+4/rFdpOAHAp4oTmvGQSqtFbniPXre X-Received: by 2002:a05:6a00:811:b0:518:b0eb:9132 with SMTP id m17-20020a056a00081100b00518b0eb9132mr1237511pfk.57.1654113594379; Wed, 01 Jun 2022 12:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654113594; cv=none; d=google.com; s=arc-20160816; b=GYABb0i160vR3rpeNteSvEqYFHnaIT6a2QC5/TUt/o/HekTxUbZzKxl4+UJRanPDJD xlJEhnYamUEfpJqULSMDYEr2dFnj1t0QBbRH7unk4/3OygcuWAXqFm+t3P8UOi+E9FVB iyTHMDJ3Beh00Y4TqX0nUebF4kg30dDCTlWeDffXhPaR+8qCXAK0jzcbu4tE/JM8ak+G WWQh0KZVjDeRSivkRyfNS7G05YnaIfj69sPRcenK2FterMxfJ9g8/IisZ+/tVhb7fHoD LWQAEBACrCSPoc2faxqaEYhJF9vFmCDWdy8Il4WI6KttaP1det9aYBqWpQaKJHL9dqBB ya7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VxFuFFtt3LC2oJme02UFAXEMwCnA1q9pVURut5riEbk=; b=W93/PoVO5dudoxOb2CX78qhgnbN+d0QvxnlXBEaqLXem4DY13QqaKcdv+cFCwFQCKM 8YnxkWwaQ6NKgQnjNQy2zz0xefm/ruWVf8PvU2FW1YOa/CnKpfMeZN6OeUqd8amiyxae GBK9WwkXa7QSm7HYSwISHYa5rvw8f6/eXPHPM2wvbxpIh9tm0UvMsIjrzo3N628iNQh8 iAmlfCFTWrtLxbHvP2Ql4BTrwLiTR2VM2U31/Jk68QiWbDAPLOi6rU9TfM6OAdgejEA7 TQP6ZTdVvIQKmLeuwkIVAdrlyJPmbd7VJq16Zr+RCHBIHhJefRgazz4e/Iz4icZXXo0s ljaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Mutjqjbt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c74-20020a621c4d000000b004fa895878afsi2948854pfc.254.2022.06.01.12.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 12:59:54 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Mutjqjbt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AF5DC153503; Wed, 1 Jun 2022 12:18:33 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242622AbiE3Ohj (ORCPT + 99 others); Mon, 30 May 2022 10:37:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238548AbiE3OSs (ORCPT ); Mon, 30 May 2022 10:18:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84FF11216D9; Mon, 30 May 2022 06:49:50 -0700 (PDT) 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 D93BB60F22; 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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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