Skip to content

Commit 56bf33b

Browse files
authored
kernel: bump 5.15 to 5.15.71 (coolsnowwolf#10203)
All patches automatically rebased. Signed-off-by: Liu Linhui <[email protected]>
1 parent 13ac208 commit 56bf33b

17 files changed

+38
-38
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 = .70
2-
LINUX_KERNEL_HASH-5.15.70 = 1a7c26f0253407bb222786c8cbf2ee6235acebe8ea641fe0bc2360acce970d76
1+
LINUX_VERSION-5.15 = .71
2+
LINUX_KERNEL_HASH-5.15.71 = 5f5408138e016c0e029e015d98ceab86f4e6366c65cd611259dac808ab1d1e53

target/linux/generic/backport-5.15/703-00-v5.16-net-convert-users-of-bitmap_foo-to-linkmode_foo.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <[email protected]>
637637
static void macb_usx_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode,
638638
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
639639
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
640-
@@ -940,7 +940,7 @@ static void enetc_pl_mac_validate(struct
640+
@@ -968,7 +968,7 @@ static void enetc_pl_mac_validate(struct
641641
state->interface != PHY_INTERFACE_MODE_2500BASEX &&
642642
state->interface != PHY_INTERFACE_MODE_USXGMII &&
643643
!phy_interface_mode_is_rgmii(state->interface)) {
@@ -646,7 +646,7 @@ Signed-off-by: David S. Miller <[email protected]>
646646
return;
647647
}
648648

649-
@@ -963,10 +963,8 @@ static void enetc_pl_mac_validate(struct
649+
@@ -991,10 +991,8 @@ static void enetc_pl_mac_validate(struct
650650
phylink_set(mask, 2500baseX_Full);
651651
}
652652

target/linux/generic/hack-5.15/221-module_exports.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
5656
} \
5757
\
5858
/* __*init sections */ \
59-
@@ -1018,6 +1028,8 @@
59+
@@ -1017,6 +1027,8 @@
6060

6161
#define COMMON_DISCARDS \
6262
SANITIZER_DISCARDS \

target/linux/generic/hack-5.15/720-net-phy-add-aqr-phys.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Birger Koblitz <[email protected]>
2020

2121
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
2222
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3)
23-
@@ -372,6 +374,49 @@ static int aqr107_read_rate(struct phy_d
23+
@@ -381,6 +383,49 @@ static int aqr107_read_rate(struct phy_d
2424
return 0;
2525
}
2626

@@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz <[email protected]>
7070
static int aqr107_read_status(struct phy_device *phydev)
7171
{
7272
int val, ret;
73-
@@ -502,7 +547,7 @@ static void aqr107_chip_info(struct phy_
73+
@@ -511,7 +556,7 @@ static void aqr107_chip_info(struct phy_
7474
build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val);
7575
prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val);
7676

@@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz <[email protected]>
7979
fw_major, fw_minor, build_id, prov_id);
8080
}
8181

82-
@@ -674,6 +719,24 @@ static struct phy_driver aqr_driver[] =
82+
@@ -719,6 +764,24 @@ static struct phy_driver aqr_driver[] =
8383
.link_change_notify = aqr107_link_change_notify,
8484
},
8585
{
@@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz <[email protected]>
104104
PHY_ID_MATCH_MODEL(PHY_ID_AQCS109),
105105
.name = "Aquantia AQCS109",
106106
.probe = aqr107_probe,
107-
@@ -699,6 +762,24 @@ static struct phy_driver aqr_driver[] =
107+
@@ -744,6 +807,24 @@ static struct phy_driver aqr_driver[] =
108108
.handle_interrupt = aqr_handle_interrupt,
109109
.read_status = aqr_read_status,
110110
},
@@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz <[email protected]>
129129
};
130130

131131
module_phy_driver(aqr_driver);
132-
@@ -709,8 +790,10 @@ static struct mdio_device_id __maybe_unu
132+
@@ -754,8 +835,10 @@ static struct mdio_device_id __maybe_unu
133133
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
134134
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
135135
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },

target/linux/generic/hack-5.15/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Signed-off-by: Alex Marginean <[email protected]>
2727
#define PHY_ID_AQR813 0x31c31cb2
2828

2929
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
30-
@@ -126,6 +128,29 @@
31-
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)
32-
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0)
30+
@@ -135,6 +137,29 @@
31+
#define AQR107_OP_IN_PROG_SLEEP 1000
32+
#define AQR107_OP_IN_PROG_TIMEOUT 100000
3333

3434
+/* registers in MDIO_MMD_VEND1 region */
3535
+#define AQUANTIA_VND1_GLOBAL_SC 0x000
@@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <[email protected]>
5757
struct aqr107_hw_stat {
5858
const char *name;
5959
int reg;
60-
@@ -257,6 +282,51 @@ static int aqr_config_aneg(struct phy_de
60+
@@ -266,6 +291,51 @@ static int aqr_config_aneg(struct phy_de
6161
return genphy_c45_check_and_restart_aneg(phydev, changed);
6262
}
6363

@@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <[email protected]>
109109
static int aqr_config_intr(struct phy_device *phydev)
110110
{
111111
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
112-
@@ -780,6 +850,30 @@ static struct phy_driver aqr_driver[] =
112+
@@ -825,6 +895,30 @@ static struct phy_driver aqr_driver[] =
113113
.get_stats = aqr107_get_stats,
114114
.link_change_notify = aqr107_link_change_notify,
115115
},
@@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <[email protected]>
140140
};
141141

142142
module_phy_driver(aqr_driver);
143-
@@ -790,9 +884,11 @@ static struct mdio_device_id __maybe_unu
143+
@@ -835,9 +929,11 @@ static struct mdio_device_id __maybe_unu
144144
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
145145
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
146146
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },

target/linux/generic/hack-5.15/723-net-phy-aquantia-fix-system-side-protocol-mi.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <[email protected]>
1414

1515
--- a/drivers/net/phy/aquantia_main.c
1616
+++ b/drivers/net/phy/aquantia_main.c
17-
@@ -315,10 +315,16 @@ static int aqr_config_aneg_set_prot(stru
17+
@@ -324,10 +324,16 @@ static int aqr_config_aneg_set_prot(stru
1818
phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE,
1919
aquantia_syscfg[if_type].start_rate);
2020

target/linux/generic/hack-5.15/724-net-phy-aquantia-Add-AQR113-driver-support.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID
1818
#define PHY_ID_AQR113C 0x31c31c12
1919
#define PHY_ID_AQCS109 0x03a1b5c2
2020
#define PHY_ID_AQR405 0x03a1b4b0
21-
@@ -869,6 +870,14 @@ static struct phy_driver aqr_driver[] =
21+
@@ -914,6 +915,14 @@ static struct phy_driver aqr_driver[] =
2222
.get_stats = aqr107_get_stats,
2323
},
2424
{
@@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID
3333
PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
3434
.name = "Aquantia AQR412",
3535
.probe = aqr107_probe,
36-
@@ -891,6 +900,7 @@ static struct mdio_device_id __maybe_unu
36+
@@ -936,6 +945,7 @@ static struct mdio_device_id __maybe_unu
3737
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
3838
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
3939
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },

target/linux/generic/hack-5.15/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <[email protected]>
2121
#define PHY_ID_AQR113 0x31c31c40
2222
#define PHY_ID_AQR113C 0x31c31c12
2323
#define PHY_ID_AQCS109 0x03a1b5c2
24-
@@ -870,6 +872,30 @@ static struct phy_driver aqr_driver[] =
24+
@@ -915,6 +917,30 @@ static struct phy_driver aqr_driver[] =
2525
.get_stats = aqr107_get_stats,
2626
},
2727
{
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <[email protected]>
5252
PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
5353
.name = "Aquantia AQR113",
5454
.config_aneg = aqr_config_aneg,
55-
@@ -900,6 +926,8 @@ static struct mdio_device_id __maybe_unu
55+
@@ -945,6 +971,8 @@ static struct mdio_device_id __maybe_unu
5656
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
5757
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
5858
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },

target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
2929

3030
#define QUECTEL_VENDOR_ID 0x2c7c
3131
/* These Quectel products use Quectel's vendor ID */
32-
@@ -1140,6 +1142,11 @@ static const struct usb_device_id option
33-
{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) },
32+
@@ -1143,6 +1145,11 @@ static const struct usb_device_id option
33+
.driver_info = ZLP },
3434
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
3535
.driver_info = RSVD(4) },
3636
+ /* Meiglink products using Qualcomm vendor ID */

target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
struct list_head *br_ip_list);
1313
--- a/include/linux/skbuff.h
1414
+++ b/include/linux/skbuff.h
15-
@@ -912,6 +912,10 @@ struct sk_buff {
15+
@@ -913,6 +913,10 @@ struct sk_buff {
1616
#endif
1717
__u8 slow_gro:1;
1818

@@ -49,7 +49,7 @@
4949
const struct nf_ct_event_notifier *nb);
5050
--- a/net/Kconfig
5151
+++ b/net/Kconfig
52-
@@ -456,6 +456,9 @@ config FAILOVER
52+
@@ -469,6 +469,9 @@ config FAILOVER
5353
migration of VMs with direct attached VFs by failing over to the
5454
paravirtual datapath when the VF is unplugged.
5555

target/linux/generic/pending-5.15/700-net-ethernet-mtk_eth_soc-avoid-creating-duplicate-of.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
1414

1515
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
1616
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
17-
@@ -233,6 +233,9 @@ mtk_flow_offload_replace(struct mtk_eth
17+
@@ -247,6 +247,9 @@ mtk_flow_offload_replace(struct mtk_eth
1818
if (rhashtable_lookup(&eth->flow_table, &f->cookie, mtk_flow_ht_params))
1919
return -EEXIST;
2020

target/linux/generic/pending-5.15/730-mtk_sgmii-enable-PCS-polling-to-allow-SFP-work.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Couzens <[email protected]>
1313

1414
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c
1515
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c
16-
@@ -180,6 +180,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss,
16+
@@ -182,6 +182,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss,
1717
return PTR_ERR(ss->pcs[i].regmap);
1818

1919
ss->pcs[i].pcs.ops = &mtk_pcs_ops;

target/linux/ipq60xx/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ variable names created with 603.
1414

1515
--- a/include/linux/skbuff.h
1616
+++ b/include/linux/skbuff.h
17-
@@ -687,6 +687,7 @@ typedef unsigned char *sk_buff_data_t;
17+
@@ -688,6 +688,7 @@ typedef unsigned char *sk_buff_data_t;
1818
* @offload_fwd_mark: Packet was L2-forwarded in hardware
1919
* @offload_l3_fwd_mark: Packet was L3-forwarded in hardware
2020
* @tc_skip_classify: do not classify packet. set by IFB device
2121
+ * @tc_skip_classify_offload: do not classify packet set by offload IFB device
2222
* @tc_at_ingress: used within tc_classify to distinguish in/egress
2323
* @redirected: packet was redirected by packet classifier
2424
* @from_ingress: packet was redirected from the ingress path
25-
@@ -902,6 +903,7 @@ struct sk_buff {
25+
@@ -903,6 +904,7 @@ struct sk_buff {
2626
#ifdef CONFIG_NET_CLS_ACT
2727
__u8 tc_skip_classify:1;
2828
__u8 tc_at_ingress:1;

target/linux/ipq60xx/patches-5.15/0606-5.15-qca-nss-ecm-bonding-add-bond_get_id.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
static struct flow_dissector flow_keys_bonding __read_mostly;
1111

1212
/*-------------------------- Forward declarations ---------------------------*/
13-
@@ -4060,6 +4063,23 @@ static int bond_get_lowest_level_rcu(str
13+
@@ -4081,6 +4084,23 @@ static int bond_get_lowest_level_rcu(str
1414
}
1515
#endif
1616

@@ -34,7 +34,7 @@
3434
static void bond_get_stats(struct net_device *bond_dev,
3535
struct rtnl_link_stats64 *stats)
3636
{
37-
@@ -5392,6 +5412,10 @@ static void bond_destructor(struct net_d
37+
@@ -5413,6 +5433,10 @@ static void bond_destructor(struct net_d
3838

3939
if (bond->rr_tx_counter)
4040
free_percpu(bond->rr_tx_counter);
@@ -45,7 +45,7 @@
4545
}
4646

4747
void bond_setup(struct net_device *bond_dev)
48-
@@ -5969,7 +5993,14 @@ int bond_create(struct net *net, const c
48+
@@ -5981,7 +6005,14 @@ int bond_create(struct net *net, const c
4949

5050
bond_work_init_all(bond);
5151

target/linux/ipq807x/patches-5.15/0603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ variable names created with 603.
1414

1515
--- a/include/linux/skbuff.h
1616
+++ b/include/linux/skbuff.h
17-
@@ -687,6 +687,7 @@ typedef unsigned char *sk_buff_data_t;
17+
@@ -688,6 +688,7 @@ typedef unsigned char *sk_buff_data_t;
1818
* @offload_fwd_mark: Packet was L2-forwarded in hardware
1919
* @offload_l3_fwd_mark: Packet was L3-forwarded in hardware
2020
* @tc_skip_classify: do not classify packet. set by IFB device
2121
+ * @tc_skip_classify_offload: do not classify packet set by offload IFB device
2222
* @tc_at_ingress: used within tc_classify to distinguish in/egress
2323
* @redirected: packet was redirected by packet classifier
2424
* @from_ingress: packet was redirected from the ingress path
25-
@@ -902,6 +903,7 @@ struct sk_buff {
25+
@@ -903,6 +904,7 @@ struct sk_buff {
2626
#ifdef CONFIG_NET_CLS_ACT
2727
__u8 tc_skip_classify:1;
2828
__u8 tc_at_ingress:1;

target/linux/ipq807x/patches-5.15/0606-5.15-qca-nss-ecm-bonding-add-bond_get_id.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
static struct flow_dissector flow_keys_bonding __read_mostly;
1111

1212
/*-------------------------- Forward declarations ---------------------------*/
13-
@@ -4060,6 +4063,23 @@ static int bond_get_lowest_level_rcu(str
13+
@@ -4081,6 +4084,23 @@ static int bond_get_lowest_level_rcu(str
1414
}
1515
#endif
1616

@@ -34,7 +34,7 @@
3434
static void bond_get_stats(struct net_device *bond_dev,
3535
struct rtnl_link_stats64 *stats)
3636
{
37-
@@ -5392,6 +5412,10 @@ static void bond_destructor(struct net_d
37+
@@ -5413,6 +5433,10 @@ static void bond_destructor(struct net_d
3838

3939
if (bond->rr_tx_counter)
4040
free_percpu(bond->rr_tx_counter);
@@ -45,7 +45,7 @@
4545
}
4646

4747
void bond_setup(struct net_device *bond_dev)
48-
@@ -5969,7 +5993,14 @@ int bond_create(struct net *net, const c
48+
@@ -5981,7 +6005,14 @@ int bond_create(struct net *net, const c
4949

5050
bond_work_init_all(bond);
5151

target/linux/rockchip/patches-5.15/040-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
2222

2323
--- a/drivers/usb/dwc3/core.c
2424
+++ b/drivers/usb/dwc3/core.c
25-
@@ -1068,6 +1068,11 @@ static int dwc3_core_init(struct dwc3 *d
25+
@@ -1066,6 +1066,11 @@ static int dwc3_core_init(struct dwc3 *d
2626
if (dwc->parkmode_disable_ss_quirk)
2727
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;
2828

0 commit comments

Comments
 (0)