Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2181394iof; Tue, 7 Jun 2022 22:24:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcXBFXuMs6t/Yr43vrX+GAdAcuTUIOMnpgbSRHXisrn4HI6pVFsVwE3qmayjZ8ycvzSA+i X-Received: by 2002:a17:903:1252:b0:154:ca85:59a0 with SMTP id u18-20020a170903125200b00154ca8559a0mr32427115plh.169.1654665853446; Tue, 07 Jun 2022 22:24:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654665853; cv=none; d=google.com; s=arc-20160816; b=H68hzoPoxpWl17HmA4JrDpMcBSdH54rD1VihVelpDuVjr94TurUZlyl/MDTQ77BZpf gXzdElwjTdnRPcG78TdtvPjqTTKVZfdScYumVFid411iknnzonc2+SA02JaBAlmID1ue hOe+6LJqvXTmFT+q5qsU93JpnVeMz56Xha1ruqvBBp48yQNaycuVuQiP06Vjwc8W0Y8I K184On/n++IvWoIeUzZu1ExNvj5urowarpFWBY76UMp14UX3WQD21paM5kQE/J9wE182 LV3Xiu8PuQ/oViOoVVyo5z6+n3MuslSkyL2ip+NZEyX1qBXgS+fVoFTJn2PB4dCDbFwl jLzw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6skCEfKDqRqGqBX1lbA9dr/1KW2nsqBWRIx6igx2opo=; b=Se+e0Hjsw7AuB4cQpZ1MyYfaxwg54La1g+6SbbaPuOlvzpab+be3du4Eui5owJh378 0mNuZgrhDhVIEnyo9lIm0XYT69X7EoCSqhhNjZ+gwkX9djoqmspg536ea5bw0Ez2OlOe B73ojwXcygWe/6xCS9b6oZmBS4vbiPdNf+ua2SqKB9mpWVJoAl7d81L5en0yEDfIpSqC abz4/ZaAndgN+X7cQ+BCBFCE04LhE6hqUP1j4qZrIo8cL757MtKN8DmzJS0mmeDqiJoJ B4t6HHqiag7b62p06VFzcS3kaDOr0RcOE4R/70IUUOyt/cWbTbAuYYAK+NXSyFbxBT+a Myuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rush1UlL; 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=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id n14-20020a170902f60e00b0016763dfce14si15258934plg.35.2022.06.07.22.24.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:24:13 -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=@linuxfoundation.org header.s=korg header.b=rush1UlL; 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=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2FAC64706E2; Tue, 7 Jun 2022 21:50:58 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352274AbiFGSZt (ORCPT + 99 others); Tue, 7 Jun 2022 14:25:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351040AbiFGSBg (ORCPT ); Tue, 7 Jun 2022 14:01:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14F9F14E966; Tue, 7 Jun 2022 10:43:53 -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 17B60614BC; Tue, 7 Jun 2022 17:43:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23C87C385A5; Tue, 7 Jun 2022 17:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654623832; bh=63KEk9VLTggDHYa7uCWhw1ThCahBRf68liu0x9+Y4Q8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rush1UlLmlcnFStVdwaZM+9wh0vYIPvm8lomTvOhL0f1zoBi6DvhU50rLMYjSfCb1 YwO5O7GO0NgO40FGRoTwnQVogI0cB62NpISr9GAoWaGAeosr+QBeCCBmDLmVZcj7bQ MO/KvKLfYCZzkvrgZ2+iM6tnqr/lfveyz+ZoaSHU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Patrice Chotard , eberhard.stoll@kontron.de, Mark Brown , Sasha Levin Subject: [PATCH 5.15 108/667] spi: stm32-qspi: Fix wait_cmd timeout in APM mode Date: Tue, 7 Jun 2022 18:56:13 +0200 Message-Id: <20220607164938.062005587@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164934.766888869@linuxfoundation.org> References: <20220607164934.766888869@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 ffdc55f87e82..dd38cb8ffbc2 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -308,7 +308,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