projects / openwrt / staging / xback.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84fa59b)
kernel: bump 5.4 to 5.4.94
authorJohn Audia <graysky@archlinux.us>
Sat, 30 Jan 2021 14:37:13 +0000 (09:37 -0500)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Mon, 1 Feb 2021 18:10:43 +0000 (19:10 +0100)
All modification made by update_kernel.sh in a fresh clone without
existing toolchains.

Build-tested: bcm27xx/bcm2711, ipq806x/R7800,
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
include/kernel-version.mk patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0440-arm64-mm-use-arm64_dma_phys_limit-instead-of-calling.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0441-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0442-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0445-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0631-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch patch | blob | history
target/linux/bcm27xx/patches-5.4/950-0632-arm64-mm-Fix-initialisation-of-DMA-zones-on-non-NUMA.patch patch | blob | history
target/linux/layerscape/patches-5.4/303-core-0009-arm64-move-elfcorehdr-reservation-early-for-crash-du.patch patch | blob | history
target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch patch | blob | history

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 06860bc0e990e972fa19454f61ffac35646b1378..dd3c1bfbf0201f26785ffb23a18180b957267707 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .93
+LINUX_VERSION-5.4 = .94
 
-LINUX_KERNEL_HASH-5.4.93 = d37449403664cc3b1bac96d0d9a199dbe619885cd899c0ae3108843f42e3d522
+LINUX_KERNEL_HASH-5.4.94 = c23df57db7312e9afa5ce477046e227a3c2153efbe1f29045ad23c820aad2b39
 
 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/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 a90e7f8587c5ab5eee5a0e910ee2f3b07a2cc8d6..c697494f8aee041f3dc393c4b2cdf9183d0e9a48 100644 (file)
--- 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 3039bfe822e825e1736e38e21489fdadab625837..df184f53eee023b82804e4aa605a8656b851e5bd 100644 (file)
--- 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 2397c71af7e4b8e50dc0fc2cb503324a70e25060..ccb2071f17c414d5f442eb87e85d99f8c2b29f83 100644 (file)
--- 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 c3ae61c993f6c414a46d9b9dc8316a3579b14570..ab04d64b72d473722d74f37c7f364764576e7fe0 100644 (file)
--- 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 137a2fa4a027c63e0b6182599631050eaf614c01..e1a340ec9135eb6f86b9e523d7a7ca80418e1fbe 100644 (file)
--- 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 654864d52daefa287416ccef2f807c610eca51e0..0f4f09ee1cec0f5e0c31042041fc6b2cceaae7af 100644 (file)
--- 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 c6c9801148de744a89ec1095c1e8b73daa668328..d41b160369b45b0b770a3e778c1a1190b10ac8d0 100644 (file)
--- 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 c680de593820c96e1efb4514e07d39b5d718f6c3..00d2b30d58ade23fd86f2f2d7cdb9ed98ec82d64 100644 (file)
--- 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++) {
Staging tree of Koen Vandeputte