mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Refresh also Mediatek patch for kernel 6.6
This commit is contained in:
parent
aeff1eca40
commit
8479dde544
3 changed files with 0 additions and 224 deletions
|
@ -1,44 +0,0 @@
|
||||||
From 3cf212c4ce6cd72c09bc47f35f539ba0afd4d106 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <3cf212c4ce6cd72c09bc47f35f539ba0afd4d106.1678716918.git.lorenzo@kernel.org>
|
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Sun, 12 Mar 2023 16:40:31 +0100
|
|
||||||
Subject: [PATCH net-next 1/2] net: ethernet: mtk_wed: rename
|
|
||||||
mtk_wed_get_memory_region in mtk_wed_get_reserved_memory_region
|
|
||||||
|
|
||||||
This is a preliminary patch to move wed ilm/dlm and cpuboot properties in
|
|
||||||
dedicated dts nodes.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -215,8 +215,8 @@ int mtk_wed_mcu_msg_update(struct mtk_we
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
-mtk_wed_get_memory_region(struct mtk_wed_wo *wo,
|
|
||||||
- struct mtk_wed_wo_memory_region *region)
|
|
||||||
+mtk_wed_get_reserved_memory_region(struct mtk_wed_wo *wo,
|
|
||||||
+ struct mtk_wed_wo_memory_region *region)
|
|
||||||
{
|
|
||||||
struct reserved_mem *rmem;
|
|
||||||
struct device_node *np;
|
|
||||||
@@ -311,13 +311,13 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
|
||||||
|
|
||||||
/* load firmware region metadata */
|
|
||||||
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
|
||||||
- ret = mtk_wed_get_memory_region(wo, &mem_region[i]);
|
|
||||||
+ ret = mtk_wed_get_reserved_memory_region(wo, &mem_region[i]);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
wo->boot.name = "wo-boot";
|
|
||||||
- ret = mtk_wed_get_memory_region(wo, &wo->boot);
|
|
||||||
+ ret = mtk_wed_get_reserved_memory_region(wo, &wo->boot);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
|
@ -1,89 +0,0 @@
|
||||||
From f292d1bf83ec160bef2532b58aa08f5b71041923 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <f292d1bf83ec160bef2532b58aa08f5b71041923.1678716918.git.lorenzo@kernel.org>
|
|
||||||
In-Reply-To: <3cf212c4ce6cd72c09bc47f35f539ba0afd4d106.1678716918.git.lorenzo@kernel.org>
|
|
||||||
References: <3cf212c4ce6cd72c09bc47f35f539ba0afd4d106.1678716918.git.lorenzo@kernel.org>
|
|
||||||
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
Date: Sat, 11 Mar 2023 18:13:04 +0100
|
|
||||||
Subject: [PATCH net-next 2/2] net: ethernet: mtk_wed: move cpuboot in a
|
|
||||||
dedicated dts node
|
|
||||||
|
|
||||||
Since the cpuboot memory region is not part of the RAM SoC, move cpuboot
|
|
||||||
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 cpuboot was
|
|
||||||
defined as reserved-memory child node.
|
|
||||||
|
|
||||||
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 34 +++++++++++++++++----
|
|
||||||
drivers/net/ethernet/mediatek/mtk_wed_wo.h | 3 +-
|
|
||||||
2 files changed, 30 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
|
||||||
@@ -18,12 +18,23 @@
|
|
||||||
|
|
||||||
static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
|
|
||||||
{
|
|
||||||
- return readl(wo->boot.addr + reg);
|
|
||||||
+ u32 val;
|
|
||||||
+
|
|
||||||
+ if (!wo->boot_regmap)
|
|
||||||
+ return readl(wo->boot.addr + reg);
|
|
||||||
+
|
|
||||||
+ if (regmap_read(wo->boot_regmap, reg, &val))
|
|
||||||
+ val = ~0;
|
|
||||||
+
|
|
||||||
+ return val;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
|
|
||||||
{
|
|
||||||
- writel(val, wo->boot.addr + reg);
|
|
||||||
+ if (wo->boot_regmap)
|
|
||||||
+ regmap_write(wo->boot_regmap, reg, val);
|
|
||||||
+ else
|
|
||||||
+ writel(val, wo->boot.addr + reg);
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct sk_buff *
|
|
||||||
@@ -316,10 +327,21 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
- wo->boot.name = "wo-boot";
|
|
||||||
- ret = mtk_wed_get_reserved_memory_region(wo, &wo->boot);
|
|
||||||
- if (ret)
|
|
||||||
- return ret;
|
|
||||||
+ wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
|
|
||||||
+ "mediatek,wo-cpuboot");
|
|
||||||
+ if (IS_ERR(wo->boot_regmap)) {
|
|
||||||
+ if (wo->boot_regmap != ERR_PTR(-ENODEV))
|
|
||||||
+ return PTR_ERR(wo->boot_regmap);
|
|
||||||
+
|
|
||||||
+ /* For backward compatibility, we need to check if cpu_boot
|
|
||||||
+ * is defined through reserved memory property.
|
|
||||||
+ */
|
|
||||||
+ wo->boot_regmap = NULL;
|
|
||||||
+ wo->boot.name = "wo-boot";
|
|
||||||
+ ret = mtk_wed_get_reserved_memory_region(wo, &wo->boot);
|
|
||||||
+ if (ret)
|
|
||||||
+ return ret;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* set dummy cr */
|
|
||||||
wed_w32(wo->hw->wed_dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_FWDL,
|
|
||||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
|
||||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
|
||||||
@@ -228,7 +228,8 @@ struct mtk_wed_wo_queue {
|
|
||||||
|
|
||||||
struct mtk_wed_wo {
|
|
||||||
struct mtk_wed_hw *hw;
|
|
||||||
- struct mtk_wed_wo_memory_region boot;
|
|
||||||
+ struct mtk_wed_wo_memory_region boot; /* backward compatibility */
|
|
||||||
+ struct regmap *boot_regmap;
|
|
||||||
|
|
||||||
struct mtk_wed_wo_queue q_tx;
|
|
||||||
struct mtk_wed_wo_queue q_rx;
|
|
|
@ -1,91 +0,0 @@
|
||||||
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");
|
|
Loading…
Add table
Add a link
Reference in a new issue