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>
90 lines
3.2 KiB
Diff
90 lines
3.2 KiB
Diff
From 1ec619ee4a052fb9ac48b57554ac2722a0bfe73c Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 18 May 2022 15:55:02 +0100
|
|
Subject: [PATCH 07/12] net: mtk_eth_soc: provide mtk_sgmii_config()
|
|
|
|
Provide mtk_sgmii_config() to wrap up the decisions about which SGMII
|
|
configuration will be called.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +------
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 5 ++---
|
|
drivers/net/ethernet/mediatek/mtk_sgmii.c | 20 +++++++++++++++++---
|
|
3 files changed, 20 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -435,12 +435,7 @@ static void mtk_mac_config(struct phylin
|
|
0 : mac->id;
|
|
|
|
/* Setup SGMIISYS with the determined property */
|
|
- if (state->interface != PHY_INTERFACE_MODE_SGMII)
|
|
- err = mtk_sgmii_setup_mode_force(eth->sgmii, sid,
|
|
- state->interface);
|
|
- else if (phylink_autoneg_inband(mode))
|
|
- err = mtk_sgmii_setup_mode_an(eth->sgmii, sid);
|
|
-
|
|
+ err = mtk_sgmii_config(eth->sgmii, sid, mode, state->interface);
|
|
if (err)
|
|
goto init_err;
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -1101,9 +1101,8 @@ u32 mtk_r32(struct mtk_eth *eth, unsigne
|
|
|
|
int mtk_sgmii_init(struct mtk_sgmii *ss, struct device_node *np,
|
|
u32 ana_rgc3);
|
|
-int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id);
|
|
-int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,
|
|
- phy_interface_t interface);
|
|
+int mtk_sgmii_config(struct mtk_sgmii *ss, int id, unsigned int mode,
|
|
+ phy_interface_t interface);
|
|
void mtk_sgmii_link_up(struct mtk_sgmii *ss, int id, int speed, int duplex);
|
|
void mtk_sgmii_restart_an(struct mtk_eth *eth, int mac_id);
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
|
|
@@ -35,7 +35,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss,
|
|
}
|
|
|
|
/* For SGMII interface mode */
|
|
-int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id)
|
|
+static int mtk_sgmii_setup_mode_an(struct mtk_sgmii *ss, int id)
|
|
{
|
|
unsigned int val;
|
|
|
|
@@ -64,8 +64,8 @@ int mtk_sgmii_setup_mode_an(struct mtk_s
|
|
/* For 1000BASE-X and 2500BASE-X interface modes, which operate at a
|
|
* fixed speed.
|
|
*/
|
|
-int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,
|
|
- phy_interface_t interface)
|
|
+static int mtk_sgmii_setup_mode_force(struct mtk_sgmii *ss, int id,
|
|
+ phy_interface_t interface)
|
|
{
|
|
unsigned int val;
|
|
|
|
@@ -97,6 +97,20 @@ int mtk_sgmii_setup_mode_force(struct mt
|
|
return 0;
|
|
}
|
|
|
|
+int mtk_sgmii_config(struct mtk_sgmii *ss, int id, unsigned int mode,
|
|
+ phy_interface_t interface)
|
|
+{
|
|
+ int err = 0;
|
|
+
|
|
+ /* Setup SGMIISYS with the determined property */
|
|
+ if (interface != PHY_INTERFACE_MODE_SGMII)
|
|
+ err = mtk_sgmii_setup_mode_force(ss, id, interface);
|
|
+ else if (phylink_autoneg_inband(mode))
|
|
+ err = mtk_sgmii_setup_mode_an(ss, id);
|
|
+
|
|
+ return err;
|
|
+}
|
|
+
|
|
/* For 1000BASE-X and 2500BASE-X interface modes */
|
|
void mtk_sgmii_link_up(struct mtk_sgmii *ss, int id, int speed, int duplex)
|
|
{
|