forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kernel: bump 5.15 to 5.15.71 (coolsnowwolf#10203)
All patches automatically rebased. Signed-off-by: Liu Linhui <[email protected]>
- Loading branch information
Showing
17 changed files
with
38 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-5.15 = .70 | ||
LINUX_KERNEL_HASH-5.15.70 = 1a7c26f0253407bb222786c8cbf2ee6235acebe8ea641fe0bc2360acce970d76 | ||
LINUX_VERSION-5.15 = .71 | ||
LINUX_KERNEL_HASH-5.15.71 = 5f5408138e016c0e029e015d98ceab86f4e6366c65cd611259dac808ab1d1e53 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
static void macb_usx_pcs_link_up(struct phylink_pcs *pcs, unsigned int mode, | ||
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c | ||
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c | ||
@@ -940,7 +940,7 @@ static void enetc_pl_mac_validate(struct | ||
@@ -968,7 +968,7 @@ static void enetc_pl_mac_validate(struct | ||
state->interface != PHY_INTERFACE_MODE_2500BASEX && | ||
state->interface != PHY_INTERFACE_MODE_USXGMII && | ||
!phy_interface_mode_is_rgmii(state->interface)) { | ||
|
@@ -646,7 +646,7 @@ Signed-off-by: David S. Miller <[email protected]> | |
return; | ||
} | ||
|
||
@@ -963,10 +963,8 @@ static void enetc_pl_mac_validate(struct | ||
@@ -991,10 +991,8 @@ static void enetc_pl_mac_validate(struct | ||
phylink_set(mask, 2500baseX_Full); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} \ | ||
\ | ||
/* __*init sections */ \ | ||
@@ -1018,6 +1028,8 @@ | ||
@@ -1017,6 +1027,8 @@ | ||
|
||
#define COMMON_DISCARDS \ | ||
SANITIZER_DISCARDS \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,7 +20,7 @@ Signed-off-by: Birger Koblitz <[email protected]> | |
|
||
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812 | ||
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) | ||
@@ -372,6 +374,49 @@ static int aqr107_read_rate(struct phy_d | ||
@@ -381,6 +383,49 @@ static int aqr107_read_rate(struct phy_d | ||
return 0; | ||
} | ||
|
||
|
@@ -70,7 +70,7 @@ Signed-off-by: Birger Koblitz <[email protected]> | |
static int aqr107_read_status(struct phy_device *phydev) | ||
{ | ||
int val, ret; | ||
@@ -502,7 +547,7 @@ static void aqr107_chip_info(struct phy_ | ||
@@ -511,7 +556,7 @@ static void aqr107_chip_info(struct phy_ | ||
build_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_FW_BUILD_ID, val); | ||
prov_id = FIELD_GET(VEND1_GLOBAL_RSVD_STAT1_PROV_ID, val); | ||
|
||
|
@@ -79,7 +79,7 @@ Signed-off-by: Birger Koblitz <[email protected]> | |
fw_major, fw_minor, build_id, prov_id); | ||
} | ||
|
||
@@ -674,6 +719,24 @@ static struct phy_driver aqr_driver[] = | ||
@@ -719,6 +764,24 @@ static struct phy_driver aqr_driver[] = | ||
.link_change_notify = aqr107_link_change_notify, | ||
}, | ||
{ | ||
|
@@ -104,7 +104,7 @@ Signed-off-by: Birger Koblitz <[email protected]> | |
PHY_ID_MATCH_MODEL(PHY_ID_AQCS109), | ||
.name = "Aquantia AQCS109", | ||
.probe = aqr107_probe, | ||
@@ -699,6 +762,24 @@ static struct phy_driver aqr_driver[] = | ||
@@ -744,6 +807,24 @@ static struct phy_driver aqr_driver[] = | ||
.handle_interrupt = aqr_handle_interrupt, | ||
.read_status = aqr_read_status, | ||
}, | ||
|
@@ -129,7 +129,7 @@ Signed-off-by: Birger Koblitz <[email protected]> | |
}; | ||
|
||
module_phy_driver(aqr_driver); | ||
@@ -709,8 +790,10 @@ static struct mdio_device_id __maybe_unu | ||
@@ -754,8 +835,10 @@ static struct mdio_device_id __maybe_unu | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,9 +27,9 @@ Signed-off-by: Alex Marginean <[email protected]> | |
#define PHY_ID_AQR813 0x31c31cb2 | ||
|
||
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812 | ||
@@ -126,6 +128,29 @@ | ||
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1) | ||
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0) | ||
@@ -135,6 +137,29 @@ | ||
#define AQR107_OP_IN_PROG_SLEEP 1000 | ||
#define AQR107_OP_IN_PROG_TIMEOUT 100000 | ||
|
||
+/* registers in MDIO_MMD_VEND1 region */ | ||
+#define AQUANTIA_VND1_GLOBAL_SC 0x000 | ||
|
@@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
struct aqr107_hw_stat { | ||
const char *name; | ||
int reg; | ||
@@ -257,6 +282,51 @@ static int aqr_config_aneg(struct phy_de | ||
@@ -266,6 +291,51 @@ static int aqr_config_aneg(struct phy_de | ||
return genphy_c45_check_and_restart_aneg(phydev, changed); | ||
} | ||
|
||
|
@@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
static int aqr_config_intr(struct phy_device *phydev) | ||
{ | ||
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; | ||
@@ -780,6 +850,30 @@ static struct phy_driver aqr_driver[] = | ||
@@ -825,6 +895,30 @@ static struct phy_driver aqr_driver[] = | ||
.get_stats = aqr107_get_stats, | ||
.link_change_notify = aqr107_link_change_notify, | ||
}, | ||
|
@@ -140,7 +140,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
}; | ||
|
||
module_phy_driver(aqr_driver); | ||
@@ -790,9 +884,11 @@ static struct mdio_device_id __maybe_unu | ||
@@ -835,9 +929,11 @@ static struct mdio_device_id __maybe_unu | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean <[email protected]> | |
|
||
--- a/drivers/net/phy/aquantia_main.c | ||
+++ b/drivers/net/phy/aquantia_main.c | ||
@@ -315,10 +315,16 @@ static int aqr_config_aneg_set_prot(stru | ||
@@ -324,10 +324,16 @@ static int aqr_config_aneg_set_prot(stru | ||
phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE, | ||
aquantia_syscfg[if_type].start_rate); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
#define PHY_ID_AQR113 0x31c31c40 | ||
#define PHY_ID_AQR113C 0x31c31c12 | ||
#define PHY_ID_AQCS109 0x03a1b5c2 | ||
@@ -870,6 +872,30 @@ static struct phy_driver aqr_driver[] = | ||
@@ -915,6 +917,30 @@ static struct phy_driver aqr_driver[] = | ||
.get_stats = aqr107_get_stats, | ||
}, | ||
{ | ||
|
@@ -52,7 +52,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
PHY_ID_MATCH_MODEL(PHY_ID_AQR113), | ||
.name = "Aquantia AQR113", | ||
.config_aneg = aqr_config_aneg, | ||
@@ -900,6 +926,8 @@ static struct mdio_device_id __maybe_unu | ||
@@ -945,6 +971,8 @@ static struct mdio_device_id __maybe_unu | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) }, | ||
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) }, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c | ||
@@ -233,6 +233,9 @@ mtk_flow_offload_replace(struct mtk_eth | ||
@@ -247,6 +247,9 @@ mtk_flow_offload_replace(struct mtk_eth | ||
if (rhashtable_lookup(ð->flow_table, &f->cookie, mtk_flow_ht_params)) | ||
return -EEXIST; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Couzens <[email protected]> | |
|
||
--- a/drivers/net/ethernet/mediatek/mtk_sgmii.c | ||
+++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c | ||
@@ -180,6 +180,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss, | ||
@@ -182,6 +182,7 @@ int mtk_sgmii_init(struct mtk_sgmii *ss, | ||
return PTR_ERR(ss->pcs[i].regmap); | ||
|
||
ss->pcs[i].pcs.ops = &mtk_pcs_ops; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]> | |
|
||
--- a/drivers/usb/dwc3/core.c | ||
+++ b/drivers/usb/dwc3/core.c | ||
@@ -1068,6 +1068,11 @@ static int dwc3_core_init(struct dwc3 *d | ||
@@ -1066,6 +1066,11 @@ static int dwc3_core_init(struct dwc3 *d | ||
if (dwc->parkmode_disable_ss_quirk) | ||
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS; | ||
|
||
|