Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump 5.19 to 5.19.14 #10228

Merged
merged 2 commits into from
Oct 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-5.19
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.19 = .12
LINUX_KERNEL_HASH-5.19.12 = c436a548c7312ce6fc5a3472cbead895eef8f52841fbe7c71fd8e48bdfe2b0ba
LINUX_VERSION-5.19 = .14
LINUX_KERNEL_HASH-5.19.14 = 1ded27e1c4a8b51df5f93f2f772827183b805d9ab4771071307c13ee86cd1ac1
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <[email protected]>

--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7698,7 +7698,7 @@ static void __init alloc_node_mem_map(st
@@ -7743,7 +7743,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
#define JFFS2_NODE_ACCURATE 0x2000
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -320,6 +320,12 @@ config ZSTD_DECOMPRESS
@@ -346,6 +346,12 @@ config ZSTD_DECOMPRESS

source "lib/xz/Kconfig"

Expand Down Expand Up @@ -981,7 +981,7 @@ Signed-off-by: Alexandros C. Couloumbis <[email protected]>
obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o
CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any)

@@ -191,6 +201,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
@@ -194,6 +204,8 @@ obj-$(CONFIG_ZSTD_COMPRESS) += zstd/
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd/
obj-$(CONFIG_XZ_DEC) += xz/
obj-$(CONFIG_RAID6_PQ) += raid6/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <[email protected]>

--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde
@@ -1746,6 +1746,9 @@ void phy_detach(struct phy_device *phyde
struct module *ndev_owner = NULL;
struct mii_bus *bus;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: René van Dorst <[email protected]>
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2816,9 +2816,13 @@ static void mt753x_phylink_mac_link_up(s
@@ -2821,9 +2821,13 @@ static void mt753x_phylink_mac_link_up(s
switch (speed) {
case SPEED_1000:
mcr |= PMCR_FORCE_SPEED_1000;
Expand All @@ -23,7 +23,7 @@ Signed-off-by: René van Dorst <[email protected]>
break;
}
if (duplex == DUPLEX_FULL) {
@@ -3089,6 +3093,54 @@ static int mt753x_set_mac_eee(struct dsa
@@ -3092,6 +3096,54 @@ static int mt753x_set_mac_eee(struct dsa

return 0;
}
Expand Down
8 changes: 4 additions & 4 deletions target/linux/generic/pending-5.19/834-ledtrig-libata.patch
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <[email protected]>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
@@ -4617,6 +4630,9 @@ void __ata_qc_complete(struct ata_queued
@@ -4621,6 +4634,9 @@ void __ata_qc_complete(struct ata_queued
link->active_tag = ATA_TAG_POISON;
ap->nr_active_links--;
}
Expand All @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <[email protected]>

/* clear exclusive status */
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
@@ -5323,6 +5339,9 @@ struct ata_port *ata_port_alloc(struct a
@@ -5327,6 +5343,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
Expand All @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <[email protected]>
ata_sff_port_init(ap);

return ap;
@@ -5358,6 +5377,12 @@ static void ata_host_release(struct kref
@@ -5362,6 +5381,12 @@ static void ata_host_release(struct kref

kfree(ap->pmp_link);
kfree(ap->slave_link);
Expand All @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <[email protected]>
kfree(ap);
host->ports[i] = NULL;
}
@@ -5760,7 +5785,23 @@ int ata_host_register(struct ata_host *h
@@ -5764,7 +5789,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1527,11 +1527,11 @@ static void
@@ -1530,11 +1530,11 @@ static void
mt7530_hw_vlan_add(struct mt7530_priv *priv,
struct mt7530_hw_vlan_entry *entry)
{
Expand All @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

/* Validate the entry with independent learning, create egress tag per
* VLAN and joining the port as one of the port members.
@@ -1542,22 +1542,20 @@ mt7530_hw_vlan_add(struct mt7530_priv *p
@@ -1545,22 +1545,20 @@ mt7530_hw_vlan_add(struct mt7530_priv *p

/* Decide whether adding tag or not for those outgoing packets from the
* port inside the VLAN.
Expand Down Expand Up @@ -72,7 +72,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
}

static void
@@ -1576,11 +1574,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *p
@@ -1579,11 +1577,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *p
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -2092,11 +2092,12 @@ static int
@@ -2095,11 +2095,12 @@ static int
mt7530_setup(struct dsa_switch *ds)
{
struct mt7530_priv *priv = ds->priv;
Expand All @@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
u32 id, val;
int ret, i;

@@ -2104,7 +2105,19 @@ mt7530_setup(struct dsa_switch *ds)
@@ -2107,7 +2108,19 @@ mt7530_setup(struct dsa_switch *ds)
* controller also is the container for two GMACs nodes representing
* as two netdev instances.
*/
Expand All @@ -51,15 +51,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
ds->assisted_learning_on_cpu_port = true;
ds->mtu_enforcement_ingress = true;

@@ -2266,6 +2279,7 @@ mt7531_setup(struct dsa_switch *ds)
@@ -2269,6 +2282,7 @@ mt7531_setup(struct dsa_switch *ds)
{
struct mt7530_priv *priv = ds->priv;
struct mt7530_dummy_poll p;
+ struct dsa_port *cpu_dp;
u32 val, id;
int ret, i;

@@ -2338,8 +2352,11 @@ mt7531_setup(struct dsa_switch *ds)
@@ -2343,8 +2357,11 @@ mt7531_setup(struct dsa_switch *ds)
CORE_PLL_GROUP4, val);

/* BPDU to CPU port */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>

--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
@@ -1038,6 +1038,7 @@ static int
@@ -1041,6 +1041,7 @@ static int
mt7530_port_enable(struct dsa_switch *ds, int port,
struct phy_device *phy)
{
+ struct dsa_port *dp = dsa_to_port(ds, port);
struct mt7530_priv *priv = ds->priv;

mutex_lock(&priv->reg_mutex);
@@ -1046,7 +1047,11 @@ mt7530_port_enable(struct dsa_switch *ds
@@ -1049,7 +1050,11 @@ mt7530_port_enable(struct dsa_switch *ds
* restore the port matrix if the port is the member of a certain
* bridge.
*/
Expand All @@ -42,7 +42,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
priv->ports[port].enable = true;
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
priv->ports[port].pm);
@@ -1195,7 +1200,8 @@ mt7530_port_bridge_join(struct dsa_switc
@@ -1198,7 +1203,8 @@ mt7530_port_bridge_join(struct dsa_switc
struct netlink_ext_ack *extack)
{
struct dsa_port *dp = dsa_to_port(ds, port), *other_dp;
Expand All @@ -52,7 +52,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
struct mt7530_priv *priv = ds->priv;

mutex_lock(&priv->reg_mutex);
@@ -1272,9 +1278,12 @@ mt7530_port_set_vlan_unaware(struct dsa_
@@ -1275,9 +1281,12 @@ mt7530_port_set_vlan_unaware(struct dsa_
* the CPU port get out of VLAN filtering mode.
*/
if (all_user_ports_removed) {
Expand All @@ -67,15 +67,15 @@ Signed-off-by: Jakub Kicinski <[email protected]>
| PVC_EG_TAG(MT7530_VLAN_EG_CONSISTENT));
}
}
@@ -1312,6 +1321,7 @@ mt7530_port_bridge_leave(struct dsa_swit
@@ -1315,6 +1324,7 @@ mt7530_port_bridge_leave(struct dsa_swit
struct dsa_bridge bridge)
{
struct dsa_port *dp = dsa_to_port(ds, port), *other_dp;
+ struct dsa_port *cpu_dp = dp->cpu_dp;
struct mt7530_priv *priv = ds->priv;

mutex_lock(&priv->reg_mutex);
@@ -1340,8 +1350,8 @@ mt7530_port_bridge_leave(struct dsa_swit
@@ -1343,8 +1353,8 @@ mt7530_port_bridge_leave(struct dsa_swit
*/
if (priv->ports[port].enable)
mt7530_rmw(priv, MT7530_PCR_P(port), PCR_MATRIX_MASK,
Expand All @@ -86,7 +86,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>

/* When a port is removed from the bridge, the port would be set up
* back to the default as is at initial boot which is a VLAN-unaware
@@ -1508,6 +1518,9 @@ static int
@@ -1511,6 +1521,9 @@ static int
mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,
struct netlink_ext_ack *extack)
{
Expand All @@ -96,7 +96,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
if (vlan_filtering) {
/* The port is being kept as VLAN-unaware port when bridge is
* set up with vlan_filtering not being set, Otherwise, the
@@ -1515,7 +1528,7 @@ mt7530_port_vlan_filtering(struct dsa_sw
@@ -1518,7 +1531,7 @@ mt7530_port_vlan_filtering(struct dsa_sw
* for becoming a VLAN-aware port.
*/
mt7530_port_set_vlan_aware(ds, port);
Expand Down