Skip to contentSkip to conversation

net: ethernet: mtk_eth_soc: use WO firmware for MT7981

PATCH Applied Daniel Golle 3 participants 5 messages Apr 20, 2023 – Apr 22, 2023

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover net: ethernet: mtk_eth_soc: use WO firmware for MT7981

In order to support wireless offloading on MT7981 we need to load the appropriate firmware. Recognize MT7981 by introducing a new DT compatible and load mt7981_wo.bin if it is set.

Changes since v1:
* retain alphabetic order in dt-bindings

Daniel Golle (2):
dt-bindings: net: mediatek: add WED RX binding for MT7981 eth driver
net: ethernet: mtk_eth_soc: use WO firmware for MT7981

 .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml         | 1 +
 drivers/net/ethernet/mediatek/mtk_wed_mcu.c                | 7 ++++++-
 drivers/net/ethernet/mediatek/mtk_wed_wo.h                 | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
Signature · 1 line
2.40.0
#1 lore raw

PATCH v2 1/2 dt-bindings: net: mediatek: add WED RX binding for MT7981 eth driver

Add compatible string for mediatek,mt7981-wed as MT7981 also supports RX WED just like MT7986, but needs a different firmware file.

---
Changes since v1:
* maintain alphabetic order

 .../devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml    | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt7622-wed.yaml +1 -0
index 5c223cb063d48..f7d578a171a4f 100644
@@ -20,6 +20,7 @@ properties:
     items:
       - enum:
           - mediatek,mt7622-wed
+          - mediatek,mt7981-wed
           - mediatek,mt7986-wed
       - const: syscon
 
Signature · 1 line
2.40.0
#3 lore raw

PATCH v2 2/2 net: ethernet: mtk_eth_soc: use WO firmware for MT7981

In reply to Daniel Golle

In order to support wireless offloading on MT7981 we need to load the appropriate firmware. Recognize MT7981 and load mt7981_wo.bin.

---
No changes since v1.

 drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 7 ++++++-
 drivers/net/ethernet/mediatek/mtk_wed_wo.h  | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/net/ethernet/mediatek/mtk_wed_mcu.c +6 -1
index 6bad0d262f286..071ed3dea860d 100644
@@ -326,7 +326,11 @@ mtk_wed_mcu_load_firmware(struct mtk_wed_wo *wo)
 		wo->hw->index + 1);
 
 	/* load firmware */
-	fw_name = wo->hw->index ? MT7986_FIRMWARE_WO1 : MT7986_FIRMWARE_WO0;
+	if (of_device_is_compatible(wo->hw->node, "mediatek,mt7981-wed"))
+		fw_name = MT7981_FIRMWARE_WO;
+	else
+		fw_name = wo->hw->index ? MT7986_FIRMWARE_WO1 : MT7986_FIRMWARE_WO0;
+
 	ret = request_firmware(&fw, fw_name, wo->hw->dev);
 	if (ret)
 		return ret;
@@ -386,5 +390,6 @@ int mtk_wed_mcu_init(struct mtk_wed_wo *wo)
 				  100, MTK_FW_DL_TIMEOUT);
 }
 
+MODULE_FIRMWARE(MT7981_FIRMWARE_WO);
 MODULE_FIRMWARE(MT7986_FIRMWARE_WO0);
 MODULE_FIRMWARE(MT7986_FIRMWARE_WO1);
drivers/net/ethernet/mediatek/mtk_wed_wo.h +1 -0
index dbcf42ce9173c..7a1a2a28f1acb 100644
@@ -88,6 +88,7 @@ enum mtk_wed_dummy_cr_idx {
 	MTK_WED_DUMMY_CR_WO_STATUS,
 };
 
+#define MT7981_FIRMWARE_WO	"mediatek/mt7981_wo.bin"
 #define MT7986_FIRMWARE_WO0	"mediatek/mt7986_wo_0.bin"
 #define MT7986_FIRMWARE_WO1	"mediatek/mt7986_wo_1.bin"
 
Signature · 1 line
2.40.0
#4 lore raw
In reply to Daniel Golle
This series was applied to netdev/net.git (main) by David S. Miller <[email protected]>:

Hello:

This series was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

Quoted 8 lines · On Thu, 20 Apr 2023 17:04:02 +0100 you wrote:

In order to support wireless offloading on MT7981 we need to load the appropriate firmware. Recognize MT7981 by introducing a new DT compatible and load mt7981_wo.bin if it is set.

Changes since v1:
* retain alphabetic order in dt-bindings

[...]

Here is the summary with links:
- [v2,1/2] dt-bindings: net: mediatek: add WED RX binding for MT7981 eth driver

    https://git.kernel.org/netdev/net/c/cf88231d9739
  - [v2,2/2] net: ethernet: mtk_eth_soc: use WO firmware for MT7981
    https://git.kernel.org/netdev/net/c/86ce0d09e424

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html