|
|
@@ -1,45 +0,0 @@
|
|
|
-From 0e71cac033bb7689c4dfa2e6814191337ef770f5 Mon Sep 17 00:00:00 2001
|
|
|
-From: INAGAKI Hiroshi <[email protected]>
|
|
|
-Date: Thu, 13 Oct 2022 00:51:33 +0900
|
|
|
-Subject: [PATCH] nvmem: layouts: u-boot-env: align endianness of crc32 values
|
|
|
-MIME-Version: 1.0
|
|
|
-Content-Type: text/plain; charset=UTF-8
|
|
|
-Content-Transfer-Encoding: 8bit
|
|
|
-
|
|
|
-This patch fixes crc32 error on Big-Endianness system by conversion of
|
|
|
-calculated crc32 value.
|
|
|
-
|
|
|
-Little-Endianness system:
|
|
|
-
|
|
|
- obtained crc32: Little
|
|
|
-calculated crc32: Little
|
|
|
-
|
|
|
-Big-Endianness system:
|
|
|
-
|
|
|
- obtained crc32: Little
|
|
|
-calculated crc32: Big
|
|
|
-
|
|
|
-log (APRESIA ApresiaLightGS120GT-SS, RTL8382M, Big-Endianness):
|
|
|
-
|
|
|
-[ 8.570000] u_boot_env 18001200.spi:flash@0:partitions:partition@c0000: Invalid calculated CRC32: 0x88cd6f09 (expected: 0x096fcd88)
|
|
|
-[ 8.580000] u_boot_env: probe of 18001200.spi:flash@0:partitions:partition@c0000 failed with error -22
|
|
|
-
|
|
|
-Fixes: f955dc1445069 ("nvmem: add driver handling U-Boot environment variables")
|
|
|
-
|
|
|
-Signed-off-by: INAGAKI Hiroshi <[email protected]>
|
|
|
-Acked-by: Rafał Miłecki <[email protected]>
|
|
|
-Tested-by: Christian Lamparter <[email protected]>
|
|
|
-Signed-off-by: Srinivas Kandagatla <[email protected]>
|
|
|
----
|
|
|
-
|
|
|
---- a/drivers/nvmem/layouts/u-boot-env.c
|
|
|
-+++ b/drivers/nvmem/layouts/u-boot-env.c
|
|
|
-@@ -148,7 +148,7 @@ int u_boot_env_parse(struct device *dev,
|
|
|
- crc32_data_len = dev_size - crc32_data_offset;
|
|
|
- data_len = dev_size - data_offset;
|
|
|
-
|
|
|
-- calc = crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L;
|
|
|
-+ calc = le32_to_cpu((__le32)crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L);
|
|
|
- if (calc != crc32) {
|
|
|
- dev_err(dev, "Invalid calculated CRC32: 0x%08x (expected: 0x%08x)\n", calc, crc32);
|
|
|
- err = -EINVAL;
|