From 4a3beb3ae7cad76ff509ce8acecc2981e85a8328 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sat, 10 Feb 2024 11:30:54 +0800 Subject: [PATCH 1/4] ramips: mt76x8: drop AT803X phy driver This Qualcomm Gigabit phy driver was mistakenly added because MT76x8 does not support external phy, and it only supports max 100M full duplex speed. Fixes: cadf5171074f ("ralink: add support for mt7628") Signed-off-by: Shiji Yang --- target/linux/ramips/mt76x8/config-5.15 | 1 - target/linux/ramips/mt76x8/config-6.1 | 2 -- 2 files changed, 3 deletions(-) diff --git a/target/linux/ramips/mt76x8/config-5.15 b/target/linux/ramips/mt76x8/config-5.15 index 6d6759a7c5..fc9aebc46a 100644 --- a/target/linux/ramips/mt76x8/config-5.15 +++ b/target/linux/ramips/mt76x8/config-5.15 @@ -4,7 +4,6 @@ CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MMAP_RND_BITS_MAX=15 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_AT803X_PHY=y CONFIG_BLK_MQ_PCI=y CONFIG_CEVT_R4K=y CONFIG_CEVT_SYSTICK_QUIRK=y diff --git a/target/linux/ramips/mt76x8/config-6.1 b/target/linux/ramips/mt76x8/config-6.1 index a1ae10c926..be779b03d8 100644 --- a/target/linux/ramips/mt76x8/config-6.1 +++ b/target/linux/ramips/mt76x8/config-6.1 @@ -4,7 +4,6 @@ CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MMAP_RND_BITS_MAX=15 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_AT803X_PHY=y CONFIG_BLK_MQ_PCI=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_CC_NO_ARRAY_BOUNDS=y @@ -166,7 +165,6 @@ CONFIG_PINCTRL_RALINK=y # CONFIG_PINCTRL_SINGLE is not set CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y -CONFIG_QCOM_NET_PHYLIB=y CONFIG_RALINK=y # CONFIG_RALINK_WDT is not set CONFIG_RANDSTRUCT_NONE=y From b49a6f685b4a25056093f1e3ff6563a763a92f92 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 12 Feb 2024 01:14:11 +0100 Subject: [PATCH 2/4] tools/ccache: update to 4.9.1 Release Notes: https://ccache.dev/releasenotes.html#_ccache_4_9_1 Manually refresh patch: - 100-honour-copts.patch Signed-off-by: Nick Hainke --- tools/ccache/Makefile | 4 ++-- tools/ccache/patches/100-honour-copts.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index ace6bc3f42..5720dabf6e 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ccache -PKG_VERSION:=4.9 +PKG_VERSION:=4.9.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION) -PKG_HASH:=1ebc72324e3ab52af0b562bf54189d108e85eef6478d6304a345a3c2dc4018e0 +PKG_HASH:=4c03bc840699127d16c3f0e6112e3f40ce6a230d5873daa78c60a59c7ef59d25 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch index becfc9fe29..8f1c426501 100644 --- a/tools/ccache/patches/100-honour-copts.patch +++ b/tools/ccache/patches/100-honour-copts.patch @@ -1,6 +1,6 @@ --- a/src/ccache.cpp +++ b/src/ccache.cpp -@@ -1843,6 +1843,7 @@ get_manifest_key(Context& ctx, Hash& has +@@ -1841,6 +1841,7 @@ get_manifest_key(Context& ctx, Hash& has "OBJCPLUS_INCLUDE_PATH", // Clang "CLANG_CONFIG_FILE_SYSTEM_DIR", // Clang "CLANG_CONFIG_FILE_USER_DIR", // Clang From 4a3f430d726e0713f4936844f26ccaf5077ef881 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 12 Feb 2024 01:02:06 +0100 Subject: [PATCH 3/4] tools/expat: update to 2.6.0 Changelog: https://github.com/libexpat/libexpat/blob/R_2_6_0/expat/Changes Signed-off-by: Nick Hainke --- tools/expat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/expat/Makefile b/tools/expat/Makefile index c1a8cb8d97..5ee91bfc8a 100644 --- a/tools/expat/Makefile +++ b/tools/expat/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=expat PKG_CPE_ID:=cpe:/a:libexpat:expat -PKG_VERSION:=2.5.0 +PKG_VERSION:=2.6.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe +PKG_HASH:=cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION)) HOST_BUILD_PARALLEL:=1 From 6497cdba09d6faa04a4f74465ed95ae21e2ff1ff Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Mon, 12 Feb 2024 12:35:58 +0100 Subject: [PATCH 4/4] generic: 6.1: fixup QCA807x upstream PHY Currently, we are checking whether the PHY package mode matches the individual PHY interface modes at PHY package probe time, but at that time we only know the PHY package mode and not the individual PHY interface modes as of_get_phy_mode() that populates it will only get called once the netdev to which PHY-s are attached to is being probed and thus this check will always fail and return -EINVAL. So, lets move this check to .config_init_once as at that point individual PHY interface modes should be populated. Fixes: 16364e410039 ("generic: 6.1: backport QCA807x PHY patches") Signed-off-by: Robert Marko --- ...move-interface-mode-check-to-.config.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 target/linux/generic/pending-6.1/778-net-phy-qca807x-move-interface-mode-check-to-.config.patch diff --git a/target/linux/generic/pending-6.1/778-net-phy-qca807x-move-interface-mode-check-to-.config.patch b/target/linux/generic/pending-6.1/778-net-phy-qca807x-move-interface-mode-check-to-.config.patch new file mode 100644 index 0000000000..e4e60bc3ed --- /dev/null +++ b/target/linux/generic/pending-6.1/778-net-phy-qca807x-move-interface-mode-check-to-.config.patch @@ -0,0 +1,48 @@ +From 824d6c9747fb46eadf763b879fb1c072e541a65a Mon Sep 17 00:00:00 2001 +From: Robert Marko +Date: Mon, 12 Feb 2024 12:26:41 +0100 +Subject: [PATCH net-next] net: phy: qca807x: move interface mode check to + .config_init_once + +Currently, we are checking whether the PHY package mode matches the +individual PHY interface modes at PHY package probe time, but at that time +we only know the PHY package mode and not the individual PHY interface +modes as of_get_phy_mode() that populates it will only get called once the +netdev to which PHY-s are attached to is being probed and thus this check +will always fail and return -EINVAL. + +So, lets move this check to .config_init_once as at that point individual +PHY interface modes should be populated. + +Fixes: d1cb613efbd3 ("net: phy: qcom: add support for QCA807x PHY Family") +Signed-off-by: Robert Marko +--- + drivers/net/phy/qcom/qca807x.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/net/phy/qcom/qca807x.c ++++ b/drivers/net/phy/qcom/qca807x.c +@@ -562,6 +562,11 @@ static int qca807x_phy_package_config_in + struct qca807x_shared_priv *priv = shared->priv; + int val, ret; + ++ /* Make sure PHY follow PHY package mode if enforced */ ++ if (priv->package_mode != PHY_INTERFACE_MODE_NA && ++ phydev->interface != priv->package_mode) ++ return -EINVAL; ++ + phy_lock_mdio_bus(phydev); + + /* Set correct PHY package mode */ +@@ -718,11 +723,6 @@ static int qca807x_probe(struct phy_devi + shared = phydev->shared; + shared_priv = shared->priv; + +- /* Make sure PHY follow PHY package mode if enforced */ +- if (shared_priv->package_mode != PHY_INTERFACE_MODE_NA && +- phydev->interface != shared_priv->package_mode) +- return -EINVAL; +- + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM;