From 0d6d3fd5d8b8e2c33e9c9368c68395296e1ed8eb Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 25 Apr 2020 11:08:19 +0800 Subject: [PATCH] kernel: bump 4.19 to 4.19.118 Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- ...-A-present-but-empty-dmas-disables-audio.patch | 2 +- .../cns3xxx/patches-4.19/210-dwc2_defaults.patch | 4 ++-- ...Add-initial-support-for-Toshiba-TC58CVG2.patch | 2 +- ...nd-add-support-for-GigaDevice-GD5FxGQ4xA.patch | 2 +- ...nand-Add-support-for-two-byte-device-IDs.patch | 2 +- ...Add-initial-support-for-Paragon-PN26G0xA.patch | 2 +- ...0-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- .../patches-4.19/400-sdhci-msm-fix-clock.patch | 2 +- .../706-ar40xx-abort-probe-on-missig-phy.patch | 4 ++-- .../716-essedma-reduce-write-reg.patch | 8 +++----- ...901-essedma-disable-default-vlan-tagging.patch | 15 ++++----------- .../patches-4.19/995-4g-add-u9300-driver.patch | 8 ++++---- .../patches-4.19/995-4g-add-u9300-driver.patch | 8 ++++---- 14 files changed, 32 insertions(+), 41 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 6937cb7fb1..9b362f8dc5 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .220 LINUX_VERSION-4.14 = .177 -LINUX_VERSION-4.19 = .117 +LINUX_VERSION-4.19 = .118 LINUX_KERNEL_HASH-4.9.220 = dad9c760787f9694173308c29f8e357b2c447b87a7965565ae4bb7f5979f0b2e LINUX_KERNEL_HASH-4.14.177 = 33a73c88344a78b75751a5d42fff8b3ee1e2e006b30b2913605ebc6a40041812 -LINUX_KERNEL_HASH-4.19.117 = d6289f298e8b06f72f3465a4132d33674642ad6ff0d80a8fb99b600ef90dac8b +LINUX_KERNEL_HASH-4.19.118 = 89749365f9dafa6c62cc5e920a7e532ed4aad9ab766fb436423b153ffbc08c96 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch b/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch index 2d38456ae6..080a7d991a 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0630-drm-vc4-A-present-but-empty-dmas-disables-audio.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -1087,10 +1087,12 @@ static int vc4_hdmi_audio_init(struct vc +@@ -1099,10 +1099,12 @@ static int vc4_hdmi_audio_init(struct vc struct device *dev = &hdmi->pdev->dev; const __be32 *addr; int ret; diff --git a/target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch b/target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch index 5a5b17d0a0..3efcc18854 100644 --- a/target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch +++ b/target/linux/cns3xxx/patches-4.19/210-dwc2_defaults.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/dwc2/params.c +++ b/drivers/usb/dwc2/params.c -@@ -151,6 +151,36 @@ static void dwc2_set_stm32f7_hsotg_param +@@ -152,6 +152,36 @@ static void dwc2_set_stm32f7_hsotg_param p->host_perio_tx_fifo_size = 256; } @@ -37,7 +37,7 @@ const struct of_device_id dwc2_of_match_table[] = { { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params }, { .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params }, -@@ -806,17 +836,23 @@ int dwc2_get_hwparams(struct dwc2_hsotg +@@ -820,17 +850,23 @@ int dwc2_get_hwparams(struct dwc2_hsotg int dwc2_init_params(struct dwc2_hsotg *hsotg) { diff --git a/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch b/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch index 260795b586..288fdbf267 100644 --- a/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch +++ b/target/linux/generic/backport-4.19/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch @@ -28,7 +28,7 @@ Signed-off-by: Miquel Raynal obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -761,6 +761,7 @@ static const struct nand_ops spinand_ops +@@ -762,6 +762,7 @@ static const struct nand_ops spinand_ops static const struct spinand_manufacturer *spinand_manufacturers[] = { ¯onix_spinand_manufacturer, µn_spinand_manufacturer, diff --git a/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch b/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch index f6f1ee695c..d3ded95ccb 100644 --- a/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch +++ b/target/linux/generic/backport-4.19/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch @@ -25,7 +25,7 @@ Signed-off-by: Miquel Raynal obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -759,6 +759,7 @@ static const struct nand_ops spinand_ops +@@ -760,6 +760,7 @@ static const struct nand_ops spinand_ops }; static const struct spinand_manufacturer *spinand_manufacturers[] = { diff --git a/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch b/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch index 13d7e59feb..ee81f97f4e 100644 --- a/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch +++ b/target/linux/generic/backport-4.19/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch @@ -17,7 +17,7 @@ Signed-off-by: Miquel Raynal --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -850,7 +850,7 @@ spinand_select_op_variant(struct spinand +@@ -851,7 +851,7 @@ spinand_select_op_variant(struct spinand */ int spinand_match_and_init(struct spinand_device *spinand, const struct spinand_info *table, diff --git a/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch b/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch index 6eed0e4d79..d30abdc143 100644 --- a/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch +++ b/target/linux/generic/backport-4.19/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch @@ -33,7 +33,7 @@ ADOPTED FROM UPSTREAM due to upstream commit 377e517b5fa5 in Linux 5.2 obj-$(CONFIG_MTD_SPI_NAND) += spinand.o --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -762,6 +762,7 @@ static const struct spinand_manufacturer +@@ -763,6 +763,7 @@ static const struct spinand_manufacturer &gigadevice_spinand_manufacturer, ¯onix_spinand_manufacturer, µn_spinand_manufacturer, diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 6aa2bcfbb9..59645e2ecb 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5466,6 +5466,9 @@ static enum gro_result dev_gro_receive(s +@@ -5467,6 +5467,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7124,6 +7127,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7125,6 +7128,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7174,6 +7219,7 @@ static int __netdev_upper_dev_link(struc +@@ -7175,6 +7220,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7266,6 +7312,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7267,6 +7313,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -7905,6 +7952,7 @@ int dev_set_mac_address(struct net_devic +@@ -7906,6 +7953,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/ipq40xx/patches-4.19/400-sdhci-msm-fix-clock.patch b/target/linux/ipq40xx/patches-4.19/400-sdhci-msm-fix-clock.patch index e2b4bcfc03..cc200a23ac 100644 --- a/target/linux/ipq40xx/patches-4.19/400-sdhci-msm-fix-clock.patch +++ b/target/linux/ipq40xx/patches-4.19/400-sdhci-msm-fix-clock.patch @@ -1,6 +1,6 @@ --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c -@@ -1681,7 +1681,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat +@@ -1688,7 +1688,7 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_mat static const struct sdhci_ops sdhci_msm_ops = { .reset = sdhci_reset, diff --git a/target/linux/ipq40xx/patches-4.19/706-ar40xx-abort-probe-on-missig-phy.patch b/target/linux/ipq40xx/patches-4.19/706-ar40xx-abort-probe-on-missig-phy.patch index 19474bff0d..97927b1e5e 100644 --- a/target/linux/ipq40xx/patches-4.19/706-ar40xx-abort-probe-on-missig-phy.patch +++ b/target/linux/ipq40xx/patches-4.19/706-ar40xx-abort-probe-on-missig-phy.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/ar40xx.c +++ b/drivers/net/phy/ar40xx.c -@@ -2021,6 +2021,12 @@ static int ar40xx_probe(struct platform_ +@@ -2054,6 +2054,12 @@ static int ar40xx_probe(struct platform_ /* register switch */ swdev = &priv->dev; @@ -13,7 +13,7 @@ swdev->alias = dev_name(&priv->mii_bus->dev); swdev->cpu_port = AR40XX_PORT_CPU; -@@ -2052,6 +2058,7 @@ err_unregister_switch: +@@ -2085,6 +2091,7 @@ err_unregister_switch: unregister_switch(&priv->dev); err_unregister_phy: phy_driver_unregister(&ar40xx_phy_driver); diff --git a/target/linux/ipq40xx/patches-4.19/716-essedma-reduce-write-reg.patch b/target/linux/ipq40xx/patches-4.19/716-essedma-reduce-write-reg.patch index 58b87467d6..e179fa6cfb 100644 --- a/target/linux/ipq40xx/patches-4.19/716-essedma-reduce-write-reg.patch +++ b/target/linux/ipq40xx/patches-4.19/716-essedma-reduce-write-reg.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c -index fc274c8..e9d12a4 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -2075,15 +2075,13 @@ int edma_poll(struct napi_struct *napi, int budget) +@@ -2079,15 +2079,13 @@ int edma_poll(struct napi_struct *napi, int i, work_done = 0; u16 rx_pending_fill; @@ -21,7 +19,7 @@ index fc274c8..e9d12a4 100644 /* Every core will have a start, which will be computed * in probe and stored in edma_percpu_info->tx_start variable. -@@ -2098,6 +2096,14 @@ int edma_poll(struct napi_struct *napi, int budget) +@@ -2102,6 +2100,14 @@ int edma_poll(struct napi_struct *napi, edma_percpu_info->tx_status &= ~(1 << queue_id); } @@ -36,7 +34,7 @@ index fc274c8..e9d12a4 100644 /* Every core will have a start, which will be computed * in probe and stored in edma_percpu_info->tx_start variable. * We will shift the status bit by tx_start to obtain -@@ -2122,15 +2128,6 @@ int edma_poll(struct napi_struct *napi, int budget) +@@ -2126,15 +2132,6 @@ int edma_poll(struct napi_struct *napi, } } diff --git a/target/linux/ipq40xx/patches-4.19/901-essedma-disable-default-vlan-tagging.patch b/target/linux/ipq40xx/patches-4.19/901-essedma-disable-default-vlan-tagging.patch index ec339c4795..e2cb37fc0c 100644 --- a/target/linux/ipq40xx/patches-4.19/901-essedma-disable-default-vlan-tagging.patch +++ b/target/linux/ipq40xx/patches-4.19/901-essedma-disable-default-vlan-tagging.patch @@ -22,11 +22,9 @@ Signed-off-by: Chen Minqiang drivers/net/ethernet/qualcomm/essedma/edma.c | 14 +++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi -index 3c4617f..7c3af8e 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi -@@ -598,8 +598,7 @@ +@@ -652,8 +652,7 @@ qcom,page-mode = <0>; qcom,rx_head_buf_size = <1540>; qcom,mdio_supported; @@ -36,7 +34,7 @@ index 3c4617f..7c3af8e 100644 interrupts = <0 65 IRQ_TYPE_EDGE_RISING 0 66 IRQ_TYPE_EDGE_RISING 0 67 IRQ_TYPE_EDGE_RISING -@@ -637,7 +636,7 @@ +@@ -691,7 +690,7 @@ gmac0: gmac0 { local-mac-address = [00 00 00 00 00 00]; @@ -45,11 +43,9 @@ index 3c4617f..7c3af8e 100644 }; gmac1: gmac1 { -diff --git a/drivers/net/ethernet/qualcomm/essedma/edma.c b/drivers/net/ethernet/qualcomm/essedma/edma.c -index 05f9ce9..a3c0d66 100644 --- a/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c -@@ -750,13 +750,11 @@ static void edma_rx_complete(struct edma_common_info *edma_cinfo, +@@ -721,13 +721,11 @@ static u16 edma_rx_complete(struct edma_ edma_receive_checksum(rd, skb); /* Process VLAN HW acceleration indication provided by HW */ @@ -68,7 +64,7 @@ index 05f9ce9..a3c0d66 100644 /* Update rx statistics */ adapter->stats.rx_packets++; -@@ -1434,8 +1432,6 @@ netdev_tx_t edma_xmit(struct sk_buff *skb, +@@ -1408,8 +1406,6 @@ netdev_tx_t edma_xmit(struct sk_buff *sk if (!adapter->edma_cinfo->is_single_phy) { if (unlikely(skb_vlan_tag_present(skb))) flags_transmit |= EDMA_VLAN_TX_TAG_INSERT_FLAG; @@ -77,6 +73,3 @@ index 05f9ce9..a3c0d66 100644 } /* Check and mark checksum offload */ --- -2.7.4 - diff --git a/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch b/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch index aeae334d60..6c4d0be0fd 100644 --- a/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch +++ b/target/linux/ipq40xx/patches-4.19/995-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1297,6 +1297,7 @@ static const struct usb_device_id products[] = { +@@ -1301,6 +1301,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ @@ -10,7 +10,7 @@ {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -381,6 +381,7 @@ static void option_instat_callback(struct urb *urb); +@@ -381,6 +381,7 @@ static void option_instat_callback(struc * Mobidata, etc sell under their own brand names. */ #define LONGCHEER_VENDOR_ID 0x1c9e @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -571,6 +572,16 @@ static void option_instat_callback(struct urb *urb); +@@ -571,6 +572,16 @@ static void option_instat_callback(struc /* Device needs ZLP */ #define ZLP BIT(17) @@ -35,7 +35,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -605,6 +616,8 @@ static const struct usb_device_id option_ids[] = { +@@ -605,6 +616,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = RSVD(4) }, diff --git a/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch b/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch index aeae334d60..6c4d0be0fd 100644 --- a/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch +++ b/target/linux/ipq806x/patches-4.19/995-4g-add-u9300-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1297,6 +1297,7 @@ static const struct usb_device_id products[] = { +@@ -1301,6 +1301,7 @@ static const struct usb_device_id produc {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ {QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */ @@ -10,7 +10,7 @@ {QMI_FIXED_INTF(0x2c7c, 0x0296, 4)}, /* Quectel BG96 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -381,6 +381,7 @@ static void option_instat_callback(struct urb *urb); +@@ -381,6 +381,7 @@ static void option_instat_callback(struc * Mobidata, etc sell under their own brand names. */ #define LONGCHEER_VENDOR_ID 0x1c9e @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -571,6 +572,16 @@ static void option_instat_callback(struct urb *urb); +@@ -571,6 +572,16 @@ static void option_instat_callback(struc /* Device needs ZLP */ #define ZLP BIT(17) @@ -35,7 +35,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -605,6 +616,8 @@ static const struct usb_device_id option_ids[] = { +@@ -605,6 +616,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = RSVD(4) },