b0687062bd
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/21019 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From 4a7843cc8a41b9612becccc07715ed017770eb89 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Tue, 6 May 2025 18:56:47 +0200
|
|
Subject: [PATCH] net: airoha: Add missing field to ppe_mbox_data struct
|
|
|
|
The official Airoha EN7581 firmware requires adding max_packet field in
|
|
ppe_mbox_data struct while the unofficial one used to develop the Airoha
|
|
EN7581 flowtable support does not require this field.
|
|
This patch does not introduce any real backwards compatible issue since
|
|
EN7581 fw is not publicly available in linux-firmware or other
|
|
repositories (e.g. OpenWrt) yet and the official fw version will use this
|
|
new layout. For this reason this change needs to be backported.
|
|
Moreover, make explicit the padding added by the compiler introducing
|
|
the rsv array in init_info struct.
|
|
At the same time use u32 instead of int for init_info and set_info
|
|
struct definitions in ppe_mbox_data struct.
|
|
|
|
Fixes: 23290c7bc190d ("net: airoha: Introduce Airoha NPU support")
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20250506-airoha-en7581-fix-ppe_mbox_data-v5-1-29cabed6864d@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_npu.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_npu.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
|
|
@@ -104,12 +104,14 @@ struct ppe_mbox_data {
|
|
u8 xpon_hal_api;
|
|
u8 wan_xsi;
|
|
u8 ct_joyme4;
|
|
- int ppe_type;
|
|
- int wan_mode;
|
|
- int wan_sel;
|
|
+ u8 max_packet;
|
|
+ u8 rsv[3];
|
|
+ u32 ppe_type;
|
|
+ u32 wan_mode;
|
|
+ u32 wan_sel;
|
|
} init_info;
|
|
struct {
|
|
- int func_id;
|
|
+ u32 func_id;
|
|
u32 size;
|
|
u32 data;
|
|
} set_info;
|