mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
9e86e0b33b
Changelogs: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.67 https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.68 https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.69 Upstreamed patches: target/linux/generic/backport-6.1/740-v6.9-01-netfilter-flowtable-validate-pppoe-header.patch [1] target/linux/generic/backport-6.1/740-v6.9-02-netfilter-flowtable-incorrect-pppoe-tuple.patch [2] target/linux/generic/backport-6.1/790-48-STABLE-net-dsa-mt7530-trap-link-local-frames-regardless-of-.patch [3] target/linux/generic/backport-6.1/790-50-v6.10-net-dsa-mt7530-fix-mirroring-frames-received-on-loca.patch [4] target/linux/generic/backport-6.1/790-16-v6.4-net-dsa-mt7530-set-all-CPU-ports-in-MT7531_CPU_PMAP.patch [5] target/linux/generic/backport-6.1/790-46-v6.9-net-dsa-mt7530-fix-improper-frames-on-all-25MHz-and-.patch [6] target/linux/generic/backport-6.1/790-47-v6.10-net-dsa-mt7530-fix-enabling-EEE-on-MT7531-switch-on-.patch [7] target/linux/mediatek/patches-6.1/220-v6.3-clk-mediatek-clk-gate-Propagate-struct-device-with-m.patch [8] target/linux/mediatek/patches-6.1/222-v6.3-clk-mediatek-clk-mtk-Propagate-struct-device-for-com.patch [9] target/linux/mediatek/patches-6.1/223-v6.3-clk-mediatek-clk-mux-Propagate-struct-device-for-mtk.patch [10] target/linux/mediatek/patches-6.1/226-v6.3-clk-mediatek-clk-mtk-Extend-mtk_clk_simple_probe.patch [11] Symbol changes: MITIGATION_SPECTRE_BHI (new) [12] SPECTRE_BHI_{ON,OFF} (deprecated) [12] References: [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=8bf7c76a2a207ca2b4cfda0a279192adf27678d7 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=f1c3c61701a0b12f4906152c1626a5de580ea3d2 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=19643bf8c9b5bb5eea5163bf2f6a3eee6fb5b99b [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=e86c9db58eba290e858e2bb80efcde9e3973a5ef [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=013c787d231188a6408e2991150d3c9bf9a2aa0b [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=41a004ffba9b1fd8a5a7128ebd0dfa3ed39c3316 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=7d51db455ca03e5270cc585a75a674abd063fa6c [8] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=082b831488a41257b7ac7ffa1d80a0b60d98394d [9] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=6f5f72a684a2823f21efbfd20c7e4b528c44a781 [10] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=a4fe8813a7868ba5867e42e60de7a2b8baac30ff [11] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=c1d87d56af063c87961511ee25f6b07a5676d27d [12] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.89&id=d844df110084ef8bd950a52194865f3f63b561ca Signed-off-by: Shiji Yang <yangshiji66@qq.com>
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From 6efc8ae3eb0363328f479191a0cf0dc12a16e090 Mon Sep 17 00:00:00 2001
|
||
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
||
Date: Mon, 22 Apr 2024 10:15:20 +0300
|
||
Subject: [PATCH 13/15] net: dsa: mt7530: use priv->ds->num_ports instead of
|
||
MT7530_NUM_PORTS
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Use priv->ds->num_ports on all for loops which configure the switch
|
||
registers. In the future, the value of MT7530_NUM_PORTS will depend on
|
||
priv->id. Therefore, this change prepares the subdriver for a simpler
|
||
implementation.
|
||
|
||
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
||
---
|
||
drivers/net/dsa/mt7530.c | 8 ++++----
|
||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
||
--- a/drivers/net/dsa/mt7530.c
|
||
+++ b/drivers/net/dsa/mt7530.c
|
||
@@ -1418,7 +1418,7 @@ mt7530_port_set_vlan_unaware(struct dsa_
|
||
mt7530_rmw(priv, MT7530_PPBV1_P(port), G0_PORT_VID_MASK,
|
||
G0_PORT_VID_DEF);
|
||
|
||
- for (i = 0; i < MT7530_NUM_PORTS; i++) {
|
||
+ for (i = 0; i < priv->ds->num_ports; i++) {
|
||
if (dsa_is_user_port(ds, i) &&
|
||
dsa_port_is_vlan_filtering(dsa_to_port(ds, i))) {
|
||
all_user_ports_removed = false;
|
||
@@ -2433,7 +2433,7 @@ mt7530_setup(struct dsa_switch *ds)
|
||
/* Enable and reset MIB counters */
|
||
mt7530_mib_reset(ds);
|
||
|
||
- for (i = 0; i < MT7530_NUM_PORTS; i++) {
|
||
+ for (i = 0; i < priv->ds->num_ports; i++) {
|
||
/* Clear link settings and enable force mode to force link down
|
||
* on all ports until they're enabled later.
|
||
*/
|
||
@@ -2544,7 +2544,7 @@ mt7531_setup_common(struct dsa_switch *d
|
||
mt7530_clear(priv, MT753X_MFC, BC_FFP_MASK | UNM_FFP_MASK |
|
||
UNU_FFP_MASK);
|
||
|
||
- for (i = 0; i < MT7530_NUM_PORTS; i++) {
|
||
+ for (i = 0; i < priv->ds->num_ports; i++) {
|
||
/* Clear link settings and enable force mode to force link down
|
||
* on all ports until they're enabled later.
|
||
*/
|
||
@@ -2631,7 +2631,7 @@ mt7531_setup(struct dsa_switch *ds)
|
||
priv->p5_sgmii = !!(val & PAD_DUAL_SGMII_EN);
|
||
|
||
/* Force link down on all ports before internal reset */
|
||
- for (i = 0; i < MT7530_NUM_PORTS; i++)
|
||
+ for (i = 0; i < priv->ds->num_ports; i++)
|
||
mt7530_write(priv, MT753X_PMCR_P(i), MT7531_FORCE_MODE_LNK);
|
||
|
||
/* Reset the switch through internal reset */
|