From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 23 Apr 2024 08:45:21 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rz9u5-00CYLQ-2l for lore@lore.pengutronix.de; Tue, 23 Apr 2024 08:45:21 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rz9u5-0007nh-92 for lore@pengutronix.de; Tue, 23 Apr 2024 08:45:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=g9/6Oan9qG9q21wy9b5R27GTvKsBdlP9Jq0gl1kg8Yo=; b=F5rAoGniYj1QB8KaJspYMKEe78 +8aQBuEXJBu278fZxsTJpmyQuN3gvSnxs2lQRUnUWV5i+/d4FPtAhWS74TIQTsYEWJCwX+WJDRTkB hCK6Z3UhksyyzR1lhxD93n5s7Hb7/1Y0X6g9YXrUnqBWKWsjRksBMNmTgVKvHzp/NUSFDPBbcjrWZ /05EF3O2fm5Sg9wI+YEOdvI5kREbNUZGP0AeHSjV6csTJWJ/Dn1ZqenGmL7rI4g9pMsrSbnZRcWVO 6qmt+9vVYUqq5mpF59zqg2IAWaVM6qAgrsWFKjBllLulyJg28AvJojzP0T2SWj7UXNX2R1fLV+Mo/ hxda7mEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rz9tX-0000000GA98-0j5B; Tue, 23 Apr 2024 06:44:47 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rz9tU-0000000GA8J-16Ja for barebox@lists.infradead.org; Tue, 23 Apr 2024 06:44:45 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rz9tS-0007dP-RM; Tue, 23 Apr 2024 08:44:42 +0200 Received: from [2a0a:edc0:2:b01:1d::c5] (helo=pty.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rz9tS-00DpT7-Ez; Tue, 23 Apr 2024 08:44:42 +0200 Received: from sha by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rz9tS-009lPs-1E; Tue, 23 Apr 2024 08:44:42 +0200 Date: Tue, 23 Apr 2024 08:44:42 +0200 From: Sascha Hauer To: Ahmad Fatoum Cc: barebox@lists.infradead.org, str@pengutronix.de, mtr@pengutronix.de Message-ID: References: <20240423062206.1518464-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240423062206.1518464-1-a.fatoum@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240422_234444_470397_08A1832F X-CRM114-Status: GOOD ( 24.49 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.5 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH master 1/3] mci: core: fix fallback when eMMC DDR52 is not possible X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On Tue, Apr 23, 2024 at 08:22:04AM +0200, Ahmad Fatoum wrote: > mci_mmc_select_hs_ddr() will try DDR52 and if that fails, revert to > SDR operation. In that case, it returns the bus width, which would > be forwarded as if it were an error code: > > WARNING: mmc2: Card's startup fails with 3 > > Fix this by translating successful return values to 0 in > mci_startup_mmc(). > > Signed-off-by: Ahmad Fatoum > --- > drivers/mci/mci-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c > index 1d383e6449e9..57b4c5b99c9c 100644 > --- a/drivers/mci/mci-core.c > +++ b/drivers/mci/mci-core.c > @@ -1566,7 +1566,7 @@ static int mci_startup_mmc(struct mci *mci) > } > } > > - return ret; > + return ret >= MMC_BUS_WIDTH_1 ? 0 : ret; > } Can we do it like below instead? It makes clear where a MMC_BUS_WIDTH_x return value is expected. Sascha ----------------------------------8<--------------------------- diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index 083d2f4ed1..da892a5f84 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1558,8 +1558,12 @@ static int mci_startup_mmc(struct mci *mci) /* find out maximum bus width and then try DDR if supported */ ret = mci_mmc_select_bus_width(mci); - if (ret > MMC_BUS_WIDTH_1 && mci->tran_speed == 52000000) - ret = mci_mmc_select_hs_ddr(mci); + if (ret > MMC_BUS_WIDTH_1) { + ret = 0; + + if (mci->tran_speed == 52000000) + ret = mci_mmc_select_hs_ddr(mci); + } if (ret < 0) { dev_warn(&mci->dev, "Changing MMC bus width failed: %d\n", ret); -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |