FAILED: patch "[PATCH] net: phy: broadcom: stub c45 read/write for 54810" failed to apply to 4.14-stable tree
Subsystems (5)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y
git checkout FETCH_HEAD
git cherry-pick -x 096516d092d54604d590827d05b1022c8f326639
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023082134-chain-tubular-c681@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
096516d092d5 ("net: phy: broadcom: stub c45 read/write for 54810") 5a32fcdb1e68 ("net: phy: broadcom: Add statistics for all Gigabit PHYs") 1e2e61af1996 ("net: phy: broadcom: remove BCM5482 1000Base-BX support") 15772e4ddf3f ("net: phy: broadcom: remove use of ack_interrupt()") 4567d5c3eb9b ("net: phy: broadcom: implement generic .handle_interrupt() callback") b0ed0bbfb304 ("net: phy: broadcom: add support for BCM54811 PHY") 9d42205036d4 ("net: phy: bcm54140: Make a bunch of functions static") 6937602ed3f9 ("net: phy: add Broadcom BCM54140 support")123aff2a789c ("net: phy: broadcom: Add support for BCM53125 internal PHYs") fe26821fa614 ("net: phy: broadcom: Wire suspend/resume for BCM54810") 0ececcfc9267 ("net: phy: broadcom: Allow BCM54810 to use bcm54xx_adjust_rxrefclk()") 75f4d8d10e01 ("net: phy: add Broadcom BCM84881 PHY driver") b9bcb95315fe ("net: phy: broadcom: add 1000Base-X support for BCM54616S") 283da99af1d8 ("net: phy: broadcom: Add genphy_suspend and genphy_resume for BCM5464") dcdecdcfe1fc ("net: phy: switch drivers to use dynamic feature detection") 5c3407abb338 ("net: phy: meson-gxl: add g12a support")356d71e00d27 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 096516d092d54604d590827d05b1022c8f326639 Mon Sep 17 00:00:00 2001
From: Justin Chen <[email protected]>
Date: Sat, 12 Aug 2023 21:41:47 -0700
Subject: [PATCH] net: phy: broadcom: stub c45 read/write for 54810
The 54810 does not support c45. The mmd_phy_indirect accesses return arbirtary values leading to odd behavior like saying it supports EEE when it doesn't. We also see that reading/writing these non-existent MMD registers leads to phy instability in some cases.
drivers/net/phy/broadcom.c +13 -0
@@ -542,6 +542,17 @@ static int bcm54xx_resume(struct phy_device *phydev)return bcm54xx_config_init (phydev); } +static int bcm54810_read_mmd (struct phy_device *phydev,int devnum,u16 regnum) +{ +return -EOPNOTSUPP ; +} + +static int bcm54810_write_mmd (struct phy_device *phydev,int devnum,u16 regnum, +u16 val) +{ +return -EOPNOTSUPP ; +} +static int bcm54811_config_init (struct phy_device *phydev) {int err, reg;
@@ -1103,6 +1114,8 @@ static struct phy_driver broadcom_drivers[] = { .get_strings = bcm_phy_get_strings, .get_stats = bcm54xx_get_stats, .probe = bcm54xx_phy_probe, + .read_mmd = bcm54810_read_mmd, + .write_mmd = bcm54810_write_mmd, .config_init = bcm54xx_config_init, .config_aneg = bcm5481_config_aneg, .config_intr = bcm_phy_config_intr,
Florian Fainelli
maintainerPATCH 1/1 net: phy: broadcom: stub c45 read/write for 54810
From: Justin Chen <[email protected]>
commit 096516d092d54604d590827d05b1022c8f326639 upstream
The 54810 does not support c45. The mmd_phy_indirect accesses return arbirtary values leading to odd behavior like saying it supports EEE when it doesn't. We also see that reading/writing these non-existent MMD registers leads to phy instability in some cases.
--- drivers/net/phy/broadcom.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/net/phy/broadcom.c +13 -0
@@ -403,6 +403,17 @@ static int bcm5482_read_status(struct phy_device *phydev)return err; } +static int bcm54810_read_mmd (struct phy_device *phydev,int devnum,u16 regnum) +{ +return -EOPNOTSUPP ; +} + +static int bcm54810_write_mmd (struct phy_device *phydev,int devnum,u16 regnum, +u16 val) +{ +return -EOPNOTSUPP ; +} +static int bcm5481_config_aneg (struct phy_device *phydev) {struct device_node *np = phydev->mdio.dev.of_node;
@@ -650,6 +661,8 @@ static struct phy_driver broadcom_drivers[] = { .name = "Broadcom BCM54810", .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_INTERRUPT, + .read_mmd = bcm54810_read_mmd, + .write_mmd = bcm54810_write_mmd, .config_init = bcm54xx_config_init, .config_aneg = bcm5481_config_aneg, .read_status = genphy_read_status,
Signature · 1 line
2.34.1
Greg Kroah-Hartman
maintainerRe: [PATCH stable 4.14] net: phy: broadcom: stub c45 read/write for 54810
Quoted 9 lines · Florian Fainelli
From: Justin Chen <[email protected]>
commit
096516d092d54604d590827d05b1022c8f326639upstreamThe 54810 does not support c45. The
mmd_phy_indirectaccesses return arbirtary values leading to odd behavior like saying it supports EEE when it doesn't. We also see that reading/writing these non-existent MMD registers leads to phy instability in some cases.
Quoted 7 lines
Fixes b14995ac2527 ("net: phy: broadcom: Add BCM54810 PHY entry")Signed-off-by Justin Chen <[email protected]>Reviewed-by Florian Fainelli <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>[florian: resolved conflicts in 4.14]Signed-off-by Florian Fainelli <[email protected]>
Thanks for these, all now queued up.
greg k-h