kernel: bump 6.6 to 6.6.125
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.125 All patches autorefreshed. Signed-off-by: Goetz Goerisch <ggoerisch@gmail.com> Link: https://github.com/openwrt/openwrt/pull/21919 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
committed by
Hauke Mehrtens
parent
cfbe693405
commit
c5f645581a
+2
-2
@@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.6 = .124
|
||||
LINUX_KERNEL_HASH-6.6.124 = a7aefb9f8e9be2314a66ccda708257d1c2dc04e68235cda987879597fc89794e
|
||||
LINUX_VERSION-6.6 = .125
|
||||
LINUX_KERNEL_HASH-6.6.125 = 8ee33b6f438a340579c9a763686a38a4268e185726381163b0a1025c76c8083d
|
||||
|
||||
+4
-4
@@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
static void sfp_fixup_rollball_cc(struct sfp *sfp)
|
||||
{
|
||||
sfp_fixup_rollball(sfp);
|
||||
@@ -2321,7 +2319,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
||||
@@ -2323,7 +2321,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
||||
mask |= SFP_F_RS1;
|
||||
|
||||
sfp->module_t_start_up = T_START_UP;
|
||||
@@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
sfp->tx_fault_ignore = false;
|
||||
|
||||
@@ -2555,10 +2553,9 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
@@ -2557,10 +2555,9 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
|
||||
/* We need to check the TX_FAULT state, which is not defined
|
||||
* while TX_DISABLE is asserted. The earliest we want to do
|
||||
@@ -108,7 +108,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
break;
|
||||
|
||||
case SFP_S_WAIT:
|
||||
@@ -2572,8 +2569,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
@@ -2574,8 +2571,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
* deasserting.
|
||||
*/
|
||||
timeout = sfp->module_t_start_up;
|
||||
@@ -119,7 +119,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
else
|
||||
timeout = 1;
|
||||
|
||||
@@ -2616,7 +2613,11 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
@@ -2618,7 +2615,11 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
ret = sfp_sm_probe_for_phy(sfp);
|
||||
if (ret == -ENODEV) {
|
||||
if (--sfp->sm_phy_retries) {
|
||||
|
||||
+3
-3
@@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
}
|
||||
|
||||
static void sfp_fixup_halny_gsfp(struct sfp *sfp)
|
||||
@@ -2319,6 +2326,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
||||
@@ -2321,6 +2328,7 @@ static int sfp_sm_mod_probe(struct sfp *
|
||||
mask |= SFP_F_RS1;
|
||||
|
||||
sfp->module_t_start_up = T_START_UP;
|
||||
@@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
sfp->phy_t_retry = T_PHY_RETRY;
|
||||
|
||||
sfp->tx_fault_ignore = false;
|
||||
@@ -2553,9 +2561,10 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
@@ -2555,9 +2563,10 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
|
||||
/* We need to check the TX_FAULT state, which is not defined
|
||||
* while TX_DISABLE is asserted. The earliest we want to do
|
||||
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
break;
|
||||
|
||||
case SFP_S_WAIT:
|
||||
@@ -2569,8 +2578,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
@@ -2571,8 +2580,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
* deasserting.
|
||||
*/
|
||||
timeout = sfp->module_t_start_up;
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
|
||||
--- a/drivers/net/phy/sfp.c
|
||||
+++ b/drivers/net/phy/sfp.c
|
||||
@@ -454,8 +454,9 @@ static const struct sfp_quirk sfp_quirks
|
||||
@@ -456,8 +456,9 @@ static const struct sfp_quirk sfp_quirks
|
||||
SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
|
||||
sfp_fixup_long_startup),
|
||||
|
||||
|
||||
+2
-2
@@ -54,7 +54,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
static void sfp_fixup_halny_gsfp(struct sfp *sfp)
|
||||
{
|
||||
/* Ignore the TX_FAULT and LOS signals on this module.
|
||||
@@ -459,6 +464,10 @@ static const struct sfp_quirk sfp_quirks
|
||||
@@ -461,6 +466,10 @@ static const struct sfp_quirk sfp_quirks
|
||||
// PHY.
|
||||
SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt),
|
||||
|
||||
@@ -65,7 +65,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
// Fiberstore GPON-ONU-34-20BI can operate at 2500base-X, but report 1.2GBd
|
||||
// NRZ in their EEPROM
|
||||
SFP_QUIRK("FS", "GPON-ONU-34-20BI", sfp_quirk_2500basex,
|
||||
@@ -475,9 +484,6 @@ static const struct sfp_quirk sfp_quirks
|
||||
@@ -477,9 +486,6 @@ static const struct sfp_quirk sfp_quirks
|
||||
SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex,
|
||||
sfp_fixup_ignore_tx_fault),
|
||||
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
}
|
||||
|
||||
static void sfp_fixup_halny_gsfp(struct sfp *sfp)
|
||||
@@ -464,9 +464,10 @@ static const struct sfp_quirk sfp_quirks
|
||||
@@ -466,9 +466,10 @@ static const struct sfp_quirk sfp_quirks
|
||||
// PHY.
|
||||
SFP_QUIRK_F("FS", "SFP-10G-T", sfp_fixup_fs_10gt),
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/net/phy/sfp.c
|
||||
+++ b/drivers/net/phy/sfp.c
|
||||
@@ -485,6 +485,9 @@ static const struct sfp_quirk sfp_quirks
|
||||
@@ -487,6 +487,9 @@ static const struct sfp_quirk sfp_quirks
|
||||
SFP_QUIRK("HUAWEI", "MA5671A", sfp_quirk_2500basex,
|
||||
sfp_fixup_ignore_tx_fault),
|
||||
|
||||
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report
|
||||
// 2500MBd NRZ in their EEPROM
|
||||
SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex),
|
||||
@@ -2606,7 +2609,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
@@ -2608,7 +2611,8 @@ static void sfp_sm_main(struct sfp *sfp,
|
||||
* or t_start_up, so assume there is a fault.
|
||||
*/
|
||||
sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT,
|
||||
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) {
|
||||
init_done:
|
||||
/* Create mdiobus and start trying for PHY */
|
||||
@@ -2864,10 +2868,12 @@ static void sfp_check_state(struct sfp *
|
||||
@@ -2866,10 +2870,12 @@ static void sfp_check_state(struct sfp *
|
||||
mutex_lock(&sfp->st_mutex);
|
||||
state = sfp_get_state(sfp);
|
||||
changed = state ^ sfp->state;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
|
||||
--- a/drivers/net/phy/sfp.c
|
||||
+++ b/drivers/net/phy/sfp.c
|
||||
@@ -2432,6 +2432,13 @@ static void sfp_sm_module(struct sfp *sf
|
||||
@@ -2434,6 +2434,13 @@ static void sfp_sm_module(struct sfp *sf
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
|
||||
--- a/drivers/net/phy/sfp.c
|
||||
+++ b/drivers/net/phy/sfp.c
|
||||
@@ -678,10 +678,64 @@ static int sfp_i2c_write(struct sfp *sfp
|
||||
@@ -680,10 +680,64 @@ static int sfp_i2c_write(struct sfp *sfp
|
||||
return ret == ARRAY_SIZE(msgs) ? len : 0;
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
|
||||
sfp->i2c = i2c;
|
||||
sfp->read = sfp_i2c_read;
|
||||
@@ -713,6 +767,29 @@ static int sfp_i2c_mdiobus_create(struct
|
||||
@@ -715,6 +769,29 @@ static int sfp_i2c_mdiobus_create(struct
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -107,7 +107,7 @@ Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
|
||||
static void sfp_i2c_mdiobus_destroy(struct sfp *sfp)
|
||||
{
|
||||
mdiobus_unregister(sfp->i2c_mii);
|
||||
@@ -1886,8 +1963,15 @@ static void sfp_sm_fault(struct sfp *sfp
|
||||
@@ -1888,8 +1965,15 @@ static void sfp_sm_fault(struct sfp *sfp
|
||||
|
||||
static int sfp_sm_add_mdio_bus(struct sfp *sfp)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user