Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/mtd-rawnand-omap_elm-fix-incorrect-type-in-assignmen.patch b/queue-4.14/mtd-rawnand-omap_elm-fix-incorrect-type-in-assignmen.patch
new file mode 100644 (file)
index 0000000..cfae405
--- /dev/null
+++ b/queue-4.14/mtd-rawnand-omap_elm-fix-incorrect-type-in-assignmen.patch
@@ -0,0 +1,120 @@
+From 5f2a1fe9caa30d01dafba82353daaf861c7ba74a Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Sun, 25 Jun 2023 00:10:21 +0530
+Subject: mtd: rawnand: omap_elm: Fix incorrect type in assignment
+
+From: Roger Quadros <rogerq@kernel.org>
+
+[ Upstream commit d8403b9eeee66d5dd81ecb9445800b108c267ce3 ]
+
+Once the ECC word endianness is converted to BE32, we force cast it
+to u32 so we can use elm_write_reg() which in turn uses writel().
+
+Fixes below sparse warnings:
+
+   drivers/mtd/nand/raw/omap_elm.c:180:37: sparse:     expected unsigned int [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:180:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:185:37: sparse:     expected unsigned int [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:185:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:190:37: sparse:     expected unsigned int [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:190:37: sparse:     got restricted __be32 [usertype]
+>> drivers/mtd/nand/raw/omap_elm.c:200:40: sparse: sparse: restricted __be32 degrades to integer
+   drivers/mtd/nand/raw/omap_elm.c:206:39: sparse: sparse: restricted __be32 degrades to integer
+   drivers/mtd/nand/raw/omap_elm.c:210:37: sparse:     expected unsigned int [assigned] [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:210:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:213:37: sparse:     expected unsigned int [assigned] [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:213:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:216:37: sparse:     expected unsigned int [assigned] [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:216:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:219:37: sparse:     expected unsigned int [assigned] [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:219:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:222:37: sparse:     expected unsigned int [assigned] [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:222:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:225:37: sparse:     expected unsigned int [assigned] [usertype] val
+   drivers/mtd/nand/raw/omap_elm.c:225:37: sparse:     got restricted __be32 [usertype]
+   drivers/mtd/nand/raw/omap_elm.c:228:39: sparse: sparse: restricted __be32 degrades to integer
+
+Fixes: bf22433575ef ("mtd: devices: elm: Add support for ELM error correction")
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202306212211.WDXokuWh-lkp@intel.com/
+Signed-off-by: Roger Quadros <rogerq@kernel.org>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20230624184021.7740-1-rogerq@kernel.org
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/mtd/nand/omap_elm.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/mtd/nand/omap_elm.c b/drivers/mtd/nand/omap_elm.c
+index 6736777a41567..02d1740383120 100644
+--- a/drivers/mtd/nand/omap_elm.c
++++ b/drivers/mtd/nand/omap_elm.c
+@@ -184,17 +184,17 @@ static void elm_load_syndrome(struct elm_info *info,
+                       switch (info->bch_type) {
+                       case BCH8_ECC:
+                               /* syndrome fragment 0 = ecc[9-12B] */
+-                              val = cpu_to_be32(*(u32 *) &ecc[9]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[9]);
+                               elm_write_reg(info, offset, val);
+ 
+                               /* syndrome fragment 1 = ecc[5-8B] */
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[5]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[5]);
+                               elm_write_reg(info, offset, val);
+ 
+                               /* syndrome fragment 2 = ecc[1-4B] */
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[1]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[1]);
+                               elm_write_reg(info, offset, val);
+ 
+                               /* syndrome fragment 3 = ecc[0B] */
+@@ -204,35 +204,35 @@ static void elm_load_syndrome(struct elm_info *info,
+                               break;
+                       case BCH4_ECC:
+                               /* syndrome fragment 0 = ecc[20-52b] bits */
+-                              val = (cpu_to_be32(*(u32 *) &ecc[3]) >> 4) |
++                              val = ((__force u32)cpu_to_be32(*(u32 *)&ecc[3]) >> 4) |
+                                       ((ecc[2] & 0xf) << 28);
+                               elm_write_reg(info, offset, val);
+ 
+                               /* syndrome fragment 1 = ecc[0-20b] bits */
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[0]) >> 12;
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[0]) >> 12;
+                               elm_write_reg(info, offset, val);
+                               break;
+                       case BCH16_ECC:
+-                              val = cpu_to_be32(*(u32 *) &ecc[22]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[22]);
+                               elm_write_reg(info, offset, val);
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[18]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[18]);
+                               elm_write_reg(info, offset, val);
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[14]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[14]);
+                               elm_write_reg(info, offset, val);
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[10]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[10]);
+                               elm_write_reg(info, offset, val);
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[6]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[6]);
+                               elm_write_reg(info, offset, val);
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[2]);
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[2]);
+                               elm_write_reg(info, offset, val);
+                               offset += 4;
+-                              val = cpu_to_be32(*(u32 *) &ecc[0]) >> 16;
++                              val = (__force u32)cpu_to_be32(*(u32 *)&ecc[0]) >> 16;
+                               elm_write_reg(info, offset, val);
+                               break;
+                       default:
+-- 
+2.40.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 26e02f40433fdcbd3b0238647ce8cc5a60c0307f..a17e8cdd64caafee97d18db1e042237f08e58ed4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -201,3 +201,4 @@ bluetooth-l2cap-fix-use-after-free-in-l2cap_sock_ready_cb.patch
 net-usbnet-fix-warning-in-usbnet_start_xmit-usb_submit_urb.patch
 ext2-drop-fragment-support.patch
 test_firmware-fix-a-memory-leak-with-reqs-buffer.patch
+mtd-rawnand-omap_elm-fix-incorrect-type-in-assignmen.patch