kernel: update U-Boot nvmem driver to v6.2 release version
Backport queued patches that 1. Fix CRC32 calculation for redundant images 2. Fix CRC32 on big-endian 3. Fix parting images with Broadcom header Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
parent
2403428c75
commit
797177ad85
|
|
@ -0,0 +1,56 @@
|
|||
From 7a69ff9c9bde03a690ea783970f664782fc303d8 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Lamparter <chunkeey@gmail.com>
|
||||
Date: Fri, 4 Nov 2022 17:52:03 +0100
|
||||
Subject: [PATCH] nvmem: u-boot-env: fix crc32_data_offset on redundant
|
||||
u-boot-env
|
||||
|
||||
The Western Digital MyBook Live (PowerPC 464/APM82181)
|
||||
has a set of redundant u-boot-env. Loading up the driver
|
||||
the following error:
|
||||
|
||||
| u_boot_env: Invalid calculated CRC32: 0x4f8f2c86 (expected: 0x98b14514)
|
||||
| u_boot_env: probe of partition@1e000 failed with error -22
|
||||
|
||||
Looking up the userspace libubootenv utilities source [0],
|
||||
it looks like the "mark" or "flag" is not part of the
|
||||
crc32 sum... which is unfortunate :(
|
||||
|
||||
|static int libuboot_load(struct uboot_ctx *ctx)
|
||||
|{
|
||||
|[...]
|
||||
| if (ctx->redundant) {
|
||||
| [...]
|
||||
| offsetdata = offsetof(struct uboot_env_redund, data);
|
||||
| [...] //-----^^
|
||||
| }
|
||||
| usable_envsize = ctx->size - offsetdata;
|
||||
| buf[0] = malloc(bufsize);
|
||||
|[...]
|
||||
| for (i = 0; i < copies; i++) {
|
||||
| data = (uint8_t *)(buf[i] + offsetdata);
|
||||
| uint32_t crc;
|
||||
|
|
||||
| ret = devread(ctx, i, buf[i]);
|
||||
| [...]
|
||||
| crc = *(uint32_t *)(buf[i] + offsetcrc);
|
||||
| dev->crc = crc32(0, (uint8_t *)data, usable_envsize);
|
||||
|
|
||||
|
||||
[0] https://github.com/sbabic/libubootenv/blob/master/src/uboot_env.c#L951
|
||||
Fixes: d5542923f200 ("nvmem: add driver handling U-Boot environment variables")
|
||||
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
---
|
||||
drivers/nvmem/u-boot-env.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/u-boot-env.c
|
||||
+++ b/drivers/nvmem/u-boot-env.c
|
||||
@@ -135,7 +135,7 @@ static int u_boot_env_parse(struct u_boo
|
||||
break;
|
||||
case U_BOOT_FORMAT_REDUNDANT:
|
||||
crc32_offset = offsetof(struct u_boot_env_image_redundant, crc32);
|
||||
- crc32_data_offset = offsetof(struct u_boot_env_image_redundant, mark);
|
||||
+ crc32_data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
break;
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From 0e71cac033bb7689c4dfa2e6814191337ef770f5 Mon Sep 17 00:00:00 2001
|
||||
From: INAGAKI Hiroshi <musashino.open@gmail.com>
|
||||
Date: Thu, 13 Oct 2022 00:51:33 +0900
|
||||
Subject: [PATCH] nvmem: 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 <musashino.open@gmail.com>
|
||||
Acked-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Tested-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
---
|
||||
drivers/nvmem/u-boot-env.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/u-boot-env.c
|
||||
+++ b/drivers/nvmem/u-boot-env.c
|
||||
@@ -143,7 +143,7 @@ static int u_boot_env_parse(struct u_boo
|
||||
crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||
data_len = priv->mtd->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;
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
From 5b4eaafbeac472fc19049152f18e88aecb2b2829 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 17 Oct 2022 09:17:22 +0200
|
||||
Subject: [PATCH] nvmem: u-boot-env: add Broadcom format support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Broadcom uses U-Boot for a lot of their bcmbca familiy chipsets. They
|
||||
decided to store U-Boot environment data inside U-Boot partition and to
|
||||
use a custom header (with "uEnv" magic and env data length).
|
||||
|
||||
Add support for Broadcom's specific binding and their custom format.
|
||||
|
||||
Ref: 6b0584c19d87 ("dt-bindings: nvmem: u-boot,env: add Broadcom's variant binding")
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
---
|
||||
drivers/nvmem/u-boot-env.c | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
--- a/drivers/nvmem/u-boot-env.c
|
||||
+++ b/drivers/nvmem/u-boot-env.c
|
||||
@@ -16,6 +16,7 @@
|
||||
enum u_boot_env_format {
|
||||
U_BOOT_FORMAT_SINGLE,
|
||||
U_BOOT_FORMAT_REDUNDANT,
|
||||
+ U_BOOT_FORMAT_BROADCOM,
|
||||
};
|
||||
|
||||
struct u_boot_env {
|
||||
@@ -40,6 +41,13 @@ struct u_boot_env_image_redundant {
|
||||
uint8_t data[];
|
||||
} __packed;
|
||||
|
||||
+struct u_boot_env_image_broadcom {
|
||||
+ __le32 magic;
|
||||
+ __le32 len;
|
||||
+ __le32 crc32;
|
||||
+ uint8_t data[0];
|
||||
+} __packed;
|
||||
+
|
||||
static int u_boot_env_read(void *context, unsigned int offset, void *val,
|
||||
size_t bytes)
|
||||
{
|
||||
@@ -138,6 +146,11 @@ static int u_boot_env_parse(struct u_boo
|
||||
crc32_data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
break;
|
||||
+ case U_BOOT_FORMAT_BROADCOM:
|
||||
+ crc32_offset = offsetof(struct u_boot_env_image_broadcom, crc32);
|
||||
+ crc32_data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
||||
+ data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
||||
+ break;
|
||||
}
|
||||
crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
||||
crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||
@@ -202,6 +215,7 @@ static const struct of_device_id u_boot_
|
||||
{ .compatible = "u-boot,env", .data = (void *)U_BOOT_FORMAT_SINGLE, },
|
||||
{ .compatible = "u-boot,env-redundant-bool", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||
{ .compatible = "u-boot,env-redundant-count", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||
+ { .compatible = "brcm,env", .data = (void *)U_BOOT_FORMAT_BROADCOM, },
|
||||
{},
|
||||
};
|
||||
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
From 7a69ff9c9bde03a690ea783970f664782fc303d8 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Lamparter <chunkeey@gmail.com>
|
||||
Date: Fri, 4 Nov 2022 17:52:03 +0100
|
||||
Subject: [PATCH] nvmem: u-boot-env: fix crc32_data_offset on redundant
|
||||
u-boot-env
|
||||
|
||||
The Western Digital MyBook Live (PowerPC 464/APM82181)
|
||||
has a set of redundant u-boot-env. Loading up the driver
|
||||
the following error:
|
||||
|
||||
| u_boot_env: Invalid calculated CRC32: 0x4f8f2c86 (expected: 0x98b14514)
|
||||
| u_boot_env: probe of partition@1e000 failed with error -22
|
||||
|
||||
Looking up the userspace libubootenv utilities source [0],
|
||||
it looks like the "mark" or "flag" is not part of the
|
||||
crc32 sum... which is unfortunate :(
|
||||
|
||||
|static int libuboot_load(struct uboot_ctx *ctx)
|
||||
|{
|
||||
|[...]
|
||||
| if (ctx->redundant) {
|
||||
| [...]
|
||||
| offsetdata = offsetof(struct uboot_env_redund, data);
|
||||
| [...] //-----^^
|
||||
| }
|
||||
| usable_envsize = ctx->size - offsetdata;
|
||||
| buf[0] = malloc(bufsize);
|
||||
|[...]
|
||||
| for (i = 0; i < copies; i++) {
|
||||
| data = (uint8_t *)(buf[i] + offsetdata);
|
||||
| uint32_t crc;
|
||||
|
|
||||
| ret = devread(ctx, i, buf[i]);
|
||||
| [...]
|
||||
| crc = *(uint32_t *)(buf[i] + offsetcrc);
|
||||
| dev->crc = crc32(0, (uint8_t *)data, usable_envsize);
|
||||
|
|
||||
|
||||
[0] https://github.com/sbabic/libubootenv/blob/master/src/uboot_env.c#L951
|
||||
Fixes: d5542923f200 ("nvmem: add driver handling U-Boot environment variables")
|
||||
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
---
|
||||
drivers/nvmem/u-boot-env.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/u-boot-env.c
|
||||
+++ b/drivers/nvmem/u-boot-env.c
|
||||
@@ -135,7 +135,7 @@ static int u_boot_env_parse(struct u_boo
|
||||
break;
|
||||
case U_BOOT_FORMAT_REDUNDANT:
|
||||
crc32_offset = offsetof(struct u_boot_env_image_redundant, crc32);
|
||||
- crc32_data_offset = offsetof(struct u_boot_env_image_redundant, mark);
|
||||
+ crc32_data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
break;
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From 0e71cac033bb7689c4dfa2e6814191337ef770f5 Mon Sep 17 00:00:00 2001
|
||||
From: INAGAKI Hiroshi <musashino.open@gmail.com>
|
||||
Date: Thu, 13 Oct 2022 00:51:33 +0900
|
||||
Subject: [PATCH] nvmem: 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 <musashino.open@gmail.com>
|
||||
Acked-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Tested-by: Christian Lamparter <chunkeey@gmail.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
---
|
||||
drivers/nvmem/u-boot-env.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/u-boot-env.c
|
||||
+++ b/drivers/nvmem/u-boot-env.c
|
||||
@@ -143,7 +143,7 @@ static int u_boot_env_parse(struct u_boo
|
||||
crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||
data_len = priv->mtd->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;
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
From 5b4eaafbeac472fc19049152f18e88aecb2b2829 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 17 Oct 2022 09:17:22 +0200
|
||||
Subject: [PATCH] nvmem: u-boot-env: add Broadcom format support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Broadcom uses U-Boot for a lot of their bcmbca familiy chipsets. They
|
||||
decided to store U-Boot environment data inside U-Boot partition and to
|
||||
use a custom header (with "uEnv" magic and env data length).
|
||||
|
||||
Add support for Broadcom's specific binding and their custom format.
|
||||
|
||||
Ref: 6b0584c19d87 ("dt-bindings: nvmem: u-boot,env: add Broadcom's variant binding")
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
---
|
||||
drivers/nvmem/u-boot-env.c | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
--- a/drivers/nvmem/u-boot-env.c
|
||||
+++ b/drivers/nvmem/u-boot-env.c
|
||||
@@ -16,6 +16,7 @@
|
||||
enum u_boot_env_format {
|
||||
U_BOOT_FORMAT_SINGLE,
|
||||
U_BOOT_FORMAT_REDUNDANT,
|
||||
+ U_BOOT_FORMAT_BROADCOM,
|
||||
};
|
||||
|
||||
struct u_boot_env {
|
||||
@@ -40,6 +41,13 @@ struct u_boot_env_image_redundant {
|
||||
uint8_t data[];
|
||||
} __packed;
|
||||
|
||||
+struct u_boot_env_image_broadcom {
|
||||
+ __le32 magic;
|
||||
+ __le32 len;
|
||||
+ __le32 crc32;
|
||||
+ uint8_t data[0];
|
||||
+} __packed;
|
||||
+
|
||||
static int u_boot_env_read(void *context, unsigned int offset, void *val,
|
||||
size_t bytes)
|
||||
{
|
||||
@@ -138,6 +146,11 @@ static int u_boot_env_parse(struct u_boo
|
||||
crc32_data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
data_offset = offsetof(struct u_boot_env_image_redundant, data);
|
||||
break;
|
||||
+ case U_BOOT_FORMAT_BROADCOM:
|
||||
+ crc32_offset = offsetof(struct u_boot_env_image_broadcom, crc32);
|
||||
+ crc32_data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
||||
+ data_offset = offsetof(struct u_boot_env_image_broadcom, data);
|
||||
+ break;
|
||||
}
|
||||
crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
||||
crc32_data_len = priv->mtd->size - crc32_data_offset;
|
||||
@@ -202,6 +215,7 @@ static const struct of_device_id u_boot_
|
||||
{ .compatible = "u-boot,env", .data = (void *)U_BOOT_FORMAT_SINGLE, },
|
||||
{ .compatible = "u-boot,env-redundant-bool", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||
{ .compatible = "u-boot,env-redundant-count", .data = (void *)U_BOOT_FORMAT_REDUNDANT, },
|
||||
+ { .compatible = "brcm,env", .data = (void *)U_BOOT_FORMAT_BROADCOM, },
|
||||
{},
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue