diff options
Diffstat (limited to 'target')
8 files changed, 29 insertions, 29 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0440-arm64-mm-use-arm64_dma_phys_limit-instead-of-calling.patch b/target/linux/bcm27xx/patches-5.4/950-0440-arm64-mm-use-arm64_dma_phys_limit-instead-of-calling.patch index a90e7f8587..c697494f8a 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0440-arm64-mm-use-arm64_dma_phys_limit-instead-of-calling.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0440-arm64-mm-use-arm64_dma_phys_limit-instead-of-calling.patch @@ -19,7 +19,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -187,7 +187,7 @@ static void __init zone_sizes_init(unsig +@@ -181,7 +181,7 @@ static void __init zone_sizes_init(unsig unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; #ifdef CONFIG_ZONE_DMA32 diff --git a/target/linux/bcm27xx/patches-5.4/950-0441-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch b/target/linux/bcm27xx/patches-5.4/950-0441-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch index 3039bfe822..df184f53ee 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0441-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0441-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch @@ -18,16 +18,16 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -56,7 +56,7 @@ EXPORT_SYMBOL(physvirt_offset); - struct page *vmemmap __ro_after_init; - EXPORT_SYMBOL(vmemmap); +@@ -50,7 +50,7 @@ + s64 memstart_addr __ro_after_init = -1; + EXPORT_SYMBOL(memstart_addr); -phys_addr_t arm64_dma_phys_limit __ro_after_init; +phys_addr_t arm64_dma32_phys_limit __ro_after_init; #ifdef CONFIG_KEXEC_CORE /* -@@ -174,7 +174,7 @@ static void __init reserve_elfcorehdr(vo +@@ -168,7 +168,7 @@ static void __init reserve_elfcorehdr(vo * currently assumes that for memory starting above 4G, 32-bit devices will * use a DMA offset. */ @@ -36,7 +36,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> { phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32); return min(offset + (1ULL << 32), memblock_end_of_DRAM()); -@@ -187,7 +187,7 @@ static void __init zone_sizes_init(unsig +@@ -181,7 +181,7 @@ static void __init zone_sizes_init(unsig unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; #ifdef CONFIG_ZONE_DMA32 @@ -45,7 +45,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> #endif max_zone_pfns[ZONE_NORMAL] = max; -@@ -200,16 +200,16 @@ static void __init zone_sizes_init(unsig +@@ -194,16 +194,16 @@ static void __init zone_sizes_init(unsig { struct memblock_region *reg; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; @@ -66,7 +66,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> memcpy(zhole_size, zone_size, sizeof(zhole_size)); -@@ -221,14 +221,14 @@ static void __init zone_sizes_init(unsig +@@ -215,14 +215,14 @@ static void __init zone_sizes_init(unsig continue; #ifdef CONFIG_ZONE_DMA32 @@ -85,7 +85,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> zhole_size[ZONE_NORMAL] -= normal_end - normal_start; } } -@@ -420,9 +420,9 @@ void __init arm64_memblock_init(void) +@@ -410,9 +410,9 @@ void __init arm64_memblock_init(void) /* 4GB maximum for 32-bit only capable devices */ if (IS_ENABLED(CONFIG_ZONE_DMA32)) @@ -97,7 +97,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> reserve_crashkernel(); -@@ -430,7 +430,7 @@ void __init arm64_memblock_init(void) +@@ -420,7 +420,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; @@ -106,7 +106,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> } void __init bootmem_init(void) -@@ -534,7 +534,7 @@ static void __init free_unused_memmap(vo +@@ -524,7 +524,7 @@ static void __init free_unused_memmap(vo void __init mem_init(void) { if (swiotlb_force == SWIOTLB_FORCE || diff --git a/target/linux/bcm27xx/patches-5.4/950-0442-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch b/target/linux/bcm27xx/patches-5.4/950-0442-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch index 2397c71af7..ccb2071f17 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0442-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0442-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch @@ -51,9 +51,9 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> #endif --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -56,6 +56,13 @@ EXPORT_SYMBOL(physvirt_offset); - struct page *vmemmap __ro_after_init; - EXPORT_SYMBOL(vmemmap); +@@ -50,6 +50,13 @@ + s64 memstart_addr __ro_after_init = -1; + EXPORT_SYMBOL(memstart_addr); +/* + * We create both ZONE_DMA and ZONE_DMA32. ZONE_DMA covers the first 1G of @@ -65,7 +65,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> phys_addr_t arm64_dma32_phys_limit __ro_after_init; #ifdef CONFIG_KEXEC_CORE -@@ -169,15 +176,16 @@ static void __init reserve_elfcorehdr(vo +@@ -163,15 +170,16 @@ static void __init reserve_elfcorehdr(vo { } #endif /* CONFIG_CRASH_DUMP */ @@ -88,7 +88,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> } #ifdef CONFIG_NUMA -@@ -186,6 +194,9 @@ static void __init zone_sizes_init(unsig +@@ -180,6 +188,9 @@ static void __init zone_sizes_init(unsig { unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; @@ -98,7 +98,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> #ifdef CONFIG_ZONE_DMA32 max_zone_pfns[ZONE_DMA32] = PFN_DOWN(arm64_dma32_phys_limit); #endif -@@ -201,13 +212,18 @@ static void __init zone_sizes_init(unsig +@@ -195,13 +206,18 @@ static void __init zone_sizes_init(unsig struct memblock_region *reg; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; unsigned long max_dma32 = min; @@ -119,7 +119,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> #endif zone_size[ZONE_NORMAL] = max - max_dma32; -@@ -219,11 +235,17 @@ static void __init zone_sizes_init(unsig +@@ -213,11 +229,17 @@ static void __init zone_sizes_init(unsig if (start >= max) continue; @@ -140,7 +140,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> } #endif if (end > max_dma32) { -@@ -418,9 +440,11 @@ void __init arm64_memblock_init(void) +@@ -408,9 +430,11 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); @@ -154,7 +154,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> else arm64_dma32_phys_limit = PHYS_MASK + 1; -@@ -430,7 +454,7 @@ void __init arm64_memblock_init(void) +@@ -420,7 +444,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; @@ -163,7 +163,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> } void __init bootmem_init(void) -@@ -534,7 +558,7 @@ static void __init free_unused_memmap(vo +@@ -524,7 +548,7 @@ static void __init free_unused_memmap(vo void __init mem_init(void) { if (swiotlb_force == SWIOTLB_FORCE || diff --git a/target/linux/bcm27xx/patches-5.4/950-0445-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch b/target/linux/bcm27xx/patches-5.4/950-0445-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch index c3ae61c993..ab04d64b72 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0445-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0445-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch @@ -50,7 +50,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> /* * We need to be able to catch inadvertent references to memstart_addr * that occur (potentially in generic code) before arm64_memblock_init() -@@ -440,8 +443,10 @@ void __init arm64_memblock_init(void) +@@ -430,8 +433,10 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); diff --git a/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch b/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch index 137a2fa4a0..e1a340ec91 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch @@ -24,7 +24,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -91,7 +91,7 @@ static void __init reserve_crashkernel(v +@@ -85,7 +85,7 @@ static void __init reserve_crashkernel(v if (crash_base == 0) { /* Current arm64 boot protocol requires 2MB alignment */ @@ -33,7 +33,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> crash_size, SZ_2M); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", -@@ -459,7 +459,7 @@ void __init arm64_memblock_init(void) +@@ -449,7 +449,7 @@ void __init arm64_memblock_init(void) high_memory = __va(memblock_end_of_DRAM() - 1) + 1; diff --git a/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch b/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch index 654864d52d..0f4f09ee1c 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch @@ -50,7 +50,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -214,15 +214,14 @@ static void __init zone_sizes_init(unsig +@@ -208,15 +208,14 @@ static void __init zone_sizes_init(unsig { struct memblock_region *reg; unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; @@ -69,7 +69,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> #endif #ifdef CONFIG_ZONE_DMA32 max_dma32 = PFN_DOWN(arm64_dma32_phys_limit); -@@ -236,25 +235,23 @@ static void __init zone_sizes_init(unsig +@@ -230,25 +229,23 @@ static void __init zone_sizes_init(unsig unsigned long start = memblock_region_memory_base_pfn(reg); unsigned long end = memblock_region_memory_end_pfn(reg); diff --git a/target/linux/layerscape/patches-5.4/303-core-0009-arm64-move-elfcorehdr-reservation-early-for-crash-du.patch b/target/linux/layerscape/patches-5.4/303-core-0009-arm64-move-elfcorehdr-reservation-early-for-crash-du.patch index c6c9801148..d41b160369 100644 --- a/target/linux/layerscape/patches-5.4/303-core-0009-arm64-move-elfcorehdr-reservation-early-for-crash-du.patch +++ b/target/linux/layerscape/patches-5.4/303-core-0009-arm64-move-elfcorehdr-reservation-early-for-crash-du.patch @@ -14,7 +14,7 @@ Signed-off-by: Poonam Aggrwal <poonam.aggrwal@nxp.com> --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c -@@ -416,6 +416,8 @@ void __init arm64_memblock_init(void) +@@ -406,6 +406,8 @@ void __init arm64_memblock_init(void) initrd_end = initrd_start + phys_initrd_size; } @@ -23,7 +23,7 @@ Signed-off-by: Poonam Aggrwal <poonam.aggrwal@nxp.com> early_init_fdt_scan_reserved_mem(); /* 4GB maximum for 32-bit only capable devices */ -@@ -426,8 +428,6 @@ void __init arm64_memblock_init(void) +@@ -416,8 +418,6 @@ void __init arm64_memblock_init(void) reserve_crashkernel(); diff --git a/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch b/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch index c680de5938..00d2b30d58 100644 --- a/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch +++ b/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch @@ -20,7 +20,7 @@ Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c -@@ -1253,7 +1253,7 @@ static int mvebu_gpio_probe(struct platf +@@ -1248,7 +1248,7 @@ static int mvebu_gpio_probe(struct platf * pins. */ for (i = 0; i < 4; i++) { |