Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2503645pxj; Mon, 10 May 2021 04:42:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyV7GvK6+b51mIE2qxOM7iEgs9uyz42IS01sq9Yi76fiBfI3SDF+a7t8qzTjtROR19ZBm97 X-Received: by 2002:a05:6402:5111:: with SMTP id m17mr29223192edd.343.1620646945636; Mon, 10 May 2021 04:42:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620646945; cv=none; d=google.com; s=arc-20160816; b=Du1K3PHLWqJhUtZeZNspFnDHQtChQaCBBKuBgV+ra768DhJa4iLLDBZKHg7gyFuaU2 T3eWYrQAu8eJDloiue6JJVNNuoHDVSPc07sDNwnt5tortUNRCwTj56BWSU0I7fWqcDMe UjuR0vvkngb7aFni6Wbe6s6XP7Q7jr3iSIf+TR0DRluc6/Pk/Fz97E9+wpWv3sx+u46Y 2flJDWKFUykpEiV77BdIYxv7It7zGJqFCKQlwNpRtbCF1EefYKCw5xI5Vzwk+UeHmEs6 AVvUOrENKdGq9P1lvvr015ft8wRIo+N7km76pBRVhjG65QsWoHadqIKEsMLxhfoQES5c w5cQ== 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=wbPC1ijkaxzSgOu/tb/rk11mUAgcuxB5uMkrosQu7wo=; b=SlHfK3SVDBtShLXphrA677/EtEVA8h15SgjJ4X3A+NR/ol7grct79/wds49xtiB7HQ hTli4qge7qM4ba9LCRU4Qef6O1dioGzdJ8mY2XptxPJThIUgHQbXjVQ1DkrJKDhP7P7N 0pOMSXzwoZPz2zjS2oiDA/AJfIhNlTj/rwGtLhPEvTNv7Tw42O/cA0e31kXGXfms10id 93iuem1kJ8SPthE7zdeBJDfOtfQ//hX9wbZnIoY5+AzvwD+79umduv4JYDscihqwNSUe nRtLbni5w987AULTUZaMbEFoY37nNR+4iuWG1THa/b7EaSYzpQHyYdmJb9GJqMD6Xygh lTKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="LZ/9W0vh"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ka15si4151104ejc.148.2021.05.10.04.42.01; Mon, 10 May 2021 04:42:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="LZ/9W0vh"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241570AbhEJLiV (ORCPT + 99 others); Mon, 10 May 2021 07:38:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:52714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234291AbhEJK4I (ORCPT ); Mon, 10 May 2021 06:56:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C38C161981; Mon, 10 May 2021 10:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643511; bh=ETJoj2j80oumrwPwA11tzNIIEASKJKrk3A+O9Q4qKDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZ/9W0vhTKPbQ4Aln8TvXFOonHLRLEIXq2NdtVq54yrvivgr7I1lIp1g31enkANRq 63X5HKxujGvuzdyRAU6hOLy2uML9Vr6eF0GfVCRSEMak2gY6lsuWJyAcwE37Y+tjE8 7zljKm5KyFmtjke4X+bOdFh/8Zw2YGiPwYMD/5B0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Brendan Peter , Avri Altman , Adrian Hunter , Ulf Hansson Subject: [PATCH 5.11 044/342] mmc: block: Issue a cache flush only when its enabled Date: Mon, 10 May 2021 12:17:14 +0200 Message-Id: <20210510102011.575223665@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Avri Altman commit 97fce126e279690105ee15be652b465fd96f9997 upstream. In command queueing mode, the cache isn't flushed via the mmc_flush_cache() function, but instead by issuing a CMDQ_TASK_MGMT (CMD48) with a FLUSH_CACHE opcode. In this path, we need to check if cache has been enabled, before deciding to flush the cache, along the lines of what's being done in mmc_flush_cache(). To fix this problem, let's add a new bus ops callback ->cache_enabled() and implement it for the mmc bus type. In this way, the mmc block device driver can call it to know whether cache flushing should be done. Fixes: 1e8e55b67030 (mmc: block: Add CQE support) Cc: stable@vger.kernel.org Reported-by: Brendan Peter Signed-off-by: Avri Altman Tested-by: Brendan Peter Acked-by: Adrian Hunter Link: https://lore.kernel.org/r/20210425060207.2591-2-avri.altman@wdc.com Link: https://lore.kernel.org/r/20210425060207.2591-3-avri.altman@wdc.com [Ulf: Squashed the two patches and made some minor updates] Signed-off-by: Ulf Hansson Signed-off-by: Greg Kroah-Hartman --- drivers/mmc/core/block.c | 4 ++++ drivers/mmc/core/core.h | 9 +++++++++ drivers/mmc/core/mmc.c | 7 +++++++ drivers/mmc/core/mmc_ops.c | 4 +--- 4 files changed, 21 insertions(+), 3 deletions(-) --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -2233,6 +2233,10 @@ enum mmc_issued mmc_blk_mq_issue_rq(stru case MMC_ISSUE_ASYNC: switch (req_op(req)) { case REQ_OP_FLUSH: + if (!mmc_cache_enabled(host)) { + blk_mq_end_request(req, BLK_STS_OK); + return MMC_REQ_FINISHED; + } ret = mmc_blk_cqe_issue_flush(mq, req); break; case REQ_OP_READ: --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -29,6 +29,7 @@ struct mmc_bus_ops { int (*shutdown)(struct mmc_host *); int (*hw_reset)(struct mmc_host *); int (*sw_reset)(struct mmc_host *); + bool (*cache_enabled)(struct mmc_host *); }; void mmc_attach_bus(struct mmc_host *host, const struct mmc_bus_ops *ops); @@ -171,4 +172,12 @@ static inline void mmc_post_req(struct m host->ops->post_req(host, mrq, err); } +static inline bool mmc_cache_enabled(struct mmc_host *host) +{ + if (host->bus_ops->cache_enabled) + return host->bus_ops->cache_enabled(host); + + return false; +} + #endif --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2033,6 +2033,12 @@ static void mmc_detect(struct mmc_host * } } +static bool _mmc_cache_enabled(struct mmc_host *host) +{ + return host->card->ext_csd.cache_size > 0 && + host->card->ext_csd.cache_ctrl & 1; +} + static int _mmc_suspend(struct mmc_host *host, bool is_suspend) { int err = 0; @@ -2212,6 +2218,7 @@ static const struct mmc_bus_ops mmc_ops .alive = mmc_alive, .shutdown = mmc_shutdown, .hw_reset = _mmc_hw_reset, + .cache_enabled = _mmc_cache_enabled, }; /* --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -988,9 +988,7 @@ int mmc_flush_cache(struct mmc_card *car { int err = 0; - if (mmc_card_mmc(card) && - (card->ext_csd.cache_size > 0) && - (card->ext_csd.cache_ctrl & 1)) { + if (mmc_cache_enabled(card->host)) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_FLUSH_CACHE, 1, MMC_CACHE_FLUSH_TIMEOUT_MS);