mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
87 lines
2.9 KiB
Diff
87 lines
2.9 KiB
Diff
From 3c1d788a62dc648d1846049b66119ebb69dedd52 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Mon, 11 Apr 2022 10:46:17 +0100
|
|
Subject: [PATCH 05/13] net: dsa: mt7530: only indicate linkmodes that can be
|
|
supported
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Now that mt7530 is not using the basex helper, it becomes unnecessary to
|
|
indicate support for both 1000baseX and 2500baseX when one of the 803.3z
|
|
PHY interface modes is being selected. Ensure that the driver indicates
|
|
only those linkmodes that can actually be supported by the PHY interface
|
|
mode.
|
|
|
|
Tested-by: Marek Behún <kabel@kernel.org>
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 12 ++++++++----
|
|
drivers/net/dsa/mt7530.h | 1 +
|
|
2 files changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -2540,12 +2540,13 @@ static int mt7531_rgmii_setup(struct mt7
|
|
}
|
|
|
|
static void mt7531_sgmii_validate(struct mt7530_priv *priv, int port,
|
|
+ phy_interface_t interface,
|
|
unsigned long *supported)
|
|
{
|
|
/* Port5 supports ethier RGMII or SGMII.
|
|
* Port6 supports SGMII only.
|
|
*/
|
|
- if (port == 6) {
|
|
+ if (port == 6 && interface == PHY_INTERFACE_MODE_2500BASEX) {
|
|
phylink_set(supported, 2500baseX_Full);
|
|
phylink_set(supported, 2500baseT_Full);
|
|
}
|
|
@@ -2918,16 +2919,18 @@ static void mt753x_phylink_get_caps(stru
|
|
|
|
static void
|
|
mt7530_mac_port_validate(struct dsa_switch *ds, int port,
|
|
+ phy_interface_t interface,
|
|
unsigned long *supported)
|
|
{
|
|
}
|
|
|
|
static void mt7531_mac_port_validate(struct dsa_switch *ds, int port,
|
|
+ phy_interface_t interface,
|
|
unsigned long *supported)
|
|
{
|
|
struct mt7530_priv *priv = ds->priv;
|
|
|
|
- mt7531_sgmii_validate(priv, port, supported);
|
|
+ mt7531_sgmii_validate(priv, port, interface, supported);
|
|
}
|
|
|
|
static void
|
|
@@ -2950,12 +2953,13 @@ mt753x_phylink_validate(struct dsa_switc
|
|
}
|
|
|
|
/* This switch only supports 1G full-duplex. */
|
|
- if (state->interface != PHY_INTERFACE_MODE_MII) {
|
|
+ if (state->interface != PHY_INTERFACE_MODE_MII &&
|
|
+ state->interface != PHY_INTERFACE_MODE_2500BASEX) {
|
|
phylink_set(mask, 1000baseT_Full);
|
|
phylink_set(mask, 1000baseX_Full);
|
|
}
|
|
|
|
- priv->info->mac_port_validate(ds, port, mask);
|
|
+ priv->info->mac_port_validate(ds, port, state->interface, mask);
|
|
|
|
phylink_set(mask, Pause);
|
|
phylink_set(mask, Asym_Pause);
|
|
--- a/drivers/net/dsa/mt7530.h
|
|
+++ b/drivers/net/dsa/mt7530.h
|
|
@@ -772,6 +772,7 @@ struct mt753x_info {
|
|
void (*mac_port_get_caps)(struct dsa_switch *ds, int port,
|
|
struct phylink_config *config);
|
|
void (*mac_port_validate)(struct dsa_switch *ds, int port,
|
|
+ phy_interface_t interface,
|
|
unsigned long *supported);
|
|
int (*mac_port_get_state)(struct dsa_switch *ds, int port,
|
|
struct phylink_link_state *state);
|