target/linux/generic/backport-5.15/834-v6.8-0012-nvmem-u-boot-env-use-nvmem-device-helpers.patch

   1 From a832556d23c5a11115f300011a5874d6107a0d62 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Thu, 21 Dec 2023 18:34:19 +0100
   4 Subject: [PATCH] nvmem: u-boot-env: use nvmem device helpers
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Use nvmem_dev_size() and nvmem_device_read() to make this driver less
  10 mtd dependent.
  11
  12 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  13 Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
  14 Link: https://lore.kernel.org/r/20231221173421.13737-4-zajec5@gmail.com
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16 ---
  17  drivers/nvmem/u-boot-env.c | 23 +++++++++++++++--------
  18  1 file changed, 15 insertions(+), 8 deletions(-)
  19
  20 --- a/drivers/nvmem/u-boot-env.c
  21 +++ b/drivers/nvmem/u-boot-env.c
  22 @@ -127,27 +127,34 @@ static int u_boot_env_add_cells(struct u
  23
  24  static int u_boot_env_parse(struct u_boot_env *priv)
  25  {
  26 +       struct nvmem_device *nvmem = priv->nvmem;
  27         struct device *dev = priv->dev;
  28         size_t crc32_data_offset;
  29         size_t crc32_data_len;
  30         size_t crc32_offset;
  31         size_t data_offset;
  32         size_t data_len;
  33 +       size_t dev_size;
  34         uint32_t crc32;
  35         uint32_t calc;
  36 -       size_t bytes;
  37         uint8_t *buf;
  38 +       int bytes;
  39         int err;
  40
  41 -       buf = kcalloc(1, priv->mtd->size, GFP_KERNEL);
  42 +       dev_size = nvmem_dev_size(nvmem);
  43 +
  44 +       buf = kcalloc(1, dev_size, GFP_KERNEL);
  45         if (!buf) {
  46                 err = -ENOMEM;
  47                 goto err_out;
  48         }
  49
  50 -       err = mtd_read(priv->mtd, 0, priv->mtd->size, &bytes, buf);
  51 -       if ((err && !mtd_is_bitflip(err)) || bytes != priv->mtd->size) {
  52 -               dev_err(dev, "Failed to read from mtd: %d\n", err);
  53 +       bytes = nvmem_device_read(nvmem, 0, dev_size, buf);
  54 +       if (bytes < 0) {
  55 +               err = bytes;
  56 +               goto err_kfree;
  57 +       } else if (bytes != dev_size) {
  58 +               err = -EIO;
  59                 goto err_kfree;
  60         }
  61
  62 @@ -169,8 +176,8 @@ static int u_boot_env_parse(struct u_boo
  63                 break;
  64         }
  65         crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset));
  66 -       crc32_data_len = priv->mtd->size - crc32_data_offset;
  67 -       data_len = priv->mtd->size - data_offset;
  68 +       crc32_data_len = dev_size - crc32_data_offset;
  69 +       data_len = dev_size - data_offset;
  70
  71         calc = crc32(~0, buf + crc32_data_offset, crc32_data_len) ^ ~0L;
  72         if (calc != crc32) {
  73 @@ -179,7 +186,7 @@ static int u_boot_env_parse(struct u_boo
  74                 goto err_kfree;
  75         }
  76
  77 -       buf[priv->mtd->size - 1] = '\0';
  78 +       buf[dev_size - 1] = '\0';
  79         err = u_boot_env_add_cells(priv, buf, data_offset, data_len);
  80         if (err)
  81                 dev_err(dev, "Failed to add cells: %d\n", err);