mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From a832556d23c5a11115f300011a5874d6107a0d62 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 21 Dec 2023 18:34:19 +0100
|
|
Subject: [PATCH] nvmem: u-boot-env: use nvmem device helpers
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Use nvmem_dev_size() and nvmem_device_read() to make this driver less
|
|
mtd dependent.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
|
Link: https://lore.kernel.org/r/20231221173421.13737-4-zajec5@gmail.com
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/u-boot-env.c | 23 +++++++++++++++--------
|
|
1 file changed, 15 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/nvmem/u-boot-env.c
|
|
+++ b/drivers/nvmem/u-boot-env.c
|
|
@@ -127,27 +127,34 @@ static int u_boot_env_add_cells(struct u
|
|
|
|
static int u_boot_env_parse(struct u_boot_env *priv)
|
|
{
|
|
+ struct nvmem_device *nvmem = priv->nvmem;
|
|
struct device *dev = priv->dev;
|
|
size_t crc32_data_offset;
|
|
size_t crc32_data_len;
|
|
size_t crc32_offset;
|
|
size_t data_offset;
|
|
size_t data_len;
|
|
+ size_t dev_size;
|
|
uint32_t crc32;
|
|
uint32_t calc;
|
|
- size_t bytes;
|
|
uint8_t *buf;
|
|
+ int bytes;
|
|
int err;
|
|
|
|
- buf = kcalloc(1, priv->mtd->size, GFP_KERNEL);
|
|
+ dev_size = nvmem_dev_size(nvmem);
|
|
+
|
|
+ buf = kcalloc(1, dev_size, GFP_KERNEL);
|
|
if (!buf) {
|
|
err = -ENOMEM;
|
|
goto err_out;
|
|
}
|
|
|
|
- err = mtd_read(priv->mtd, 0, priv->mtd->size, &bytes, buf);
|
|
- if ((err && !mtd_is_bitflip(err)) || bytes != priv->mtd->size) {
|
|
- dev_err(dev, "Failed to read from mtd: %d\n", err);
|
|
+ bytes = nvmem_device_read(nvmem, 0, dev_size, buf);
|
|
+ if (bytes < 0) {
|
|
+ err = bytes;
|
|
+ goto err_kfree;
|
|
+ } else if (bytes != dev_size) {
|
|
+ err = -EIO;
|
|
goto err_kfree;
|
|
}
|
|
|
|
@@ -169,8 +176,8 @@ static int u_boot_env_parse(struct u_boo
|
|
break;
|
|
}
|
|
crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
|
|
- crc32_data_len = priv->mtd->size - crc32_data_offset;
|
|
- data_len = priv->mtd->size - data_offset;
|
|
+ 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;
|
|
if (calc != crc32) {
|
|
@@ -179,7 +186,7 @@ static int u_boot_env_parse(struct u_boo
|
|
goto err_kfree;
|
|
}
|
|
|
|
- buf[priv->mtd->size - 1] = '\0';
|
|
+ buf[dev_size - 1] = '\0';
|
|
err = u_boot_env_add_cells(priv, buf, data_offset, data_len);
|
|
if (err)
|
|
dev_err(dev, "Failed to add cells: %d\n", err);
|