From 0f347c8211089d19b01b40539f86bfd25b95aa2d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 11 Aug 2024 15:53:53 -0700 Subject: [PATCH 1/3] ct-bugcheck: use . for RELEASE Adds compatibility for APK. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/16355 Signed-off-by: Robert Marko --- package/utils/ct-bugcheck/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/utils/ct-bugcheck/Makefile b/package/utils/ct-bugcheck/Makefile index 5deb1e0d35f40e..d8b35df1eab68c 100644 --- a/package/utils/ct-bugcheck/Makefile +++ b/package/utils/ct-bugcheck/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ct-bugcheck -PKG_RELEASE:=2016-07-21 +PKG_RELEASE:=2016.07.21 include $(INCLUDE_DIR)/package.mk From 2f7369150b158c509507881b156c448b16ccce36 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 12 Sep 2024 15:42:20 +0200 Subject: [PATCH 2/3] netifd: revert problematic ethtool hack 02aa43d Revert "system-linux: re-apply ethtool on phy attachment" Signed-off-by: Daniel Golle --- package/network/config/netifd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 1c26446f02e406..2bfe5b844a6a3f 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2024-09-05 -PKG_SOURCE_VERSION:=61c606d6e66b132f602135e0f0fda5f532b588e9 -PKG_MIRROR_HASH:=9fc091803545b0314c888e74ea7cecb5c4f8dbdb9b832bb5595378e67fd06ea3 +PKG_SOURCE_DATE:=2024-09-12 +PKG_SOURCE_VERSION:=02aa43d82d587d87523231be5a5e0bf956435725 +PKG_MIRROR_HASH:=a0e997ed9b0191417e65aaf43fbfd3a51b734ce1ea83f87e2d71b904b5a368ca PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 From c4a926516038250105aef1cc5c6ec9fd5c74e300 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 12 Sep 2024 15:43:05 +0200 Subject: [PATCH 3/3] mediatek: apply pending PHY driver fixes Apply changes suggested by SkyLake Huang for pending series improving MediaTek Ethernet PHY drivers. Signed-off-by: Daniel Golle --- ...atek-Extend-1G-TX-RX-link-pulse-time.patch | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/target/linux/mediatek/patches-6.6/733-10-net-phy-mediatek-Extend-1G-TX-RX-link-pulse-time.patch b/target/linux/mediatek/patches-6.6/733-10-net-phy-mediatek-Extend-1G-TX-RX-link-pulse-time.patch index dcbe95783624c9..2fc1adb5ec1229 100644 --- a/target/linux/mediatek/patches-6.6/733-10-net-phy-mediatek-Extend-1G-TX-RX-link-pulse-time.patch +++ b/target/linux/mediatek/patches-6.6/733-10-net-phy-mediatek-Extend-1G-TX-RX-link-pulse-time.patch @@ -69,7 +69,7 @@ Signed-off-by: SkyLake.Huang */ --- a/drivers/net/phy/mediatek/mtk-phy-lib.c +++ b/drivers/net/phy/mediatek/mtk-phy-lib.c -@@ -109,6 +109,98 @@ int mtk_phy_write_page(struct phy_device +@@ -109,6 +109,108 @@ int mtk_phy_write_page(struct phy_device } EXPORT_SYMBOL_GPL(mtk_phy_write_page); @@ -79,7 +79,7 @@ Signed-off-by: SkyLake.Huang + */ +static int extend_an_new_lp_cnt_limit(struct phy_device *phydev) +{ -+ int mmd_read_ret; ++ int ret; + u32 reg_val; + int timeout; + @@ -90,13 +90,14 @@ Signed-off-by: SkyLake.Huang + * this PHY's 1G training starts. If 1G training never starts, we do + * nothing but leave. + */ -+ timeout = read_poll_timeout(mmd_read_ret = phy_read_mmd, reg_val, -+ (mmd_read_ret < 0) || ++ timeout = read_poll_timeout(ret = phy_read_mmd, reg_val, ++ (ret < 0) || + reg_val & MTK_PHY_FINAL_SPEED_1000, -+ 10000, 1000000, false, phydev, ++ 10000, 500000, false, phydev, + MDIO_MMD_VEND1, MTK_PHY_LINK_STATUS_MISC); -+ if (mmd_read_ret < 0) -+ return mmd_read_ret; ++ phydev_dbg(phydev, "%s: Training Indicator: 0x%x\n", __func__, reg_val); ++ if (ret < 0) ++ return ret; + + if (!timeout) { + /* Once we found MTK_PHY_FINAL_SPEED_1000 is set, no matter 1G @@ -105,7 +106,16 @@ Signed-off-by: SkyLake.Huang + */ + mtk_tr_modify(phydev, 0x0, 0xf, 0x3c, AN_NEW_LP_CNT_LIMIT_MASK, + FIELD_PREP(AN_NEW_LP_CNT_LIMIT_MASK, 0xf)); -+ mdelay(1500); ++ msleep(1500); ++ ++ /* Read phy status again to make sure the following step won't ++ * affect normal devices. ++ */ ++ ret = genphy_read_status(phydev); ++ if (ret) ++ return ret; ++ if (phydev->link) ++ return 0; + + timeout = read_poll_timeout(mtk_tr_read, reg_val, + (reg_val & AN_STATE_MASK) != @@ -113,19 +123,18 @@ Signed-off-by: SkyLake.Huang + AN_STATE_SHIFT), + 10000, 1000000, false, phydev, + 0x0, 0xf, 0x2); ++ phydev_dbg(phydev, "%s: AN State: 0x%x\n", __func__, reg_val); + if (!timeout) { -+ mdelay(625); ++ msleep(625); + mtk_tr_modify(phydev, 0x0, 0xf, 0x3c, + AN_NEW_LP_CNT_LIMIT_MASK, + FIELD_PREP(AN_NEW_LP_CNT_LIMIT_MASK, + 0x8)); -+ mdelay(500); ++ msleep(500); + mtk_tr_modify(phydev, 0x0, 0xf, 0x3c, + AN_NEW_LP_CNT_LIMIT_MASK, + FIELD_PREP(AN_NEW_LP_CNT_LIMIT_MASK, + 0xf)); -+ } else { -+ return -ETIMEDOUT; + } + } + @@ -156,6 +165,7 @@ Signed-off-by: SkyLake.Huang + ret = phy_read(phydev, MII_CTRL1000); + if (ret & (ADVERTISE_1000FULL | ADVERTISE_1000HALF)) { + ret = extend_an_new_lp_cnt_limit(phydev); ++ phydev_dbg(phydev, "%s: counter limit ret: %d\n", __func__, ret); + if (ret < 0) + return ret; + }