Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realtek: 5.15: refresh HSGMII patch due to recent PHY backport

Browse source 
Refresh HSGMII patch due to recent PHY backport that cause
compilation warning for case not handled in phy_interface_num_ports.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-01-26 15:50:43 +01:00
parent 1a392e7f24
commit 0f09fd60fb
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
target/linux/realtek/patches-5.15/704-include-linux-add-phy-hsgmii-mode.patch
View file

@ -13,6 +13,16 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
include/linux/phy.h | 3 +++ include/linux/phy.h | 3 +++
2 file changed, 5 insertions(+) 2 file changed, 5 insertions(+)
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -124,6 +124,7 @@ int phy_interface_num_ports(phy_interfac
case PHY_INTERFACE_MODE_MOCA:
case PHY_INTERFACE_MODE_TRGMII:
case PHY_INTERFACE_MODE_USXGMII:
+ case PHY_INTERFACE_MODE_HSGMII:
case PHY_INTERFACE_MODE_SGMII:
case PHY_INTERFACE_MODE_SMII:
case PHY_INTERFACE_MODE_1000BASEX:
--- a/drivers/net/phy/phylink.c --- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c
@@ -410,6 +410,7 @@ void phylink_get_linkmodes(unsigned long @@ -410,6 +410,7 @@ void phylink_get_linkmodes(unsigned long

12
target/linux/realtek/patches-5.15/800-net-mdio-support-hardware-assisted-indirect-access.patch
View file

@ -443,7 +443,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* @dev: target MDIO device * @dev: target MDIO device
--- a/drivers/net/phy/phy-core.c --- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c +++ b/drivers/net/phy/phy-core.c
@@ -556,10 +556,16 @@ int __phy_read_mmd(struct phy_device *ph @@ -557,10 +557,16 @@ int __phy_read_mmd(struct phy_device *ph
struct mii_bus *bus = phydev->mdio.bus; struct mii_bus *bus = phydev->mdio.bus;
int phy_addr = phydev->mdio.addr; int phy_addr = phydev->mdio.addr;
@ -464,7 +464,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
} }
return val; return val;
} }
@@ -612,12 +618,18 @@ int __phy_write_mmd(struct phy_device *p @@ -613,12 +619,18 @@ int __phy_write_mmd(struct phy_device *p
struct mii_bus *bus = phydev->mdio.bus; struct mii_bus *bus = phydev->mdio.bus;
int phy_addr = phydev->mdio.addr; int phy_addr = phydev->mdio.addr;
@ -487,7 +487,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
} }
return ret; return ret;
} }
@@ -823,6 +835,13 @@ EXPORT_SYMBOL_GPL(phy_modify_mmd); @@ -824,6 +836,13 @@ EXPORT_SYMBOL_GPL(phy_modify_mmd);
static int __phy_read_page(struct phy_device *phydev) static int __phy_read_page(struct phy_device *phydev)
{ {
@ -501,7 +501,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
if (WARN_ONCE(!phydev->drv->read_page, "read_page callback not available, PHY driver not loaded?\n")) if (WARN_ONCE(!phydev->drv->read_page, "read_page callback not available, PHY driver not loaded?\n"))
return -EOPNOTSUPP; return -EOPNOTSUPP;
@@ -831,6 +850,13 @@ static int __phy_read_page(struct phy_de @@ -832,6 +851,13 @@ static int __phy_read_page(struct phy_de
static int __phy_write_page(struct phy_device *phydev, int page) static int __phy_write_page(struct phy_device *phydev, int page)
{ {
@ -515,7 +515,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
if (WARN_ONCE(!phydev->drv->write_page, "write_page callback not available, PHY driver not loaded?\n")) if (WARN_ONCE(!phydev->drv->write_page, "write_page callback not available, PHY driver not loaded?\n"))
return -EOPNOTSUPP; return -EOPNOTSUPP;
@@ -932,6 +958,18 @@ int phy_read_paged(struct phy_device *ph @@ -933,6 +959,18 @@ int phy_read_paged(struct phy_device *ph
{ {
int ret = 0, oldpage; int ret = 0, oldpage;
@ -534,7 +534,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
oldpage = phy_select_page(phydev, page); oldpage = phy_select_page(phydev, page);
if (oldpage >= 0) if (oldpage >= 0)
ret = __phy_read(phydev, regnum); ret = __phy_read(phydev, regnum);
@@ -953,6 +991,18 @@ int phy_write_paged(struct phy_device *p @@ -954,6 +992,18 @@ int phy_write_paged(struct phy_device *p
{ {
int ret = 0, oldpage; int ret = 0, oldpage;