[PATCH] net: airoha: Remove dead MT7996 NPU firmware declarations

[PATCH] net: airoha: Remove dead MT7996 NPU firmware declarations

[Wayen.Yan]

Remove the NPU_EN7581_7996_FIRMWARE_DATA/RV32 #define macros and
their corresponding MODULE_FIRMWARE() declarations. Neither the
en7581_npu_soc_data nor the an7583_npu_soc_data references these
firmware names, and no firmware loading path in the driver ever
requests them. The only references are the #define lines themselves
and the MODULE_FIRMWARE() declarations below.

Keeping dead MODULE_FIRMWARE entries causes modprobe/udev to attempt
pre-loading non-existent firmware files, generating kernel log noise
and misleading distributors about which firmware files to package.

Fixes: 23290c7bc190 ("net: airoha: Introduce Airoha NPU support")
Signed-off-by: Wayen <win847@gmail.com>
---
 drivers/net/ethernet/airoha/airoha_npu.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
index 17dbdc8325..93095f3894 100644
--- a/drivers/net/ethernet/airoha/airoha_npu.c
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
@@ -16,8 +16,6 @@
 
 #define NPU_EN7581_FIRMWARE_DATA		"airoha/en7581_npu_data.bin"
 #define NPU_EN7581_FIRMWARE_RV32		"airoha/en7581_npu_rv32.bin"
-#define NPU_EN7581_7996_FIRMWARE_DATA		"airoha/en7581_MT7996_npu_data.bin"
-#define NPU_EN7581_7996_FIRMWARE_RV32		"airoha/en7581_MT7996_npu_rv32.bin"
 #define NPU_AN7583_FIRMWARE_DATA		"airoha/an7583_npu_data.bin"
 #define NPU_AN7583_FIRMWARE_RV32		"airoha/an7583_npu_rv32.bin"
 #define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE	0x200000
@@ -822,8 +820,6 @@ module_platform_driver(airoha_npu_driver);
 
 MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);
 MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);
-MODULE_FIRMWARE(NPU_EN7581_7996_FIRMWARE_DATA);
-MODULE_FIRMWARE(NPU_EN7581_7996_FIRMWARE_RV32);
 MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_DATA);
 MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_RV32);
 MODULE_LICENSE("GPL");
-- 
2.51.0

Re: [PATCH] net: airoha: Remove dead MT7996 NPU firmware declarations

[Lorenzo Bianconi]

[-- Attachment #1: Type: text/plain, Size: 2985 bytes --]

> Remove the NPU_EN7581_7996_FIRMWARE_DATA/RV32 #define macros and
> their corresponding MODULE_FIRMWARE() declarations. Neither the
> en7581_npu_soc_data nor the an7583_npu_soc_data references these
> firmware names, and no firmware loading path in the driver ever
> requests them. The only references are the #define lines themselves
> and the MODULE_FIRMWARE() declarations below.
> 
> Keeping dead MODULE_FIRMWARE entries causes modprobe/udev to attempt
> pre-loading non-existent firmware files, generating kernel log noise
> and misleading distributors about which firmware files to package.
> 
> Fixes: 23290c7bc190 ("net: airoha: Introduce Airoha NPU support")
> Signed-off-by: Wayen <win847@gmail.com>

Please drop this patch since EN7581_7996 firmware is defined via dts
for 7581:

commit 3847173525e307ebcd23bd4863da943ea78b0057
Author: Lorenzo Bianconi <lorenzo@kernel.org>
Date:   Tue Jan 20 11:17:18 2026 +0100

    net: airoha: npu: Add the capability to read firmware names from dts
    
    Introduce the capability to read the firmware binary names from device-tree
    using the firmware-name property if available.
    This patch is needed because NPU firmware binaries are board specific since
    they depend on the MediaTek WiFi chip used on the board (e.g. MT7996 or
    MT7992) and the WiFi chip version info is not available in the NPU driver.
    This is a preliminary patch to enable MT76 NPU offloading if the Airoha SoC
    is equipped with MT7996 (Eagle) WiFi chipset.

https://github.com/openwrt/openwrt/blob/main/target/linux/airoha/dts/an7581-npu-mt7996.dtsi

and here these macros are used to notify userspace for firmware loading.

Regards,
Lorenzo

> ---
>  drivers/net/ethernet/airoha/airoha_npu.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
> index 17dbdc8325..93095f3894 100644
> --- a/drivers/net/ethernet/airoha/airoha_npu.c
> +++ b/drivers/net/ethernet/airoha/airoha_npu.c
> @@ -16,8 +16,6 @@
>  
>  #define NPU_EN7581_FIRMWARE_DATA		"airoha/en7581_npu_data.bin"
>  #define NPU_EN7581_FIRMWARE_RV32		"airoha/en7581_npu_rv32.bin"
> -#define NPU_EN7581_7996_FIRMWARE_DATA		"airoha/en7581_MT7996_npu_data.bin"
> -#define NPU_EN7581_7996_FIRMWARE_RV32		"airoha/en7581_MT7996_npu_rv32.bin"
>  #define NPU_AN7583_FIRMWARE_DATA		"airoha/an7583_npu_data.bin"
>  #define NPU_AN7583_FIRMWARE_RV32		"airoha/an7583_npu_rv32.bin"
>  #define NPU_EN7581_FIRMWARE_RV32_MAX_SIZE	0x200000
> @@ -822,8 +820,6 @@ module_platform_driver(airoha_npu_driver);
>  
>  MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);
>  MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);
> -MODULE_FIRMWARE(NPU_EN7581_7996_FIRMWARE_DATA);
> -MODULE_FIRMWARE(NPU_EN7581_7996_FIRMWARE_RV32);
>  MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_DATA);
>  MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_RV32);
>  MODULE_LICENSE("GPL");
> -- 
> 2.51.0
> 
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: net: airoha: Remove dead MT7996 NPU firmware declarations

[win847]

Thank you for the clarification, Lorenzo.

You're right - I missed the DTS-based firmware loading mechanism
introduced in commit 3847173525e30. The MODULE_FIRMWARE() macros
are indeed used to notify userspace for firmware loading, and the
firmware names are defined via DTS for different board configurations.

I'll drop this patch.

Regards,
Wayen