domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 5.15 to 5.15.33

Browse Source 
Deleted (upstreamed):
generic/backport-5.15/350-v5.18-MIPS-pgalloc-fix-memory-leak-caused-by-pgd_free.patch [1]
generic/backport-5.15/730-v5.16-hv-utils-add-PTP_1588_CLOCK-to-Kconfig-to-fix-build.patch [2]
generic/pending-5.15/850-0014-PCI-aardvark-Fix-reading-PCI_EXP_RTSTA_PME-bit-on-em.patch [3]
generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch [4]

Manually rebased:
generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch
ramips/patches-5.15/710-at803x.patch

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d29cda15cab086d82d692de016f7249545d4b6b4
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=d5aad7d63b1b5c1f3c4b69e12c05e7c7d196fae8
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=ed750e22e44366e264bcdf7b1cf0713f08f7980a
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.33&id=0fe94b84c43cfea867e1721606185e8686d7d32f

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
[Refresh patches again]
[Remove generic/pending-5.15/850-0002-PCI-aardvark-Fix-reading-MSI-interrupt-number.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rui Salvaterra
2022-04-08 14:43:04 +01:00
committed by Hauke Mehrtens
parent 5a09eb17c2
commit be381a7ac7
57 changed files with 124 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
target/linux/ramips/patches-5.15/710-at803x.patch
View File

@@ -118,23 +118,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -674,6 +748,7 @@ static int at803x_probe(struct phy_devic
return ret;
}
+#if 0
/* Some bootloaders leave the fiber page selected.
* Switch to the copper page, as otherwise we read
* the PHY capabilities from the fiber side.
@@ -685,6 +760,7 @@ static int at803x_probe(struct phy_devic
if (ret)
goto err;
}
+#endif
return 0;
@@ -711,6 +787,7 @@ static int at803x_get_features(struct ph
@@ -693,6 +767,7 @@ static int at803x_get_features(struct ph
if (err)
return err;
@@ -142,7 +126,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
if (phydev->drv->phy_id != ATH8031_PHY_ID)
return 0;
@@ -728,6 +805,7 @@ static int at803x_get_features(struct ph
@@ -710,6 +785,7 @@ static int at803x_get_features(struct ph
*/
linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
phydev->supported);
@@ -150,7 +134,23 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
return 0;
}
@@ -933,6 +1011,10 @@ static int at803x_read_status(struct phy
@@ -775,6 +851,7 @@ static int at803x_config_init(struct phy
{
int ret;
+#if 0
if (phydev->drv->phy_id == ATH8031_PHY_ID) {
/* Some bootloaders leave the fiber page selected.
* Switch to the copper page, as otherwise we read
@@ -790,6 +867,7 @@ static int at803x_config_init(struct phy
if (ret < 0)
return ret;
}
+#endif
/* The RX and TX delay default is:
* after HW reset: RX delay enabled and TX delay disabled
@@ -925,6 +1003,10 @@ static int at803x_read_status(struct phy
{
int ss, err, old_link = phydev->link;
@@ -161,7 +161,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
/* Update the link, but return if there was an error */
err = genphy_update_link(phydev);
if (err)
@@ -1033,6 +1115,12 @@ static int at803x_config_aneg(struct phy
@@ -1025,6 +1107,12 @@ static int at803x_config_aneg(struct phy
{
int ret;
@@ -174,7 +174,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
if (ret < 0)
return ret;
@@ -1445,6 +1533,7 @@ static struct phy_driver at803x_driver[]
@@ -1437,6 +1525,7 @@ static struct phy_driver at803x_driver[]
/* Qualcomm Atheros AR8031/AR8033 */
PHY_ID_MATCH_EXACT(ATH8031_PHY_ID),
.name = "Qualcomm Atheros AR8031/AR8033",