Skip to content

Commit 87d7c07

Browse files
authored
kernel: bump 5.15 to 5.15.157 (#12108)
1 parent 76c97b7 commit 87d7c07

File tree

48 files changed

+218
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+218
-332
lines changed

include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .156
2-
LINUX_KERNEL_HASH-5.15.156 = 9f0465d14c93691056f5f94de647601f94f083ad8ce2e5d306564394b13e7778
1+
LINUX_VERSION-5.15 = .157
2+
LINUX_KERNEL_HASH-5.15.157 = aff22351d34d69a16762dcf1fd51fe228da55d4b96b67247bdd598a86cc7a414

target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Signed-off-by: David S. Miller <[email protected]>
124124
list_del(&dst->list);
125125
kfree(dst);
126126
}
127-
@@ -805,7 +809,7 @@ static int dsa_switch_setup_tag_protocol
127+
@@ -827,7 +831,7 @@ static int dsa_switch_setup_tag_protocol
128128
int port, err;
129129

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

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

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

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

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

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

217217
rtnl_unlock();
218218

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

225225
/* Find out which protocol the switch would prefer. */
226226
default_proto = dsa_get_tag_protocol(dp, master);
227-
@@ -1311,6 +1370,12 @@ static int dsa_port_parse_cpu(struct dsa
227+
@@ -1333,6 +1392,12 @@ static int dsa_port_parse_cpu(struct dsa
228228
*/
229229
dsa_tag_driver_put(tag_ops);
230230
} else {

target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <[email protected]>
101101
list_del(&dst->list);
102102
kfree(dst);
103103
}
104-
@@ -826,17 +822,29 @@ static int dsa_switch_setup_tag_protocol
104+
@@ -848,17 +844,29 @@ static int dsa_switch_setup_tag_protocol
105105
}
106106

107107
connect:
@@ -132,7 +132,7 @@ Signed-off-by: David S. Miller <[email protected]>
132132
}
133133

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

137137
dst->tag_ops = tag_ops;
138138

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

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

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

176176
/* Find out which protocol the switch would prefer. */
177177
default_proto = dsa_get_tag_protocol(dp, master);
178-
@@ -1370,12 +1368,6 @@ static int dsa_port_parse_cpu(struct dsa
178+
@@ -1392,12 +1390,6 @@ static int dsa_port_parse_cpu(struct dsa
179179
*/
180180
dsa_tag_driver_put(tag_ops);
181181
} else {

target/linux/generic/backport-5.15/705-01-v5.17-net-dsa-mt7530-iterate-using-dsa_switch_for_each_use.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
2121

2222
--- a/drivers/net/dsa/mt7530.c
2323
+++ b/drivers/net/dsa/mt7530.c
24-
@@ -1404,27 +1404,31 @@ static int
24+
@@ -1425,27 +1425,31 @@ static int
2525
mt7530_port_bridge_join(struct dsa_switch *ds, int port,
2626
struct net_device *bridge)
2727
{
@@ -65,7 +65,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
6565
}
6666

6767
/* Add the all other ports to this port matrix. */
68-
@@ -1529,24 +1533,28 @@ static void
68+
@@ -1550,24 +1554,28 @@ static void
6969
mt7530_port_bridge_leave(struct dsa_switch *ds, int port,
7070
struct net_device *bridge)
7171
{

target/linux/generic/backport-5.15/705-02-v5.19-net-dsa-mt7530-populate-supported_interfaces-and-mac.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
2323

2424
--- a/drivers/net/dsa/mt7530.c
2525
+++ b/drivers/net/dsa/mt7530.c
26-
@@ -2660,6 +2660,32 @@ mt7531_setup(struct dsa_switch *ds)
26+
@@ -2687,6 +2687,32 @@ mt7531_setup(struct dsa_switch *ds)
2727
return 0;
2828
}
2929

@@ -56,7 +56,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
5656
static bool
5757
mt7530_phy_mode_supported(struct dsa_switch *ds, int port,
5858
const struct phylink_link_state *state)
59-
@@ -2696,6 +2722,37 @@ static bool mt7531_is_rgmii_port(struct
59+
@@ -2723,6 +2749,37 @@ static bool mt7531_is_rgmii_port(struct
6060
return (port == 5) && (priv->p5_intf_sel != P5_INTF_SEL_GMAC5_SGMII);
6161
}
6262

@@ -94,7 +94,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
9494
static bool
9595
mt7531_phy_mode_supported(struct dsa_switch *ds, int port,
9696
const struct phylink_link_state *state)
97-
@@ -3172,6 +3229,18 @@ mt7531_cpu_port_config(struct dsa_switch
97+
@@ -3199,6 +3256,18 @@ mt7531_cpu_port_config(struct dsa_switch
9898
return 0;
9999
}
100100

@@ -113,39 +113,39 @@ Signed-off-by: Paolo Abeni <[email protected]>
113113
static void
114114
mt7530_mac_port_validate(struct dsa_switch *ds, int port,
115115
unsigned long *supported)
116-
@@ -3407,6 +3476,7 @@ static const struct dsa_switch_ops mt753
116+
@@ -3435,6 +3504,7 @@ static const struct dsa_switch_ops mt753
117117
.port_vlan_del = mt7530_port_vlan_del,
118118
.port_mirror_add = mt753x_port_mirror_add,
119119
.port_mirror_del = mt753x_port_mirror_del,
120120
+ .phylink_get_caps = mt753x_phylink_get_caps,
121121
.phylink_validate = mt753x_phylink_validate,
122122
.phylink_mac_link_state = mt753x_phylink_mac_link_state,
123123
.phylink_mac_config = mt753x_phylink_mac_config,
124-
@@ -3424,6 +3494,7 @@ static const struct mt753x_info mt753x_t
124+
@@ -3452,6 +3522,7 @@ static const struct mt753x_info mt753x_t
125125
.phy_read = mt7530_phy_read,
126126
.phy_write = mt7530_phy_write,
127127
.pad_setup = mt7530_pad_clk_setup,
128128
+ .mac_port_get_caps = mt7530_mac_port_get_caps,
129129
.phy_mode_supported = mt7530_phy_mode_supported,
130130
.mac_port_validate = mt7530_mac_port_validate,
131131
.mac_port_get_state = mt7530_phylink_mac_link_state,
132-
@@ -3435,6 +3506,7 @@ static const struct mt753x_info mt753x_t
132+
@@ -3463,6 +3534,7 @@ static const struct mt753x_info mt753x_t
133133
.phy_read = mt7530_phy_read,
134134
.phy_write = mt7530_phy_write,
135135
.pad_setup = mt7530_pad_clk_setup,
136136
+ .mac_port_get_caps = mt7530_mac_port_get_caps,
137137
.phy_mode_supported = mt7530_phy_mode_supported,
138138
.mac_port_validate = mt7530_mac_port_validate,
139139
.mac_port_get_state = mt7530_phylink_mac_link_state,
140-
@@ -3447,6 +3519,7 @@ static const struct mt753x_info mt753x_t
140+
@@ -3475,6 +3547,7 @@ static const struct mt753x_info mt753x_t
141141
.phy_write = mt7531_ind_phy_write,
142142
.pad_setup = mt7531_pad_setup,
143143
.cpu_port_config = mt7531_cpu_port_config,
144144
+ .mac_port_get_caps = mt7531_mac_port_get_caps,
145145
.phy_mode_supported = mt7531_phy_mode_supported,
146146
.mac_port_validate = mt7531_mac_port_validate,
147147
.mac_port_get_state = mt7531_phylink_mac_link_state,
148-
@@ -3509,6 +3582,7 @@ mt7530_probe(struct mdio_device *mdiodev
148+
@@ -3537,6 +3610,7 @@ mt7530_probe(struct mdio_device *mdiodev
149149
*/
150150
if (!priv->info->sw_setup || !priv->info->pad_setup ||
151151
!priv->info->phy_read || !priv->info->phy_write ||
@@ -155,7 +155,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
155155
!priv->info->mac_port_get_state || !priv->info->mac_port_config)
156156
--- a/drivers/net/dsa/mt7530.h
157157
+++ b/drivers/net/dsa/mt7530.h
158-
@@ -801,6 +801,8 @@ struct mt753x_info {
158+
@@ -807,6 +807,8 @@ struct mt753x_info {
159159
int (*phy_write)(struct mt7530_priv *priv, int port, int regnum, u16 val);
160160
int (*pad_setup)(struct dsa_switch *ds, phy_interface_t interface);
161161
int (*cpu_port_config)(struct dsa_switch *ds, int port);

target/linux/generic/backport-5.15/705-03-v5.19-net-dsa-mt7530-remove-interface-checks.patch

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
2121

2222
--- a/drivers/net/dsa/mt7530.c
2323
+++ b/drivers/net/dsa/mt7530.c
24-
@@ -2686,37 +2686,6 @@ static void mt7530_mac_port_get_caps(str
24+
@@ -2713,37 +2713,6 @@ static void mt7530_mac_port_get_caps(str
2525
}
2626
}
2727

@@ -59,7 +59,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
5959
static bool mt7531_is_rgmii_port(struct mt7530_priv *priv, u32 port)
6060
{
6161
return (port == 5) && (priv->p5_intf_sel != P5_INTF_SEL_GMAC5_SGMII);
62-
@@ -2753,44 +2722,6 @@ static void mt7531_mac_port_get_caps(str
62+
@@ -2780,44 +2749,6 @@ static void mt7531_mac_port_get_caps(str
6363
}
6464
}
6565

@@ -104,7 +104,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
104104
static int
105105
mt753x_pad_setup(struct dsa_switch *ds, const struct phylink_link_state *state)
106106
{
107-
@@ -3045,9 +2976,6 @@ mt753x_phylink_mac_config(struct dsa_swi
107+
@@ -3072,9 +3003,6 @@ mt753x_phylink_mac_config(struct dsa_swi
108108
struct mt7530_priv *priv = ds->priv;
109109
u32 mcr_cur, mcr_new;
110110

@@ -114,7 +114,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
114114
switch (port) {
115115
case 0 ... 4: /* Internal phy */
116116
if (state->interface != PHY_INTERFACE_MODE_GMII)
117-
@@ -3263,12 +3191,6 @@ mt753x_phylink_validate(struct dsa_switc
117+
@@ -3290,12 +3218,6 @@ mt753x_phylink_validate(struct dsa_switc
118118
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
119119
struct mt7530_priv *priv = ds->priv;
120120

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

129129
if (state->interface != PHY_INTERFACE_MODE_TRGMII &&
130-
@@ -3495,7 +3417,6 @@ static const struct mt753x_info mt753x_t
130+
@@ -3523,7 +3445,6 @@ static const struct mt753x_info mt753x_t
131131
.phy_write = mt7530_phy_write,
132132
.pad_setup = mt7530_pad_clk_setup,
133133
.mac_port_get_caps = mt7530_mac_port_get_caps,
134134
- .phy_mode_supported = mt7530_phy_mode_supported,
135135
.mac_port_validate = mt7530_mac_port_validate,
136136
.mac_port_get_state = mt7530_phylink_mac_link_state,
137137
.mac_port_config = mt7530_mac_config,
138-
@@ -3507,7 +3428,6 @@ static const struct mt753x_info mt753x_t
138+
@@ -3535,7 +3456,6 @@ static const struct mt753x_info mt753x_t
139139
.phy_write = mt7530_phy_write,
140140
.pad_setup = mt7530_pad_clk_setup,
141141
.mac_port_get_caps = mt7530_mac_port_get_caps,
142142
- .phy_mode_supported = mt7530_phy_mode_supported,
143143
.mac_port_validate = mt7530_mac_port_validate,
144144
.mac_port_get_state = mt7530_phylink_mac_link_state,
145145
.mac_port_config = mt7530_mac_config,
146-
@@ -3520,7 +3440,6 @@ static const struct mt753x_info mt753x_t
146+
@@ -3548,7 +3468,6 @@ static const struct mt753x_info mt753x_t
147147
.pad_setup = mt7531_pad_setup,
148148
.cpu_port_config = mt7531_cpu_port_config,
149149
.mac_port_get_caps = mt7531_mac_port_get_caps,
150150
- .phy_mode_supported = mt7531_phy_mode_supported,
151151
.mac_port_validate = mt7531_mac_port_validate,
152152
.mac_port_get_state = mt7531_phylink_mac_link_state,
153153
.mac_port_config = mt7531_mac_config,
154-
@@ -3583,7 +3502,6 @@ mt7530_probe(struct mdio_device *mdiodev
154+
@@ -3611,7 +3530,6 @@ mt7530_probe(struct mdio_device *mdiodev
155155
if (!priv->info->sw_setup || !priv->info->pad_setup ||
156156
!priv->info->phy_read || !priv->info->phy_write ||
157157
!priv->info->mac_port_get_caps ||
@@ -161,7 +161,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
161161
return -EINVAL;
162162
--- a/drivers/net/dsa/mt7530.h
163163
+++ b/drivers/net/dsa/mt7530.h
164-
@@ -803,8 +803,6 @@ struct mt753x_info {
164+
@@ -809,8 +809,6 @@ struct mt753x_info {
165165
int (*cpu_port_config)(struct dsa_switch *ds, int port);
166166
void (*mac_port_get_caps)(struct dsa_switch *ds, int port,
167167
struct phylink_config *config);

target/linux/generic/backport-5.15/705-04-v5.19-net-dsa-mt7530-drop-use-of-phylink_helper_basex_spee.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
2020

2121
--- a/drivers/net/dsa/mt7530.c
2222
+++ b/drivers/net/dsa/mt7530.c
23-
@@ -3215,11 +3215,6 @@ mt753x_phylink_validate(struct dsa_switc
23+
@@ -3242,11 +3242,6 @@ mt753x_phylink_validate(struct dsa_switc
2424

2525
linkmode_and(supported, supported, mask);
2626
linkmode_and(state->advertising, state->advertising, mask);

target/linux/generic/backport-5.15/705-05-v5.19-net-dsa-mt7530-only-indicate-linkmodes-that-can-be-s.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
2323

2424
--- a/drivers/net/dsa/mt7530.c
2525
+++ b/drivers/net/dsa/mt7530.c
26-
@@ -2793,12 +2793,13 @@ static int mt7531_rgmii_setup(struct mt7
26+
@@ -2820,12 +2820,13 @@ static int mt7531_rgmii_setup(struct mt7
2727
}
2828

2929
static void mt7531_sgmii_validate(struct mt7530_priv *priv, int port,
@@ -38,7 +38,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
3838
phylink_set(supported, 2500baseX_Full);
3939
phylink_set(supported, 2500baseT_Full);
4040
}
41-
@@ -3171,16 +3172,18 @@ static void mt753x_phylink_get_caps(stru
41+
@@ -3198,16 +3199,18 @@ static void mt753x_phylink_get_caps(stru
4242

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

6060
static void
61-
@@ -3203,12 +3206,13 @@ mt753x_phylink_validate(struct dsa_switc
61+
@@ -3230,12 +3233,13 @@ mt753x_phylink_validate(struct dsa_switc
6262
}
6363

6464
/* This switch only supports 1G full-duplex. */
@@ -76,7 +76,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
7676
phylink_set(mask, Asym_Pause);
7777
--- a/drivers/net/dsa/mt7530.h
7878
+++ b/drivers/net/dsa/mt7530.h
79-
@@ -804,6 +804,7 @@ struct mt753x_info {
79+
@@ -810,6 +810,7 @@ struct mt753x_info {
8080
void (*mac_port_get_caps)(struct dsa_switch *ds, int port,
8181
struct phylink_config *config);
8282
void (*mac_port_validate)(struct dsa_switch *ds, int port,

target/linux/generic/backport-5.15/705-06-v5.19-net-dsa-mt7530-switch-to-use-phylink_get_linkmodes.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
2020

2121
--- a/drivers/net/dsa/mt7530.c
2222
+++ b/drivers/net/dsa/mt7530.c
23-
@@ -2792,19 +2792,6 @@ static int mt7531_rgmii_setup(struct mt7
23+
@@ -2819,19 +2819,6 @@ static int mt7531_rgmii_setup(struct mt7
2424
return 0;
2525
}
2626

@@ -40,7 +40,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
4040
static void
4141
mt7531_sgmii_link_up_force(struct dsa_switch *ds, int port,
4242
unsigned int mode, phy_interface_t interface,
43-
@@ -3171,51 +3158,21 @@ static void mt753x_phylink_get_caps(stru
43+
@@ -3198,51 +3185,21 @@ static void mt753x_phylink_get_caps(stru
4444
}
4545

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

9898
linkmode_and(supported, supported, mask);
9999
linkmode_and(state->advertising, state->advertising, mask);
100-
@@ -3416,7 +3373,6 @@ static const struct mt753x_info mt753x_t
100+
@@ -3444,7 +3401,6 @@ static const struct mt753x_info mt753x_t
101101
.phy_write = mt7530_phy_write,
102102
.pad_setup = mt7530_pad_clk_setup,
103103
.mac_port_get_caps = mt7530_mac_port_get_caps,
104104
- .mac_port_validate = mt7530_mac_port_validate,
105105
.mac_port_get_state = mt7530_phylink_mac_link_state,
106106
.mac_port_config = mt7530_mac_config,
107107
},
108-
@@ -3427,7 +3383,6 @@ static const struct mt753x_info mt753x_t
108+
@@ -3455,7 +3411,6 @@ static const struct mt753x_info mt753x_t
109109
.phy_write = mt7530_phy_write,
110110
.pad_setup = mt7530_pad_clk_setup,
111111
.mac_port_get_caps = mt7530_mac_port_get_caps,
112112
- .mac_port_validate = mt7530_mac_port_validate,
113113
.mac_port_get_state = mt7530_phylink_mac_link_state,
114114
.mac_port_config = mt7530_mac_config,
115115
},
116-
@@ -3439,7 +3394,6 @@ static const struct mt753x_info mt753x_t
116+
@@ -3467,7 +3422,6 @@ static const struct mt753x_info mt753x_t
117117
.pad_setup = mt7531_pad_setup,
118118
.cpu_port_config = mt7531_cpu_port_config,
119119
.mac_port_get_caps = mt7531_mac_port_get_caps,
120120
- .mac_port_validate = mt7531_mac_port_validate,
121121
.mac_port_get_state = mt7531_phylink_mac_link_state,
122122
.mac_port_config = mt7531_mac_config,
123123
.mac_pcs_an_restart = mt7531_sgmii_restart_an,
124-
@@ -3501,7 +3455,6 @@ mt7530_probe(struct mdio_device *mdiodev
124+
@@ -3529,7 +3483,6 @@ mt7530_probe(struct mdio_device *mdiodev
125125
if (!priv->info->sw_setup || !priv->info->pad_setup ||
126126
!priv->info->phy_read || !priv->info->phy_write ||
127127
!priv->info->mac_port_get_caps ||

0 commit comments

Comments
 (0)