From: "Marek Behún" <kabel@kernel.org>
To: stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>
Cc: "Andrew Lunn" <andrew@lunn.ch>,
"Vladimir Oltean" <olteanv@gmail.com>,
"Eric Dumazet" <edumazet@google.com>,
"Marek Behún" <kabel@kernel.org>
Subject: [PATCH 6.12.y v2 1/5] Revert "net: dsa: mv88e6xxx: fix internal PHYs for 6320 family"
Date: Tue, 29 Apr 2025 12:08:14 +0200 [thread overview]
Message-ID: <20250429100818.17101-1-kabel@kernel.org> (raw)
This reverts commit 2b27df6852444b76724f5d425826a38581d63407.
For stable 6.12 it was misapplied to wrong entries of the
`mv88e6xxx_table` array: instead of the MV88E6320 and MV88E6321 entries
it was applied to the MV88E6240 and MV88E6352 entries.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/net/dsa/mv88e6xxx/chip.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 28967a338aa9..720ff57c854d 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6182,8 +6182,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_databases = 4096,
.num_macs = 8192,
.num_ports = 7,
- .num_internal_phys = 2,
- .internal_phys_offset = 3,
+ .num_internal_phys = 5,
.num_gpio = 15,
.max_vid = 4095,
.max_sid = 63,
@@ -6377,8 +6376,7 @@ static const struct mv88e6xxx_info mv88e6xxx_table[] = {
.num_databases = 4096,
.num_macs = 8192,
.num_ports = 7,
- .num_internal_phys = 2,
- .internal_phys_offset = 3,
+ .num_internal_phys = 5,
.num_gpio = 15,
.max_vid = 4095,
.max_sid = 63,
--
2.49.0
next reply other threads:[~2025-04-29 10:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-29 10:08 Marek Behún [this message]
2025-04-29 10:08 ` [PATCH 6.12.y v2 2/5] net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family Marek Behún
2025-04-29 10:08 ` [PATCH 6.12.y v2 3/5] net: dsa: mv88e6xxx: enable PVT for 6321 switch Marek Behún
2025-04-29 10:08 ` [PATCH 6.12.y v2 4/5] net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family Marek Behún
2025-04-29 10:08 ` [PATCH 6.12.y v2 5/5] net: dsa: mv88e6xxx: enable STU methods " Marek Behún
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=20250429100818.17101-1-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=andrew@lunn.ch \
--cc=edumazet@google.com \
--cc=olteanv@gmail.com \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/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