From patchwork Fri Jun 25 19:01:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 12345763 X-Patchwork-Delegate: geert@linux-m68k.org 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 6BC79C2B9F4 for ; Fri, 25 Jun 2021 19:01:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4ACBC61942 for ; Fri, 25 Jun 2021 19:01:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229774AbhFYTDi (ORCPT ); Fri, 25 Jun 2021 15:03:38 -0400 Received: from www.zeus03.de ([194.117.254.33]:51880 "EHLO mail.zeus03.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229759AbhFYTDi (ORCPT ); Fri, 25 Jun 2021 15:03:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=k1; bh=xbeeBB5Mp9udtSX6atpEVfdXnpk dIZsPDWpgQpyP1uY=; b=2n1O+JN4anxX1CD4onqmuwsyMM0qxhemMdjSAJeOL5Q kclbkzrO5BxkSaW835FEUn1HdWnaw1cRygcDTr5D1QKTe551/eTmIszYf1EHJ4Tb 7bYfNmWlf/PdhOI80Vfz+LQ+oqSqS6EU4PvnSTA7Xgbb+1d8BPZlUsoos8hwTJg0 = Received: (qmail 3402476 invoked from network); 25 Jun 2021 21:01:15 +0200 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 25 Jun 2021 21:01:15 +0200 X-UD-Smtp-Session: l3s3148p1@44hcw5vFnIkgAwDPXwSbABaL5ZbYSJxc From: Wolfram Sang To: linux-mmc@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Yoshihiro Shimoda , Adrian Hunter , Wolfram Sang Subject: [RFC PATCH] mmc: core: ensure flags are always cleared when retune gets enabled Date: Fri, 25 Jun 2021 21:01:07 +0200 Message-Id: <20210625190107.8160-1-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Move the call to clear the retune flags into mmc_retune_enable() to ensure they are always cleared. With current code, there is no functional change. But it is more future-proof this way. Signed-off-by: Wolfram Sang --- After reviewing my own code, I thought this is even a tad better. What do you guys think? Based on the series "[PATCH 0/3] mmc: avoid vicious circle when retuning", of course. drivers/mmc/core/core.c | 6 ++---- drivers/mmc/core/host.c | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 84f39a59a28e..b039dcff17f8 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -937,13 +937,11 @@ int mmc_execute_tuning(struct mmc_card *card) err = host->ops->execute_tuning(host, opcode); - if (err) { + if (err) pr_err("%s: tuning execution failed: %d\n", mmc_hostname(host), err); - } else { - mmc_retune_clear(host); + else mmc_retune_enable(host); - } return err; } diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 52d37587cf45..8ca1db6413f8 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -101,6 +101,7 @@ void mmc_unregister_host_class(void) */ void mmc_retune_enable(struct mmc_host *host) { + mmc_retune_clear(host); host->can_retune = 1; if (host->retune_period) mod_timer(&host->retune_timer,