mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-30 10:42:22 +00:00
92 lines
2.7 KiB
Diff
92 lines
2.7 KiB
Diff
From f3565e6c2276411275e707a5442d3f69cc111273 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <f3565e6c2276411275e707a5442d3f69cc111273.1678718888.git.lorenzo@kernel.org>
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sun, 12 Mar 2023 18:51:47 +0100
|
|
Subject: [PATCH net-next 1/3] net: ethernet: mtk_wed: move ilm a dedicated dts
|
|
node
|
|
|
|
Since the ilm memory region is not part of the RAM SoC, move ilm in a
|
|
deidicated syscon node.
|
|
This patch helps to keep backward-compatibility with older version of
|
|
uboot codebase where we have a limit of 8 reserved-memory dts child
|
|
nodes.
|
|
Keep backward-compatibility with older dts version where ilm was defined
|
|
as reserved-memory child node.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 55 ++++++++++++++++++---
|
|
1 file changed, 49 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
@@ -300,6 +300,52 @@ next:
|
|
}
|
|
|
|
static int
|
|
+mtk_wed_mcu_load_memory_regions(struct mtk_wed_wo *wo,
|
|
+ struct mtk_wed_wo_memory_region *region)
|
|
+{
|
|
+ struct device_node *np;
|
|
+ int ret;
|
|
+
|
|
+ /* firmware EMI memory region */
|
|
+ ret = mtk_wed_get_reserved_memory_region(wo,
|
|
+ ®ion[MTK_WED_WO_REGION_EMI]);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /* firmware DATA memory region */
|
|
+ ret = mtk_wed_get_reserved_memory_region(wo,
|
|
+ ®ion[MTK_WED_WO_REGION_DATA]);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ np = of_parse_phandle(wo->hw->node, "mediatek,wo-ilm", 0);
|
|
+ if (np) {
|
|
+ struct mtk_wed_wo_memory_region *ilm_region;
|
|
+ struct resource res;
|
|
+
|
|
+ ret = of_address_to_resource(np, 0, &res);
|
|
+ of_node_put(np);
|
|
+
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
+ ilm_region = ®ion[MTK_WED_WO_REGION_ILM];
|
|
+ ilm_region->phy_addr = res.start;
|
|
+ ilm_region->size = resource_size(&res);
|
|
+ ilm_region->addr = devm_ioremap(wo->hw->dev, res.start,
|
|
+ resource_size(&res));
|
|
+
|
|
+ return IS_ERR(ilm_region->addr) ? PTR_ERR(ilm_region->addr) : 0;
|
|
+ }
|
|
+
|
|
+ /* For backward compatibility, we need to check if ILM
|
|
+ * node is defined through reserved memory property.
|
|
+ */
|
|
+ return mtk_wed_get_reserved_memory_region(wo,
|
|
+ ®ion[MTK_WED_WO_REGION_ILM]);
|
|
+}
|
|
+
|
|
+static int
|
|
mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
|
|
{
|
|
static struct mtk_wed_wo_memory_region mem_region[] = {
|
|
@@ -320,12 +366,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
|
u32 val, boot_cr;
|
|
int ret, i;
|
|
|
|
- /* load firmware region metadata */
|
|
- for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
|
- ret = mtk_wed_get_reserved_memory_region(wo, &mem_region[i]);
|
|
- if (ret)
|
|
- return ret;
|
|
- }
|
|
+ ret = mtk_wed_mcu_load_memory_regions(wo, mem_region);
|
|
+ if (ret)
|
|
+ return ret;
|
|
|
|
wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
|
|
"mediatek,wo-cpuboot");
|