Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/coolsnowwolf/lede
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Apr 6, 2023
2 parents 5b86234 + a10029f commit 00c491d
Show file tree
Hide file tree
Showing 23 changed files with 86 additions and 85 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.15
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .104
LINUX_KERNEL_HASH-5.15.104 = 71c532ce09992e470f3259ffeb38d2b5bba990c243a559e4726a57412bd36b54
LINUX_VERSION-5.15 = .105
LINUX_KERNEL_HASH-5.15.105 = 01b537650332d2852722a626169cf7e5e798d11f9b578171b477868555f5e44f
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <[email protected]>
static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
u32 *data, int in_pm)
{
@@ -1837,7 +1841,8 @@ static int smsc95xx_rx_fixup(struct usbn
@@ -1843,7 +1847,8 @@ static int smsc95xx_rx_fixup(struct usbn
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(skb);
skb_trim(skb, skb->len - 4); /* remove fcs */
Expand All @@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <[email protected]>

return 1;
}
@@ -1855,7 +1860,8 @@ static int smsc95xx_rx_fixup(struct usbn
@@ -1861,7 +1866,8 @@ static int smsc95xx_rx_fixup(struct usbn
if (dev->net->features & NETIF_F_RXCSUM)
smsc95xx_rx_csum_offload(ax_skb);
skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Signed-off-by: Maxime Ripard <[email protected]>
commit->event = kzalloc(sizeof(*commit->event),
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -10821,6 +10821,19 @@ static int intel_atomic_commit(struct dr
@@ -10822,6 +10822,19 @@ static int intel_atomic_commit(struct dr
state->base.legacy_cursor_update = false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ Signed-off-by: Andrew Morton <[email protected]>
/* forking complete and child started to run, tell ptracer */
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5007,6 +5007,7 @@ context_switch(struct rq *rq, struct tas
@@ -5010,6 +5010,7 @@ context_switch(struct rq *rq, struct tas
* finish_task_switch()'s mmdrop().
*/
switch_mm_irqs_off(prev->active_mm, next->mm, next);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1194,27 +1194,31 @@ static int
@@ -1190,27 +1190,31 @@ static int
mt7530_port_bridge_join(struct dsa_switch *ds, int port,
struct net_device *bridge)
{
Expand Down Expand Up @@ -65,7 +65,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
}

/* Add the all other ports to this port matrix. */
@@ -1319,24 +1323,28 @@ static void
@@ -1315,24 +1319,28 @@ static void
mt7530_port_bridge_leave(struct dsa_switch *ds, int port,
struct net_device *bridge)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2407,6 +2407,32 @@ mt7531_setup(struct dsa_switch *ds)
@@ -2412,6 +2412,32 @@ mt7531_setup(struct dsa_switch *ds)
return 0;
}

Expand Down Expand Up @@ -56,7 +56,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
static bool
mt7530_phy_mode_supported(struct dsa_switch *ds, int port,
const struct phylink_link_state *state)
@@ -2443,6 +2469,37 @@ static bool mt7531_is_rgmii_port(struct
@@ -2448,6 +2474,37 @@ static bool mt7531_is_rgmii_port(struct
return (port == 5) && (priv->p5_intf_sel != P5_INTF_SEL_GMAC5_SGMII);
}

Expand Down Expand Up @@ -94,7 +94,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
static bool
mt7531_phy_mode_supported(struct dsa_switch *ds, int port,
const struct phylink_link_state *state)
@@ -2919,6 +2976,18 @@ mt7531_cpu_port_config(struct dsa_switch
@@ -2924,6 +2981,18 @@ mt7531_cpu_port_config(struct dsa_switch
return 0;
}

Expand All @@ -113,39 +113,39 @@ Signed-off-by: Paolo Abeni <[email protected]>
static void
mt7530_mac_port_validate(struct dsa_switch *ds, int port,
unsigned long *supported)
@@ -3154,6 +3223,7 @@ static const struct dsa_switch_ops mt753
@@ -3159,6 +3228,7 @@ static const struct dsa_switch_ops mt753
.port_vlan_del = mt7530_port_vlan_del,
.port_mirror_add = mt753x_port_mirror_add,
.port_mirror_del = mt753x_port_mirror_del,
+ .phylink_get_caps = mt753x_phylink_get_caps,
.phylink_validate = mt753x_phylink_validate,
.phylink_mac_link_state = mt753x_phylink_mac_link_state,
.phylink_mac_config = mt753x_phylink_mac_config,
@@ -3171,6 +3241,7 @@ static const struct mt753x_info mt753x_t
@@ -3176,6 +3246,7 @@ static const struct mt753x_info mt753x_t
.phy_read = mt7530_phy_read,
.phy_write = mt7530_phy_write,
.pad_setup = mt7530_pad_clk_setup,
+ .mac_port_get_caps = mt7530_mac_port_get_caps,
.phy_mode_supported = mt7530_phy_mode_supported,
.mac_port_validate = mt7530_mac_port_validate,
.mac_port_get_state = mt7530_phylink_mac_link_state,
@@ -3182,6 +3253,7 @@ static const struct mt753x_info mt753x_t
@@ -3187,6 +3258,7 @@ static const struct mt753x_info mt753x_t
.phy_read = mt7530_phy_read,
.phy_write = mt7530_phy_write,
.pad_setup = mt7530_pad_clk_setup,
+ .mac_port_get_caps = mt7530_mac_port_get_caps,
.phy_mode_supported = mt7530_phy_mode_supported,
.mac_port_validate = mt7530_mac_port_validate,
.mac_port_get_state = mt7530_phylink_mac_link_state,
@@ -3194,6 +3266,7 @@ static const struct mt753x_info mt753x_t
@@ -3199,6 +3271,7 @@ static const struct mt753x_info mt753x_t
.phy_write = mt7531_ind_phy_write,
.pad_setup = mt7531_pad_setup,
.cpu_port_config = mt7531_cpu_port_config,
+ .mac_port_get_caps = mt7531_mac_port_get_caps,
.phy_mode_supported = mt7531_phy_mode_supported,
.mac_port_validate = mt7531_mac_port_validate,
.mac_port_get_state = mt7531_phylink_mac_link_state,
@@ -3256,6 +3329,7 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -3261,6 +3334,7 @@ mt7530_probe(struct mdio_device *mdiodev
*/
if (!priv->info->sw_setup || !priv->info->pad_setup ||
!priv->info->phy_read || !priv->info->phy_write ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2433,37 +2433,6 @@ static void mt7530_mac_port_get_caps(str
@@ -2438,37 +2438,6 @@ static void mt7530_mac_port_get_caps(str
}
}

Expand Down Expand Up @@ -59,7 +59,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
static bool mt7531_is_rgmii_port(struct mt7530_priv *priv, u32 port)
{
return (port == 5) && (priv->p5_intf_sel != P5_INTF_SEL_GMAC5_SGMII);
@@ -2500,44 +2469,6 @@ static void mt7531_mac_port_get_caps(str
@@ -2505,44 +2474,6 @@ static void mt7531_mac_port_get_caps(str
}
}

Expand Down Expand Up @@ -104,7 +104,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
static int
mt753x_pad_setup(struct dsa_switch *ds, const struct phylink_link_state *state)
{
@@ -2792,9 +2723,6 @@ mt753x_phylink_mac_config(struct dsa_swi
@@ -2797,9 +2728,6 @@ mt753x_phylink_mac_config(struct dsa_swi
struct mt7530_priv *priv = ds->priv;
u32 mcr_cur, mcr_new;

Expand All @@ -114,7 +114,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
switch (port) {
case 0 ... 4: /* Internal phy */
if (state->interface != PHY_INTERFACE_MODE_GMII)
@@ -3010,12 +2938,6 @@ mt753x_phylink_validate(struct dsa_switc
@@ -3015,12 +2943,6 @@ mt753x_phylink_validate(struct dsa_switc
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
struct mt7530_priv *priv = ds->priv;

Expand All @@ -127,31 +127,31 @@ Signed-off-by: Paolo Abeni <[email protected]>
phylink_set_port_modes(mask);

if (state->interface != PHY_INTERFACE_MODE_TRGMII &&
@@ -3242,7 +3164,6 @@ static const struct mt753x_info mt753x_t
@@ -3247,7 +3169,6 @@ static const struct mt753x_info mt753x_t
.phy_write = mt7530_phy_write,
.pad_setup = mt7530_pad_clk_setup,
.mac_port_get_caps = mt7530_mac_port_get_caps,
- .phy_mode_supported = mt7530_phy_mode_supported,
.mac_port_validate = mt7530_mac_port_validate,
.mac_port_get_state = mt7530_phylink_mac_link_state,
.mac_port_config = mt7530_mac_config,
@@ -3254,7 +3175,6 @@ static const struct mt753x_info mt753x_t
@@ -3259,7 +3180,6 @@ static const struct mt753x_info mt753x_t
.phy_write = mt7530_phy_write,
.pad_setup = mt7530_pad_clk_setup,
.mac_port_get_caps = mt7530_mac_port_get_caps,
- .phy_mode_supported = mt7530_phy_mode_supported,
.mac_port_validate = mt7530_mac_port_validate,
.mac_port_get_state = mt7530_phylink_mac_link_state,
.mac_port_config = mt7530_mac_config,
@@ -3267,7 +3187,6 @@ static const struct mt753x_info mt753x_t
@@ -3272,7 +3192,6 @@ static const struct mt753x_info mt753x_t
.pad_setup = mt7531_pad_setup,
.cpu_port_config = mt7531_cpu_port_config,
.mac_port_get_caps = mt7531_mac_port_get_caps,
- .phy_mode_supported = mt7531_phy_mode_supported,
.mac_port_validate = mt7531_mac_port_validate,
.mac_port_get_state = mt7531_phylink_mac_link_state,
.mac_port_config = mt7531_mac_config,
@@ -3330,7 +3249,6 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -3335,7 +3254,6 @@ mt7530_probe(struct mdio_device *mdiodev
if (!priv->info->sw_setup || !priv->info->pad_setup ||
!priv->info->phy_read || !priv->info->phy_write ||
!priv->info->mac_port_get_caps ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2962,11 +2962,6 @@ mt753x_phylink_validate(struct dsa_switc
@@ -2967,11 +2967,6 @@ mt753x_phylink_validate(struct dsa_switc

linkmode_and(supported, supported, mask);
linkmode_and(state->advertising, state->advertising, mask);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2540,12 +2540,13 @@ static int mt7531_rgmii_setup(struct mt7
@@ -2545,12 +2545,13 @@ static int mt7531_rgmii_setup(struct mt7
}

static void mt7531_sgmii_validate(struct mt7530_priv *priv, int port,
Expand All @@ -38,7 +38,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
phylink_set(supported, 2500baseX_Full);
phylink_set(supported, 2500baseT_Full);
}
@@ -2918,16 +2919,18 @@ static void mt753x_phylink_get_caps(stru
@@ -2923,16 +2924,18 @@ static void mt753x_phylink_get_caps(stru

static void
mt7530_mac_port_validate(struct dsa_switch *ds, int port,
Expand All @@ -58,7 +58,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
}

static void
@@ -2950,12 +2953,13 @@ mt753x_phylink_validate(struct dsa_switc
@@ -2955,12 +2958,13 @@ mt753x_phylink_validate(struct dsa_switc
}

/* This switch only supports 1G full-duplex. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2539,19 +2539,6 @@ static int mt7531_rgmii_setup(struct mt7
@@ -2544,19 +2544,6 @@ static int mt7531_rgmii_setup(struct mt7
return 0;
}

Expand All @@ -40,7 +40,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
static void
mt7531_sgmii_link_up_force(struct dsa_switch *ds, int port,
unsigned int mode, phy_interface_t interface,
@@ -2918,51 +2905,21 @@ static void mt753x_phylink_get_caps(stru
@@ -2923,51 +2910,21 @@ static void mt753x_phylink_get_caps(stru
}

static void
Expand Down Expand Up @@ -97,31 +97,31 @@ Signed-off-by: Paolo Abeni <[email protected]>

linkmode_and(supported, supported, mask);
linkmode_and(state->advertising, state->advertising, mask);
@@ -3163,7 +3120,6 @@ static const struct mt753x_info mt753x_t
@@ -3168,7 +3125,6 @@ static const struct mt753x_info mt753x_t
.phy_write = mt7530_phy_write,
.pad_setup = mt7530_pad_clk_setup,
.mac_port_get_caps = mt7530_mac_port_get_caps,
- .mac_port_validate = mt7530_mac_port_validate,
.mac_port_get_state = mt7530_phylink_mac_link_state,
.mac_port_config = mt7530_mac_config,
},
@@ -3174,7 +3130,6 @@ static const struct mt753x_info mt753x_t
@@ -3179,7 +3135,6 @@ static const struct mt753x_info mt753x_t
.phy_write = mt7530_phy_write,
.pad_setup = mt7530_pad_clk_setup,
.mac_port_get_caps = mt7530_mac_port_get_caps,
- .mac_port_validate = mt7530_mac_port_validate,
.mac_port_get_state = mt7530_phylink_mac_link_state,
.mac_port_config = mt7530_mac_config,
},
@@ -3186,7 +3141,6 @@ static const struct mt753x_info mt753x_t
@@ -3191,7 +3146,6 @@ static const struct mt753x_info mt753x_t
.pad_setup = mt7531_pad_setup,
.cpu_port_config = mt7531_cpu_port_config,
.mac_port_get_caps = mt7531_mac_port_get_caps,
- .mac_port_validate = mt7531_mac_port_validate,
.mac_port_get_state = mt7531_phylink_mac_link_state,
.mac_port_config = mt7531_mac_config,
.mac_pcs_an_restart = mt7531_sgmii_restart_an,
@@ -3248,7 +3202,6 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -3253,7 +3207,6 @@ mt7530_probe(struct mdio_device *mdiodev
if (!priv->info->sw_setup || !priv->info->pad_setup ||
!priv->info->phy_read || !priv->info->phy_write ||
!priv->info->mac_port_get_caps ||
Expand Down

0 comments on commit 00c491d

Please sign in to comment.