[4.4,7/9] mmc: block: Fix tag condition with packed writes

Message ID	20191122105113.11213-7-lee.jones@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: Lee Jones <lee.jones@linaro.org> To: lee.jones@linaro.org, gregkh@google.com, stable@vger.kernel.org Subject: [PATCH 4.4 7/9] mmc: block: Fix tag condition with packed writes Date: Fri, 22 Nov 2019 10:51:11 +0000 Message-Id: <20191122105113.11213-7-lee.jones@linaro.org> In-Reply-To: <20191122105113.11213-1-lee.jones@linaro.org> References: <20191122105113.11213-1-lee.jones@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	[4.4,1/9] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary \| expand [4.4,1/9] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary [4.4,2/9] can: dev: can_dellink(): remove return at end of void function [4.4,3/9] arm64: fix for bad_mode() handler to always result in panic [4.4,4/9] cpufreq: Skip cpufreq resume if it's not suspended [4.4,5/9] bcache: silence static checker warning [4.4,6/9] dm: use blk_set_queue_dying() in __dm_destroy() [4.4,7/9] mmc: block: Fix tag condition with packed writes [4.4,8/9] ocfs2: remove ocfs2_is_o2cb_active() [4.4,9/9] ext4: avoid unnecessary stalls in ext4_evict_inode()

Message ID

20191122105113.11213-7-lee.jones@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	stable-owner@vger.kernel.org designates 209.132.180.67 as
	permitted sender) client-ip=209.132.180.67; 
From: Lee Jones <lee.jones@linaro.org>
To: lee.jones@linaro.org, gregkh@google.com, stable@vger.kernel.org
Subject: [PATCH 4.4 7/9] mmc: block: Fix tag condition with packed writes
Date: Fri, 22 Nov 2019 10:51:11 +0000
Message-Id: <20191122105113.11213-7-lee.jones@linaro.org>
In-Reply-To: <20191122105113.11213-1-lee.jones@linaro.org>
References: <20191122105113.11213-1-lee.jones@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: stable-owner@vger.kernel.org
Precedence: bulk

Series

[4.4,1/9] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary | expand

Commit Message

Lee Jones Nov. 22, 2019, 10:51 a.m. UTC

From: Adrian Hunter <adrian.hunter@intel.com>


[ Upstream commit d806b46e5f496a6335ebd7f8432d2533507ce9a2 ]

Apparently a cut-and-paste error, 'do_data_tag' is using 'brq' for data
size even though 'brq' has not been set up. Instead use blk_rq_sectors().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

---
 drivers/mmc/card/block.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

-- 
2.24.0

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index f600bdcaf5b4..07592e428755 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1772,8 +1772,7 @@  static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
 		do_data_tag = (card->ext_csd.data_tag_unit_size) &&
 			(prq->cmd_flags & REQ_META) &&
 			(rq_data_dir(prq) == WRITE) &&
-			((brq->data.blocks * brq->data.blksz) >=
-			 card->ext_csd.data_tag_unit_size);
+			blk_rq_bytes(prq) >= card->ext_csd.data_tag_unit_size;
 		/* Argument of CMD23 */
 		packed_cmd_hdr[(i * 2)] = cpu_to_le32(
 			(do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) |

[4.4,7/9] mmc: block: Fix tag condition with packed writes

Commit Message

Patch