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;
IronPort-SDR: aYxpIhowG1XbSB/euvEb8Kafg5p8Wjt0qVtKifMhJPHTHnoMaVbMJQ680jsrsvG4os/Oq1H56k
 RNn1P9BVc2wNk+dmPUgI5gINlKjyuA3yowtW9h1upM9Sk+y2cLKPFltuuQLhgTTtdyRObxsSa/
 Wt6iDeecTndyuQXsmla5Ua/cUdAqRUSySW3fzk79pdm65+bo3qT08diPEdtemHyvF7lf3I3Ave
 Tk0r7OHir/jQZku/Vqnq1fDHQrntbQVdb345fPYgcxi/h6CX8maUsEtttD1ecHrjEEpsH6DNBf
 d08=
IronPort-SDR: IecnpIn2k6KA8AWHDHu/Ka5DEqVgpuQA2ERhpe+GPOdRcdW4Q5Mx1/2XExgdfUtATJskEaMuTi
 230GzaPnjFCAQ0skConiPU80m4s1XxnExD4t4ImiBRFq29kR6HuQ7Ga/SShNFTE21rA5ln8mRW
 4cyeic+OsRMreBQek0Uqm5/KUmJvWgHXOIwf8QEdoOkUcGkdEeN16Knhi6L1PQXdi3WfO8BkVA
 FQ5+6lmrCvU9SuAgrwIoHdsjk5V7PEZzib2V0YiVJwMgjCTs8oo9wMRiIsY5alhBIiDUdX8QeD
 q3j/KOfk5rQ783ZEJ0dIJ3UK
IronPort-SDR: TRRnLltwox+dfhV+wOdktE2ftlDZbKqzHBmGiFot0ld6cSFMOLeXleSadxaw5aNacmh/8kVVMn
 Prp6vudnIfZX+Epiis2+rg3DbRQG3fH97XJG29VfBhgXoTJ5umxnJFyUJk30Ez7cmTjNk8sPm2
 03GtXa4IKnFReps3jnSYNmcw0uqsPzDlA9Vf0qIO5S8TiEn9yie635iy4blQWQQQlQQLMm732w
 STR73OjgGVgWNDiaMZDE4YlWZ1kvUiCjkAcca9dWq8b/YApF40zGDzTeTiCNlPZtDY3vcmVhKc
 qOQ=
WDCIronportException: Internal
From:   Avri Altman <avri.altman@wdc.com>
To:     Ulf Hansson <ulf.hansson@linaro.org>, linux-mmc@vger.kernel.org,
        Adrian Hunter <adrian.hunter@intel.com>
Cc:     linux-kernel@vger.kernel.org, Avri Altman <avri.altman@wdc.com>,
        Brendan Peter <bpeter@lytx.com>
Subject: [PATCH v2 1/2] mmc: block: Issue flush only if allowed
Date:   Sun, 18 Apr 2021 08:59:52 +0300
Message-Id: <20210418055953.26959-2-avri.altman@wdc.com>
In-Reply-To: <20210418055953.26959-1-avri.altman@wdc.com>
References: <20210418055953.26959-1-avri.altman@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The cache may be flushed to the nonvolatile storage by writing to
FLUSH_CACHE byte (EXT_CSD byte [32]). When in command queueing mode, the
cache may be flushed by issuing a CMDQ_TASK_ DEV_MGMT (CMD48) with a
FLUSH_CACHE op-code.  Either way, verify that The cache function is
turned ON before doing so.

fixes: 1e8e55b67030 (mmc: block: Add CQE support)

Reported-by: Brendan Peter <bpeter@lytx.com>
Tested-by: Brendan Peter <bpeter@lytx.com>
Signed-off-by: Avri Altman <avri.altman@wdc.com>
---
 drivers/mmc/core/block.c   | 7 +++++++
 drivers/mmc/core/mmc_ops.c | 4 +---
 drivers/mmc/core/mmc_ops.h | 5 +++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index fe5892d30778..6800feb70c92 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1476,6 +1476,11 @@ static int mmc_blk_cqe_issue_flush(struct mmc_queue *mq, struct request *req)
 	struct mmc_queue_req *mqrq = req_to_mmc_queue_req(req);
 	struct mmc_request *mrq = mmc_blk_cqe_prep_dcmd(mqrq, req);
 
+	if (mmc_card_mmc(mq->card) && !mmc_flush_allowed(mq->card)) {
+		blk_mq_end_request(req, BLK_STS_OK);
+		return -EPERM;
+	}
+
 	mrq->cmd->opcode = MMC_SWITCH;
 	mrq->cmd->arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
 			(EXT_CSD_FLUSH_CACHE << 16) |
@@ -2226,6 +2231,8 @@ enum mmc_issued mmc_blk_mq_issue_rq(struct mmc_queue *mq, struct request *req)
 		switch (req_op(req)) {
 		case REQ_OP_FLUSH:
 			ret = mmc_blk_cqe_issue_flush(mq, req);
+			if (ret == -EPERM)
+				return MMC_REQ_FINISHED;
 			break;
 		case REQ_OP_READ:
 		case REQ_OP_WRITE:
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index f413474f0f80..9c2a665be034 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -967,9 +967,7 @@ int mmc_flush_cache(struct mmc_card *card)
 {
 	int err = 0;
 
-	if (mmc_card_mmc(card) &&
-			(card->ext_csd.cache_size > 0) &&
-			(card->ext_csd.cache_ctrl & 1)) {
+	if (mmc_card_mmc(card) && mmc_flush_allowed(card)) {
 		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
 				 EXT_CSD_FLUSH_CACHE, 1,
 				 MMC_CACHE_FLUSH_TIMEOUT_MS);
diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
index 632009260e51..bf2b315addd7 100644
--- a/drivers/mmc/core/mmc_ops.h
+++ b/drivers/mmc/core/mmc_ops.h
@@ -19,6 +19,11 @@ enum mmc_busy_cmd {
 struct mmc_host;
 struct mmc_card;
 
+static inline bool mmc_flush_allowed(struct mmc_card *card)
+{
+	return card->ext_csd.cache_size > 0 && (card->ext_csd.cache_ctrl & 1);
+}
+
 int mmc_select_card(struct mmc_card *card);
 int mmc_deselect_cards(struct mmc_host *host);
 int mmc_set_dsr(struct mmc_host *host);
-- 
2.25.1