Skip to content

Commit

Permalink
kernel: bump 5.4 to 5.4.142
Browse files Browse the repository at this point in the history 
Removed upstreamed:
  hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Aug 21, 2021
1 parent 96369a6 commit f25cebc
Show file tree
Hide file tree
Showing 13 changed files with 57 additions and 113 deletions.
4 changes: 2 additions & 2 deletions include/kernel-version.mk
View file
Expand Up @@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif

LINUX_VERSION-5.4 = .141
LINUX_VERSION-5.4 = .142
LINUX_VERSION-5.10 = .60

LINUX_KERNEL_HASH-5.4.141 = 10636d360cc5ba3857f8e91dfb0a4efcdb1406675e981fa9433748b097138c28
LINUX_KERNEL_HASH-5.4.142 = 99785728968564ba27c7e552d024b560072dcbc885540912eabb5c021e231451
LINUX_KERNEL_HASH-5.10.60 = 696ff7753f6c7c5123dbcb0a22d693cb358c760c61a76649531b6a207155f78d

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
Expand Down
2 changes: 1 addition & 1 deletion ...inux/bcm27xx/patches-5.4/950-0445-dma-mapping-treat-dev-bus_dma_mask-as-a-DMA-limit.patch
View file
Expand Up @@ -249,7 +249,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
* @dma_pfn_offset: offset of DMA memory range relatively of RAM
* @dma_parms: A low level driver may set these to teach IOMMU code about
* segment limitations.
@@ -1270,7 +1270,7 @@ struct device {
@@ -1271,7 +1271,7 @@ struct device {
not all hardware supports
64 bit addresses for consistent
allocations such descriptors. */
Expand Down
4 changes: 2 additions & 2 deletions ...t/linux/generic/backport-5.4/745-v5.7-net-dsa-mt7530-add-support-for-port-mirroring.patch
View file
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1145,6 +1145,64 @@ mt7530_port_vlan_del(struct dsa_switch *
@@ -1146,6 +1146,64 @@ mt7530_port_vlan_del(struct dsa_switch *
return 0;
}

Expand Down Expand Up @@ -82,7 +82,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static enum dsa_tag_protocol
mtk_get_tag_protocol(struct dsa_switch *ds, int port)
{
@@ -1522,6 +1580,8 @@ static const struct dsa_switch_ops mt753
@@ -1523,6 +1581,8 @@ static const struct dsa_switch_ops mt753
.port_vlan_prepare = mt7530_port_vlan_prepare,
.port_vlan_add = mt7530_port_vlan_add,
.port_vlan_del = mt7530_port_vlan_del,
Expand Down
6 changes: 3 additions & 3 deletions target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch
View file
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1085,12 +1085,6 @@ mt7530_port_vlan_add(struct dsa_switch *
@@ -1086,12 +1086,6 @@ mt7530_port_vlan_add(struct dsa_switch *
struct mt7530_priv *priv = ds->priv;
u16 vid;

Expand All @@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mutex_lock(&priv->reg_mutex);

for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) {
@@ -1116,12 +1110,6 @@ mt7530_port_vlan_del(struct dsa_switch *
@@ -1117,12 +1111,6 @@ mt7530_port_vlan_del(struct dsa_switch *
struct mt7530_priv *priv = ds->priv;
u16 vid, pvid;

Expand All @@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mutex_lock(&priv->reg_mutex);

pvid = priv->ports[port].pvid;
@@ -1234,6 +1222,7 @@ mt7530_setup(struct dsa_switch *ds)
@@ -1235,6 +1223,7 @@ mt7530_setup(struct dsa_switch *ds)
* as two netdev instances.
*/
dn = ds->ports[MT7530_CPU_PORT].master->dev.of_node->parent;
Expand Down
2 changes: 1 addition & 1 deletion .../linux/generic/backport-5.4/780-net-dsa-mt7530-setup-core-clock-even-in-TRGMII-mode.patch
View file
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -427,34 +427,32 @@ mt7530_pad_clk_setup(struct dsa_switch *
@@ -428,34 +428,32 @@ mt7530_pad_clk_setup(struct dsa_switch *
TD_DM_DRVP(8) | TD_DM_DRVN(8));

/* Setup core clock for MT7530 */
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.4/221-module_exports.patch
View file
Expand Up @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
} \
\
/* __*init sections */ \
@@ -904,6 +914,8 @@
@@ -905,6 +915,8 @@
EXIT_TEXT \
EXIT_DATA \
EXIT_CALL \
Expand Down
56 changes: 0 additions & 56 deletions target/linux/generic/hack-5.4/991-platform-x86-pcengines-apuv2-revert-simswitch.patch
View file

This file was deleted.

6 changes: 3 additions & 3 deletions target/linux/generic/pending-5.4/761-net-dsa-mt7530-Support-EEE-features.patch
View file
Expand Up @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: René van Dorst <opensource@vdorst.com>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1409,9 +1409,13 @@ static void mt7530_phylink_mac_config(st
@@ -1410,9 +1410,13 @@ static void mt7530_phylink_mac_config(st
switch (state->speed) {
case SPEED_1000:
mcr_new |= PMCR_FORCE_SPEED_1000;
Expand All @@ -23,7 +23,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
break;
}
if (state->duplex == DUPLEX_FULL) {
@@ -1547,6 +1551,54 @@ mt7530_phylink_mac_link_state(struct dsa
@@ -1548,6 +1552,54 @@ mt7530_phylink_mac_link_state(struct dsa
return 1;
}

Expand Down Expand Up @@ -78,7 +78,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
static const struct dsa_switch_ops mt7530_switch_ops = {
.get_tag_protocol = mtk_get_tag_protocol,
.setup = mt7530_setup,
@@ -1574,6 +1626,8 @@ static const struct dsa_switch_ops mt753
@@ -1575,6 +1627,8 @@ static const struct dsa_switch_ops mt753
.phylink_mac_config = mt7530_phylink_mac_config,
.phylink_mac_link_down = mt7530_phylink_mac_link_down,
.phylink_mac_link_up = mt7530_phylink_mac_link_up,
Expand Down
4 changes: 2 additions & 2 deletions ...inux/mediatek/patches-5.4/0601-net-dsa-propagate-resolved-link-config-via-mac_link_.patch
View file
Expand Up @@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct ethtool_eee *p = &priv->dev->ports[port].eee;
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -1657,7 +1657,9 @@ static void gswip_phylink_mac_link_down(
@@ -1663,7 +1663,9 @@ static void gswip_phylink_mac_link_down(
static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port,
unsigned int mode,
phy_interface_t interface,
Expand All @@ -64,7 +64,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1442,7 +1442,9 @@ static void mt7530_phylink_mac_link_down
@@ -1443,7 +1443,9 @@ static void mt7530_phylink_mac_link_down
static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port,
unsigned int mode,
phy_interface_t interface,
Expand Down
14 changes: 7 additions & 7 deletions ...inux/mediatek/patches-5.4/0602-net-dsa-mt7530-use-resolved-link-config-in-mac_link_.patch
View file
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -488,17 +488,6 @@ mt7530_mib_reset(struct dsa_switch *ds)
@@ -489,17 +489,6 @@ mt7530_mib_reset(struct dsa_switch *ds)
mt7530_write(priv, MT7530_MIB_CCR, CCR_MIB_ACTIVATE);
}

Expand All @@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static int mt7530_phy_read(struct dsa_switch *ds, int port, int regnum)
{
struct mt7530_priv *priv = ds->priv;
@@ -672,7 +661,7 @@ mt7530_port_enable(struct dsa_switch *ds
@@ -673,7 +662,7 @@ mt7530_port_enable(struct dsa_switch *ds
priv->ports[port].enable = true;
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
priv->ports[port].pm);
Expand All @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

mutex_unlock(&priv->reg_mutex);

@@ -695,7 +684,7 @@ mt7530_port_disable(struct dsa_switch *d
@@ -696,7 +685,7 @@ mt7530_port_disable(struct dsa_switch *d
priv->ports[port].enable = false;
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
PCR_MATRIX_CLR);
Expand All @@ -51,7 +51,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>

mutex_unlock(&priv->reg_mutex);
}
@@ -1397,8 +1386,7 @@ static void mt7530_phylink_mac_config(st
@@ -1398,8 +1387,7 @@ static void mt7530_phylink_mac_config(st

mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port));
mcr_new = mcr_cur;
Expand All @@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN |
PMCR_BACKPR_EN | PMCR_FORCE_MODE;

@@ -1406,26 +1394,6 @@ static void mt7530_phylink_mac_config(st
@@ -1407,26 +1395,6 @@ static void mt7530_phylink_mac_config(st
if (port == 5 && dsa_is_user_port(ds, 5))
mcr_new |= PMCR_EXT_PHY;

Expand All @@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (mcr_new != mcr_cur)
mt7530_write(priv, MT7530_PMCR_P(port), mcr_new);
}
@@ -1436,7 +1404,7 @@ static void mt7530_phylink_mac_link_down
@@ -1437,7 +1405,7 @@ static void mt7530_phylink_mac_link_down
{
struct mt7530_priv *priv = ds->priv;

Expand All @@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}

static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port,
@@ -1447,8 +1415,31 @@ static void mt7530_phylink_mac_link_up(s
@@ -1448,8 +1416,31 @@ static void mt7530_phylink_mac_link_up(s
bool tx_pause, bool rx_pause)
{
struct mt7530_priv *priv = ds->priv;
Expand Down
18 changes: 9 additions & 9 deletions ...inux/mediatek/patches-5.4/0603-net-dsa-mt7530-Extend-device-data-ready-for-adding-a.patch
View file
Expand Up @@ -17,7 +17,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -372,8 +372,9 @@ mt7530_fdb_write(struct mt7530_priv *pri
@@ -373,8 +373,9 @@ mt7530_fdb_write(struct mt7530_priv *pri
mt7530_write(priv, MT7530_ATA1 + (i * 4), reg[i]);
}

Expand All @@ -28,7 +28,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
{
struct mt7530_priv *priv = ds->priv;
u32 ncpo1, ssc_delta, trgint, i, xtal;
@@ -387,7 +388,7 @@ mt7530_pad_clk_setup(struct dsa_switch *
@@ -388,7 +389,7 @@ mt7530_pad_clk_setup(struct dsa_switch *
return -EINVAL;
}

Expand All @@ -37,7 +37,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
case PHY_INTERFACE_MODE_RGMII:
trgint = 0;
/* PLL frequency: 125MHz */
@@ -409,7 +410,8 @@ mt7530_pad_clk_setup(struct dsa_switch *
@@ -410,7 +411,8 @@ mt7530_pad_clk_setup(struct dsa_switch *
}
break;
default:
Expand All @@ -47,7 +47,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
return -EINVAL;
}

@@ -1334,12 +1336,11 @@ mt7530_setup(struct dsa_switch *ds)
@@ -1335,12 +1337,11 @@ mt7530_setup(struct dsa_switch *ds)
return 0;
}

Expand All @@ -63,7 +63,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>

switch (port) {
case 0: /* Internal phy */
@@ -1348,33 +1349,114 @@ static void mt7530_phylink_mac_config(st
@@ -1349,33 +1350,114 @@ static void mt7530_phylink_mac_config(st
case 3:
case 4:
if (state->interface != PHY_INTERFACE_MODE_GMII)
Expand Down Expand Up @@ -189,7 +189,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
return;
}

@@ -1442,61 +1524,44 @@ static void mt7530_phylink_mac_link_up(s
@@ -1443,61 +1525,44 @@ static void mt7530_phylink_mac_link_up(s
mt7530_set(priv, MT7530_PMCR_P(port), mcr);
}

Expand Down Expand Up @@ -274,7 +274,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
phylink_set(mask, Pause);
phylink_set(mask, Asym_Pause);

@@ -1592,12 +1657,45 @@ static int mt7530_set_mac_eee(struct dsa
@@ -1593,12 +1658,45 @@ static int mt7530_set_mac_eee(struct dsa
return 0;
}

Expand Down Expand Up @@ -323,7 +323,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
.get_ethtool_stats = mt7530_get_ethtool_stats,
.get_sset_count = mt7530_get_sset_count,
.port_enable = mt7530_port_enable,
@@ -1614,18 +1712,43 @@ static const struct dsa_switch_ops mt753
@@ -1615,18 +1713,43 @@ static const struct dsa_switch_ops mt753
.port_vlan_del = mt7530_port_vlan_del,
.port_mirror_add = mt7530_port_mirror_add,
.port_mirror_del = mt7530_port_mirror_del,
Expand Down Expand Up @@ -372,7 +372,7 @@ Signed-off-by: Sean Wang <sean.wang@mediatek.com>
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, mt7530_of_match);
@@ -1663,8 +1786,21 @@ mt7530_probe(struct mdio_device *mdiodev
@@ -1664,8 +1787,21 @@ mt7530_probe(struct mdio_device *mdiodev
/* Get the hardware identifier from the devicetree node.
* We will need it for some of the clock and regulator setup.
*/
Expand Down

0 comments on commit f25cebc

Please sign in to comment.