mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
fe9d2ccbc3
Move accepted patches to backport folder, re-add previously removed patch
which caused havoc on MT7621 and add the (still pending) fix.
Fixes: d40691a5fb ("generic: 6.1, 6.6: mt7530: import pending patches")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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
|
||
@@ -1411,7 +1411,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;
|
||
@@ -2428,7 +2428,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.
|
||
*/
|
||
@@ -2539,7 +2539,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.
|
||
*/
|
||
@@ -2626,7 +2626,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 */
|