diff options
Diffstat (limited to 'target/linux/mvebu/patches-4.14')
5 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch b/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch index 4f9e2e29b5..eeb6b1ef19 100644 --- a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch +++ b/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -247,6 +247,184 @@ static unsigned int sfp_check(void *buf, +@@ -248,6 +248,184 @@ static unsigned int sfp_check(void *buf, return check; } @@ -195,7 +195,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> /* Helpers */ static void sfp_module_tx_disable(struct sfp *sfp) { -@@ -415,6 +593,7 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -416,6 +594,7 @@ static int sfp_sm_mod_probe(struct sfp * char sn[17]; char date[9]; char rev[5]; @@ -203,7 +203,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> u8 check; int err; -@@ -458,10 +637,83 @@ static int sfp_sm_mod_probe(struct sfp * +@@ -459,10 +638,83 @@ static int sfp_sm_mod_probe(struct sfp * rev[4] = '\0'; memcpy(sn, sfp->id.ext.vendor_sn, 16); sn[16] = '\0'; diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch index c31a540228..f5506a8bdf 100644 --- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch +++ b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch @@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> }; --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -1045,34 +1045,6 @@ int phylink_ethtool_set_pauseparam(struc +@@ -1054,34 +1054,6 @@ int phylink_ethtool_set_pauseparam(struc } EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam); @@ -86,15 +86,15 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> int ret = -EPROTONOSUPPORT; --- a/drivers/net/phy/sfp-bus.c +++ b/drivers/net/phy/sfp-bus.c -@@ -278,6 +278,7 @@ static int sfp_register_bus(struct sfp_b - } +@@ -279,6 +279,7 @@ static int sfp_register_bus(struct sfp_b + bus->socket_ops->attach(bus->sfp); if (bus->started) bus->socket_ops->start(bus->sfp); + bus->netdev->sfp_bus = bus; bus->registered = true; return 0; } -@@ -292,14 +293,13 @@ static void sfp_unregister_bus(struct sf +@@ -294,14 +295,13 @@ static void sfp_unregister_bus(struct sf if (bus->phydev && ops && ops->disconnect_phy) ops->disconnect_phy(bus->upstream); } @@ -110,7 +110,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> return bus->socket_ops->module_info(bus->sfp, modinfo); } EXPORT_SYMBOL_GPL(sfp_get_module_info); -@@ -307,8 +307,6 @@ EXPORT_SYMBOL_GPL(sfp_get_module_info); +@@ -309,8 +309,6 @@ EXPORT_SYMBOL_GPL(sfp_get_module_info); int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee, u8 *data) { diff --git a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch b/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch index 47b71ee4c1..c2cf554281 100644 --- a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch +++ b/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -760,8 +760,8 @@ void phylink_start(struct phylink *pl) +@@ -771,8 +771,8 @@ void phylink_start(struct phylink *pl) clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); phylink_run_resolve(pl); @@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> if (pl->phydev) phy_start(pl->phydev); } -@@ -773,8 +773,8 @@ void phylink_stop(struct phylink *pl) +@@ -784,8 +784,8 @@ void phylink_stop(struct phylink *pl) if (pl->phydev) phy_stop(pl->phydev); @@ -30,5 +30,5 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> + if (pl->netdev->sfp_bus) + sfp_upstream_stop(pl->netdev->sfp_bus); - set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); - queue_work(system_power_efficient_wq, &pl->resolve); + phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED); + } diff --git a/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch b/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch index b775116cda..4cbd30a6e2 100644 --- a/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch +++ b/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch @@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -1136,6 +1136,7 @@ static int sfp_remove(struct platform_de +@@ -1148,6 +1148,7 @@ static int sfp_remove(struct platform_de static const struct of_device_id sfp_of_match[] = { { .compatible = "sff,sfp", }, diff --git a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch b/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch index e9a3d695da..e05d5ad47c 100644 --- a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch +++ b/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch @@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c -@@ -488,7 +488,7 @@ static void sfp_sm_phy_detach(struct sfp +@@ -489,7 +489,7 @@ static void sfp_sm_phy_detach(struct sfp sfp->mod_phy = NULL; } @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> { struct phy_device *phy; int err; -@@ -498,11 +498,11 @@ static void sfp_sm_probe_phy(struct sfp +@@ -499,11 +499,11 @@ static void sfp_sm_probe_phy(struct sfp phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR); if (phy == ERR_PTR(-ENODEV)) { dev_info(sfp->dev, "no PHY detected\n"); @@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> } err = sfp_add_phy(sfp->sfp_bus, phy); -@@ -510,11 +510,13 @@ static void sfp_sm_probe_phy(struct sfp +@@ -511,11 +511,13 @@ static void sfp_sm_probe_phy(struct sfp phy_device_remove(phy); phy_device_free(phy); dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err); @@ -51,7 +51,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> } static void sfp_sm_link_up(struct sfp *sfp) -@@ -560,14 +562,9 @@ static void sfp_sm_fault(struct sfp *sfp +@@ -561,14 +563,9 @@ static void sfp_sm_fault(struct sfp *sfp static void sfp_sm_mod_init(struct sfp *sfp) { @@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> /* Setting the serdes link mode is guesswork: there's no * field in the EEPROM which indicates what mode should -@@ -581,7 +578,22 @@ static void sfp_sm_mod_init(struct sfp * +@@ -582,7 +579,22 @@ static void sfp_sm_mod_init(struct sfp * if (sfp->id.base.e1000_base_t || sfp->id.base.e100_base_lx || sfp->id.base.e100_base_fx) |