target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch

   1 From 298923cf999cecd2ef06df126f85a3d68da8c4d8 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Mon, 8 Mar 2021 10:03:18 +0100
   4 Subject: [PATCH] firmware: bcm47xx_nvram: extract code copying NVRAM
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This simplifies function finding NVRAM. It doesn't directly deal with
  10 NVRAM structure anymore and is a bit smaller.
  11
  12 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  13 Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
  14 ---
  15  drivers/firmware/broadcom/bcm47xx_nvram.c | 43 +++++++++++++----------
  16  1 file changed, 25 insertions(+), 18 deletions(-)
  17
  18 diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
  19 index 99f3ec180be6..09f51b95849e 100644
  20 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
  21 +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
  22 @@ -54,12 +54,35 @@ static u32 find_nvram_size(void __iomem *end)
  23         return 0;
  24  }
  25
  26 +/**
  27 + * bcm47xx_nvram_copy - copy NVRAM to internal buffer
  28 + */
  29 +static void bcm47xx_nvram_copy(void __iomem *nvram_start, size_t res_size)
  30 +{
  31 +       struct nvram_header __iomem *header = nvram_start;
  32 +       size_t copy_size;
  33 +
  34 +       copy_size = header->len;
  35 +       if (copy_size > res_size) {
  36 +               pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
  37 +               copy_size = res_size;
  38 +       }
  39 +       if (copy_size >= NVRAM_SPACE) {
  40 +               pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
  41 +                      copy_size, NVRAM_SPACE - 1);
  42 +               copy_size = NVRAM_SPACE - 1;
  43 +       }
  44 +
  45 +       __ioread32_copy(nvram_buf, nvram_start, DIV_ROUND_UP(copy_size, 4));
  46 +       nvram_buf[NVRAM_SPACE - 1] = '\0';
  47 +       nvram_len = copy_size;
  48 +}
  49 +
  50  /**
  51   * bcm47xx_nvram_find_and_copy - find NVRAM on flash mapping & copy it
  52   */
  53  static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_size)
  54  {
  55 -       struct nvram_header __iomem *header;
  56         size_t flash_size;
  57         size_t offset;
  58         u32 size;
  59 @@ -95,23 +118,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
  60         return -ENXIO;
  61
  62  found:
  63 -       header = (struct nvram_header *)(flash_start + offset);
  64 -       __ioread32_copy(nvram_buf, header, sizeof(*header) / 4);
  65 -       nvram_len = ((struct nvram_header *)(nvram_buf))->len;
  66 -       size = res_size - offset;
  67 -       if (nvram_len > size) {
  68 -               pr_err("The nvram size according to the header seems to be bigger than the partition on flash\n");
  69 -               nvram_len = size;
  70 -       }
  71 -       if (nvram_len >= NVRAM_SPACE) {
  72 -               pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
  73 -                      nvram_len, NVRAM_SPACE - 1);
  74 -               nvram_len = NVRAM_SPACE - 1;
  75 -       }
  76 -       /* proceed reading data after header */
  77 -       __ioread32_copy(nvram_buf + sizeof(*header), header + 1,
  78 -                       DIV_ROUND_UP(nvram_len, 4));
  79 -       nvram_buf[NVRAM_SPACE - 1] = '\0';
  80 +       bcm47xx_nvram_copy(flash_start + offset, res_size - offset);
  81
  82         return 0;
  83  }
  84 --
  85 2.26.2
  86