Skip to content

Commit

Permalink
kernel: bump 5.15 to 5.15.157
Browse files Browse the repository at this point in the history
Removed because they are upstream:
   generic/backport-5.15/741-v6.9-01-netfilter-flowtable-validate-pppoe-header.patch
   https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=d06977b9a4109f8738bb276125eb6a0b772bc433

Removed because they are upstream:
   generic/backport-5.15/741-v6.9-02-netfilter-flowtable-incorrect-pppoe-tuple.patch
   https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=e719b52d0c56989b0f3475a03a6d64f182c85b56

Manual adapted the following patches:
   generic/pending-5.15/700-netfilter-nft_flow_offload-handle-netdevice-events-f.patch
   generic/pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch

Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
hauke committed May 11, 2024
1 parent 1fbe41f commit 84d0b0b
Show file tree
Hide file tree
Showing 47 changed files with 208 additions and 321 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 = .156
LINUX_KERNEL_HASH-5.15.156 = 9f0465d14c93691056f5f94de647601f94f083ad8ce2e5d306564394b13e7778
LINUX_VERSION-5.15 = .157
LINUX_KERNEL_HASH-5.15.157 = aff22351d34d69a16762dcf1fd51fe228da55d4b96b67247bdd598a86cc7a414
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Signed-off-by: David S. Miller <[email protected]>
list_del(&dst->list);
kfree(dst);
}
@@ -805,7 +809,7 @@ static int dsa_switch_setup_tag_protocol
@@ -827,7 +831,7 @@ static int dsa_switch_setup_tag_protocol
int port, err;

if (tag_ops->proto == dst->default_proto)
Expand All @@ -133,7 +133,7 @@ Signed-off-by: David S. Miller <[email protected]>

for (port = 0; port < ds->num_ports; port++) {
if (!dsa_is_cpu_port(ds, port))
@@ -821,6 +825,17 @@ static int dsa_switch_setup_tag_protocol
@@ -843,6 +847,17 @@ static int dsa_switch_setup_tag_protocol
}
}

Expand All @@ -151,7 +151,7 @@ Signed-off-by: David S. Miller <[email protected]>
return 0;
}

@@ -1132,6 +1147,46 @@ static void dsa_tree_teardown(struct dsa
@@ -1154,6 +1169,46 @@ static void dsa_tree_teardown(struct dsa
dst->setup = false;
}

Expand Down Expand Up @@ -198,7 +198,7 @@ Signed-off-by: David S. Miller <[email protected]>
/* Since the dsa/tagging sysfs device attribute is per master, the assumption
* is that all DSA switches within a tree share the same tagger, otherwise
* they would have formed disjoint trees (different "dsa,member" values).
@@ -1164,12 +1219,15 @@ int dsa_tree_change_tag_proto(struct dsa
@@ -1186,12 +1241,15 @@ int dsa_tree_change_tag_proto(struct dsa
goto out_unlock;
}

Expand All @@ -216,15 +216,15 @@ Signed-off-by: David S. Miller <[email protected]>

rtnl_unlock();

@@ -1257,6 +1315,7 @@ static int dsa_port_parse_cpu(struct dsa
@@ -1279,6 +1337,7 @@ static int dsa_port_parse_cpu(struct dsa
struct dsa_switch *ds = dp->ds;
struct dsa_switch_tree *dst = ds->dst;
enum dsa_tag_protocol default_proto;
+ int err;

/* Find out which protocol the switch would prefer. */
default_proto = dsa_get_tag_protocol(dp, master);
@@ -1311,6 +1370,12 @@ static int dsa_port_parse_cpu(struct dsa
@@ -1333,6 +1392,12 @@ static int dsa_port_parse_cpu(struct dsa
*/
dsa_tag_driver_put(tag_ops);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <[email protected]>
list_del(&dst->list);
kfree(dst);
}
@@ -826,17 +822,29 @@ static int dsa_switch_setup_tag_protocol
@@ -848,17 +844,29 @@ static int dsa_switch_setup_tag_protocol
}

connect:
Expand Down Expand Up @@ -132,7 +132,7 @@ Signed-off-by: David S. Miller <[email protected]>
}

static int dsa_switch_setup(struct dsa_switch *ds)
@@ -1156,13 +1164,6 @@ static int dsa_tree_bind_tag_proto(struc
@@ -1178,13 +1186,6 @@ static int dsa_tree_bind_tag_proto(struc

dst->tag_ops = tag_ops;

Expand All @@ -146,7 +146,7 @@ Signed-off-by: David S. Miller <[email protected]>
/* Notify the switches from this tree about the connection
* to the new tagger
*/
@@ -1172,16 +1173,14 @@ static int dsa_tree_bind_tag_proto(struc
@@ -1194,16 +1195,14 @@ static int dsa_tree_bind_tag_proto(struc
goto out_disconnect;

/* Notify the old tagger about the disconnection from this tree */
Expand All @@ -167,15 +167,15 @@ Signed-off-by: David S. Miller <[email protected]>
dst->tag_ops = old_tag_ops;

return err;
@@ -1315,7 +1314,6 @@ static int dsa_port_parse_cpu(struct dsa
@@ -1337,7 +1336,6 @@ static int dsa_port_parse_cpu(struct dsa
struct dsa_switch *ds = dp->ds;
struct dsa_switch_tree *dst = ds->dst;
enum dsa_tag_protocol default_proto;
- int err;

/* Find out which protocol the switch would prefer. */
default_proto = dsa_get_tag_protocol(dp, master);
@@ -1370,12 +1368,6 @@ static int dsa_port_parse_cpu(struct dsa
@@ -1392,12 +1390,6 @@ static int dsa_port_parse_cpu(struct dsa
*/
dsa_tag_driver_put(tag_ops);
} else {
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
@@ -1404,27 +1404,31 @@ static int
@@ -1425,27 +1425,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. */
@@ -1529,24 +1533,28 @@ static void
@@ -1550,24 +1554,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
@@ -2660,6 +2660,32 @@ mt7531_setup(struct dsa_switch *ds)
@@ -2687,6 +2687,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)
@@ -2696,6 +2722,37 @@ static bool mt7531_is_rgmii_port(struct
@@ -2723,6 +2749,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)
@@ -3172,6 +3229,18 @@ mt7531_cpu_port_config(struct dsa_switch
@@ -3199,6 +3256,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)
@@ -3407,6 +3476,7 @@ static const struct dsa_switch_ops mt753
@@ -3435,6 +3504,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,
@@ -3424,6 +3494,7 @@ static const struct mt753x_info mt753x_t
@@ -3452,6 +3522,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,
@@ -3435,6 +3506,7 @@ static const struct mt753x_info mt753x_t
@@ -3463,6 +3534,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,
@@ -3447,6 +3519,7 @@ static const struct mt753x_info mt753x_t
@@ -3475,6 +3547,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,
@@ -3509,6 +3582,7 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -3537,6 +3610,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 All @@ -155,7 +155,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
!priv->info->mac_port_get_state || !priv->info->mac_port_config)
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -801,6 +801,8 @@ struct mt753x_info {
@@ -807,6 +807,8 @@ struct mt753x_info {
int (*phy_write)(struct mt7530_priv *priv, int port, int regnum, u16 val);
int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface);
int (*cpu_port_config)(struct dsa_switch *ds, int port);
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
@@ -2686,37 +2686,6 @@ static void mt7530_mac_port_get_caps(str
@@ -2713,37 +2713,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);
@@ -2753,44 +2722,6 @@ static void mt7531_mac_port_get_caps(str
@@ -2780,44 +2749,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)
{
@@ -3045,9 +2976,6 @@ mt753x_phylink_mac_config(struct dsa_swi
@@ -3072,9 +3003,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)
@@ -3263,12 +3191,6 @@ mt753x_phylink_validate(struct dsa_switc
@@ -3290,12 +3218,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 &&
@@ -3495,7 +3417,6 @@ static const struct mt753x_info mt753x_t
@@ -3523,7 +3445,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,
@@ -3507,7 +3428,6 @@ static const struct mt753x_info mt753x_t
@@ -3535,7 +3456,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,
@@ -3520,7 +3440,6 @@ static const struct mt753x_info mt753x_t
@@ -3548,7 +3468,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,
@@ -3583,7 +3502,6 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -3611,7 +3530,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 All @@ -161,7 +161,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
return -EINVAL;
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -803,8 +803,6 @@ struct mt753x_info {
@@ -809,8 +809,6 @@ struct mt753x_info {
int (*cpu_port_config)(struct dsa_switch *ds, int port);
void (*mac_port_get_caps)(struct dsa_switch *ds, int port,
struct phylink_config *config);
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
@@ -3215,11 +3215,6 @@ mt753x_phylink_validate(struct dsa_switc
@@ -3242,11 +3242,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
@@ -2793,12 +2793,13 @@ static int mt7531_rgmii_setup(struct mt7
@@ -2820,12 +2820,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);
}
@@ -3171,16 +3172,18 @@ static void mt753x_phylink_get_caps(stru
@@ -3198,16 +3199,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
@@ -3203,12 +3206,13 @@ mt753x_phylink_validate(struct dsa_switc
@@ -3230,12 +3233,13 @@ mt753x_phylink_validate(struct dsa_switc
}

/* This switch only supports 1G full-duplex. */
Expand All @@ -76,7 +76,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
phylink_set(mask, Asym_Pause);
--- a/drivers/net/dsa/mt7530.h
+++ b/drivers/net/dsa/mt7530.h
@@ -804,6 +804,7 @@ struct mt753x_info {
@@ -810,6 +810,7 @@ struct mt753x_info {
void (*mac_port_get_caps)(struct dsa_switch *ds, int port,
struct phylink_config *config);
void (*mac_port_validate)(struct dsa_switch *ds, int port,
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
@@ -2792,19 +2792,6 @@ static int mt7531_rgmii_setup(struct mt7
@@ -2819,19 +2819,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,
@@ -3171,51 +3158,21 @@ static void mt753x_phylink_get_caps(stru
@@ -3198,51 +3185,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);
@@ -3416,7 +3373,6 @@ static const struct mt753x_info mt753x_t
@@ -3444,7 +3401,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,
},
@@ -3427,7 +3383,6 @@ static const struct mt753x_info mt753x_t
@@ -3455,7 +3411,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,
},
@@ -3439,7 +3394,6 @@ static const struct mt753x_info mt753x_t
@@ -3467,7 +3422,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,
@@ -3501,7 +3455,6 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -3529,7 +3483,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
Loading

0 comments on commit 84d0b0b

Please sign in to comment.