Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mmc: block: fix packed command header endianness

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: ce39f9d17c14 ("mmc: support packed write command for eMMC4.5 devices")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

authored by

Taras Kondratiuk and committed by
Ulf Hansson
f68381a7 bfe5b1b1

+6 -6
+6 -6
drivers/mmc/card/block.c
··· 1788 1788 1789 1789 packed_cmd_hdr = packed->cmd_hdr; 1790 1790 memset(packed_cmd_hdr, 0, sizeof(packed->cmd_hdr)); 1791 - packed_cmd_hdr[0] = (packed->nr_entries << 16) | 1792 - (PACKED_CMD_WR << 8) | PACKED_CMD_VER; 1791 + packed_cmd_hdr[0] = cpu_to_le32((packed->nr_entries << 16) | 1792 + (PACKED_CMD_WR << 8) | PACKED_CMD_VER); 1793 1793 hdr_blocks = mmc_large_sector(card) ? 8 : 1; 1794 1794 1795 1795 /* ··· 1803 1803 ((brq->data.blocks * brq->data.blksz) >= 1804 1804 card->ext_csd.data_tag_unit_size); 1805 1805 /* Argument of CMD23 */ 1806 - packed_cmd_hdr[(i * 2)] = 1806 + packed_cmd_hdr[(i * 2)] = cpu_to_le32( 1807 1807 (do_rel_wr ? MMC_CMD23_ARG_REL_WR : 0) | 1808 1808 (do_data_tag ? MMC_CMD23_ARG_TAG_REQ : 0) | 1809 - blk_rq_sectors(prq); 1809 + blk_rq_sectors(prq)); 1810 1810 /* Argument of CMD18 or CMD25 */ 1811 - packed_cmd_hdr[((i * 2)) + 1] = 1811 + packed_cmd_hdr[((i * 2)) + 1] = cpu_to_le32( 1812 1812 mmc_card_blockaddr(card) ? 1813 - blk_rq_pos(prq) : blk_rq_pos(prq) << 9; 1813 + blk_rq_pos(prq) : blk_rq_pos(prq) << 9); 1814 1814 packed->blocks += blk_rq_sectors(prq); 1815 1815 i++; 1816 1816 }