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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0838CC742B9 for ; Fri, 12 Jul 2019 12:38:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8C55208E4 for ; Fri, 12 Jul 2019 12:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562935138; bh=FD9t5F8PGi371TcVdek1ysKVoWqC0ABFqzPsaC7jCPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=h8ru0o3gaKS1iXJQaBxkZ+rkK/KffquxFp6ybzOYrpCCkeRp1eqCn4H7elaeDUtbz 86f23CN48jlYLwzpGg9IZ0jrG9AgpWexLmZ5iCdu7WVHEbAUJTSlkALEmGJTTOBztW SpmotlM/PSfTJ2D7q20huIYcNFLjDtLSvP0QLBMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728238AbfGLM2P (ORCPT ); Fri, 12 Jul 2019 08:28:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:41834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728775AbfGLM2P (ORCPT ); Fri, 12 Jul 2019 08:28:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D1E22084B; Fri, 12 Jul 2019 12:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934494; bh=FD9t5F8PGi371TcVdek1ysKVoWqC0ABFqzPsaC7jCPE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I26YZ8U96Nno0Q2A2zcQjMe0vYMC19OxeYpPGlQ6qdp7RQR6ooTzBptgFbHAe0ES0 K2M7vtcRr4qYcIYo8CxU815qvZhWGcKDqZ3TcPtAPGlUpnxmKY7/dPrqEkWVrTr2uu DUFGyhPAQEaMdiO36Te3QKiKRXUI+tsAvsQOxsWI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yoshihiro Shimoda , Wolfram Sang , Ulf Hansson , Sasha Levin Subject: [PATCH 5.1 071/138] mmc: core: complete HS400 before checking status Date: Fri, 12 Jul 2019 14:18:55 +0200 Message-Id: <20190712121631.401754036@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit b0e370b95a3b231d0fb5d1958cce85ef57196fe6 ] We don't have a reproducible error case, yet our BSP team suggested that the mmc_switch_status() command in mmc_select_hs400() should come after the callback into the driver completing HS400 setup. It makes sense to me because we want the status of a fully setup HS400, so it will increase the reliability of the mmc_switch_status() command. Reported-by: Yoshihiro Shimoda Signed-off-by: Wolfram Sang Fixes: ba6c7ac3a2f4 ("mmc: core: more fine-grained hooks for HS400 tuning") Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 3e786ba204c3..671bfcceea6a 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1212,13 +1212,13 @@ static int mmc_select_hs400(struct mmc_card *card) mmc_set_timing(host, MMC_TIMING_MMC_HS400); mmc_set_bus_speed(card); + if (host->ops->hs400_complete) + host->ops->hs400_complete(host); + err = mmc_switch_status(card); if (err) goto out_err; - if (host->ops->hs400_complete) - host->ops->hs400_complete(host); - return 0; out_err: -- 2.20.1