Browse Source

kernel: bump 4.14 to 4.14.145

Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <[email protected]>
Koen Vandeputte 6 years ago
parent
commit
0b18fca82f

+ 2 - 2
include/kernel-version.mk

@@ -7,11 +7,11 @@ ifdef CONFIG_TESTING_KERNEL
 endif
 
 LINUX_VERSION-4.9 = .193
-LINUX_VERSION-4.14 = .144
+LINUX_VERSION-4.14 = .145
 LINUX_VERSION-4.19 = .73
 
 LINUX_KERNEL_HASH-4.9.193 = 9be5081cc0fa6b720e6b3e5cb90296f3d857469bb3cda09ff93db00f9e16fd01
-LINUX_KERNEL_HASH-4.14.144 = cb8b84675ba060b249ffa62de2366d16e842e3edfcb355ebbfb06bf3de03ca54
+LINUX_KERNEL_HASH-4.14.145 = eb05b5806713263a6d5bfa1e018ad07c3f4b3c6e71032306a94d7113ed594929
 LINUX_KERNEL_HASH-4.19.73 = 7db5e77ef2a2d8da4b128b7d47d7dd645ebcde2d19c1d191793e1eeefc275fab
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

+ 1 - 1
target/linux/ar71xx/patches-4.14/500-MIPS-fw-myloader.patch

@@ -10,7 +10,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1155,6 +1155,9 @@ config MIPS_MSC
+@@ -1152,6 +1152,9 @@ config MIPS_MSC
  config MIPS_NILE4
  	bool
  

+ 2 - 2
target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch

@@ -89,7 +89,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -1942,7 +1942,8 @@ int gpiochip_add_pingroup_range(struct g
+@@ -1950,7 +1950,8 @@ int gpiochip_add_pingroup_range(struct g
  
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
  
@@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  }
  EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
  
-@@ -1994,7 +1995,7 @@ int gpiochip_add_pin_range(struct gpio_c
+@@ -2002,7 +2003,7 @@ int gpiochip_add_pin_range(struct gpio_c
  
  	list_add_tail(&pin_range->node, &gdev->pin_ranges);
  

+ 1 - 1
target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch

@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1161,6 +1161,10 @@ config SYNC_R4K
+@@ -1158,6 +1158,10 @@ config SYNC_R4K
  config MIPS_MACHINE
  	def_bool n
  

+ 2 - 2
target/linux/generic/pending-4.14/300-mips_expose_boot_raw.patch

@@ -9,7 +9,7 @@ Acked-by: Rob Landley <[email protected]>
 ---
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1070,9 +1070,6 @@ config FW_ARC
+@@ -1067,9 +1067,6 @@ config FW_ARC
  config ARCH_MAY_HAVE_PC_FDC
  	bool
  
@@ -19,7 +19,7 @@ Acked-by: Rob Landley <[email protected]>
  config CEVT_BCM1480
  	bool
  
-@@ -2970,6 +2967,18 @@ choice
+@@ -2967,6 +2964,18 @@ choice
  		bool "Extend builtin kernel arguments with bootloader arguments"
  endchoice
  

+ 1 - 1
target/linux/generic/pending-4.14/304-mips_disable_fpu.patch

@@ -24,7 +24,7 @@ v2: incorporated changes suggested by Jonas Gorski
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2894,6 +2894,20 @@ config MIPS_O32_FP64_SUPPORT
+@@ -2891,6 +2891,20 @@ config MIPS_O32_FP64_SUPPORT
  
  	  If unsure, say N.
  

+ 4 - 4
target/linux/generic/pending-4.14/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch

@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	select HAVE_PCSPKR_PLATFORM
  	select IRQ_MIPS_CPU
  	select I8253
-@@ -1131,6 +1133,9 @@ config DMA_NONCOHERENT
+@@ -1128,6 +1130,9 @@ config DMA_NONCOHERENT
  	bool
  	select NEED_DMA_MAP_STATE
  
@@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  config NEED_DMA_MAP_STATE
  	bool
  
-@@ -1655,6 +1660,7 @@ config CPU_R10000
+@@ -1652,6 +1657,7 @@ config CPU_R10000
  	select CPU_SUPPORTS_64BIT_KERNEL
  	select CPU_SUPPORTS_HIGHMEM
  	select CPU_SUPPORTS_HUGEPAGES
@@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	help
  	  MIPS Technologies R10000-series processors.
  
-@@ -1903,9 +1909,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
+@@ -1900,9 +1906,11 @@ config SYS_HAS_CPU_MIPS32_R3_5
  	bool
  
  config SYS_HAS_CPU_MIPS32_R5
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
  	bool
  
  config SYS_HAS_CPU_MIPS64_R1
-@@ -1915,6 +1923,7 @@ config SYS_HAS_CPU_MIPS64_R2
+@@ -1912,6 +1920,7 @@ config SYS_HAS_CPU_MIPS64_R2
  	bool
  
  config SYS_HAS_CPU_MIPS64_R6

+ 1 - 1
target/linux/layerscape/patches-4.14/820-sec-support-layerscape.patch

@@ -15266,7 +15266,7 @@ Signed-off-by: Zhao Qiang <[email protected]>
  #endif /* __SG_SW_QM_H */
 --- a/drivers/crypto/talitos.c
 +++ b/drivers/crypto/talitos.c
-@@ -1247,6 +1247,14 @@ static int ipsec_esp(struct talitos_edes
+@@ -1250,6 +1250,14 @@ static int ipsec_esp(struct talitos_edes
  	ret = talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->ptr[4],
  				 sg_count, areq->assoclen, tbl_off, elen);
  

+ 2 - 2
target/linux/mediatek/patches-4.14/0162-mtd-nand-mtk-use-nand_reset-to-reset-NAND-devices-in.patch

@@ -17,7 +17,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
 
 --- a/drivers/mtd/nand/mtk_nand.c
 +++ b/drivers/mtd/nand/mtk_nand.c
-@@ -1540,7 +1540,6 @@ static int mtk_nfc_resume(struct device
+@@ -1539,7 +1539,6 @@ static int mtk_nfc_resume(struct device
  	struct mtk_nfc *nfc = dev_get_drvdata(dev);
  	struct mtk_nfc_nand_chip *chip;
  	struct nand_chip *nand;
@@ -25,7 +25,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  	int ret;
  	u32 i;
  
-@@ -1553,11 +1552,8 @@ static int mtk_nfc_resume(struct device
+@@ -1552,11 +1551,8 @@ static int mtk_nfc_resume(struct device
  	/* reset NAND chip if VCC was powered off */
  	list_for_each_entry(chip, &nfc->chips, node) {
  		nand = &chip->nand;

+ 6 - 6
target/linux/mediatek/patches-4.14/0166-mtd-nand-mtk-Support-different-MTK-NAND-flash-contro.patch

@@ -312,7 +312,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  		nfi_writel(nfc, reg, NFI_CON);
  
  		nfi_writew(nfc, STAR_EN, NFI_STRDATA);
-@@ -1126,9 +1127,11 @@ static void mtk_nfc_set_fdm(struct mtk_n
+@@ -1125,9 +1126,11 @@ static void mtk_nfc_set_fdm(struct mtk_n
  {
  	struct nand_chip *nand = mtd_to_nand(mtd);
  	struct mtk_nfc_nand_chip *chip = to_mtk_nand(nand);
@@ -325,7 +325,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  
  	fdm->reg_size = chip->spare_per_sector - ecc_bytes;
  	if (fdm->reg_size > NFI_FDM_MAX_SIZE)
-@@ -1208,7 +1211,8 @@ static int mtk_nfc_ecc_init(struct devic
+@@ -1207,7 +1210,8 @@ static int mtk_nfc_ecc_init(struct devic
  		 * this controller only supports 512 and 1024 sizes
  		 */
  		if (nand->ecc.size < 1024) {
@@ -335,7 +335,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  				nand->ecc.size = 1024;
  				nand->ecc.strength <<= 1;
  			} else {
-@@ -1223,7 +1227,8 @@ static int mtk_nfc_ecc_init(struct devic
+@@ -1222,7 +1226,8 @@ static int mtk_nfc_ecc_init(struct devic
  			return ret;
  
  		/* calculate oob bytes except ecc parity data */
@@ -345,7 +345,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  		free = spare - free;
  
  		/*
-@@ -1233,10 +1238,12 @@ static int mtk_nfc_ecc_init(struct devic
+@@ -1232,10 +1237,12 @@ static int mtk_nfc_ecc_init(struct devic
  		 */
  		if (free > NFI_FDM_MAX_SIZE) {
  			spare -= NFI_FDM_MAX_SIZE;
@@ -360,7 +360,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  		}
  	}
  
-@@ -1389,6 +1396,8 @@ static const struct mtk_nfc_caps mtk_nfc
+@@ -1388,6 +1395,8 @@ static const struct mtk_nfc_caps mtk_nfc
  	.num_spare_size = 16,
  	.pageformat_spare_shift = 4,
  	.nfi_clk_div = 1,
@@ -369,7 +369,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  };
  
  static const struct mtk_nfc_caps mtk_nfc_caps_mt2712 = {
-@@ -1396,6 +1405,8 @@ static const struct mtk_nfc_caps mtk_nfc
+@@ -1395,6 +1404,8 @@ static const struct mtk_nfc_caps mtk_nfc
  	.num_spare_size = 19,
  	.pageformat_spare_shift = 16,
  	.nfi_clk_div = 2,

+ 2 - 2
target/linux/mediatek/patches-4.14/0167-mtd-nand-mtk-Support-MT7622-NAND-flash-controller.patch

@@ -81,7 +81,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  static inline struct mtk_nfc_nand_chip *to_mtk_nand(struct nand_chip *nand)
  {
  	return container_of(nand, struct mtk_nfc_nand_chip, nand);
-@@ -1409,6 +1413,15 @@ static const struct mtk_nfc_caps mtk_nfc
+@@ -1408,6 +1412,15 @@ static const struct mtk_nfc_caps mtk_nfc
  	.max_sector_size = 1024,
  };
  
@@ -97,7 +97,7 @@ Signed-off-by: Boris Brezillon <[email protected]>
  static const struct of_device_id mtk_nfc_id_table[] = {
  	{
  		.compatible = "mediatek,mt2701-nfc",
-@@ -1416,6 +1429,9 @@ static const struct of_device_id mtk_nfc
+@@ -1415,6 +1428,9 @@ static const struct of_device_id mtk_nfc
  	}, {
  		.compatible = "mediatek,mt2712-nfc",
  		.data = &mtk_nfc_caps_mt2712,