forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'openwrt:main' into mx4300-dev
- Loading branch information
Showing
69 changed files
with
2,271 additions
and
280 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
.../uboot-mediatek/patches/455-arm-provide-noncached_set_region-prototype-to-fix-build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| From aab8e6cf7afbbcef60593c6b1795fa5d8e78e597 Mon Sep 17 00:00:00 2001 | ||
| From: Jonas Jelonek <[email protected]> | ||
| Date: Tue, 15 Oct 2024 20:02:25 +0200 | ||
| Subject: [PATCH] arm: provide noncached_set_region prototype to fix build | ||
|
|
||
| Due to the removal of weak functions in 7d6cee2cd0 ("cmd: cache: Remove | ||
| weak function"), uboot fails to compile after updating to v2024.10 for | ||
| mediatek target in OpenWrt with GCC-14 with error: | ||
| cmd/cache.c: In function 'do_dcache': | ||
| cmd/cache.c:57:25: error: implicit declaration of function | ||
| 'noncached_set_region' [-Wimplicit-function-declaration] | ||
|
|
||
| Thus, provide a prototype in arm's include/asm/system.h to fix a build | ||
| error in cmd/cache.c, since related prototypes are also located there. | ||
| Also add an include of asm/system.h in cmd/cache.c have the function | ||
| available there. | ||
|
|
||
| Signed-off-by: Jonas Jelonek <[email protected]> | ||
| --- | ||
| arch/arm/include/asm/system.h | 1 + | ||
| cmd/cache.c | 1 + | ||
| 2 files changed, 2 insertions(+) | ||
|
|
||
| --- a/arch/arm/include/asm/system.h | ||
| +++ b/arch/arm/include/asm/system.h | ||
| @@ -658,6 +658,7 @@ void mmu_set_region_dcache_behaviour(phy | ||
| * Return: 0 if OK | ||
| */ | ||
| int noncached_init(void); | ||
| +void noncached_set_region(void); | ||
|
|
||
| phys_addr_t noncached_alloc(size_t size, size_t align); | ||
| #endif /* CONFIG_SYS_NONCACHED_MEMORY */ | ||
| --- a/cmd/cache.c | ||
| +++ b/cmd/cache.c | ||
| @@ -10,6 +10,7 @@ | ||
| #include <command.h> | ||
| #include <cpu_func.h> | ||
| #include <linux/compiler.h> | ||
| +#include <asm/system.h> | ||
|
|
||
| static int parse_argv(const char *); | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...eric/backport-6.6/781-13-v6.12-net-phy-realtek-Check-the-index-value-in-led_hw_cont.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| From c283782fc5d60c4d8169137c6f955aa3553d3b3d Mon Sep 17 00:00:00 2001 | ||
| From: Hui Wang <[email protected]> | ||
| Date: Fri, 27 Sep 2024 19:46:10 +0800 | ||
| Subject: [PATCH] net: phy: realtek: Check the index value in | ||
| led_hw_control_get | ||
|
|
||
| Just like rtl8211f_led_hw_is_supported() and | ||
| rtl8211f_led_hw_control_set(), the rtl8211f_led_hw_control_get() also | ||
| needs to check the index value, otherwise the caller is likely to get | ||
| an incorrect rules. | ||
|
|
||
| Fixes: 17784801d888 ("net: phy: realtek: Add support for PHY LEDs on RTL8211F") | ||
| Signed-off-by: Hui Wang <[email protected]> | ||
| Reviewed-by: Marek Vasut <[email protected]> | ||
| Link: https://patch.msgid.link/[email protected] | ||
| Signed-off-by: Jakub Kicinski <[email protected]> | ||
| --- | ||
| drivers/net/phy/realtek.c | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| --- a/drivers/net/phy/realtek.c | ||
| +++ b/drivers/net/phy/realtek.c | ||
| @@ -527,6 +527,9 @@ static int rtl8211f_led_hw_control_get(s | ||
| { | ||
| int val; | ||
|
|
||
| + if (index >= RTL8211F_LED_COUNT) | ||
| + return -EINVAL; | ||
| + | ||
| val = phy_read_paged(phydev, 0xd04, RTL8211F_LEDCR); | ||
| if (val < 0) | ||
| return val; |
67 changes: 67 additions & 0 deletions
67
...eric/backport-6.6/781-14-v6.12-net-phy-realtek-Fix-MMD-access-on-RTL8126A-integrate.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| From a6ad589c1d118f9d5b1bc4c6888d42919f830340 Mon Sep 17 00:00:00 2001 | ||
| From: Heiner Kallweit <[email protected]> | ||
| Date: Mon, 7 Oct 2024 11:57:41 +0200 | ||
| Subject: [PATCH] net: phy: realtek: Fix MMD access on RTL8126A-integrated PHY | ||
|
|
||
| All MMD reads return 0 for the RTL8126A-integrated PHY. Therefore phylib | ||
| assumes it doesn't support EEE, what results in higher power consumption, | ||
| and a significantly higher chip temperature in my case. | ||
| To fix this split out the PHY driver for the RTL8126A-integrated PHY | ||
| and set the read_mmd/write_mmd callbacks to read from vendor-specific | ||
| registers. | ||
|
|
||
| Fixes: 5befa3728b85 ("net: phy: realtek: add support for RTL8126A-integrated 5Gbps PHY") | ||
| Cc: [email protected] | ||
| Signed-off-by: Heiner Kallweit <[email protected]> | ||
| Signed-off-by: David S. Miller <[email protected]> | ||
| --- | ||
| drivers/net/phy/realtek.c | 24 +++++++++++++++++++++++- | ||
| 1 file changed, 23 insertions(+), 1 deletion(-) | ||
|
|
||
| --- a/drivers/net/phy/realtek.c | ||
| +++ b/drivers/net/phy/realtek.c | ||
| @@ -1081,6 +1081,16 @@ static int rtl8221b_vn_cg_c45_match_phy_ | ||
| return rtlgen_is_c45_match(phydev, RTL_8221B_VN_CG, true); | ||
| } | ||
|
|
||
| +static int rtl8251b_c22_match_phy_device(struct phy_device *phydev) | ||
| +{ | ||
| + return rtlgen_is_c45_match(phydev, RTL_8251B, false); | ||
| +} | ||
| + | ||
| +static int rtl8251b_c45_match_phy_device(struct phy_device *phydev) | ||
| +{ | ||
| + return rtlgen_is_c45_match(phydev, RTL_8251B, true); | ||
| +} | ||
| + | ||
| static int rtlgen_resume(struct phy_device *phydev) | ||
| { | ||
| int ret = genphy_resume(phydev); | ||
| @@ -1418,7 +1428,7 @@ static struct phy_driver realtek_drvs[] | ||
| .suspend = genphy_c45_pma_suspend, | ||
| .resume = rtlgen_c45_resume, | ||
| }, { | ||
| - PHY_ID_MATCH_EXACT(0x001cc862), | ||
| + .match_phy_device = rtl8251b_c45_match_phy_device, | ||
| .name = "RTL8251B 5Gbps PHY", | ||
| .get_features = rtl822x_get_features, | ||
| .config_aneg = rtl822x_config_aneg, | ||
| @@ -1428,6 +1438,18 @@ static struct phy_driver realtek_drvs[] | ||
| .read_page = rtl821x_read_page, | ||
| .write_page = rtl821x_write_page, | ||
| }, { | ||
| + .match_phy_device = rtl8251b_c22_match_phy_device, | ||
| + .name = "RTL8126A-internal 5Gbps PHY", | ||
| + .get_features = rtl822x_get_features, | ||
| + .config_aneg = rtl822x_config_aneg, | ||
| + .read_status = rtl822x_read_status, | ||
| + .suspend = genphy_suspend, | ||
| + .resume = rtlgen_resume, | ||
| + .read_page = rtl821x_read_page, | ||
| + .write_page = rtl821x_write_page, | ||
| + .read_mmd = rtl822x_read_mmd, | ||
| + .write_mmd = rtl822x_write_mmd, | ||
| + }, { | ||
| PHY_ID_MATCH_EXACT(0x001ccad0), | ||
| .name = "RTL8224 2.5Gbps PHY", | ||
| .get_features = rtl822x_c45_get_features, |
Oops, something went wrong.