From 2c81b1696400c60fdb4316ae447f789087781359 Mon Sep 17 00:00:00 2001 From: John Audia Date: Wed, 17 Mar 2021 14:22:56 -0400 Subject: kernel: bump 5.4 to 5.4.106 Ran update_kernel.sh in a fresh clone without any existing toolchains. Manually rebased: bcm27xx/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch layerscape/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia [remove accidental whitespace edit] Signed-off-by: Adrian Schmutzler --- .../950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch | 2 +- ...-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch | 4 ++-- ...-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch | 4 ++-- ...950-0313-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch | 2 +- ...-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch | 6 +++--- .../950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch | 6 +++--- ...50-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch | 2 +- .../950-0454-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch | 2 +- ...50-0625-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch | 2 +- .../950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) (limited to 'target/linux/bcm27xx/patches-5.4') diff --git a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index b2a8279da2..83a2341e1b 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -254,6 +254,10 @@ static void xhci_pci_quirks(struct devic +@@ -255,6 +255,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; diff --git a/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index 5c241536dd..f6eac15a53 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0219-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1456,6 +1456,103 @@ command_cleanup: +@@ -1464,6 +1464,103 @@ command_cleanup: } /* @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5337,6 +5434,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5345,6 +5442,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index a125fdcb47..db69423d33 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -255,8 +255,10 @@ static void xhci_pci_quirks(struct devic +@@ -256,8 +256,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_VIA && @@ -87,4 +87,4 @@ Signed-off-by: Jonathan Bell +#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) #define XHCI_SKIP_PHY_INIT BIT_ULL(37) #define XHCI_DISABLE_SPARSE BIT_ULL(38) - + #define XHCI_NO_SOFT_RETRY BIT_ULL(40) diff --git a/target/linux/bcm27xx/patches-5.4/950-0313-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch b/target/linux/bcm27xx/patches-5.4/950-0313-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch index d36f3eb802..0fb5c12ac3 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0313-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0313-kbuild-Allow-.dtbo-overlays-to-be-built-piecemeal.patch @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell --- a/Makefile +++ b/Makefile -@@ -1261,6 +1261,9 @@ ifneq ($(dtstree),) +@@ -1267,6 +1267,9 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ diff --git a/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch b/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch index df184f53ee..18ed0f50ec 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0435-arm64-rename-variables-used-to-calculate-ZONE_DMA32-.patch @@ -85,7 +85,7 @@ Signed-off-by: Catalin Marinas zhole_size[ZONE_NORMAL] -= normal_end - normal_start; } } -@@ -410,9 +410,9 @@ void __init arm64_memblock_init(void) +@@ -422,9 +422,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 reserve_crashkernel(); -@@ -420,7 +420,7 @@ void __init arm64_memblock_init(void) +@@ -432,7 +432,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 } void __init bootmem_init(void) -@@ -524,7 +524,7 @@ static void __init free_unused_memmap(vo +@@ -536,7 +536,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-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch b/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch index ccb2071f17..92123ceb32 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0436-arm64-use-both-ZONE_DMA-and-ZONE_DMA32.patch @@ -140,7 +140,7 @@ Signed-off-by: Catalin Marinas } #endif if (end > max_dma32) { -@@ -408,9 +430,11 @@ void __init arm64_memblock_init(void) +@@ -420,9 +442,11 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); @@ -154,7 +154,7 @@ Signed-off-by: Catalin Marinas else arm64_dma32_phys_limit = PHYS_MASK + 1; -@@ -420,7 +444,7 @@ void __init arm64_memblock_init(void) +@@ -432,7 +456,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 } void __init bootmem_init(void) -@@ -524,7 +548,7 @@ static void __init free_unused_memmap(vo +@@ -536,7 +560,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-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch b/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch index ab04d64b72..127d4c51d9 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0439-dma-direct-turn-ARCH_ZONE_DMA_BITS-into-a-variable.patch @@ -50,7 +50,7 @@ Signed-off-by: Catalin Marinas /* * We need to be able to catch inadvertent references to memstart_addr * that occur (potentially in generic code) before arm64_memblock_init() -@@ -430,8 +433,10 @@ void __init arm64_memblock_init(void) +@@ -442,8 +445,10 @@ void __init arm64_memblock_init(void) early_init_fdt_scan_reserved_mem(); diff --git a/target/linux/bcm27xx/patches-5.4/950-0454-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch b/target/linux/bcm27xx/patches-5.4/950-0454-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch index b1cd7bffbe..a33cfe7142 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0454-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0454-Kbuild-Allow-.dtbo-overlays-to-be-built-adjust.patch @@ -15,7 +15,7 @@ Signed-off-by: Nataliya Korovkina --- a/Makefile +++ b/Makefile -@@ -1261,7 +1261,7 @@ ifneq ($(dtstree),) +@@ -1267,7 +1267,7 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ diff --git a/target/linux/bcm27xx/patches-5.4/950-0625-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch b/target/linux/bcm27xx/patches-5.4/950-0625-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch index e1a340ec91..ad42f11e53 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0625-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0625-arm64-mm-reserve-CMA-and-crashkernel-in-ZONE_DMA32.patch @@ -33,7 +33,7 @@ Signed-off-by: Catalin Marinas crash_size, SZ_2M); if (crash_base == 0) { pr_warn("cannot allocate crashkernel (size:0x%llx)\n", -@@ -449,7 +449,7 @@ void __init arm64_memblock_init(void) +@@ -461,7 +461,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-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch index 3c89f1348f..12804bae75 100644 --- a/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch +++ b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -258,6 +258,7 @@ static void xhci_pci_quirks(struct devic +@@ -259,6 +259,7 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3483) { xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; @@ -56,6 +56,6 @@ Signed-off-by: Jonathan Bell #define XHCI_SKIP_PHY_INIT BIT_ULL(37) #define XHCI_DISABLE_SPARSE BIT_ULL(38) +#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(39) + #define XHCI_NO_SOFT_RETRY BIT_ULL(40) unsigned int num_active_eps; - unsigned int limit_active_eps; -- cgit v1.2.3