kernel: update mtk ppe flow accounting patch to the latest version
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
@@ -21,8 +21,6 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
drivers/net/ethernet/mediatek/mtk_wed_wo.h | 3 +-
|
||||
2 files changed, 30 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
index 6624f6d6abdd..797c3b412ab6 100644
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
@@ -18,12 +18,23 @@
|
||||
@@ -51,7 +49,7 @@ index 6624f6d6abdd..797c3b412ab6 100644
|
||||
}
|
||||
|
||||
static struct sk_buff *
|
||||
@@ -316,10 +327,21 @@ mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
|
||||
@@ -316,10 +327,21 @@ mtk_wed_mcu_load_firmware(struct mtk_wed
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -77,8 +75,6 @@ index 6624f6d6abdd..797c3b412ab6 100644
|
||||
|
||||
/* set dummy cr */
|
||||
wed_w32(wo->hw->wed_dev, MTK_WED_SCR0 + 4 * MTK_WED_DUMMY_CR_FWDL,
|
||||
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_wo.h b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
||||
index dbcf42ce9173..c03071203cc0 100644
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_wo.h
|
||||
@@ -227,7 +227,8 @@ struct mtk_wed_wo_queue {
|
||||
@@ -91,6 +87,3 @@ index dbcf42ce9173..c03071203cc0 100644
|
||||
|
||||
struct mtk_wed_wo_queue q_tx;
|
||||
struct mtk_wed_wo_queue q_rx;
|
||||
--
|
||||
2.39.2
|
||||
|
||||
|
||||
@@ -18,15 +18,12 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||||
drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 55 ++++++++++++++++++---
|
||||
1 file changed, 49 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
index 797c3b412ab6..976946a3653a 100644
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_wed_mcu.c
|
||||
@@ -299,6 +299,52 @@ mtk_wed_mcu_run_firmware(struct mtk_wed_wo *wo, const struct firmware *fw,
|
||||
return -EINVAL;
|
||||
@@ -300,6 +300,52 @@ next:
|
||||
}
|
||||
|
||||
+static int
|
||||
static int
|
||||
+mtk_wed_mcu_load_memory_regions(struct mtk_wed_wo *wo,
|
||||
+ struct mtk_wed_wo_memory_region *region)
|
||||
+{
|
||||
@@ -72,10 +69,11 @@ index 797c3b412ab6..976946a3653a 100644
|
||||
+ ®ion[MTK_WED_WO_REGION_ILM]);
|
||||
+}
|
||||
+
|
||||
static int
|
||||
+static int
|
||||
mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
|
||||
{
|
||||
@@ -320,12 +366,9 @@ 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;
|
||||
|
||||
@@ -91,6 +89,3 @@ index 797c3b412ab6..976946a3653a 100644
|
||||
|
||||
wo->boot_regmap = syscon_regmap_lookup_by_phandle(wo->hw->node,
|
||||
"mediatek,wo-cpuboot");
|
||||
--
|
||||
2.39.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user