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 @@ -300,6 +300,52 @@ next:
  24  }
  25
  26  static int
  27 +mtk_wed_mcu_load_memory_regions(struct mtk_wed_wo *wo,
  28 +                               struct mtk_wed_wo_memory_region *region)
  29 +{
  30 +       struct device_node *np;
  31 +       int ret;
  32 +
  33 +       /* firmware EMI memory region */
  34 +       ret = mtk_wed_get_reserved_memory_region(wo,
  35 +                       &region[MTK_WED_WO_REGION_EMI]);
  36 +       if (ret)
  37 +               return ret;
  38 +
  39 +       /* firmware DATA memory region */
  40 +       ret = mtk_wed_get_reserved_memory_region(wo,
  41 +                       &region[MTK_WED_WO_REGION_DATA]);
  42 +       if (ret)
  43 +               return ret;
  44 +
  45 +       np = of_parse_phandle(wo->hw->node, "mediatek,wo-ilm", 0);
  46 +       if (np) {
  47 +               struct mtk_wed_wo_memory_region *ilm_region;
  48 +               struct resource res;
  49 +
  50 +               ret = of_address_to_resource(np, 0, &res);
  51 +               of_node_put(np);
  52 +
  53 +               if (ret < 0)
  54 +                       return ret;
  55 +
  56 +               ilm_region = &region[MTK_WED_WO_REGION_ILM];
  57 +               ilm_region->phy_addr = res.start;
  58 +               ilm_region->size = resource_size(&res);
  59 +               ilm_region->addr = devm_ioremap(wo->hw->dev, res.start,
  60 +                                               resource_size(&res));
  61 +
  62 +               return IS_ERR(ilm_region->addr) ? PTR_ERR(ilm_region->addr) : 0;
  63 +       }
  64 +
  65 +       /* For backward compatibility, we need to check if ILM
  66 +        * node is defined through reserved memory property.
  67 +        */
  68 +       return mtk_wed_get_reserved_memory_region(wo,
  69 +                       &region[MTK_WED_WO_REGION_ILM]);
  70 +}
  71 +
  72 +static int
  73  mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
  74  {
  75         static struct mtk_wed_wo_memory_region mem_region[] = {
  76 @@ -320,12 +366,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
  77         u32 val, boot_cr;
  78         int ret, i;
  79
  80 -       /* load firmware region metadata */
  81 -       for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
  82 -               ret = mtk_wed_get_reserved_memory_region(wo, &mem_region[i]);
  83 -               if (ret)
  84 -                       return ret;
  85 -       }
  86 +       ret = mtk_wed_mcu_load_memory_regions(wo, mem_region);
  87 +       if (ret)
  88 +               return ret;
  89
  90         wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
  91                                                           "mediatek,wo-cpuboot");