target/linux/mediatek/patches-6.1/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 @@ -18,12 +18,23 @@
  27
  28  static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
  29  {
  30 -       return readl(wo->boot.addr + reg);
  31 +       u32 val;
  32 +
  33 +       if (!wo->boot_regmap)
  34 +               return readl(wo->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, wo->boot.addr + reg);
  45 +       if (wo->boot_regmap)
  46 +               regmap_write(wo->boot_regmap, reg, val);
  47 +       else
  48 +               writel(val, wo->boot.addr + reg);
  49  }
  50
  51  static struct sk_buff *
  52 @@ -316,10 +327,21 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
  53                         return ret;
  54         }
  55
  56 -       wo->boot.name = "wo-boot";
  57 -       ret = mtk_wed_get_reserved_memory_region(wo, &wo->boot);
  58 -       if (ret)
  59 -               return ret;
  60 +       wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
  61 +                                                         "mediatek,wo-cpuboot");
  62 +       if (IS_ERR(wo->boot_regmap)) {
  63 +               if (wo->boot_regmap != ERR_PTR(-ENODEV))
  64 +                       return PTR_ERR(wo->boot_regmap);
  65 +
  66 +               /* For backward compatibility, we need to check if cpu_boot
  67 +                * is defined through reserved memory property.
  68 +                */
  69 +               wo->boot_regmap = NULL;
  70 +               wo->boot.name = "wo-boot";
  71 +               ret = mtk_wed_get_reserved_memory_region(wo, &wo->boot);
  72 +               if (ret)
  73 +                       return ret;
  74 +       }
  75
  76         /* set dummy cr */
  77         wed_w32(wo->hw->wed_dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_FWDL,
  78 --- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
  79 +++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
  80 @@ -228,7 +228,8 @@ struct mtk_wed_wo_queue {
  81
  82  struct mtk_wed_wo {
  83         struct mtk_wed_hw *hw;
  84 -       struct mtk_wed_wo_memory_region boot;
  85 +       struct mtk_wed_wo_memory_region boot; /* backward compatibility */
  86 +       struct regmap *boot_regmap;
  87
  88         struct mtk_wed_wo_queue q_tx;
  89         struct mtk_wed_wo_queue q_rx;