target/linux/mediatek/patches-5.15/942-net-ethernet-mtk_wed-move-cpuboot-in-a-dedicated-dts.patch

   1 From f292d1bf83ec160bef2532b58aa08f5b71041923 Mon Sep 17 00:00:00 2001
   2 Message-Id: <f292d1bf83ec160bef2532b58aa08f5b71041923.1678716918.git.lorenzo@kernel.org>
   3 In-Reply-To: <3cf212c4ce6cd72c09bc47f35f539ba0afd4d106.1678716918.git.lorenzo@kernel.org>
   4 References: <3cf212c4ce6cd72c09bc47f35f539ba0afd4d106.1678716918.git.lorenzo@kernel.org>
   5 From: Lorenzo Bianconi <lorenzo@kernel.org>
   6 Date: Sat, 11 Mar 2023 18:13:04 +0100
   7 Subject: [PATCH net-next 2/2] net: ethernet: mtk_wed: move cpuboot in a
   8  dedicated dts node
   9
  10 Since the cpuboot memory region is not part of the RAM SoC, move cpuboot
  11 in a deidicated syscon node.
  12 This patch helps to keep backward-compatibility with older version of
  13 uboot codebase where we have a limit of 8 reserved-memory dts child
  14 nodes.
  15 Keep backward-compatibility with older dts version where cpuboot was
  16 defined as reserved-memory child node.
  17
  18 Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
  19 ---
  20  drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 34 +++++++++++++++++----
  21  drivers/net/ethernet/mediatek/mtk_wed_wo.h  |  3 +-
  22  2 files changed, 30 insertions(+), 7 deletions(-)
  23
  24 --- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  25 +++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
  26 @@ -34,12 +34,23 @@ static struct mtk_wed_wo_memory_region m
  27
  28  static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
  29  {
  30 -       return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
  31 +       u32 val;
  32 +
  33 +       if (!wo->boot_regmap)
  34 +               return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
  35 +
  36 +       if (regmap_read(wo->boot_regmap, reg, &val))
  37 +               val = ~0;
  38 +
  39 +       return val;
  40  }
  41
  42  static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
  43  {
  44 -       writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
  45 +       if (wo->boot_regmap)
  46 +               regmap_write(wo->boot_regmap, reg, val);
  47 +       else
  48 +               writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
  49  }
  50
  51  static struct sk_buff *
  52 @@ -313,6 +324,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
  53         u32 val, boot_cr;
  54         int ret, i;
  55
  56 +       wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
  57 +                                                         "mediatek,wo-cpuboot");
  58 +
  59         /* load firmware region metadata */
  60         for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
  61                 int index = of_property_match_string(wo->hw->node,
  62 @@ -321,6 +335,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
  63                 if (index < 0)
  64                         continue;
  65
  66 +               if (index == MTK_WED_WO_REGION_BOOT && !IS_ERR(wo->boot_regmap))
  67 +                       continue;
  68 +
  69                 ret = mtk_wed_get_reserved_memory_region(wo->hw, index, &mem_region[i]);
  70                 if (ret)
  71                         return ret;
  72 --- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
  73 +++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
  74 @@ -231,6 +231,7 @@ struct mtk_wed_wo_queue {
  75  struct mtk_wed_wo {
  76         struct mtk_wed_hw *hw;
  77
  78 +       struct regmap *boot_regmap;
  79         struct mtk_wed_wo_queue q_tx;
  80         struct mtk_wed_wo_queue q_rx;
  81