From a9b6077402730537ef19dd95b3583d6aeb3e3fbd Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Tue, 3 Apr 2018 20:25:20 +0200 Subject: kernel: bump kernel 4.4 to 4.4.126 for 17.01 * Refreshed patches Compile-tested: ar71xx, ramips/mt7621, x86/64 Run-tested: ar71xx Signed-off-by: Stijn Segers --- ...ifc-Segregate-IFC-fcm-and-runtime-registers.patch | 20 ++++++++++---------- ...38-pci-layerscape-add-MSI-interrupt-support.patch | 2 +- ...m64-use-fixmap-region-for-permanent-FDT-map.patch | 9 ++++++--- 3 files changed, 17 insertions(+), 14 deletions(-) (limited to 'target/linux/layerscape') diff --git a/target/linux/layerscape/patches-4.4/4046-mtd-ifc-Segregate-IFC-fcm-and-runtime-registers.patch b/target/linux/layerscape/patches-4.4/4046-mtd-ifc-Segregate-IFC-fcm-and-runtime-registers.patch index d64e002983..e219f99942 100644 --- a/target/linux/layerscape/patches-4.4/4046-mtd-ifc-Segregate-IFC-fcm-and-runtime-registers.patch +++ b/target/linux/layerscape/patches-4.4/4046-mtd-ifc-Segregate-IFC-fcm-and-runtime-registers.patch @@ -431,9 +431,9 @@ Signed-off-by: Raghav Dogra - struct fsl_ifc_regs __iomem *ifc = ctrl->regs; + struct fsl_ifc_runtime __iomem *ifc = ctrl->rregs; u32 nand_fsr; + int status; - /* Use READ_STATUS command, but wait for the device to be ready */ -@@ -826,39 +826,42 @@ static int fsl_ifc_chip_init_tail(struct +@@ -827,39 +827,42 @@ static int fsl_ifc_chip_init_tail(struct static void fsl_ifc_sram_init(struct fsl_ifc_mtd *priv) { struct fsl_ifc_ctrl *ctrl = priv->ctrl; @@ -491,7 +491,7 @@ Signed-off-by: Raghav Dogra /* wait for command complete flag or timeout */ wait_event_timeout(ctrl->nand_wait, ctrl->nand_stat, -@@ -868,14 +871,15 @@ static void fsl_ifc_sram_init(struct fsl +@@ -869,14 +872,15 @@ static void fsl_ifc_sram_init(struct fsl printk(KERN_ERR "fsl-ifc: Failed to Initialise SRAM\n"); /* Restore CSOR and CSOR_ext */ @@ -510,7 +510,7 @@ Signed-off-by: Raghav Dogra struct nand_chip *chip = &priv->chip; struct nand_ecclayout *layout; u32 csor; -@@ -886,7 +890,8 @@ static int fsl_ifc_chip_init(struct fsl_ +@@ -887,7 +891,8 @@ static int fsl_ifc_chip_init(struct fsl_ /* fill in nand_chip structure */ /* set up function call table */ @@ -520,7 +520,7 @@ Signed-off-by: Raghav Dogra chip->read_byte = fsl_ifc_read_byte16; else chip->read_byte = fsl_ifc_read_byte; -@@ -900,13 +905,14 @@ static int fsl_ifc_chip_init(struct fsl_ +@@ -901,13 +906,14 @@ static int fsl_ifc_chip_init(struct fsl_ chip->bbt_td = &bbt_main_descr; chip->bbt_md = &bbt_mirror_descr; @@ -537,7 +537,7 @@ Signed-off-by: Raghav Dogra chip->read_byte = fsl_ifc_read_byte16; chip->options |= NAND_BUSWIDTH_16; } else { -@@ -919,7 +925,7 @@ static int fsl_ifc_chip_init(struct fsl_ +@@ -920,7 +926,7 @@ static int fsl_ifc_chip_init(struct fsl_ chip->ecc.read_page = fsl_ifc_read_page; chip->ecc.write_page = fsl_ifc_write_page; @@ -546,7 +546,7 @@ Signed-off-by: Raghav Dogra /* Hardware generates ECC per 512 Bytes */ chip->ecc.size = 512; -@@ -1005,10 +1011,10 @@ static int fsl_ifc_chip_remove(struct fs +@@ -1006,10 +1012,10 @@ static int fsl_ifc_chip_remove(struct fs return 0; } @@ -559,7 +559,7 @@ Signed-off-by: Raghav Dogra if (!(cspr & CSPR_V)) return 0; -@@ -1022,7 +1028,7 @@ static DEFINE_MUTEX(fsl_ifc_nand_mutex); +@@ -1023,7 +1029,7 @@ static DEFINE_MUTEX(fsl_ifc_nand_mutex); static int fsl_ifc_nand_probe(struct platform_device *dev) { @@ -568,7 +568,7 @@ Signed-off-by: Raghav Dogra struct fsl_ifc_mtd *priv; struct resource res; static const char *part_probe_types[] -@@ -1033,9 +1039,9 @@ static int fsl_ifc_nand_probe(struct pla +@@ -1034,9 +1040,9 @@ static int fsl_ifc_nand_probe(struct pla struct mtd_part_parser_data ppdata; ppdata.of_node = dev->dev.of_node; @@ -580,7 +580,7 @@ Signed-off-by: Raghav Dogra /* get, allocate and map the memory resource */ ret = of_address_to_resource(node, 0, &res); -@@ -1046,7 +1052,7 @@ static int fsl_ifc_nand_probe(struct pla +@@ -1047,7 +1053,7 @@ static int fsl_ifc_nand_probe(struct pla /* find which chip select it is connected to */ for (bank = 0; bank < fsl_ifc_ctrl_dev->banks; bank++) { diff --git a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch index cbfa86c1e2..906d336d38 100644 --- a/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch +++ b/target/linux/layerscape/patches-4.4/8138-pci-layerscape-add-MSI-interrupt-support.patch @@ -204,7 +204,7 @@ Signed-off-by: Zhao Qiang } } -@@ -3670,11 +3672,12 @@ static void quirk_fixed_dma_alias(struct +@@ -3672,11 +3674,12 @@ static void quirk_fixed_dma_alias(struct id = pci_match_id(fixed_dma_alias_tbl, dev); if (id) { diff --git a/target/linux/layerscape/patches-4.4/9070-Revert-arm64-use-fixmap-region-for-permanent-FDT-map.patch b/target/linux/layerscape/patches-4.4/9070-Revert-arm64-use-fixmap-region-for-permanent-FDT-map.patch index c247db474a..45d4a8b8c9 100644 --- a/target/linux/layerscape/patches-4.4/9070-Revert-arm64-use-fixmap-region-for-permanent-FDT-map.patch +++ b/target/linux/layerscape/patches-4.4/9070-Revert-arm64-use-fixmap-region-for-permanent-FDT-map.patch @@ -242,11 +242,10 @@ Signed-off-by: Yutang Jiang #include #include #include -@@ -641,59 +640,3 @@ void __set_fixmap(enum fixed_addresses i - flush_tlb_kernel_range(addr, addr+PAGE_SIZE); +@@ -642,62 +641,6 @@ void __set_fixmap(enum fixed_addresses i } } -- + -void *__init fixmap_remap_fdt(phys_addr_t dt_phys) -{ - const u64 dt_virt_base = __fix_to_virt(FIX_FDT); @@ -302,3 +301,7 @@ Signed-off-by: Yutang Jiang - - return dt_virt; -} +- + #ifdef CONFIG_HAVE_ARCH_HUGE_VMAP + int pud_free_pmd_page(pud_t *pud) + { -- cgit v1.2.3