From: Greg Kroah-Hartman Date: Tue, 29 May 2018 17:38:06 +0000 (+0200) Subject: drop microblaze patch. and scsi patch. X-Git-Tag: v3.18.111~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff1683ff7b173bc224b0e357e68ed53c30e8925d;p=thirdparty%2Fkernel%2Fstable-queue.git drop microblaze patch. and scsi patch. --- diff --git a/queue-3.18/microblaze-switch-to-no_bootmem.patch b/queue-3.18/microblaze-switch-to-no_bootmem.patch deleted file mode 100644 index 4a62d5b6a4e..00000000000 --- a/queue-3.18/microblaze-switch-to-no_bootmem.patch +++ /dev/null @@ -1,155 +0,0 @@ -From foo@baz Mon May 28 08:52:37 CEST 2018 -From: Rob Herring -Date: Fri, 9 Mar 2018 09:54:07 -0600 -Subject: microblaze: switch to NO_BOOTMEM - -From: Rob Herring - -[ Upstream commit 101646a24a2f9cdb61d7732459fbf068a7bbb542 ] - -Microblaze doesn't set CONFIG_NO_BOOTMEM and so memblock_virt_alloc() -doesn't work for CONFIG_HAVE_MEMBLOCK && !CONFIG_NO_BOOTMEM. - -Similar change was already done by others architectures -"ARM: mm: Remove bootmem code and switch to NO_BOOTMEM" -(sha1: 84f452b1e8fc73ac0e31254c66e3e2260ce5263d) -or -"openrisc: Consolidate setup to use memblock instead of bootmem" -(sha1: 266c7fad157265bb54d17db1c9545f2aaa488643) -or -"parisc: Drop bootmem and switch to memblock" -(sha1: 4fe9e1d957e45ad8eba9885ee860a0e93d13a7c7) -or -"powerpc: Remove bootmem allocator" -(sha1: 10239733ee8617bac3f1c1769af43a88ed979324) -or -"s390/mm: Convert bootmem to memblock" -(sha1: 50be634507284eea38df78154d22615d21200b42) -or -"sparc64: Convert over to NO_BOOTMEM." -(sha1: 625d693e9784f988371e69c2b41a2172c0be6c11) -or -"xtensa: drop sysmem and switch to memblock" -(sha1: 0e46c1115f5816949220d62dd3ff04aa68e7ac6b) - -Issue was introduced by: -"of/fdt: use memblock_virt_alloc for early alloc" -(sha1: 0fa1c579349fdd90173381712ad78aa99c09d38b) - -Signed-off-by: Rob Herring -Tested-by: Alvaro Gamez Machado -Tested-by: Michal Simek -Signed-off-by: Michal Simek -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/microblaze/Kconfig | 1 - arch/microblaze/mm/init.c | 56 ++++------------------------------------------ - 2 files changed, 7 insertions(+), 50 deletions(-) - ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -23,6 +23,7 @@ config MICROBLAZE - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select NO_BOOTMEM - select HAVE_MEMBLOCK - select HAVE_MEMBLOCK_NODE_MAP - select HAVE_OPROFILE ---- a/arch/microblaze/mm/init.c -+++ b/arch/microblaze/mm/init.c -@@ -32,9 +32,6 @@ int mem_init_done; - #ifndef CONFIG_MMU - unsigned int __page_offset; - EXPORT_SYMBOL(__page_offset); -- --#else --static int init_bootmem_done; - #endif /* CONFIG_MMU */ - - char *klimit = _end; -@@ -117,7 +114,6 @@ static void __init paging_init(void) - - void __init setup_memory(void) - { -- unsigned long map_size; - struct memblock_region *reg; - - #ifndef CONFIG_MMU -@@ -174,17 +170,6 @@ void __init setup_memory(void) - pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn); - pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn); - -- /* -- * Find an area to use for the bootmem bitmap. -- * We look for the first area which is at least -- * 128kB in length (128kB is enough for a bitmap -- * for 4GB of memory, using 4kB pages), plus 1 page -- * (in case the address isn't page-aligned). -- */ -- map_size = init_bootmem_node(NODE_DATA(0), -- PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); -- memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); -- - /* Add active regions with valid PFNs */ - for_each_memblock(memory, reg) { - unsigned long start_pfn, end_pfn; -@@ -196,32 +181,9 @@ void __init setup_memory(void) - &memblock.memory, 0); - } - -- /* free bootmem is whole main memory */ -- free_bootmem_with_active_regions(0, max_low_pfn); -- -- /* reserve allocate blocks */ -- for_each_memblock(reserved, reg) { -- unsigned long top = reg->base + reg->size - 1; -- -- pr_debug("reserved - 0x%08x-0x%08x, %lx, %lx\n", -- (u32) reg->base, (u32) reg->size, top, -- memory_start + lowmem_size - 1); -- -- if (top <= (memory_start + lowmem_size - 1)) { -- reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); -- } else if (reg->base < (memory_start + lowmem_size - 1)) { -- unsigned long trunc_size = memory_start + lowmem_size - -- reg->base; -- reserve_bootmem(reg->base, trunc_size, BOOTMEM_DEFAULT); -- } -- } -- - /* XXX need to clip this if using highmem? */ - sparse_memory_present_with_active_regions(0); - --#ifdef CONFIG_MMU -- init_bootmem_done = 1; --#endif - paging_init(); - } - -@@ -398,18 +360,12 @@ asmlinkage void __init mmu_init(void) - /* This is only called until mem_init is done. */ - void __init *early_get_page(void) - { -- void *p; -- if (init_bootmem_done) { -- p = alloc_bootmem_pages(PAGE_SIZE); -- } else { -- /* -- * Mem start + kernel_tlb -> here is limit -- * because of mem mapping from head.S -- */ -- p = __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -- memory_start + kernel_tlb)); -- } -- return p; -+ /* -+ * Mem start + kernel_tlb -> here is limit -+ * because of mem mapping from head.S -+ */ -+ return __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -+ memory_start + kernel_tlb)); - } - - #endif /* CONFIG_MMU */ diff --git a/queue-3.18/series b/queue-3.18/series index 78923d2323c..4ac4536d67e 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -89,7 +89,6 @@ fbdev-fixing-arbitrary-kernel-leak-in-case-fbiogetcmap_sparc-in-sbusfb_ioctl_hel xen-xenbus-use-put_device-instead-of-kfree.patch usb-ohci-fix-null-dereference-in-hcds-using-hcd_local_mem.patch netfilter-ebtables-fix-erroneous-reject-of-last-rule.patch -microblaze-switch-to-no_bootmem.patch net-fix-vlan-untag-for-bridge-and-vlan_dev-with-reorder_hdr-off.patch batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch vti4-don-t-count-header-length-twice-on-tunnel-setup.patch diff --git a/queue-4.14/microblaze-switch-to-no_bootmem.patch b/queue-4.14/microblaze-switch-to-no_bootmem.patch deleted file mode 100644 index 92379f85550..00000000000 --- a/queue-4.14/microblaze-switch-to-no_bootmem.patch +++ /dev/null @@ -1,155 +0,0 @@ -From foo@baz Sun May 27 16:52:54 CEST 2018 -From: Rob Herring -Date: Fri, 9 Mar 2018 09:54:07 -0600 -Subject: microblaze: switch to NO_BOOTMEM - -From: Rob Herring - -[ Upstream commit 101646a24a2f9cdb61d7732459fbf068a7bbb542 ] - -Microblaze doesn't set CONFIG_NO_BOOTMEM and so memblock_virt_alloc() -doesn't work for CONFIG_HAVE_MEMBLOCK && !CONFIG_NO_BOOTMEM. - -Similar change was already done by others architectures -"ARM: mm: Remove bootmem code and switch to NO_BOOTMEM" -(sha1: 84f452b1e8fc73ac0e31254c66e3e2260ce5263d) -or -"openrisc: Consolidate setup to use memblock instead of bootmem" -(sha1: 266c7fad157265bb54d17db1c9545f2aaa488643) -or -"parisc: Drop bootmem and switch to memblock" -(sha1: 4fe9e1d957e45ad8eba9885ee860a0e93d13a7c7) -or -"powerpc: Remove bootmem allocator" -(sha1: 10239733ee8617bac3f1c1769af43a88ed979324) -or -"s390/mm: Convert bootmem to memblock" -(sha1: 50be634507284eea38df78154d22615d21200b42) -or -"sparc64: Convert over to NO_BOOTMEM." -(sha1: 625d693e9784f988371e69c2b41a2172c0be6c11) -or -"xtensa: drop sysmem and switch to memblock" -(sha1: 0e46c1115f5816949220d62dd3ff04aa68e7ac6b) - -Issue was introduced by: -"of/fdt: use memblock_virt_alloc for early alloc" -(sha1: 0fa1c579349fdd90173381712ad78aa99c09d38b) - -Signed-off-by: Rob Herring -Tested-by: Alvaro Gamez Machado -Tested-by: Michal Simek -Signed-off-by: Michal Simek -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/microblaze/Kconfig | 1 - arch/microblaze/mm/init.c | 56 ++++------------------------------------------ - 2 files changed, 7 insertions(+), 50 deletions(-) - ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -24,6 +24,7 @@ config MICROBLAZE - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select NO_BOOTMEM - select HAVE_MEMBLOCK - select HAVE_MEMBLOCK_NODE_MAP - select HAVE_OPROFILE ---- a/arch/microblaze/mm/init.c -+++ b/arch/microblaze/mm/init.c -@@ -32,9 +32,6 @@ int mem_init_done; - #ifndef CONFIG_MMU - unsigned int __page_offset; - EXPORT_SYMBOL(__page_offset); -- --#else --static int init_bootmem_done; - #endif /* CONFIG_MMU */ - - char *klimit = _end; -@@ -117,7 +114,6 @@ static void __init paging_init(void) - - void __init setup_memory(void) - { -- unsigned long map_size; - struct memblock_region *reg; - - #ifndef CONFIG_MMU -@@ -174,17 +170,6 @@ void __init setup_memory(void) - pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn); - pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn); - -- /* -- * Find an area to use for the bootmem bitmap. -- * We look for the first area which is at least -- * 128kB in length (128kB is enough for a bitmap -- * for 4GB of memory, using 4kB pages), plus 1 page -- * (in case the address isn't page-aligned). -- */ -- map_size = init_bootmem_node(NODE_DATA(0), -- PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); -- memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); -- - /* Add active regions with valid PFNs */ - for_each_memblock(memory, reg) { - unsigned long start_pfn, end_pfn; -@@ -196,32 +181,9 @@ void __init setup_memory(void) - &memblock.memory, 0); - } - -- /* free bootmem is whole main memory */ -- free_bootmem_with_active_regions(0, max_low_pfn); -- -- /* reserve allocate blocks */ -- for_each_memblock(reserved, reg) { -- unsigned long top = reg->base + reg->size - 1; -- -- pr_debug("reserved - 0x%08x-0x%08x, %lx, %lx\n", -- (u32) reg->base, (u32) reg->size, top, -- memory_start + lowmem_size - 1); -- -- if (top <= (memory_start + lowmem_size - 1)) { -- reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); -- } else if (reg->base < (memory_start + lowmem_size - 1)) { -- unsigned long trunc_size = memory_start + lowmem_size - -- reg->base; -- reserve_bootmem(reg->base, trunc_size, BOOTMEM_DEFAULT); -- } -- } -- - /* XXX need to clip this if using highmem? */ - sparse_memory_present_with_active_regions(0); - --#ifdef CONFIG_MMU -- init_bootmem_done = 1; --#endif - paging_init(); - } - -@@ -398,18 +360,12 @@ asmlinkage void __init mmu_init(void) - /* This is only called until mem_init is done. */ - void __init *early_get_page(void) - { -- void *p; -- if (init_bootmem_done) { -- p = alloc_bootmem_pages(PAGE_SIZE); -- } else { -- /* -- * Mem start + kernel_tlb -> here is limit -- * because of mem mapping from head.S -- */ -- p = __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -- memory_start + kernel_tlb)); -- } -- return p; -+ /* -+ * Mem start + kernel_tlb -> here is limit -+ * because of mem mapping from head.S -+ */ -+ return __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -+ memory_start + kernel_tlb)); - } - - #endif /* CONFIG_MMU */ diff --git a/queue-4.14/scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch b/queue-4.14/scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch deleted file mode 100644 index f9120a03cdc..00000000000 --- a/queue-4.14/scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch +++ /dev/null @@ -1,34 +0,0 @@ -From foo@baz Sun May 27 16:52:54 CEST 2018 -From: Hannes Reinecke -Date: Mon, 26 Feb 2018 08:39:59 +0100 -Subject: scsi: core: return BLK_STS_OK for DID_OK in __scsi_error_from_host_byte() - -From: Hannes Reinecke - -[ Upstream commit e39a97353e5378eb46bf01679799c5704d397f32 ] - -When converting __scsi_error_from_host_byte() to BLK_STS error codes the -case DID_OK was forgotten, resulting in it always returning an error. - -Fixes: 2a842acab109 ("block: introduce new block status code type") -Cc: Doug Gilbert -Signed-off-by: Hannes Reinecke -Reviewed-by: Douglas Gilbert -Signed-off-by: Martin K. Petersen -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/scsi_lib.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/scsi_lib.c -+++ b/drivers/scsi/scsi_lib.c -@@ -720,6 +720,8 @@ static blk_status_t __scsi_error_from_ho - int result) - { - switch (host_byte(result)) { -+ case DID_OK: -+ return BLK_STS_OK; - case DID_TRANSPORT_FAILFAST: - return BLK_STS_TRANSPORT; - case DID_TARGET_FAILURE: diff --git a/queue-4.14/series b/queue-4.14/series index 23d159deb97..9abe153604c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -195,7 +195,6 @@ block-display-the-correct-diskname-for-bio.patch nvme-pci-fix-eeh-failure-on-ppc.patch nvme-pci-pass-max-vectors-as-num_possible_cpus-to-pci_alloc_irq_vectors.patch selftests-powerpc-skip-the-subpage_prot-tests-if-the-syscall-is-unavailable.patch -scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch net-ethtool-don-t-ignore-return-from-driver-get_fecparam-method.patch iwlwifi-mvm-fix-tx-of-ccmp-256.patch iwlwifi-mvm-fix-channel-switch-for-count-0-and-1.patch @@ -253,7 +252,6 @@ xfrm-fix-rcu_read_unlock-usage-in-xfrm_local_error.patch iwlwifi-mvm-set-the-correct-tid-when-we-flush-the-mcast-sta.patch iwlwifi-mvm-correctly-set-igtk-for-ap.patch iwlwifi-mvm-fix-error-checking-for-multi-broadcast-sta.patch -microblaze-switch-to-no_bootmem.patch net-fix-vlan-untag-for-bridge-and-vlan_dev-with-reorder_hdr-off.patch vlan-fix-out-of-order-vlan-headers-with-reorder-header-off.patch batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch diff --git a/queue-4.4/microblaze-switch-to-no_bootmem.patch b/queue-4.4/microblaze-switch-to-no_bootmem.patch deleted file mode 100644 index 3f3c714f4f8..00000000000 --- a/queue-4.4/microblaze-switch-to-no_bootmem.patch +++ /dev/null @@ -1,155 +0,0 @@ -From foo@baz Sun May 27 17:52:22 CEST 2018 -From: Rob Herring -Date: Fri, 9 Mar 2018 09:54:07 -0600 -Subject: microblaze: switch to NO_BOOTMEM - -From: Rob Herring - -[ Upstream commit 101646a24a2f9cdb61d7732459fbf068a7bbb542 ] - -Microblaze doesn't set CONFIG_NO_BOOTMEM and so memblock_virt_alloc() -doesn't work for CONFIG_HAVE_MEMBLOCK && !CONFIG_NO_BOOTMEM. - -Similar change was already done by others architectures -"ARM: mm: Remove bootmem code and switch to NO_BOOTMEM" -(sha1: 84f452b1e8fc73ac0e31254c66e3e2260ce5263d) -or -"openrisc: Consolidate setup to use memblock instead of bootmem" -(sha1: 266c7fad157265bb54d17db1c9545f2aaa488643) -or -"parisc: Drop bootmem and switch to memblock" -(sha1: 4fe9e1d957e45ad8eba9885ee860a0e93d13a7c7) -or -"powerpc: Remove bootmem allocator" -(sha1: 10239733ee8617bac3f1c1769af43a88ed979324) -or -"s390/mm: Convert bootmem to memblock" -(sha1: 50be634507284eea38df78154d22615d21200b42) -or -"sparc64: Convert over to NO_BOOTMEM." -(sha1: 625d693e9784f988371e69c2b41a2172c0be6c11) -or -"xtensa: drop sysmem and switch to memblock" -(sha1: 0e46c1115f5816949220d62dd3ff04aa68e7ac6b) - -Issue was introduced by: -"of/fdt: use memblock_virt_alloc for early alloc" -(sha1: 0fa1c579349fdd90173381712ad78aa99c09d38b) - -Signed-off-by: Rob Herring -Tested-by: Alvaro Gamez Machado -Tested-by: Michal Simek -Signed-off-by: Michal Simek -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/microblaze/Kconfig | 1 - arch/microblaze/mm/init.c | 56 ++++------------------------------------------ - 2 files changed, 7 insertions(+), 50 deletions(-) - ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -24,6 +24,7 @@ config MICROBLAZE - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select NO_BOOTMEM - select HAVE_MEMBLOCK - select HAVE_MEMBLOCK_NODE_MAP - select HAVE_OPROFILE ---- a/arch/microblaze/mm/init.c -+++ b/arch/microblaze/mm/init.c -@@ -32,9 +32,6 @@ int mem_init_done; - #ifndef CONFIG_MMU - unsigned int __page_offset; - EXPORT_SYMBOL(__page_offset); -- --#else --static int init_bootmem_done; - #endif /* CONFIG_MMU */ - - char *klimit = _end; -@@ -117,7 +114,6 @@ static void __init paging_init(void) - - void __init setup_memory(void) - { -- unsigned long map_size; - struct memblock_region *reg; - - #ifndef CONFIG_MMU -@@ -174,17 +170,6 @@ void __init setup_memory(void) - pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn); - pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn); - -- /* -- * Find an area to use for the bootmem bitmap. -- * We look for the first area which is at least -- * 128kB in length (128kB is enough for a bitmap -- * for 4GB of memory, using 4kB pages), plus 1 page -- * (in case the address isn't page-aligned). -- */ -- map_size = init_bootmem_node(NODE_DATA(0), -- PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); -- memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); -- - /* Add active regions with valid PFNs */ - for_each_memblock(memory, reg) { - unsigned long start_pfn, end_pfn; -@@ -196,32 +181,9 @@ void __init setup_memory(void) - &memblock.memory, 0); - } - -- /* free bootmem is whole main memory */ -- free_bootmem_with_active_regions(0, max_low_pfn); -- -- /* reserve allocate blocks */ -- for_each_memblock(reserved, reg) { -- unsigned long top = reg->base + reg->size - 1; -- -- pr_debug("reserved - 0x%08x-0x%08x, %lx, %lx\n", -- (u32) reg->base, (u32) reg->size, top, -- memory_start + lowmem_size - 1); -- -- if (top <= (memory_start + lowmem_size - 1)) { -- reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); -- } else if (reg->base < (memory_start + lowmem_size - 1)) { -- unsigned long trunc_size = memory_start + lowmem_size - -- reg->base; -- reserve_bootmem(reg->base, trunc_size, BOOTMEM_DEFAULT); -- } -- } -- - /* XXX need to clip this if using highmem? */ - sparse_memory_present_with_active_regions(0); - --#ifdef CONFIG_MMU -- init_bootmem_done = 1; --#endif - paging_init(); - } - -@@ -398,18 +360,12 @@ asmlinkage void __init mmu_init(void) - /* This is only called until mem_init is done. */ - void __init *early_get_page(void) - { -- void *p; -- if (init_bootmem_done) { -- p = alloc_bootmem_pages(PAGE_SIZE); -- } else { -- /* -- * Mem start + kernel_tlb -> here is limit -- * because of mem mapping from head.S -- */ -- p = __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -- memory_start + kernel_tlb)); -- } -- return p; -+ /* -+ * Mem start + kernel_tlb -> here is limit -+ * because of mem mapping from head.S -+ */ -+ return __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -+ memory_start + kernel_tlb)); - } - - #endif /* CONFIG_MMU */ diff --git a/queue-4.4/series b/queue-4.4/series index 27f5c5ca919..6f606f4ad74 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -133,7 +133,6 @@ bnxt_en-check-valid-vnic-id-in-bnxt_hwrm_vnic_set_tpa.patch workqueue-use-put_device-instead-of-kfree.patch ipv4-lock-mtu-in-fnhe-when-received-pmtu-net.ipv4.route.min_pmtu.patch sunvnet-does-not-support-gso-for-sctp.patch -microblaze-switch-to-no_bootmem.patch net-fix-vlan-untag-for-bridge-and-vlan_dev-with-reorder_hdr-off.patch batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch vti4-don-t-count-header-length-twice-on-tunnel-setup.patch diff --git a/queue-4.9/microblaze-switch-to-no_bootmem.patch b/queue-4.9/microblaze-switch-to-no_bootmem.patch deleted file mode 100644 index 2d9fa8d30e3..00000000000 --- a/queue-4.9/microblaze-switch-to-no_bootmem.patch +++ /dev/null @@ -1,155 +0,0 @@ -From foo@baz Sun May 27 17:33:38 CEST 2018 -From: Rob Herring -Date: Fri, 9 Mar 2018 09:54:07 -0600 -Subject: microblaze: switch to NO_BOOTMEM - -From: Rob Herring - -[ Upstream commit 101646a24a2f9cdb61d7732459fbf068a7bbb542 ] - -Microblaze doesn't set CONFIG_NO_BOOTMEM and so memblock_virt_alloc() -doesn't work for CONFIG_HAVE_MEMBLOCK && !CONFIG_NO_BOOTMEM. - -Similar change was already done by others architectures -"ARM: mm: Remove bootmem code and switch to NO_BOOTMEM" -(sha1: 84f452b1e8fc73ac0e31254c66e3e2260ce5263d) -or -"openrisc: Consolidate setup to use memblock instead of bootmem" -(sha1: 266c7fad157265bb54d17db1c9545f2aaa488643) -or -"parisc: Drop bootmem and switch to memblock" -(sha1: 4fe9e1d957e45ad8eba9885ee860a0e93d13a7c7) -or -"powerpc: Remove bootmem allocator" -(sha1: 10239733ee8617bac3f1c1769af43a88ed979324) -or -"s390/mm: Convert bootmem to memblock" -(sha1: 50be634507284eea38df78154d22615d21200b42) -or -"sparc64: Convert over to NO_BOOTMEM." -(sha1: 625d693e9784f988371e69c2b41a2172c0be6c11) -or -"xtensa: drop sysmem and switch to memblock" -(sha1: 0e46c1115f5816949220d62dd3ff04aa68e7ac6b) - -Issue was introduced by: -"of/fdt: use memblock_virt_alloc for early alloc" -(sha1: 0fa1c579349fdd90173381712ad78aa99c09d38b) - -Signed-off-by: Rob Herring -Tested-by: Alvaro Gamez Machado -Tested-by: Michal Simek -Signed-off-by: Michal Simek -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/microblaze/Kconfig | 1 - arch/microblaze/mm/init.c | 56 ++++------------------------------------------ - 2 files changed, 7 insertions(+), 50 deletions(-) - ---- a/arch/microblaze/Kconfig -+++ b/arch/microblaze/Kconfig -@@ -23,6 +23,7 @@ config MICROBLAZE - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select NO_BOOTMEM - select HAVE_MEMBLOCK - select HAVE_MEMBLOCK_NODE_MAP - select HAVE_OPROFILE ---- a/arch/microblaze/mm/init.c -+++ b/arch/microblaze/mm/init.c -@@ -32,9 +32,6 @@ int mem_init_done; - #ifndef CONFIG_MMU - unsigned int __page_offset; - EXPORT_SYMBOL(__page_offset); -- --#else --static int init_bootmem_done; - #endif /* CONFIG_MMU */ - - char *klimit = _end; -@@ -117,7 +114,6 @@ static void __init paging_init(void) - - void __init setup_memory(void) - { -- unsigned long map_size; - struct memblock_region *reg; - - #ifndef CONFIG_MMU -@@ -174,17 +170,6 @@ void __init setup_memory(void) - pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn); - pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn); - -- /* -- * Find an area to use for the bootmem bitmap. -- * We look for the first area which is at least -- * 128kB in length (128kB is enough for a bitmap -- * for 4GB of memory, using 4kB pages), plus 1 page -- * (in case the address isn't page-aligned). -- */ -- map_size = init_bootmem_node(NODE_DATA(0), -- PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); -- memblock_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); -- - /* Add active regions with valid PFNs */ - for_each_memblock(memory, reg) { - unsigned long start_pfn, end_pfn; -@@ -196,32 +181,9 @@ void __init setup_memory(void) - &memblock.memory, 0); - } - -- /* free bootmem is whole main memory */ -- free_bootmem_with_active_regions(0, max_low_pfn); -- -- /* reserve allocate blocks */ -- for_each_memblock(reserved, reg) { -- unsigned long top = reg->base + reg->size - 1; -- -- pr_debug("reserved - 0x%08x-0x%08x, %lx, %lx\n", -- (u32) reg->base, (u32) reg->size, top, -- memory_start + lowmem_size - 1); -- -- if (top <= (memory_start + lowmem_size - 1)) { -- reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); -- } else if (reg->base < (memory_start + lowmem_size - 1)) { -- unsigned long trunc_size = memory_start + lowmem_size - -- reg->base; -- reserve_bootmem(reg->base, trunc_size, BOOTMEM_DEFAULT); -- } -- } -- - /* XXX need to clip this if using highmem? */ - sparse_memory_present_with_active_regions(0); - --#ifdef CONFIG_MMU -- init_bootmem_done = 1; --#endif - paging_init(); - } - -@@ -398,18 +360,12 @@ asmlinkage void __init mmu_init(void) - /* This is only called until mem_init is done. */ - void __init *early_get_page(void) - { -- void *p; -- if (init_bootmem_done) { -- p = alloc_bootmem_pages(PAGE_SIZE); -- } else { -- /* -- * Mem start + kernel_tlb -> here is limit -- * because of mem mapping from head.S -- */ -- p = __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -- memory_start + kernel_tlb)); -- } -- return p; -+ /* -+ * Mem start + kernel_tlb -> here is limit -+ * because of mem mapping from head.S -+ */ -+ return __va(memblock_alloc_base(PAGE_SIZE, PAGE_SIZE, -+ memory_start + kernel_tlb)); - } - - #endif /* CONFIG_MMU */ diff --git a/queue-4.9/series b/queue-4.9/series index 4f504b2580a..2d97fdb356f 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -196,7 +196,6 @@ workqueue-use-put_device-instead-of-kfree.patch ipv4-lock-mtu-in-fnhe-when-received-pmtu-net.ipv4.route.min_pmtu.patch sunvnet-does-not-support-gso-for-sctp.patch drm-imx-move-arming-of-the-vblank-event-to-atomic_flush.patch -microblaze-switch-to-no_bootmem.patch net-fix-vlan-untag-for-bridge-and-vlan_dev-with-reorder_hdr-off.patch batman-adv-fix-header-size-check-in-batadv_dbg_arp.patch batman-adv-fix-skbuff-rcsum-on-packet-reroute.patch