kernel: backport upstream mediatek WED changes
Reorder and update existing patches Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
@@ -323,13 +323,35 @@ static int _mtk_mdio_write(struct mtk_et
|
||||
@@ -324,13 +324,35 @@ static int _mtk_mdio_write(struct mtk_et
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -63,7 +63,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
ret = mtk_mdio_busy_wait(eth);
|
||||
if (ret < 0)
|
||||
@@ -346,12 +368,33 @@ static int _mtk_mdio_read(struct mtk_eth
|
||||
@@ -347,12 +369,33 @@ static int _mtk_mdio_read(struct mtk_eth
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -103,7 +103,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
ret = mtk_mdio_busy_wait(eth);
|
||||
if (ret < 0)
|
||||
@@ -898,6 +941,7 @@ static int mtk_mdio_init(struct mtk_eth
|
||||
@@ -899,6 +942,7 @@ static int mtk_mdio_init(struct mtk_eth
|
||||
eth->mii_bus->name = "mdio";
|
||||
eth->mii_bus->read = mtk_mdio_read;
|
||||
eth->mii_bus->write = mtk_mdio_write;
|
||||
|
||||
@@ -15,30 +15,23 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- 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
|
||||
@@ -234,8 +234,8 @@ int mtk_wed_mcu_msg_update(struct mtk_we
|
||||
}
|
||||
|
||||
static int
|
||||
-mtk_wed_get_memory_region(struct mtk_wed_wo *wo,
|
||||
-mtk_wed_get_memory_region(struct mtk_wed_hw *hw, int index,
|
||||
- struct mtk_wed_wo_memory_region *region)
|
||||
+mtk_wed_get_reserved_memory_region(struct mtk_wed_wo *wo,
|
||||
+mtk_wed_get_reserved_memory_region(struct mtk_wed_hw *hw, int index,
|
||||
+ 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
|
||||
@@ -321,7 +321,7 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
if (index < 0)
|
||||
continue;
|
||||
|
||||
/* 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]);
|
||||
- ret = mtk_wed_get_memory_region(wo->hw, index, &mem_region[i]);
|
||||
+ ret = mtk_wed_get_reserved_memory_region(wo->hw, index, &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;
|
||||
|
||||
|
||||
@@ -23,15 +23,15 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
@@ -18,12 +18,23 @@
|
||||
@@ -34,12 +34,23 @@ static struct mtk_wed_wo_memory_region m
|
||||
|
||||
static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
|
||||
{
|
||||
- return readl(wo->boot.addr + reg);
|
||||
- return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
+ u32 val;
|
||||
+
|
||||
+ if (!wo->boot_regmap)
|
||||
+ return readl(wo->boot.addr + reg);
|
||||
+ return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
+
|
||||
+ if (regmap_read(wo->boot_regmap, reg, &val))
|
||||
+ val = ~0;
|
||||
@@ -41,49 +41,41 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
|
||||
{
|
||||
- writel(val, wo->boot.addr + reg);
|
||||
- writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
+ if (wo->boot_regmap)
|
||||
+ regmap_write(wo->boot_regmap, reg, val);
|
||||
+ else
|
||||
+ writel(val, wo->boot.addr + reg);
|
||||
+ writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
}
|
||||
|
||||
static struct sk_buff *
|
||||
@@ -316,10 +327,21 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
return ret;
|
||||
}
|
||||
@@ -313,6 +324,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
u32 val, boot_cr;
|
||||
int ret, i;
|
||||
|
||||
- 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;
|
||||
+ }
|
||||
/* load firmware region metadata */
|
||||
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
||||
int index = of_property_match_string(wo->hw->node,
|
||||
@@ -321,6 +335,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
if (index < 0)
|
||||
continue;
|
||||
|
||||
/* set dummy cr */
|
||||
wed_w32(wo->hw->wed_dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_FWDL,
|
||||
+ if (index == MTK_WED_WO_REGION_BOOT && !IS_ERR(wo->boot_regmap))
|
||||
+ continue;
|
||||
+
|
||||
ret = mtk_wed_get_reserved_memory_region(wo->hw, index, &mem_region[i]);
|
||||
if (ret)
|
||||
return ret;
|
||||
--- 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 {
|
||||
|
||||
@@ -231,6 +231,7 @@ 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 regmap *boot_regmap;
|
||||
struct mtk_wed_wo_queue q_tx;
|
||||
struct mtk_wed_wo_queue q_rx;
|
||||
|
||||
|
||||
@@ -20,72 +20,67 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
@@ -300,6 +300,52 @@ next:
|
||||
@@ -316,6 +316,39 @@ next:
|
||||
}
|
||||
|
||||
static int
|
||||
+mtk_wed_mcu_load_memory_regions(struct mtk_wed_wo *wo,
|
||||
+ struct mtk_wed_wo_memory_region *region)
|
||||
+mtk_wed_mcu_load_ilm(struct mtk_wed_wo *wo)
|
||||
+{
|
||||
+ struct mtk_wed_wo_memory_region *ilm_region;
|
||||
+ struct resource res;
|
||||
+ 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;
|
||||
+ if (!np)
|
||||
+ return 0;
|
||||
+
|
||||
+ ret = of_address_to_resource(np, 0, &res);
|
||||
+ of_node_put(np);
|
||||
+ ret = of_address_to_resource(np, 0, &res);
|
||||
+ of_node_put(np);
|
||||
+
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+ 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));
|
||||
+ ilm_region = &mem_region[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;
|
||||
+ }
|
||||
+ if (!IS_ERR(ilm_region->addr))
|
||||
+ return 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]);
|
||||
+ ret = PTR_ERR(ilm_region->addr);
|
||||
+ ilm_region->addr = NULL;
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+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
|
||||
const struct mtk_wed_fw_trailer *trailer;
|
||||
@@ -324,14 +357,20 @@ 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;
|
||||
|
||||
+ mtk_wed_mcu_load_ilm(wo);
|
||||
wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
|
||||
"mediatek,wo-cpuboot");
|
||||
|
||||
/* load firmware region metadata */
|
||||
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
||||
- int index = of_property_match_string(wo->hw->node,
|
||||
- "memory-region-names",
|
||||
- mem_region[i].name);
|
||||
+ int index;
|
||||
+
|
||||
+ if (mem_region[i].addr)
|
||||
+ continue;
|
||||
+
|
||||
+ index = of_property_match_string(wo->hw->node,
|
||||
+ "memory-region-names",
|
||||
+ mem_region[i].name);
|
||||
if (index < 0)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
||||
@@ -821,6 +821,24 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
@@ -1320,6 +1320,24 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
struct device_node *np;
|
||||
int index;
|
||||
|
||||
@@ -47,7 +47,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
index = of_property_match_string(dev->hw->node, "memory-region-names",
|
||||
"wo-dlm");
|
||||
if (index < 0)
|
||||
@@ -837,6 +855,7 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
@@ -1336,6 +1354,7 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
return -ENODEV;
|
||||
|
||||
dev->rro.miod_phys = rmem->base;
|
||||
|
||||
@@ -15,30 +15,23 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- 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
|
||||
@@ -234,8 +234,8 @@ int mtk_wed_mcu_msg_update(struct mtk_we
|
||||
}
|
||||
|
||||
static int
|
||||
-mtk_wed_get_memory_region(struct mtk_wed_wo *wo,
|
||||
-mtk_wed_get_memory_region(struct mtk_wed_hw *hw, int index,
|
||||
- struct mtk_wed_wo_memory_region *region)
|
||||
+mtk_wed_get_reserved_memory_region(struct mtk_wed_wo *wo,
|
||||
+mtk_wed_get_reserved_memory_region(struct mtk_wed_hw *hw, int index,
|
||||
+ 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
|
||||
@@ -321,7 +321,7 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
if (index < 0)
|
||||
continue;
|
||||
|
||||
/* 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]);
|
||||
- ret = mtk_wed_get_memory_region(wo->hw, index, &mem_region[i]);
|
||||
+ ret = mtk_wed_get_reserved_memory_region(wo->hw, index, &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;
|
||||
|
||||
|
||||
@@ -23,15 +23,15 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
@@ -18,12 +18,23 @@
|
||||
@@ -34,12 +34,23 @@ static struct mtk_wed_wo_memory_region m
|
||||
|
||||
static u32 wo_r32(struct mtk_wed_wo *wo, u32 reg)
|
||||
{
|
||||
- return readl(wo->boot.addr + reg);
|
||||
- return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
+ u32 val;
|
||||
+
|
||||
+ if (!wo->boot_regmap)
|
||||
+ return readl(wo->boot.addr + reg);
|
||||
+ return readl(mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
+
|
||||
+ if (regmap_read(wo->boot_regmap, reg, &val))
|
||||
+ val = ~0;
|
||||
@@ -41,49 +41,41 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
static void wo_w32(struct mtk_wed_wo *wo, u32 reg, u32 val)
|
||||
{
|
||||
- writel(val, wo->boot.addr + reg);
|
||||
- writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
+ if (wo->boot_regmap)
|
||||
+ regmap_write(wo->boot_regmap, reg, val);
|
||||
+ else
|
||||
+ writel(val, wo->boot.addr + reg);
|
||||
+ writel(val, mem_region[MTK_WED_WO_REGION_BOOT].addr + reg);
|
||||
}
|
||||
|
||||
static struct sk_buff *
|
||||
@@ -316,10 +327,21 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
return ret;
|
||||
}
|
||||
@@ -313,6 +324,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
u32 val, boot_cr;
|
||||
int ret, i;
|
||||
|
||||
- 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;
|
||||
+ }
|
||||
/* load firmware region metadata */
|
||||
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
||||
int index = of_property_match_string(wo->hw->node,
|
||||
@@ -321,6 +335,9 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
if (index < 0)
|
||||
continue;
|
||||
|
||||
/* set dummy cr */
|
||||
wed_w32(wo->hw->wed_dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_FWDL,
|
||||
+ if (index == MTK_WED_WO_REGION_BOOT && !IS_ERR(wo->boot_regmap))
|
||||
+ continue;
|
||||
+
|
||||
ret = mtk_wed_get_reserved_memory_region(wo->hw, index, &mem_region[i]);
|
||||
if (ret)
|
||||
return ret;
|
||||
--- 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 {
|
||||
|
||||
@@ -231,6 +231,7 @@ 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 regmap *boot_regmap;
|
||||
struct mtk_wed_wo_queue q_tx;
|
||||
struct mtk_wed_wo_queue q_rx;
|
||||
|
||||
|
||||
@@ -20,72 +20,67 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
@@ -300,6 +300,52 @@ next:
|
||||
@@ -316,6 +316,39 @@ next:
|
||||
}
|
||||
|
||||
static int
|
||||
+mtk_wed_mcu_load_memory_regions(struct mtk_wed_wo *wo,
|
||||
+ struct mtk_wed_wo_memory_region *region)
|
||||
+mtk_wed_mcu_load_ilm(struct mtk_wed_wo *wo)
|
||||
+{
|
||||
+ struct mtk_wed_wo_memory_region *ilm_region;
|
||||
+ struct resource res;
|
||||
+ 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;
|
||||
+ if (!np)
|
||||
+ return 0;
|
||||
+
|
||||
+ ret = of_address_to_resource(np, 0, &res);
|
||||
+ of_node_put(np);
|
||||
+ ret = of_address_to_resource(np, 0, &res);
|
||||
+ of_node_put(np);
|
||||
+
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+ 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));
|
||||
+ ilm_region = &mem_region[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;
|
||||
+ }
|
||||
+ if (!IS_ERR(ilm_region->addr))
|
||||
+ return 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]);
|
||||
+ ret = PTR_ERR(ilm_region->addr);
|
||||
+ ilm_region->addr = NULL;
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+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
|
||||
const struct mtk_wed_fw_trailer *trailer;
|
||||
@@ -324,14 +357,20 @@ 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;
|
||||
|
||||
+ mtk_wed_mcu_load_ilm(wo);
|
||||
wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
|
||||
"mediatek,wo-cpuboot");
|
||||
|
||||
/* load firmware region metadata */
|
||||
for (i = 0; i < ARRAY_SIZE(mem_region); i++) {
|
||||
- int index = of_property_match_string(wo->hw->node,
|
||||
- "memory-region-names",
|
||||
- mem_region[i].name);
|
||||
+ int index;
|
||||
+
|
||||
+ if (mem_region[i].addr)
|
||||
+ continue;
|
||||
+
|
||||
+ index = of_property_match_string(wo->hw->node,
|
||||
+ "memory-region-names",
|
||||
+ mem_region[i].name);
|
||||
if (index < 0)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed.c
|
||||
@@ -814,6 +814,24 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
@@ -1320,6 +1320,24 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
struct device_node *np;
|
||||
int index;
|
||||
|
||||
@@ -47,7 +47,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
index = of_property_match_string(dev->hw->node, "memory-region-names",
|
||||
"wo-dlm");
|
||||
if (index < 0)
|
||||
@@ -830,6 +848,7 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
@@ -1336,6 +1354,7 @@ mtk_wed_rro_alloc(struct mtk_wed_device
|
||||
return -ENODEV;
|
||||
|
||||
dev->rro.miod_phys = rmem->base;
|
||||
|
||||
Reference in New Issue
Block a user