From 6d2b34758c0b15ebde00186be1bf246d769c4884 Mon Sep 17 00:00:00 2001 From: lovehackintosh <92633080+lovehackintosh@users.noreply.github.com> Date: Thu, 6 Oct 2022 15:27:38 +0800 Subject: [PATCH] kernel: bump 5.19 to 5.19.14 (#10228) * kernel: bump 5.19 to 5.19.13 All patches automatically rebased Signed-off-by: Liu Linhui * kernel: bump 5.19 to 5.19.14 All patches automatically rebased. Signed-off-by: Liu Linhui Signed-off-by: Liu Linhui --- include/kernel-5.19 | 4 ++-- ...node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- .../530-jffs2_make_lzma_available.patch | 4 ++-- ...dd-detach-callback-to-struct-phy_driver.patch | 2 +- ...761-net-dsa-mt7530-Support-EEE-features.patch | 4 ++-- .../pending-5.19/834-ledtrig-libata.patch | 8 ++++---- ...a-mt7530-rework-mt7530_hw_vlan_-add-del.patch | 6 +++--- ...2-net-dsa-mt7530-rework-mt753-01-_setup.patch | 8 ++++---- ...0-get-cpu-port-via-dp-cpu_dp-instead-of.patch | 16 ++++++++-------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/kernel-5.19 b/include/kernel-5.19 index 33742ba7c..b88ace741 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -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 diff --git a/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 7adb2c7be..3b8571561 100644 --- a/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf --- 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) diff --git a/target/linux/generic/pending-5.19/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-5.19/530-jffs2_make_lzma_available.patch index 52071ca67..1ba8e7cb5 100644 --- a/target/linux/generic/pending-5.19/530-jffs2_make_lzma_available.patch +++ b/target/linux/generic/pending-5.19/530-jffs2_make_lzma_available.patch @@ -949,7 +949,7 @@ Signed-off-by: Alexandros C. Couloumbis #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" @@ -981,7 +981,7 @@ Signed-off-by: Alexandros C. Couloumbis 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/ diff --git a/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch index bcba043f4..c50f55431 100644 --- a/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- 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; diff --git a/target/linux/generic/pending-5.19/761-net-dsa-mt7530-Support-EEE-features.patch b/target/linux/generic/pending-5.19/761-net-dsa-mt7530-Support-EEE-features.patch index 6545b369c..78ae07de0 100644 --- a/target/linux/generic/pending-5.19/761-net-dsa-mt7530-Support-EEE-features.patch +++ b/target/linux/generic/pending-5.19/761-net-dsa-mt7530-Support-EEE-features.patch @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit Signed-off-by: René van Dorst --- 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; @@ -23,7 +23,7 @@ Signed-off-by: René van Dorst 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; } diff --git a/target/linux/generic/pending-5.19/834-ledtrig-libata.patch b/target/linux/generic/pending-5.19/834-ledtrig-libata.patch index af48d8fd2..4f0d3975e 100644 --- a/target/linux/generic/pending-5.19/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.19/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * 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--; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle /* 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 @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle 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); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle 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; } diff --git a/target/linux/rockchip/patches-5.19/0031-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch b/target/linux/rockchip/patches-5.19/0031-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch index ba2983041..9704b1f66 100644 --- a/target/linux/rockchip/patches-5.19/0031-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch +++ b/target/linux/rockchip/patches-5.19/0031-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch @@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski --- 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) { @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski /* 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. @@ -72,7 +72,7 @@ Signed-off-by: Jakub Kicinski } 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; } diff --git a/target/linux/rockchip/patches-5.19/0032-net-dsa-mt7530-rework-mt753-01-_setup.patch b/target/linux/rockchip/patches-5.19/0032-net-dsa-mt7530-rework-mt753-01-_setup.patch index 0ce93ecd6..68822ca9a 100644 --- a/target/linux/rockchip/patches-5.19/0032-net-dsa-mt7530-rework-mt753-01-_setup.patch +++ b/target/linux/rockchip/patches-5.19/0032-net-dsa-mt7530-rework-mt753-01-_setup.patch @@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski --- 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; @@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski 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. */ @@ -51,7 +51,7 @@ Signed-off-by: Jakub Kicinski 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; @@ -59,7 +59,7 @@ Signed-off-by: Jakub Kicinski 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 */ diff --git a/target/linux/rockchip/patches-5.19/0033-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch b/target/linux/rockchip/patches-5.19/0033-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch index d06f4703f..b744d7975 100644 --- a/target/linux/rockchip/patches-5.19/0033-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch +++ b/target/linux/rockchip/patches-5.19/0033-net-dsa-mt7530-get-cpu-port-via-dp-cpu_dp-instead-of.patch @@ -21,7 +21,7 @@ Signed-off-by: Jakub Kicinski --- 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) { @@ -29,7 +29,7 @@ Signed-off-by: Jakub Kicinski 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. */ @@ -42,7 +42,7 @@ Signed-off-by: Jakub Kicinski 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; @@ -52,7 +52,7 @@ Signed-off-by: Jakub Kicinski 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) { @@ -67,7 +67,7 @@ Signed-off-by: Jakub Kicinski | 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; @@ -75,7 +75,7 @@ Signed-off-by: Jakub Kicinski 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, @@ -86,7 +86,7 @@ Signed-off-by: Jakub Kicinski /* 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) { @@ -96,7 +96,7 @@ Signed-off-by: Jakub Kicinski 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);