mirror of
https://github.com/LiBwrt-op/openwrt-6.x.git
synced 2025-12-17 01:06:35 +00:00
231bbe528d
Change return value from -EINVAL to -ENOENT for the TRX parser workaround patch as it's better suited and it's the common exit error for parser failing parsing for expected condition (partition not init, zero partition found in the schema, magic values not matching) Also this is needed for a pending upstream patch that will permit parser to fail and be skipped for subpartitions only with the -ENOENT error. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 13 Apr 2021 18:25:20 +0200
|
|
Subject: [PATCH] mtd: parsers: trx: parse "firmware" MTD partitions only
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Parsing every partition with "compatible" set to "brcm,trx" results in
|
|
parsing both: firmware partition and failsafe partition on devices that
|
|
implement failsafe booting. This affects e.g. Linksys EA9500 which has:
|
|
|
|
partition@200000 {
|
|
reg = <0x0200000 0x01d00000>;
|
|
compatible = "linksys,ns-firmware", "brcm,trx";
|
|
};
|
|
|
|
partition@1f00000 {
|
|
reg = <0x01f00000 0x01d00000>;
|
|
compatible = "linksys,ns-firmware", "brcm,trx";
|
|
};
|
|
|
|
Check for MTD partition name "firmware" before parsing. Recently added
|
|
ofpart_linksys_ns.c creates "firmware" and "failsafe" depending on
|
|
bootloader setup.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
---
|
|
drivers/mtd/parsers/parser_trx.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/mtd/parsers/parser_trx.c
|
|
+++ b/drivers/mtd/parsers/parser_trx.c
|
|
@@ -92,6 +92,10 @@ static int parser_trx_parse(struct mtd_i
|
|
if (err != 0 && err != -EINVAL)
|
|
pr_err("failed to parse \"brcm,trx-magic\" DT attribute, using default: %d\n", err);
|
|
|
|
+ /* Don't parse any failsafe / backup partitions */
|
|
+ if (strcmp(mtd->name, "firmware"))
|
|
+ return -ENOENT;
|
|
+
|
|
parts = kcalloc(TRX_PARSER_MAX_PARTS, sizeof(struct mtd_partition),
|
|
GFP_KERNEL);
|
|
if (!parts)
|