target/linux/mediatek/patches-5.15/943-net-ethernet-mtk_wed-move-ilm-a-dedicated-dts-node.patch

   1 From f3565e6c2276411275e707a5442d3f69cc111273 Mon Sep 17 00:00:00 2001
   2 Message-Id: <f3565e6c2276411275e707a5442d3f69cc111273.1678718888.git.lorenzo@kernel.org>
   3 From: Lorenzo Bianconi <lorenzo@kernel.org>
   4 Date: Sun, 12 Mar 2023 18:51:47 +0100
   5 Subject: [PATCH net-next 1/3] net: ethernet: mtk_wed: move ilm a dedicated dts
   6  node
   7
   8 Since the ilm memory region is not part of the RAM SoC, move ilm in a
   9 deidicated syscon node.
  10 This patch helps to keep backward-compatibility with older version of
  11 uboot codebase where we have a limit of 8 reserved-memory dts child
  12 nodes.
  13 Keep backward-compatibility with older dts version where ilm was defined
  14 as reserved-memory child node.
  15
  16 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  17 ---
  18  drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 55 ++++++++++++++++++---
  19  1 file changed, 49 insertions(+), 6 deletions(-)
  20
  21 --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  22 +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  23 @@ -316,6 +316,39 @@ next:
  24  }
  25
  26  static int
  27 +mtk_wed_mcu_load_ilm(struct mtk_wed_wo *wo)
  28 +{
  29 +       struct mtk_wed_wo_memory_region *ilm_region;
  30 +       struct resource res;
  31 +       struct device_node *np;
  32 +       int ret;
  33 +
  34 +       np = of_parse_phandle(wo->hw->node, "mediatek,wo-ilm", 0);
  35 +       if (!np)
  36 +               return 0;
  37 +
  38 +       ret = of_address_to_resource(np, 0, &res);
  39 +       of_node_put(np);
  40 +
  41 +       if (ret < 0)
  42 +               return ret;
  43 +
  44 +       ilm_region = &mem_region[MTK_WED_WO_REGION_ILM];
  45 +       ilm_region->phy_addr = res.start;
  46 +       ilm_region->size = resource_size(&res);
  47 +       ilm_region->addr = devm_ioremap(wo->hw->dev, res.start,
  48 +                                       resource_size(&res));
  49 +
  50 +       if (!IS_ERR(ilm_region->addr))
  51 +               return 0;
  52 +
  53 +       ret = PTR_ERR(ilm_region->addr);
  54 +       ilm_region->addr = NULL;
  55 +
  56 +       return ret;
  57 +}
  58 +
  59 +static int
  60  mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
  61  {
  62         const struct mtk_wed_fw_trailer *trailer;
  63 @@ -324,14 +357,20 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
  64         u32 val, boot_cr;
  65         int ret, i;
  66
  67 +       mtk_wed_mcu_load_ilm(wo);
  68         wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
  69                                                           "mediatek,wo-cpuboot");
  70
  71         /* load firmware region metadata */
  72         for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
  73 -               int index = of_property_match_string(wo->hw->node,
  74 -                                                    "memory-region-names",
  75 -                                                    mem_region[i].name);
  76 +               int index;
  77 +
  78 +               if (mem_region[i].addr)
  79 +                       continue;
  80 +
  81 +               index = of_property_match_string(wo->hw->node,
  82 +                                                "memory-region-names",
  83 +                                                mem_region[i].name);
  84                 if (index < 0)
  85                         continue;
  86