Skip to contentSkip to conversation

Patch "mmc: core: Annotate cmd_hdr as __le32" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 26, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

mmc: core: Annotate cmd_hdr as __le32

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     mmc-core-annotate-cmd_hdr-as-__le32.patch

and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 3f2d26643595973e835e8356ea90c7c15cb1b0f1 Mon Sep 17 00:00:00 2001

From: Jiri Slaby <[email protected]>
Date: Mon, 3 Oct 2016 10:58:28 +0200
Subject: mmc: core: Annotate cmd_hdr as __le32

From: Jiri Slaby <[email protected]>

commit 3f2d26643595973e835e8356ea90c7c15cb1b0f1 upstream.

Commit f68381a70bb2 (mmc: block: fix packed command header endianness) correctly fixed endianness handling of packed_cmd_hdr in mmc_blk_packed_hdr_wrq_prep.

But now, sparse complains about incorrect types:
drivers/mmc/card/block.c:1613:27: sparse: incorrect type in assignment (different base types)
drivers/mmc/card/block.c:1613:27: expected unsigned int [unsigned] [usertype] <noident>
drivers/mmc/card/block.c:1613:27: got restricted __le32 [usertype] <noident>
...

So annotate cmd_hdr properly using __le32 to make everyone happy.

Fixes f68381a70bb2 (mmc: block: fix packed command header endianness)
---
 drivers/mmc/card/block.c |    2 +-
 drivers/mmc/card/queue.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/mmc/card/block.c +1 -1
@@ -1778,7 +1778,7 @@ static void mmc_blk_packed_hdr_wrq_prep(
 	struct mmc_blk_data *md = mq->data;
 	struct mmc_packed *packed = mqrq->packed;
 	bool do_rel_wr, do_data_tag;
-	u32 *packed_cmd_hdr;
+	__le32 *packed_cmd_hdr;
 	u8 hdr_blocks;
 	u8 i = 1;
 
drivers/mmc/card/queue.h +1 -1
@@ -31,7 +31,7 @@ enum mmc_packed_type {
 
 struct mmc_packed {
 	struct list_head	list;
-	u32			cmd_hdr[1024];
+	__le32			cmd_hdr[1024];
 	unsigned int		blocks;
 	u8			nr_entries;
 	u8			retries;

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/kvm-x86-memset-whole-irq_eoi.patch queue-4.8/mmc-core-annotate-cmd_hdr-as-__le32.patch