[PATCH net-next 0/2] net: airoha: npu: Introduce support for Airoha 7583 NPU

[PATCH net-next 0/2] net: airoha: npu: Introduce support for Airoha 7583 NPU

[Lorenzo Bianconi]

Introduce support for Airoha 7583 SoC NPU.

---
Lorenzo Bianconi (2):
      dt-bindings: net: airoha: npu: Add AN7583 support
      net: airoha: npu: Add 7583 SoC support

 .../devicetree/bindings/net/airoha,en7581-npu.yaml     |  1 +
 drivers/net/ethernet/airoha/airoha_npu.c               | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
base-commit: 203e3beb73e53584ca90bc2a6d8240b9b12b9bcf
change-id: 20250926-airoha-npu-7583-63e41301664c

Best regards,
-- 
Lorenzo Bianconi <lorenzo@kernel.org>

[PATCH net-next 1/2] dt-bindings: net: airoha: npu: Add AN7583 support

[Lorenzo Bianconi]

Introduce AN7583 NPU support to Airoha EN7581 NPU device-tree bindings.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml b/Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml
index c7644e6586d329d8ec2f0a0d8d8e4f4490429dcc..59c57f58116b568092446e6cfb7b6bd3f4f47b82 100644
--- a/Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml
+++ b/Documentation/devicetree/bindings/net/airoha,en7581-npu.yaml
@@ -18,6 +18,7 @@ properties:
   compatible:
     enum:
       - airoha,en7581-npu
+      - airoha,an7583-npu
 
   reg:
     maxItems: 1

-- 
2.51.0

[PATCH net-next 2/2] net: airoha: npu: Add 7583 SoC support

[Lorenzo Bianconi]

Introduce support for Airoha 7583 SoC NPU selecting proper firmware images.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 drivers/net/ethernet/airoha/airoha_npu.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
index e1d131d6115c10b40a56b63427eec59ea587d22a..fee611666aa0debf77165d9b10abecceb756ea97 100644
--- a/drivers/net/ethernet/airoha/airoha_npu.c
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
@@ -16,6 +16,8 @@
 
 #define NPU_EN7581_FIRMWARE_DATA		"airoha/en7581_npu_data.bin"
 #define NPU_EN7581_FIRMWARE_RV32		"airoha/en7581_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
 #define NPU_EN7581_FIRMWARE_DATA_MAX_SIZE	0x10000
 #define NPU_DUMP_SIZE				512
@@ -186,10 +188,15 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
 				   struct resource *res)
 {
 	const struct firmware *fw;
+	const char *fw_name;
 	void __iomem *addr;
 	int ret;
 
-	ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_RV32, dev);
+	if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu"))
+		fw_name = NPU_AN7583_FIRMWARE_RV32;
+	else
+		fw_name = NPU_EN7581_FIRMWARE_RV32;
+	ret = request_firmware(&fw, fw_name, dev);
 	if (ret)
 		return ret == -ENOENT ? -EPROBE_DEFER : ret;
 
@@ -209,7 +216,11 @@ static int airoha_npu_run_firmware(struct device *dev, void __iomem *base,
 	memcpy_toio(addr, fw->data, fw->size);
 	release_firmware(fw);
 
-	ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_DATA, dev);
+	if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu"))
+		fw_name = NPU_AN7583_FIRMWARE_DATA;
+	else
+		fw_name = NPU_EN7581_FIRMWARE_DATA;
+	ret = request_firmware(&fw, fw_name, dev);
 	if (ret)
 		return ret == -ENOENT ? -EPROBE_DEFER : ret;
 
@@ -612,6 +623,7 @@ EXPORT_SYMBOL_GPL(airoha_npu_put);
 
 static const struct of_device_id of_airoha_npu_match[] = {
 	{ .compatible = "airoha,en7581-npu" },
+	{ .compatible = "airoha,an7583-npu" },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, of_airoha_npu_match);
@@ -749,6 +761,8 @@ module_platform_driver(airoha_npu_driver);
 
 MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_DATA);
 MODULE_FIRMWARE(NPU_EN7581_FIRMWARE_RV32);
+MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_DATA);
+MODULE_FIRMWARE(NPU_AN7583_FIRMWARE_RV32);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");
 MODULE_DESCRIPTION("Airoha Network Processor Unit driver");

-- 
2.51.0

Re: [PATCH net-next 2/2] net: airoha: npu: Add 7583 SoC support

[Andrew Lunn]

> -	ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_DATA, dev);
> +	if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu"))
> +		fw_name = NPU_AN7583_FIRMWARE_DATA;
> +	else
> +		fw_name = NPU_EN7581_FIRMWARE_DATA;
> +	ret = request_firmware(&fw, fw_name, dev);
>  	if (ret)
>  		return ret == -ENOENT ? -EPROBE_DEFER : ret;
>  
> @@ -612,6 +623,7 @@ EXPORT_SYMBOL_GPL(airoha_npu_put);
>  
>  static const struct of_device_id of_airoha_npu_match[] = {
>  	{ .compatible = "airoha,en7581-npu" },
> +	{ .compatible = "airoha,an7583-npu" },

It would be more normal to make use of the void * in of_device_id to
have per compatible data, such are firmware name.

	Andrew

Re: [PATCH net-next 2/2] net: airoha: npu: Add 7583 SoC support

[Lorenzo Bianconi]

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

> > -	ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_DATA, dev);
> > +	if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu"))
> > +		fw_name = NPU_AN7583_FIRMWARE_DATA;
> > +	else
> > +		fw_name = NPU_EN7581_FIRMWARE_DATA;
> > +	ret = request_firmware(&fw, fw_name, dev);
> >  	if (ret)
> >  		return ret == -ENOENT ? -EPROBE_DEFER : ret;
> >  
> > @@ -612,6 +623,7 @@ EXPORT_SYMBOL_GPL(airoha_npu_put);
> >  
> >  static const struct of_device_id of_airoha_npu_match[] = {
> >  	{ .compatible = "airoha,en7581-npu" },
> > +	{ .compatible = "airoha,an7583-npu" },
> 
> It would be more normal to make use of the void * in of_device_id to
> have per compatible data, such are firmware name.
> 
> 	Andrew

ack, I implemted this way since we have 2 fw names but we can have a struct
pointed by of_device_id driver_data pointer to contains both of them.
What do you think?

Regards,
Lorenzo

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

Re: [PATCH net-next 2/2] net: airoha: npu: Add 7583 SoC support

[Andrew Lunn]

On Fri, Sep 26, 2025 at 06:01:47PM +0200, Lorenzo Bianconi wrote:
> > > -	ret = request_firmware(&fw, NPU_EN7581_FIRMWARE_DATA, dev);
> > > +	if (of_device_is_compatible(dev->of_node, "airoha,an7583-npu"))
> > > +		fw_name = NPU_AN7583_FIRMWARE_DATA;
> > > +	else
> > > +		fw_name = NPU_EN7581_FIRMWARE_DATA;
> > > +	ret = request_firmware(&fw, fw_name, dev);
> > >  	if (ret)
> > >  		return ret == -ENOENT ? -EPROBE_DEFER : ret;
> > >  
> > > @@ -612,6 +623,7 @@ EXPORT_SYMBOL_GPL(airoha_npu_put);
> > >  
> > >  static const struct of_device_id of_airoha_npu_match[] = {
> > >  	{ .compatible = "airoha,en7581-npu" },
> > > +	{ .compatible = "airoha,an7583-npu" },
> > 
> > It would be more normal to make use of the void * in of_device_id to
> > have per compatible data, such are firmware name.
> > 
> > 	Andrew
> 
> ack, I implemted this way since we have 2 fw names but we can have a struct
> pointed by of_device_id driver_data pointer to contains both of them.
> What do you think?

That would work.

	Andrew