From b8336ebab9fc6d725def8eeacf71a879f63bdb0a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 22 Aug 2020 10:06:28 +0200 Subject: [PATCH] kernel: Update kernel 4.14 to version 4.14.195 Compile and runtime tested on x86/64. Signed-off-by: Hauke Mehrtens --- include/kernel-version.mk | 4 ++-- ...firmware-loader-for-uPD720201-and-uPD72.patch | 6 +++--- .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- .../cns3xxx/patches-4.14/075-spi_support.patch | 2 +- ...25-tcp-allow-drivers-to-tweak-TSQ-logic.patch | 2 +- .../hack-4.14/211-host_tools_portability.patch | 2 +- .../generic/hack-4.14/902-debloat_proc.patch | 2 +- ...node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch | 2 +- .../130-add-linux-spidev-compatible-si3210.patch | 2 +- ...set_value_cansleep-for-setting-chipsele.patch | 2 +- ...rename2-and-add-RENAME_WHITEOUT-support.patch | 6 +++--- .../141-jffs2-add-RENAME_EXCHANGE-support.patch | 8 ++++---- .../pending-4.14/630-packet_socket_type.patch | 16 ++++++++-------- ...-add-command-elements-in-BAM-transactio.patch | 6 +++--- ...-support-for-command-descriptor-formati.patch | 12 ++++++------ ...ide-several-helpers-to-do-common-NAND-o.patch | 8 ++++---- ...e-drivers-to-explicitly-send-READ-PROG-.patch | 12 ++++++------ .../0012-clk-dont-disable-unused-clocks.patch | 2 +- ...remove-superfluous-pin-setup-for-MT7622.patch | 4 ++-- ...-allow-imod-interval-to-be-configurable.patch | 2 +- 20 files changed, 51 insertions(+), 51 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 07b056fb5b..ca4ea2329c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.9 = .232 -LINUX_VERSION-4.14 = .193 +LINUX_VERSION-4.14 = .195 LINUX_KERNEL_HASH-4.9.232 = 58f472e82345dc719a1d6d7bae01e5aa73387cd83308acd2c92371f7d5bc4f60 -LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03 +LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021 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/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch index b00393e8d7..5a27b24d82 100644 --- a/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch +++ b/target/linux/apm821xx/patches-4.14/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch @@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter #include "xhci.h" #include "xhci-trace.h" -@@ -272,6 +274,458 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -276,6 +278,458 @@ static void xhci_pme_acpi_rtd3_enable(st static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } #endif /* CONFIG_ACPI */ @@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter /* called during probe() after chip reset completes */ static int xhci_pci_setup(struct usb_hcd *hcd) { -@@ -310,6 +764,22 @@ static int xhci_pci_probe(struct pci_dev +@@ -314,6 +768,22 @@ static int xhci_pci_probe(struct pci_dev struct hc_driver *driver; struct usb_hcd *hcd; @@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter driver = (struct hc_driver *)id->driver_data; /* For some HW implementation, a XHCI reset is just not enough... */ -@@ -371,6 +841,16 @@ static void xhci_pci_remove(struct pci_d +@@ -375,6 +845,16 @@ static void xhci_pci_remove(struct pci_d { struct xhci_hcd *xhci; diff --git a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch index 1fe94e8c6f..0fb95864cf 100644 --- a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,7 +13,7 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -222,7 +222,7 @@ static void xhci_pci_quirks(struct devic +@@ -225,7 +225,7 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_TRUST_TX_LENGTH; if (pdev->vendor == PCI_VENDOR_ID_RENESAS && pdev->device == 0x0015) diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch index 401ec876e9..6921799928 100644 --- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch +++ b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch @@ -39,7 +39,7 @@ /** --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -1029,6 +1029,9 @@ static int spi_transfer_one_message(stru +@@ -1041,6 +1041,9 @@ static int spi_transfer_one_message(stru list_for_each_entry(xfer, &msg->transfers, transfer_list) { trace_spi_transfer_start(msg, xfer); diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 4f6f5d2cfa..51ed9517aa 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -55,7 +55,7 @@ Cc: Kir Kolyshkin rwlock_t sk_callback_lock; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2750,6 +2750,7 @@ void sock_init_data(struct socket *sock, +@@ -2771,6 +2771,7 @@ void sock_init_data(struct socket *sock, sk->sk_max_pacing_rate = ~0U; sk->sk_pacing_rate = ~0U; diff --git a/target/linux/generic/hack-4.14/211-host_tools_portability.patch b/target/linux/generic/hack-4.14/211-host_tools_portability.patch index d806df8a5f..919785dec0 100644 --- a/target/linux/generic/hack-4.14/211-host_tools_portability.patch +++ b/target/linux/generic/hack-4.14/211-host_tools_portability.patch @@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau --- a/tools/build/Build.include +++ b/tools/build/Build.include -@@ -98,4 +98,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$ +@@ -99,4 +99,4 @@ cxx_flags = -Wp,-MD,$(depfile) -Wp,-MT,$ ### ## HOSTCC C flags diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index 2d84509f45..73144afb2f 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -328,7 +328,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -3389,6 +3389,8 @@ static __net_initdata struct pernet_oper +@@ -3410,6 +3410,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch index 44e7fa70a3..53b1a9a13c 100644 --- a/target/linux/generic/pending-4.14/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch +++ b/target/linux/generic/pending-4.14/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 -@@ -6146,7 +6146,7 @@ static void __ref alloc_node_mem_map(str +@@ -6151,7 +6151,7 @@ static void __ref alloc_node_mem_map(str mem_map = NODE_DATA(0)->node_mem_map; #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) if (page_to_pfn(mem_map) != pgdat->node_start_pfn) diff --git a/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch b/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch index 3a42182c97..c8e7ccd8d4 100644 --- a/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch +++ b/target/linux/generic/pending-4.14/130-add-linux-spidev-compatible-si3210.patch @@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -672,6 +672,7 @@ static const struct of_device_id spidev_ +@@ -677,6 +677,7 @@ static const struct of_device_id spidev_ { .compatible = "lineartechnology,ltc2488" }, { .compatible = "ge,achc" }, { .compatible = "semtech,sx1301" }, diff --git a/target/linux/generic/pending-4.14/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch b/target/linux/generic/pending-4.14/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch index 9603385aed..9a32c9a767 100644 --- a/target/linux/generic/pending-4.14/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch +++ b/target/linux/generic/pending-4.14/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c -@@ -729,7 +729,7 @@ static void spi_set_cs(struct spi_device +@@ -741,7 +741,7 @@ static void spi_set_cs(struct spi_device enable = !enable; if (gpio_is_valid(spi->cs_gpio)) { diff --git a/target/linux/generic/pending-4.14/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-4.14/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch index c97e93250b..b9bb3f71f1 100644 --- a/target/linux/generic/pending-4.14/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch +++ b/target/linux/generic/pending-4.14/140-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch @@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c -@@ -752,6 +752,24 @@ static int jffs2_mknod (struct inode *di +@@ -756,6 +756,24 @@ static int jffs2_mknod (struct inode *di return ret; } @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau static int jffs2_rename (struct inode *old_dir_i, struct dentry *old_dentry, struct inode *new_dir_i, struct dentry *new_dentry, unsigned int flags) -@@ -762,7 +780,7 @@ static int jffs2_rename (struct inode *o +@@ -766,7 +784,7 @@ static int jffs2_rename (struct inode *o uint8_t type; uint32_t now; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau return -EINVAL; /* The VFS will check for us and prevent trying to rename a -@@ -828,9 +846,14 @@ static int jffs2_rename (struct inode *o +@@ -832,9 +850,14 @@ static int jffs2_rename (struct inode *o if (d_is_dir(old_dentry) && !victim_f) inc_nlink(new_dir_i); diff --git a/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch index 093a73ab66..4b30bc7cd0 100644 --- a/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch +++ b/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch @@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c -@@ -777,18 +777,31 @@ static int jffs2_rename (struct inode *o +@@ -781,18 +781,31 @@ static int jffs2_rename (struct inode *o int ret; struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb); struct jffs2_inode_info *victim_f = NULL; @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau victim_f = JFFS2_INODE_INFO(d_inode(new_dentry)); if (d_is_dir(new_dentry)) { struct jffs2_full_dirent *fd; -@@ -823,7 +836,7 @@ static int jffs2_rename (struct inode *o +@@ -827,7 +840,7 @@ static int jffs2_rename (struct inode *o if (ret) return ret; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau /* There was a victim. Kill it off nicely */ if (d_is_dir(new_dentry)) clear_nlink(d_inode(new_dentry)); -@@ -849,6 +862,12 @@ static int jffs2_rename (struct inode *o +@@ -853,6 +866,12 @@ static int jffs2_rename (struct inode *o if (flags & RENAME_WHITEOUT) /* Replace with whiteout */ ret = jffs2_whiteout(old_dir_i, old_dentry); @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau else /* Unlink the original */ ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), -@@ -880,7 +899,7 @@ static int jffs2_rename (struct inode *o +@@ -884,7 +903,7 @@ static int jffs2_rename (struct inode *o return ret; } diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch index c4bd5fdaba..3640569213 100644 --- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.14/630-packet_socket_type.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1836,6 +1836,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1838,6 +1838,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1843,6 +1844,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1845,6 +1846,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1855,7 +1857,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1857,7 +1859,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2082,12 +2084,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2084,12 +2086,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2214,12 +2216,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2216,12 +2218,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3313,6 +3315,7 @@ static int packet_create(struct net *net +@@ -3318,6 +3320,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3935,6 +3938,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3940,6 +3943,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3987,6 +4000,13 @@ static int packet_getsockopt(struct sock +@@ -3992,6 +4005,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch b/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch index 1a32cc3767..a2c5f9d075 100644 --- a/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch +++ b/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch @@ -57,7 +57,7 @@ Signed-off-by: Boris Brezillon u32 cmd_sgl_pos; u32 cmd_sgl_start; u32 tx_sgl_pos; -@@ -462,7 +472,8 @@ alloc_bam_transaction(struct qcom_nand_c +@@ -464,7 +474,8 @@ alloc_bam_transaction(struct qcom_nand_c bam_txn_size = sizeof(*bam_txn) + num_cw * @@ -67,7 +67,7 @@ Signed-off-by: Boris Brezillon (sizeof(*bam_txn->data_sgl) * QPIC_PER_CW_DATA_SGL)); bam_txn_buf = devm_kzalloc(nandc->dev, bam_txn_size, GFP_KERNEL); -@@ -472,6 +483,10 @@ alloc_bam_transaction(struct qcom_nand_c +@@ -474,6 +485,10 @@ alloc_bam_transaction(struct qcom_nand_c bam_txn = bam_txn_buf; bam_txn_buf += sizeof(*bam_txn); @@ -78,7 +78,7 @@ Signed-off-by: Boris Brezillon bam_txn->cmd_sgl = bam_txn_buf; bam_txn_buf += sizeof(*bam_txn->cmd_sgl) * QPIC_PER_CW_CMD_SGL * num_cw; -@@ -489,6 +504,8 @@ static void clear_bam_transaction(struct +@@ -491,6 +506,8 @@ static void clear_bam_transaction(struct if (!nandc->props->is_bam) return; diff --git a/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch b/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch index 62bac3762a..2b64ce1fcb 100644 --- a/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch +++ b/target/linux/ipq40xx/patches-4.14/050-0003-mtd-nand-qcom-support-for-command-descriptor-formati.patch @@ -51,7 +51,7 @@ Signed-off-by: Boris Brezillon dma_addr_t base_dma; struct clk *core_clk; -@@ -751,6 +761,66 @@ static int prepare_bam_async_desc(struct +@@ -753,6 +763,66 @@ static int prepare_bam_async_desc(struct } /* @@ -118,7 +118,7 @@ Signed-off-by: Boris Brezillon * Prepares the data descriptor for BAM DMA which will be used for NAND * data reads and writes. */ -@@ -868,19 +938,22 @@ static int read_reg_dma(struct qcom_nand +@@ -870,19 +940,22 @@ static int read_reg_dma(struct qcom_nand { bool flow_control = false; void *vaddr; @@ -148,7 +148,7 @@ Signed-off-by: Boris Brezillon } /* -@@ -897,13 +970,9 @@ static int write_reg_dma(struct qcom_nan +@@ -899,13 +972,9 @@ static int write_reg_dma(struct qcom_nan bool flow_control = false; struct nandc_regs *regs = nandc->regs; void *vaddr; @@ -162,7 +162,7 @@ Signed-off-by: Boris Brezillon if (first == NAND_ERASED_CW_DETECT_CFG) { if (flags & NAND_ERASED_CW_SET) vaddr = ®s->erased_cw_detect_cfg_set; -@@ -920,10 +989,15 @@ static int write_reg_dma(struct qcom_nan +@@ -922,10 +991,15 @@ static int write_reg_dma(struct qcom_nan if (first == NAND_DEV_CMD_VLD_RESTORE || first == NAND_DEV_CMD_VLD) first = dev_cmd_reg_addr(nandc, NAND_DEV_CMD_VLD); @@ -181,7 +181,7 @@ Signed-off-by: Boris Brezillon } /* -@@ -1187,7 +1261,8 @@ static int submit_descs(struct qcom_nand +@@ -1189,7 +1263,8 @@ static int submit_descs(struct qcom_nand } if (bam_txn->cmd_sgl_pos > bam_txn->cmd_sgl_start) { @@ -191,7 +191,7 @@ Signed-off-by: Boris Brezillon if (r) return r; } -@@ -2725,6 +2800,7 @@ static int qcom_nandc_probe(struct platf +@@ -2728,6 +2803,7 @@ static int qcom_nandc_probe(struct platf if (IS_ERR(nandc->base)) return PTR_ERR(nandc->base); diff --git a/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch b/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch index 6b8a86ebe5..84c86f6ca3 100644 --- a/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch +++ b/target/linux/ipq40xx/patches-4.14/050-0004-mtd-nand-provide-several-helpers-to-do-common-NAND-o.patch @@ -1502,7 +1502,7 @@ Date: Thu Nov 30 18:01:29 2017 +0100 } --- a/drivers/mtd/nand/qcom_nandc.c +++ b/drivers/mtd/nand/qcom_nandc.c -@@ -1990,7 +1990,7 @@ static int qcom_nandc_write_oob(struct m +@@ -1992,7 +1992,7 @@ static int qcom_nandc_write_oob(struct m struct nand_ecc_ctrl *ecc = &chip->ecc; u8 *oob = chip->oob_poi; int data_size, oob_size; @@ -1511,7 +1511,7 @@ Date: Thu Nov 30 18:01:29 2017 +0100 host->use_ecc = true; -@@ -2027,11 +2027,7 @@ static int qcom_nandc_write_oob(struct m +@@ -2029,11 +2029,7 @@ static int qcom_nandc_write_oob(struct m return -EIO; } @@ -1524,7 +1524,7 @@ Date: Thu Nov 30 18:01:29 2017 +0100 } static int qcom_nandc_block_bad(struct mtd_info *mtd, loff_t ofs) -@@ -2081,7 +2077,7 @@ static int qcom_nandc_block_markbad(stru +@@ -2083,7 +2079,7 @@ static int qcom_nandc_block_markbad(stru struct qcom_nand_host *host = to_qcom_nand_host(chip); struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct nand_ecc_ctrl *ecc = &chip->ecc; @@ -1533,7 +1533,7 @@ Date: Thu Nov 30 18:01:29 2017 +0100 clear_read_regs(nandc); clear_bam_transaction(nandc); -@@ -2114,11 +2110,7 @@ static int qcom_nandc_block_markbad(stru +@@ -2116,11 +2112,7 @@ static int qcom_nandc_block_markbad(stru return -EIO; } diff --git a/target/linux/ipq40xx/patches-4.14/050-0005-mtd-nand-force-drivers-to-explicitly-send-READ-PROG-.patch b/target/linux/ipq40xx/patches-4.14/050-0005-mtd-nand-force-drivers-to-explicitly-send-READ-PROG-.patch index e7e2e798a1..9a04442a23 100644 --- a/target/linux/ipq40xx/patches-4.14/050-0005-mtd-nand-force-drivers-to-explicitly-send-READ-PROG-.patch +++ b/target/linux/ipq40xx/patches-4.14/050-0005-mtd-nand-force-drivers-to-explicitly-send-READ-PROG-.patch @@ -39,7 +39,7 @@ Acked-by: Masahiro Yamada --- a/drivers/mtd/nand/qcom_nandc.c +++ b/drivers/mtd/nand/qcom_nandc.c -@@ -1725,6 +1725,7 @@ static int qcom_nandc_read_page(struct m +@@ -1727,6 +1727,7 @@ static int qcom_nandc_read_page(struct m u8 *data_buf, *oob_buf = NULL; int ret; @@ -47,7 +47,7 @@ Acked-by: Masahiro Yamada data_buf = buf; oob_buf = oob_required ? chip->oob_poi : NULL; -@@ -1750,6 +1751,7 @@ static int qcom_nandc_read_page_raw(stru +@@ -1752,6 +1753,7 @@ static int qcom_nandc_read_page_raw(stru int i, ret; int read_loc; @@ -55,7 +55,7 @@ Acked-by: Masahiro Yamada data_buf = buf; oob_buf = chip->oob_poi; -@@ -1850,6 +1852,8 @@ static int qcom_nandc_write_page(struct +@@ -1852,6 +1854,8 @@ static int qcom_nandc_write_page(struct u8 *data_buf, *oob_buf; int i, ret; @@ -64,7 +64,7 @@ Acked-by: Masahiro Yamada clear_read_regs(nandc); clear_bam_transaction(nandc); -@@ -1902,6 +1906,9 @@ static int qcom_nandc_write_page(struct +@@ -1904,6 +1908,9 @@ static int qcom_nandc_write_page(struct free_descs(nandc); @@ -74,7 +74,7 @@ Acked-by: Masahiro Yamada return ret; } -@@ -1916,6 +1923,7 @@ static int qcom_nandc_write_page_raw(str +@@ -1918,6 +1925,7 @@ static int qcom_nandc_write_page_raw(str u8 *data_buf, *oob_buf; int i, ret; @@ -82,7 +82,7 @@ Acked-by: Masahiro Yamada clear_read_regs(nandc); clear_bam_transaction(nandc); -@@ -1970,6 +1978,9 @@ static int qcom_nandc_write_page_raw(str +@@ -1972,6 +1980,9 @@ static int qcom_nandc_write_page_raw(str free_descs(nandc); diff --git a/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch b/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch index 33ede7d3a6..a3fd3138cc 100644 --- a/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch +++ b/target/linux/mediatek/patches-4.14/0012-clk-dont-disable-unused-clocks.patch @@ -10,7 +10,7 @@ Signed-off-by: John Crispin --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -797,7 +797,7 @@ unlock_out: +@@ -808,7 +808,7 @@ unlock_out: clk_core_disable_unprepare(core->parent); } diff --git a/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch b/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch index db05fd994d..37c03fed88 100644 --- a/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch +++ b/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch @@ -41,7 +41,7 @@ Signed-off-by: David S. Miller /* Set linkdown as the default for each GMAC. Its own MCR would be set * up with the more appropriate value when mtk_phy_link_adjust call is -@@ -2569,11 +2571,13 @@ static int mtk_probe(struct platform_dev +@@ -2571,11 +2573,13 @@ static int mtk_probe(struct platform_dev } } @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller } for (i = 0; i < 3; i++) { -@@ -2699,17 +2703,20 @@ static int mtk_remove(struct platform_de +@@ -2701,17 +2705,20 @@ static int mtk_remove(struct platform_de static const struct mtk_soc_data mt2701_data = { .caps = MTK_GMAC1_TRGMII, diff --git a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch index 32b4e63680..02b440ca6b 100644 --- a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch +++ b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman if (!xhci->shared_hcd) { --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -283,6 +283,9 @@ static int xhci_pci_setup(struct usb_hcd +@@ -287,6 +287,9 @@ static int xhci_pci_setup(struct usb_hcd if (!xhci->sbrn) pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn); -- 2.30.2