Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcm53xx: add the latest fix version of brcm_nvram

Browse Source 
It was just sent for upstream.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2023-11-02 09:08:54 +01:00
parent d62726b1e4
commit 943bd3c9f6
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target/linux/bcm53xx/patches-5.15/800-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch → target/linux/bcm53xx/patches-5.15/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
View File

@ -25,23 +25,27 @@ Cc: Arınç ÜNAL <arinc.unal@arinc9.com>
Cc: Florian Fainelli <florian.fainelli@broadcom.com> Cc: Florian Fainelli <florian.fainelli@broadcom.com>
Cc: Scott Branden <scott.branden@broadcom.com> Cc: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Arınç ÜNAL <arinc.unal@arinc9.com>
--- ---
drivers/nvmem/brcm_nvram.c | 130 +++++++++++++++++++++++++------------ drivers/nvmem/brcm_nvram.c | 134 ++++++++++++++++++++++++++-----------
1 file changed, 90 insertions(+), 40 deletions(-) 1 file changed, 94 insertions(+), 40 deletions(-)
--- a/drivers/nvmem/brcm_nvram.c --- a/drivers/nvmem/brcm_nvram.c
+++ b/drivers/nvmem/brcm_nvram.c +++ b/drivers/nvmem/brcm_nvram.c
@@ -17,9 +17,20 @@ @@ -17,9 +17,23 @@
#define NVRAM_MAGIC "FLSH" #define NVRAM_MAGIC "FLSH"
+/** +/**
+ * struct brcm_nvram - driver state internal struct + * struct brcm_nvram - driver state internal struct
+ * + *
+ * @dev: NVMEM device pointer
+ * @nvmem_size: Size of the whole space available for NVRAM + * @nvmem_size: Size of the whole space available for NVRAM
+ * @data: NVRAM data copy stored to avoid poking underlaying flash controller + * @data: NVRAM data copy stored to avoid poking underlaying flash controller
+ * @data_len: NVRAM data size + * @data_len: NVRAM data size
+ * @padding_byte: Padding value used to fill remaining space + * @padding_byte: Padding value used to fill remaining space
+ * @cells: Array of discovered NVMEM cells
+ * @ncells: Number of elements in cells
+ */ + */
struct brcm_nvram { struct brcm_nvram {
struct device *dev; struct device *dev;
@ -53,7 +57,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
struct nvmem_cell_info *cells; struct nvmem_cell_info *cells;
int ncells; int ncells;
}; };
@@ -36,10 +47,47 @@ static int brcm_nvram_read(void *context @@ -36,10 +50,47 @@ static int brcm_nvram_read(void *context
size_t bytes) size_t bytes)
{ {
struct brcm_nvram *priv = context; struct brcm_nvram *priv = context;
@ -104,7 +108,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
return 0; return 0;
} }
@@ -67,8 +115,13 @@ static int brcm_nvram_add_cells(struct b @@ -67,8 +118,13 @@ static int brcm_nvram_add_cells(struct b
size_t len) size_t len)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
@ -119,7 +123,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
priv->ncells = 0; priv->ncells = 0;
for (var = data + sizeof(struct brcm_nvram_header); for (var = data + sizeof(struct brcm_nvram_header);
@@ -78,67 +131,67 @@ static int brcm_nvram_add_cells(struct b @@ -78,67 +134,68 @@ static int brcm_nvram_add_cells(struct b
} }
priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL); priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL);
@ -204,7 +208,8 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
- return err; - return err;
+ len = le32_to_cpu(header->len); + len = le32_to_cpu(header->len);
+ if (len > priv->nvmem_size) { + if (len > priv->nvmem_size) {
+ dev_err(dev, "NVRAM length (%zd) exceeds mapped size (%zd)\n", len, priv->nvmem_size); + dev_err(dev, "NVRAM length (%zd) exceeds mapped size (%zd)\n", len,
+ priv->nvmem_size);
+ return -EINVAL; + return -EINVAL;
} }
@ -215,7 +220,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
return 0; return 0;
} }
@@ -150,7 +203,6 @@ static int brcm_nvram_probe(struct platf @@ -150,7 +207,6 @@ static int brcm_nvram_probe(struct platf
.reg_read = brcm_nvram_read, .reg_read = brcm_nvram_read,
}; };
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -223,7 +228,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
struct brcm_nvram *priv; struct brcm_nvram *priv;
int err; int err;
@@ -159,21 +211,19 @@ static int brcm_nvram_probe(struct platf @@ -159,21 +215,19 @@ static int brcm_nvram_probe(struct platf
return -ENOMEM; return -ENOMEM;
priv->dev = dev; priv->dev = dev;

23
target/linux/bcm53xx/patches-6.1/800-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch → target/linux/bcm53xx/patches-6.1/181-nvmem-brcm_nvram-store-a-copy-of-NVRAM-content.patch
View File

@ -25,23 +25,27 @@ Cc: Arınç ÜNAL <arinc.unal@arinc9.com>
Cc: Florian Fainelli <florian.fainelli@broadcom.com> Cc: Florian Fainelli <florian.fainelli@broadcom.com>
Cc: Scott Branden <scott.branden@broadcom.com> Cc: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Arınç ÜNAL <arinc.unal@arinc9.com>
--- ---
drivers/nvmem/brcm_nvram.c | 130 +++++++++++++++++++++++++------------ drivers/nvmem/brcm_nvram.c | 134 ++++++++++++++++++++++++++-----------
1 file changed, 90 insertions(+), 40 deletions(-) 1 file changed, 94 insertions(+), 40 deletions(-)
--- a/drivers/nvmem/brcm_nvram.c --- a/drivers/nvmem/brcm_nvram.c
+++ b/drivers/nvmem/brcm_nvram.c +++ b/drivers/nvmem/brcm_nvram.c
@@ -17,9 +17,20 @@ @@ -17,9 +17,23 @@
#define NVRAM_MAGIC "FLSH" #define NVRAM_MAGIC "FLSH"
+/** +/**
+ * struct brcm_nvram - driver state internal struct + * struct brcm_nvram - driver state internal struct
+ * + *
+ * @dev: NVMEM device pointer
+ * @nvmem_size: Size of the whole space available for NVRAM + * @nvmem_size: Size of the whole space available for NVRAM
+ * @data: NVRAM data copy stored to avoid poking underlaying flash controller + * @data: NVRAM data copy stored to avoid poking underlaying flash controller
+ * @data_len: NVRAM data size + * @data_len: NVRAM data size
+ * @padding_byte: Padding value used to fill remaining space + * @padding_byte: Padding value used to fill remaining space
+ * @cells: Array of discovered NVMEM cells
+ * @ncells: Number of elements in cells
+ */ + */
struct brcm_nvram { struct brcm_nvram {
struct device *dev; struct device *dev;
@ -53,7 +57,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
struct nvmem_cell_info *cells; struct nvmem_cell_info *cells;
int ncells; int ncells;
}; };
@@ -36,10 +47,47 @@ static int brcm_nvram_read(void *context @@ -36,10 +50,47 @@ static int brcm_nvram_read(void *context
size_t bytes) size_t bytes)
{ {
struct brcm_nvram *priv = context; struct brcm_nvram *priv = context;
@ -104,7 +108,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
return 0; return 0;
} }
@@ -67,8 +115,13 @@ static int brcm_nvram_add_cells(struct b @@ -67,8 +118,13 @@ static int brcm_nvram_add_cells(struct b
size_t len) size_t len)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
@ -119,7 +123,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
priv->ncells = 0; priv->ncells = 0;
for (var = data + sizeof(struct brcm_nvram_header); for (var = data + sizeof(struct brcm_nvram_header);
@@ -78,67 +131,67 @@ static int brcm_nvram_add_cells(struct b @@ -78,67 +134,68 @@ static int brcm_nvram_add_cells(struct b
} }
priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL); priv->cells = devm_kcalloc(dev, priv->ncells, sizeof(*priv->cells), GFP_KERNEL);
@ -204,7 +208,8 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
- return err; - return err;
+ len = le32_to_cpu(header->len); + len = le32_to_cpu(header->len);
+ if (len > priv->nvmem_size) { + if (len > priv->nvmem_size) {
+ dev_err(dev, "NVRAM length (%zd) exceeds mapped size (%zd)\n", len, priv->nvmem_size); + dev_err(dev, "NVRAM length (%zd) exceeds mapped size (%zd)\n", len,
+ priv->nvmem_size);
+ return -EINVAL; + return -EINVAL;
} }
@ -215,7 +220,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
return 0; return 0;
} }
@@ -150,7 +203,6 @@ static int brcm_nvram_probe(struct platf @@ -150,7 +207,6 @@ static int brcm_nvram_probe(struct platf
.reg_read = brcm_nvram_read, .reg_read = brcm_nvram_read,
}; };
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -223,7 +228,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
struct brcm_nvram *priv; struct brcm_nvram *priv;
int err; int err;
@@ -159,21 +211,19 @@ static int brcm_nvram_probe(struct platf @@ -159,21 +215,19 @@ static int brcm_nvram_probe(struct platf
return -ENOMEM; return -ENOMEM;
priv->dev = dev; priv->dev = dev;