Skip to content

Commit 2afc533

Browse files
Ramon00Ramon00
committed
Merge branch 'wirelessscripts' of https://github.com/ramon00/openwrt into wirelessscripts
2 parents f052af4 + 4c57ea1 commit 2afc533

14 files changed

Lines changed: 246 additions & 22 deletions

File tree

‎target/linux/airoha/dts/an7581.dtsi‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
no-map;
5555
reg = <0x0 0x90c00000 0x0 0x6800>;
5656
};
57+
58+
npu_ba: npu-ba@90c06800 {
59+
no-map;
60+
reg = <0x0 0x90c06800 0x0 0x200000>;
61+
};
5762
};
5863

5964
psci {
@@ -855,9 +860,10 @@
855860
<GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,
856861
<GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
857862
memory-region = <&npu_binary>, <&npu_pkt>, <&npu_txpkt>,
858-
<&npu_txbufid>;
863+
<&npu_txbufid>, <&npu_ba>;
859864
memory-region-names = "binary", "pkt", "tx-pkt",
860-
"tx-bufid";
865+
"tx-bufid", "ba";
866+
status = "disabled";
861867
};
862868

863869
eth: ethernet@1fb50000 {

‎target/linux/airoha/patches-6.12/910-01-v7.0-net-airoha-npu-Init-BA-memory-region-if.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 875a59c9a9e584d99d8e9e5aa8435ec9300bfe91 Mon Sep 17 00:00:00 2001
2+
From: Lorenzo Bianconi <lorenzo@kernel.org>
3+
Date: Thu, 8 Jan 2026 16:05:08 +0100
4+
Subject: [PATCH] net: airoha: npu: Init BA memory region if provided via DTS
5+
6+
Initialize NPU Block Ack memory region if reserved via DTS.
7+
Block Ack memory region is used by NPU MT7996 (Eagle) offloading.
8+
9+
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
10+
Link: https://patch.msgid.link/20260108-airoha-ba-memory-region-v3-2-bf1814e5dcc4@kernel.org
11+
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12+
---
13+
drivers/net/ethernet/airoha/airoha_npu.c | 8 ++++++++
14+
1 file changed, 8 insertions(+)
15+
16+
diff --git a/drivers/net/ethernet/airoha/airoha_npu.c b/drivers/net/ethernet/airoha/airoha_npu.c
17+
index 22f72c14606599..a56b3780bb627c 100644
18+
--- a/drivers/net/ethernet/airoha/airoha_npu.c
19+
+++ b/drivers/net/ethernet/airoha/airoha_npu.c
20+
@@ -519,6 +519,14 @@ static int airoha_npu_wlan_init_memory(struct airoha_npu *npu)
21+
if (err)
22+
return err;
23+
24+
+ if (of_property_match_string(npu->dev->of_node, "memory-region-names",
25+
+ "ba") >= 0) {
26+
+ cmd = WLAN_FUNC_SET_WAIT_DRAM_BA_NODE_ADDR;
27+
+ err = airoha_npu_wlan_set_reserved_memory(npu, 0, "ba", cmd);
28+
+ if (err)
29+
+ return err;
30+
+ }
31+
+
32+
cmd = WLAN_FUNC_SET_WAIT_IS_FORCE_TO_CPU;
33+
return airoha_npu_wlan_msg_send(npu, 0, cmd, &val, sizeof(val),
34+
GFP_KERNEL);

‎target/linux/ath79/image/tiny-tp-link.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ define Device/tplink_rex5x
77
IMAGE_SIZE := 7680k
88
KERNEL_SIZE := 6016k
99
DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
10-
DEVICE_COMPAT_VERSION := 2.0
10+
DEVICE_COMPAT_VERSION := 3.0
1111
DEVICE_COMPAT_MESSAGE := Partition layout and blocksize changed. Use sysupgrade -F; image must not exceed 6016 KiB (5.875 MB).
1212
IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
1313
endef

‎target/linux/ath79/tiny/base-files/etc/board.d/05_compat-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ case "$(board_name)" in
1616
tplink,re355-v1|\
1717
tplink,re450-v1|\
1818
tplink,re450-v2)
19-
ucidef_set_compat_version "2.0"
19+
ucidef_set_compat_version "3.0"
2020
;;
2121
esac
2222

‎target/linux/generic/pending-6.12/620-net-sfp-improve-Huawei-MA5671a-fixup.patch‎

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
From patchwork Fri Mar 6 12:29:55 2026
2+
Content-Type: text/plain; charset="utf-8"
3+
MIME-Version: 1.0
4+
Content-Transfer-Encoding: 8bit
5+
X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?=
6+
<noltari@gmail.com>
7+
X-Patchwork-Id: 14457090
8+
X-Patchwork-Delegate: kuba@kernel.org
9+
Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com
10+
[209.85.221.48])
11+
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
12+
(No client certificate requested)
13+
by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF3F4386459
14+
for <netdev@vger.kernel.org>; Fri, 6 Mar 2026 12:52:18 +0000 (UTC)
15+
Authentication-Results: smtp.subspace.kernel.org;
16+
arc=none smtp.client-ip=209.85.221.48
17+
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
18+
t=1772801540; cv=none;
19+
b=LVeywxv8ajenPZ8Kr1arieKosbrf60O9l+ouIPKPFNt5btxWDZ59pIU9BfZjv5n9ifEOyUA/UD0phxnG77+oB/k6UCd7DdGQQASZB3NHq5cvmErbgXm0XG3C8BBxVXU5pF7atPS23kBqM9ptxsv3IaeH/fDFcj6k6SH61rGEpuQ=
20+
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
21+
s=arc-20240116; t=1772801540; c=relaxed/simple;
22+
bh=HAy43ssDo0xlUcBDIU7vQZtNnpxG03JPCL6Ldi51ASI=;
23+
h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type;
24+
b=OBk8kI0I91psFRaIxb6nCnAzQlsc7jrXkOPW8lL7cYCosY08yfQDwAlWBFfdFs/VDuVJjD5VEdeQeMt2K4kWGgjLNXhTrRqgs6JNe7PxALDJKvt+kcJ833TRz3hKl2eb2Ft6WnKPf/6hp5Q3qm8+/Q703ixD4sF/0aDNw1BrDY4=
25+
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
26+
dmarc=pass (p=none dis=none) header.from=gmail.com;
27+
spf=pass smtp.mailfrom=gmail.com;
28+
dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
29+
header.b=RCEse1HL; arc=none smtp.client-ip=209.85.221.48
30+
Authentication-Results: smtp.subspace.kernel.org;
31+
dmarc=pass (p=none dis=none) header.from=gmail.com
32+
Authentication-Results: smtp.subspace.kernel.org;
33+
spf=pass smtp.mailfrom=gmail.com
34+
Authentication-Results: smtp.subspace.kernel.org;
35+
dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
36+
header.b="RCEse1HL"
37+
Received: by mail-wr1-f48.google.com with SMTP id
38+
ffacd0b85a97d-439b7c2788dso4008389f8f.1
39+
for <netdev@vger.kernel.org>; Fri, 06 Mar 2026 04:52:18 -0800 (PST)
40+
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
41+
d=gmail.com; s=20230601; t=1772801537; x=1773406337;
42+
darn=vger.kernel.org;
43+
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
44+
:to:from:from:to:cc:subject:date:message-id:reply-to;
45+
bh=y8B8kg8ACcCsMXy3SgsyRYngVEpIsqkcoCsLOS/nNqQ=;
46+
b=RCEse1HLoUtQApOdbPXFvYItGrEKWhMZ5FH1L4npAxteGeWOhAEAekijg3Ur83ovNu
47+
D7j0Aio5nwazNQz3y4rO88a+svlEbLx5fyxypjkMFUV4PDnOpv7HYjT9Aw1NVdIwO6l+
48+
sTgZ1jssfWdVnLQwQe6naotyBRoBV2AugdTmASE0Okxrsi3juIOafyTCxnp4K0weRpaH
49+
XodiSWNrkHzZSWM6/wl3D42yExGGPiuDybF+9otR/5TaBWNzrcLkSb73hvP6va35kQWK
50+
mnp6OV+L7iHTbxYpTfTm4axD+IZ/Q/dtFxxA6XolA28oMQbRPK0SIHepheSZx4bgl64w
51+
FM4w==
52+
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
53+
d=1e100.net; s=20230601; t=1772801537; x=1773406337;
54+
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
55+
:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date
56+
:message-id:reply-to;
57+
bh=y8B8kg8ACcCsMXy3SgsyRYngVEpIsqkcoCsLOS/nNqQ=;
58+
b=KomubXrbvHQI4WbFxBztyfrvNNRRWm7V46yQSwx0bP8PXKIJP38kAYzK+ZKWhmcd7e
59+
LpS7422VcYyLywLRxlevD2YaXsF0CK6e00YpTtixakHxYs/4KxGaU21vfwYV8mRhfu7g
60+
HVmxKvNQ6DTdC7wAIGT6TrcZCK4VCvgCx3z9yC62hQc8C6w+9mDnnGPvXNR74ofvvXdC
61+
eVZjm56layRoEr4PTpR2F33OVSt8+HRikH7eBzIKtQ5n/lEKtmJKDHRaodAaCyFGWMWa
62+
qDVoOR8VI4NIJABfsOT6OqisXLPLf+jkKpGkCY2ioRPRKK9GzW4PgIuNcKvPQilQQkgD
63+
Xlnw==
64+
X-Forwarded-Encrypted: i=1;
65+
AJvYcCVcziiSg1n0cDakmiQXH3869FECP24dcIqrZzs8zKakP+vHT958hnq9Bp0alDnLeVtXgo0B8T4=@vger.kernel.org
66+
X-Gm-Message-State: AOJu0Yx2OF1e3PiuR4Zqpe9qXA6kz6T2CCtro6kv8eL2j4Zh2HCjWywo
67+
/rZTavazOZRoq7zTvc4fGZ/yupjkTT9xRPZCKRkM9pc0UuK/KDSP4pan
68+
X-Gm-Gg: ATEYQzx75s3OlYg8XKMgu042++2+ZPa/CZDw09DYtnwEHHBsuylQF0+eXzcFM166JtP
69+
EMuM6Nq/sGQx2WNTPNEyu1BRGci/SV005CzkExhd1KK52D/nC1c76MBxvAtioaI/+5tgNoyCg8v
70+
ZFRyiqDReKfJ6JHa3YRI213dTzMluN1sZTYNSqlWI1MwW66gaDCf0myU81ehAfiAff34wmxnm8C
71+
PUF0YrLYtgZl1I/ZcYM1npoL3PBOnrhaulSqhbn7S5NaZMkHLrNQm6ns1lof+7Ciju05dQpEcBe
72+
pumVg15Dy+PcSXQSSQt4CULH7bbuJvZ0PHJ7dS+74i/OqFSgxD4E7LCqM5ufHYdbESx0/ERaR/z
73+
CAyT3oTz6S1oMQCUTPevHjHjTbDOWhu74SqyTZETzwGnjZnfrPMa56ebQVRfYgOYW0bbx6j3O2M
74+
v3CSEBiXpdFTdaLuRcqIb56JeDryaHx87SOThqnYP6gMiu7EljKYIhr572Rpgz+UIRkrYyNjL9c
75+
BLmrcmhsXX4hU4X5KocoApkO04w
76+
X-Received: by 2002:a05:600c:8b8b:b0:483:103c:b1ee with SMTP id
77+
5b1f17b1804b1-48526922599mr34173745e9.8.1772801536778;
78+
Fri, 06 Mar 2026 04:52:16 -0800 (PST)
79+
Received: from skynet.lan
80+
(2a02-9142-4581-3c00-0000-0000-0000-0008.red-2a02-914.customerbaf.ipv6.rima-tde.net.
81+
[2a02:9142:4581:3c00::8])
82+
by smtp.gmail.com with ESMTPSA id
83+
5b1f17b1804b1-48527681a3esm76085715e9.4.2026.03.06.04.52.14
84+
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
85+
Fri, 06 Mar 2026 04:52:15 -0800 (PST)
86+
From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
87+
To: linux@armlinux.org.uk,
88+
andrew@lunn.ch,
89+
hkallweit1@gmail.com,
90+
davem@davemloft.net,
91+
edumazet@google.com,
92+
kuba@kernel.org,
93+
pabeni@redhat.com,
94+
mnhagan88@gmail.com,
95+
netdev@vger.kernel.org,
96+
linux-kernel@vger.kernel.org
97+
Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
98+
Subject: [PATCH net v3] net: sfp: improve Huawei MA5671a fixup
99+
Date: Fri, 6 Mar 2026 13:29:55 +0100
100+
Message-ID: <20260306125139.213637-1-noltari@gmail.com>
101+
X-Mailer: git-send-email 2.47.3
102+
Precedence: bulk
103+
X-Mailing-List: netdev@vger.kernel.org
104+
List-Id: <netdev.vger.kernel.org>
105+
List-Subscribe: <mailto:netdev+subscribe@vger.kernel.org>
106+
List-Unsubscribe: <mailto:netdev+unsubscribe@vger.kernel.org>
107+
MIME-Version: 1.0
108+
X-Patchwork-Delegate: kuba@kernel.org
109+
110+
With the current sfp_fixup_ignore_tx_fault() fixup we ignore the TX_FAULT
111+
signal, but we also need to apply sfp_fixup_ignore_los() in order to be
112+
able to communicate with the module even if the fiber isn't connected for
113+
configuration purposes.
114+
This is needed for all the MA5671a firmwares, excluding the FS modded
115+
firmware.
116+
117+
Fixes: 2069624dac19 ("net: sfp: Add tx-fault workaround for Huawei MA5671A SFP ONT")
118+
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
119+
---
120+
v3: avoid using a vendor name in the function
121+
v2: rebase on top of net/main instead of linux/master
122+
123+
drivers/net/phy/sfp.c | 8 +++++++-
124+
1 file changed, 7 insertions(+), 1 deletion(-)
125+
126+
--- a/drivers/net/phy/sfp.c
127+
+++ b/drivers/net/phy/sfp.c
128+
@@ -360,6 +360,12 @@ static void sfp_fixup_ignore_tx_fault(st
129+
sfp->state_ignore_mask |= SFP_F_TX_FAULT;
130+
}
131+
132+
+static void sfp_fixup_ignore_tx_fault_and_los(struct sfp *sfp)
133+
+{
134+
+ sfp_fixup_ignore_tx_fault(sfp);
135+
+ sfp_fixup_ignore_los(sfp);
136+
+}
137+
+
138+
static void sfp_fixup_ignore_hw(struct sfp *sfp, unsigned int mask)
139+
{
140+
sfp->state_hw_mask &= ~mask;
141+
@@ -523,7 +529,7 @@ static const struct sfp_quirk sfp_quirks
142+
// Huawei MA5671A can operate at 2500base-X, but report 1.2GBd NRZ in
143+
// their EEPROM
144+
SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex,
145+
- sfp_fixup_ignore_tx_fault),
146+
+ sfp_fixup_ignore_tx_fault_and_los),
147+
148+
// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
149+
// 2500MBd NRZ in their EEPROM

‎target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
};
227227

228228
enet0: ethernet@b0000 {
229-
status = "okay";
230229
phy-connection-type = "rgmii-id";
231230
nvmem-cells = <&macaddr_hwinfo_0 0>;
232231
nvmem-cell-names = "mac-address";
@@ -259,13 +258,27 @@
259258
};
260259

261260
pci0: pcie@ffe09000 {
261+
reg = <0 0xffe09000 0 0x1000>;
262+
ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
263+
0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
264+
262265
status = "disabled";
266+
267+
pcie@0 {
268+
ranges = <0x2000000 0x0 0xa0000000
269+
0x2000000 0x0 0xa0000000
270+
0x0 0x20000000
271+
272+
0x1000000 0x0 0x0
273+
0x1000000 0x0 0x0
274+
0x0 0x100000>;
275+
};
263276
};
264277

265278
pci1: pcie@ffe0a000 {
266279
reg = <0x0 0xffe0a000 0x0 0x1000>;
267280
ranges = <0x2000000 0x0 0xc0000000 0x0 0xc0000000 0x0 0x20000000
268-
0x1000000 0x0 0x00000000 0x0 0xffc20000 0x0 0x10000>;
281+
0x1000000 0x0 0x00000000 0x0 0xffc20000 0x0 0x10000>;
269282

270283
reset-gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
271284

‎target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t1x.dtsi‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,22 @@
232232
};
233233

234234
pci0: pcie@ffe09000 {
235+
reg = <0 0xffe09000 0 0x1000>;
236+
ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
237+
0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
238+
235239
status = "disabled";
240+
241+
pcie@0 {
242+
ranges = <0x2000000 0x0 0xa0000000
243+
0x2000000 0x0 0xa0000000
244+
0x0 0x20000000
245+
246+
0x1000000 0x0 0x0
247+
0x1000000 0x0 0x0
248+
0x0 0x100000>;
249+
};
250+
236251
};
237252

238253
pci1: pcie@ffe0a000 {

‎target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
d-cache-sets = <0x80>;
5050
d-cache-size = <0x8000>;
5151
d-cache-block-size = <0x20>;
52-
status = "okay";
5352
clock-frequency = <533333328>; /* 533.33 MHz */
5453
bus-frequency = <266666664>; /* 266.66 MHz */
5554
timebase-frequency = <33333333>; /* 33.33 MHz */
@@ -130,8 +129,6 @@
130129
ranges = <0x0 0x0 0x0 0xec000000 0x4000000>;
131130

132131
nor@0 {
133-
#address-cells = <1>;
134-
#size-cells = <1>;
135132
compatible = "cfi-flash";
136133
reg = <0x0 0x0 0x4000000>;
137134
bank-width = <2>;
@@ -334,7 +331,6 @@
334331
rx-stash-idx = <0x00>;
335332
rx-stash-len = <0x60>;
336333
bd-stash;
337-
status = "okay";
338334
phy-handle = <&phy0>;
339335
phy-connection-type = "rgmii-id";
340336
nvmem-cells = <&macaddr_hwinfo_0 0>;
@@ -349,7 +345,6 @@
349345
rx-stash-idx = <0x00>;
350346
rx-stash-len = <0x60>;
351347
bd-stash;
352-
status = "okay";
353348
phy-handle = <&phy1>;
354349
phy-connection-type = "rgmii-id";
355350
nvmem-cells = <&macaddr_hwinfo_0 1>;

‎target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,28 @@
194194
};
195195

196196
pci0: pcie@ffe09000 {
197+
reg = <0 0xffe09000 0 0x1000>;
198+
ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
199+
0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
200+
197201
status = "disabled";
202+
203+
pcie@0 {
204+
ranges = <0x2000000 0x0 0xa0000000
205+
0x2000000 0x0 0xa0000000
206+
0x0 0x20000000
207+
208+
0x1000000 0x0 0x0
209+
0x1000000 0x0 0x0
210+
0x0 0x100000>;
211+
};
198212
};
199213

200214
pci1: pcie@ffe0a000 {
201215
reg = <0 0xffe0a000 0 0x1000>;
202216
ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
203217
0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
218+
204219
pcie@0 {
205220
ranges = <0x2000000 0x0 0x80000000
206221
0x2000000 0x0 0x80000000

‎target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,8 @@
391391
};
392392

393393
ifc: ifc@ffe1e000 {
394+
reg = <0x0 0xffe1e000 0 0x2000>;
395+
394396
status = "disabled";
395397
};
396398

0 commit comments

Comments
 (0)