git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From 2d751203aacf86a1b301a188d8551c7da91043ab Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Tue, 2 Mar 2021 20:00:12 +0100
   4 Subject: [PATCH] mtd: parsers: ofpart: limit parsing of deprecated DT syntax
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 For backward compatibility ofpart still supports the old syntax like:
  10 spi-flash@0 {
  11         compatible = "jedec,spi-nor";
  12         reg = <0x0>;
  13
  14         partition@0 {
  15                 label = "bootloader";
  16                 reg = <0x0 0x100000>;
  17         };
  18 };
  19 (without "partitions" subnode).
  20
  21 There is no reason however to support nested partitions without a clear
  22 "compatible" string like:
  23 partitions {
  24         compatible = "fixed-partitions";
  25         #address-cells = <1>;
  26         #size-cells = <1>;
  27
  28         partition@0 {
  29                 label = "bootloader";
  30                 reg = <0x0 0x100000>;
  31
  32                 partition@0 {
  33                         label = "config";
  34                         reg = <0x80000 0x80000>;
  35                 };
  36         };
  37 };
  38 (we never officially supported or documented that).
  39
  40 Make sure ofpart doesn't attempt to parse above.
  41
  42 Cc: Ansuel Smith <ansuelsmth@gmail.com>
  43 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  44 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  45 Link: https://lore.kernel.org/linux-mtd/20210302190012.1255-1-zajec5@gmail.com
  46 ---
  47  drivers/mtd/parsers/ofpart_core.c | 4 +++-
  48  1 file changed, 3 insertions(+), 1 deletion(-)
  49
  50 --- a/drivers/mtd/parsers/ofpart_core.c
  51 +++ b/drivers/mtd/parsers/ofpart_core.c
  52 @@ -53,7 +53,7 @@ static int parse_fixed_partitions(struct
  53                 return 0;
  54
  55         ofpart_node = of_get_child_by_name(mtd_node, "partitions");
  56 -       if (!ofpart_node) {
  57 +       if (!ofpart_node && !master->parent) {
  58                 /*
  59                  * We might get here even when ofpart isn't used at all (e.g.,
  60                  * when using another parser), so don't be louder than
  61 @@ -64,6 +64,8 @@ static int parse_fixed_partitions(struct
  62                 ofpart_node = mtd_node;
  63                 dedicated = false;
  64         }
  65 +       if (!ofpart_node)
  66 +               return 0;
  67
  68         of_id = of_match_node(parse_ofpart_match_table, ofpart_node);
  69         if (dedicated && !of_id) {