netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Marek Behún" <kabel@kernel.org>
To: Andrew Lunn <andrew@lunn.ch>, Vladimir Oltean <olteanv@gmail.com>,
	"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>,
	Vivien Didelot <vivien.didelot@gmail.com>,
	Tobias Waldekranz <tobias@waldekranz.com>,
	netdev@vger.kernel.org
Cc: "Lev Olshvang" <lev_o@rad.com>, "Marek Behún" <kabel@kernel.org>
Subject: [PATCH net 02/13] net: dsa: mv88e6xxx: fix VTU methods for 6320 family
Date: Thu, 13 Mar 2025 14:41:35 +0100	[thread overview]
Message-ID: <20250313134146.27087-3-kabel@kernel.org> (raw)
In-Reply-To: <20250313134146.27087-1-kabel@kernel.org>

The VTU registers of the 6320 family use the 6352 semantics, not 6185.
Fix it.

Fixes: b8fee9571063 ("net: dsa: mv88e6xxx: add VLAN Get Next support")
Signed-off-by: Marek Behún <kabel@kernel.org>
---
This bug goes way back to 2015 to commit b8fee9571063 ("net: dsa:
mv88e6xxx: add VLAN Get Next support") where mv88e6xxx_vtu_getnext() was
first implemented: the check for whether the switch has STU did not
contain the 6320 family.

Therefore I put that commit into the Fixes tag.

But the driver was heavily refactored since then, and the actual commits
that this patch depends on are
  f1394b78a602 ("net: dsa: mv88e6xxx: add VTU GetNext operation")
  0ad5daf6ba80 ("net: dsa: mv88e6xxx: add VTU Load/Purge operation")
But I don't know how to declare it properly.
Using the "Cc: stable" method with these commits tagged would mean they
should be cherry-picked, but these commits in turn depend on other
changes in the driver.
---
 drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 99d8d438e465..aa8ebe9d6bdc 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -5164,8 +5164,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = {
 	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,
 	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,
 	.reset = mv88e6352_g1_reset,
-	.vtu_getnext = mv88e6185_g1_vtu_getnext,
-	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
+	.vtu_getnext = mv88e6352_g1_vtu_getnext,
+	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6352_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
@@ -5212,8 +5212,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = {
 	.hardware_reset_pre = mv88e6xxx_g2_eeprom_wait,
 	.hardware_reset_post = mv88e6xxx_g2_eeprom_wait,
 	.reset = mv88e6352_g1_reset,
-	.vtu_getnext = mv88e6185_g1_vtu_getnext,
-	.vtu_loadpurge = mv88e6185_g1_vtu_loadpurge,
+	.vtu_getnext = mv88e6352_g1_vtu_getnext,
+	.vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6352_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
-- 
2.48.1


  parent reply	other threads:[~2025-03-13 13:41 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-13 13:41 [PATCH net 00/13] Fixes for mv88e6xxx (mainly 6320 family) Marek Behún
2025-03-13 13:41 ` [PATCH net 01/13] net: dsa: mv88e6xxx: remove unused .port_max_speed_mode() Marek Behún
2025-03-13 14:25   ` Andrew Lunn
2025-03-13 13:41 ` Marek Behún [this message]
2025-03-13 14:33   ` [PATCH net 02/13] net: dsa: mv88e6xxx: fix VTU methods for 6320 family Andrew Lunn
2025-03-13 13:41 ` [PATCH net 03/13] net: dsa: mv88e6xxx: fix number of g1 interrupts " Marek Behún
2025-03-13 13:41 ` [PATCH net 04/13] net: dsa: mv88e6xxx: allow SPEED_200 for 6320 family on supported ports Marek Behún
2025-03-13 14:35   ` Andrew Lunn
2025-03-13 13:41 ` [PATCH net 05/13] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
2025-03-13 13:41 ` [PATCH net 06/13] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
2025-03-13 13:41 ` [PATCH net 07/13] net: dsa: mv88e6xxx: define .pot_clear() for 6321 Marek Behún
2025-03-13 13:41 ` [PATCH net 08/13] net: dsa: mv88e6xxx: enable .rmu_disable() for 6320 family Marek Behún
2025-03-13 14:40   ` Andrew Lunn
2025-03-13 13:41 ` [PATCH net 09/13] net: dsa: mv88e6xxx: enable .port_set_policy() " Marek Behún
2025-03-13 13:41 ` [PATCH net 10/13] net: dsa: mv88e6xxx: enable devlink ATU hash param " Marek Behún
2025-03-13 13:41 ` [PATCH net 11/13] net: dsa: mv88e6xxx: enable STU methods " Marek Behún
2025-03-13 13:41 ` [PATCH net 12/13] net: dsa: mv88e6xxx: fix internal PHYs " Marek Behún
2025-03-13 13:41 ` [PATCH net 13/13] net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum " Marek Behún
2025-03-13 14:14 ` [PATCH net 00/13] Fixes for mv88e6xxx (mainly 6320 family) Russell King (Oracle)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250313134146.27087-3-kabel@kernel.org \
    --to=kabel@kernel.org \
    --cc=andrew@lunn.ch \
    --cc=lev_o@rad.com \
    --cc=netdev@vger.kernel.org \
    --cc=olteanv@gmail.com \
    --cc=rmk+kernel@armlinux.org.uk \
    --cc=tobias@waldekranz.com \
    --cc=vivien.didelot@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).