Skip to content

Commit d29e5fa

Browse files
takondragregkh
authored andcommitted
mmc: block: fix packed command header endianness
commit f68381a70bb2b26c31b13fdaf67c778f92fd32b4 upstream. The code that fills packed command header assumes that CPU runs in little-endian mode. Hence the header is malformed in big-endian mode and causes MMC data transfer errors: [ 563.200828] mmcblk0: error -110 transferring data, sector 2048, nr 8, cmd response 0x900, card status 0xc40 [ 563.219647] mmcblk0: packed cmd failed, nr 2, sectors 16, failure index: -1 Convert header data to LE. Signed-off-by: Taras Kondratiuk <takondra@cisco.com> Fixes: ce39f9d ("mmc: support packed write command for eMMC4.5 devices") Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5161144 commit d29e5fa

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/mmc/card/block.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1767,8 +1767,8 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
17671767

17681768
packed_cmd_hdr = packed->cmd_hdr;
17691769
memset(packed_cmd_hdr, 0, sizeof(packed->cmd_hdr));
1770-
packed_cmd_hdr[0] = (packed->nr_entries << 16) |
1771-
(PACKED_CMD_WR << 8) | PACKED_CMD_VER;
1770+
packed_cmd_hdr[0] = cpu_to_le32((packed->nr_entries << 16) |
1771+
(PACKED_CMD_WR << 8) | PACKED_CMD_VER);
17721772
hdr_blocks = mmc_large_sector(card) ? 8 : 1;
17731773

17741774
/*
@@ -1782,14 +1782,14 @@ static void mmc_blk_packed_hdr_wrq_prep(struct mmc_queue_req *mqrq,
17821782
((brq->data.blocks * brq->data.blksz) >=
17831783
card->ext_csd.data_tag_unit_size);
17841784
/* Argument of CMD23 */
1785-
packed_cmd_hdr[(i * 2)] =
1785+
packed_cmd_hdr[(i * 2)] = cpu_to_le32(
17861786
(do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) |
17871787
(do_data_tag ? MMC_CMD23_ARG_TAG_REQ : 0) |
1788-
blk_rq_sectors(prq);
1788+
blk_rq_sectors(prq));
17891789
/* Argument of CMD18 or CMD25 */
1790-
packed_cmd_hdr[((i * 2)) + 1] =
1790+
packed_cmd_hdr[((i * 2)) + 1] = cpu_to_le32(
17911791
mmc_card_blockaddr(card) ?
1792-
blk_rq_pos(prq) : blk_rq_pos(prq) << 9;
1792+
blk_rq_pos(prq) : blk_rq_pos(prq) << 9);
17931793
packed->blocks += blk_rq_sectors(prq);
17941794
i++;
17951795
}

0 commit comments

Comments
 (0)