From 488fa50d9f89da94cf8e122bd6dcc9e30e23c7ef Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 8 Nov 2020 03:24:12 +0800 Subject: [PATCH] kernel: bump 4.19 to 4.19.155 Resolve conflicted: - bcm27xx/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch - bcm53xx/180-usb-xhci-add-support-for-performing-fake-doorbell.patch Refreshed all patches. Signed-off-by: CN_SZTL --- include/kernel-version.mk | 4 ++-- ...i-add-firmware-loader-for-uPD720201-and-uPD72.patch | 6 +++--- .../802-usb-xhci-force-msi-renesas-xhci.patch | 4 ++-- ...amba_pl011-Don-t-use-DT-aliases-for-numbering.patch | 2 +- .../950-0034-amba_pl011-Round-input-clock-up.patch | 10 +++++----- ...mba_pl011-Insert-mb-for-correct-FIFO-handling.patch | 2 +- ...ba_pl011-Add-cts-event-workaround-DT-property.patch | 2 +- ...50-0448-tty-amba-pl011-allow-shared-interrupt.patch | 2 +- ...usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch | 2 +- ...plement-xhci_fixup_endpoint-for-interval-adju.patch | 4 ++-- ...ideodev2.h-add-new-capabilities-for-buffer-ty.patch | 6 +++--- ...-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch | 2 +- ...y-amba-pl011-Make-TX-optimisation-conditional.patch | 10 +++++----- ...d-quirk-for-host-controllers-that-don-t-updat.patch | 4 ++-- ...0-0795-tty-amba-pl011-Add-un-throttle-support.patch | 4 ++-- ...y-amba-pl011-Avoid-rare-write-when-full-error.patch | 2 +- ...xhci-add-support-for-performing-fake-doorbell.patch | 2 +- target/linux/generic/hack-4.19/204-module_strip.patch | 2 +- target/linux/generic/hack-4.19/930-crashlog.patch | 2 +- .../pending-4.19/203-kallsyms_uncompressed.patch | 2 +- ...-Enable-kernel-XZ-compression-option-on-PPC_8.patch | 2 +- .../generic/pending-4.19/920-mangle_bootargs.patch | 2 +- ...-generic-Mangle-bootloader-s-kernel-arguments.patch | 2 +- .../102-powerpc-add-cmdline-override.patch | 2 +- ...06-mvebu-Mangle-bootloader-s-kernel-arguments.patch | 2 +- .../patches-4.19/110-er200-ethernet_probe_order.patch | 4 ++-- 26 files changed, 44 insertions(+), 44 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d753dcd1f7..09cdf1fe70 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.9 = .241 LINUX_VERSION-4.14 = .204 -LINUX_VERSION-4.19 = .154 +LINUX_VERSION-4.19 = .155 LINUX_KERNEL_HASH-4.9.241 = c4c6d04f91d881e68524bda6062b5c1835f285bd03344bf8f2eaeef3394bb32c LINUX_KERNEL_HASH-4.14.204 = 9e832899ec75dbfce393c9f7a07df24183b28f0bb95ad4dd8b1fa027bc668ad9 -LINUX_KERNEL_HASH-4.19.154 = 698c908c846b9ba2ba545cd229a67571fe4de18bb5547429a00d786abe556646 +LINUX_KERNEL_HASH-4.19.155 = cbc648f5405cb2b554b7a0f23885742d9969a11d22692287ee756adf940a48d2 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/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch b/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch index 950c810da3..8939fc35cf 100644 --- a/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch +++ b/target/linux/apm821xx/patches-4.19/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch @@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter #include "xhci.h" #include "xhci-trace.h" -@@ -272,6 +274,458 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -277,6 +279,458 @@ static void xhci_pme_acpi_rtd3_enable(st static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } #endif /* CONFIG_ACPI */ @@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter /* called during probe() after chip reset completes */ static int xhci_pci_setup(struct usb_hcd *hcd) { -@@ -313,6 +767,22 @@ static int xhci_pci_probe(struct pci_dev +@@ -318,6 +772,22 @@ static int xhci_pci_probe(struct pci_dev struct hc_driver *driver; struct usb_hcd *hcd; @@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter driver = (struct hc_driver *)id->driver_data; /* Prevent runtime suspending between USB-2 and USB-3 initialization */ -@@ -371,6 +841,16 @@ static void xhci_pci_remove(struct pci_d +@@ -376,6 +846,16 @@ static void xhci_pci_remove(struct pci_d { struct xhci_hcd *xhci; diff --git a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch index 3f58377d4e..48e67762f3 100644 --- a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch @@ -13,7 +13,7 @@ produce a noisy warning. --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -221,6 +221,7 @@ static void xhci_pci_quirks(struct devic +@@ -226,6 +226,7 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x0015) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_ZERO_64B_REGS; @@ -43,7 +43,7 @@ produce a noisy warning. hcd->msi_enabled = 1; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1883,6 +1883,7 @@ struct xhci_hcd { +@@ -1884,6 +1884,7 @@ struct xhci_hcd { /* support xHCI 0.96 spec USB2 software LPM */ unsigned sw_lpm_support:1; /* support xHCI 1.0 spec USB2 hardware LPM */ diff --git a/target/linux/bcm27xx/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch b/target/linux/bcm27xx/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch index d5d9056ac9..2e11030e98 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0033-amba_pl011-Don-t-use-DT-aliases-for-numbering.patch @@ -14,7 +14,7 @@ use the same logic. --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2575,7 +2575,12 @@ static int pl011_setup_port(struct devic +@@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct devic if (IS_ERR(base)) return PTR_ERR(base); diff --git a/target/linux/bcm27xx/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch b/target/linux/bcm27xx/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch index 48b475a198..15673384a6 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0034-amba_pl011-Round-input-clock-up.patch @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1650,6 +1650,23 @@ static void pl011_put_poll_char(struct u +@@ -1653,6 +1653,23 @@ static void pl011_put_poll_char(struct u #endif /* CONFIG_CONSOLE_POLL */ @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell static int pl011_hwinit(struct uart_port *port) { struct uart_amba_port *uap = -@@ -1666,7 +1683,7 @@ static int pl011_hwinit(struct uart_port +@@ -1669,7 +1686,7 @@ static int pl011_hwinit(struct uart_port if (retval) return retval; @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell /* Clear pending error and receive interrupts */ pl011_write(UART011_OEIS | UART011_BEIS | UART011_PEIS | -@@ -2321,7 +2338,7 @@ static int pl011_console_setup(struct co +@@ -2324,7 +2341,7 @@ static int pl011_console_setup(struct co plat->init(); } @@ -68,7 +68,7 @@ Signed-off-by: Phil Elwell if (uap->vendor->fixed_options) { baud = uap->fixed_baud; -@@ -2506,6 +2523,7 @@ static struct uart_driver amba_reg = { +@@ -2509,6 +2526,7 @@ static struct uart_driver amba_reg = { .cons = AMBA_CONSOLE, }; @@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell static int pl011_probe_dt_alias(int index, struct device *dev) { struct device_node *np; -@@ -2537,6 +2555,7 @@ static int pl011_probe_dt_alias(int inde +@@ -2540,6 +2558,7 @@ static int pl011_probe_dt_alias(int inde return ret; } diff --git a/target/linux/bcm27xx/patches-4.19/950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch b/target/linux/bcm27xx/patches-4.19/950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch index 30ac2a883c..3cbe0f7b81 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0035-amba_pl011-Insert-mb-for-correct-FIFO-handling.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1383,6 +1383,7 @@ static bool pl011_tx_char(struct uart_am +@@ -1386,6 +1386,7 @@ static bool pl011_tx_char(struct uart_am return false; /* unable to transmit character */ pl011_write(c, uap, REG_DR); diff --git a/target/linux/bcm27xx/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch b/target/linux/bcm27xx/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch index be399be3c9..241669a0ef 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0036-amba_pl011-Add-cts-event-workaround-DT-property.patch @@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -2662,6 +2662,11 @@ static int pl011_probe(struct amba_devic +@@ -2665,6 +2665,11 @@ static int pl011_probe(struct amba_devic if (IS_ERR(uap->clk)) return PTR_ERR(uap->clk); diff --git a/target/linux/bcm27xx/patches-4.19/950-0448-tty-amba-pl011-allow-shared-interrupt.patch b/target/linux/bcm27xx/patches-4.19/950-0448-tty-amba-pl011-allow-shared-interrupt.patch index 5d316bd314..3b182ef68d 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0448-tty-amba-pl011-allow-shared-interrupt.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0448-tty-amba-pl011-allow-shared-interrupt.patch @@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1733,7 +1733,8 @@ static int pl011_allocate_irq(struct uar +@@ -1736,7 +1736,8 @@ static int pl011_allocate_irq(struct uar { pl011_write(uap->im, uap, REG_IMSC); diff --git a/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch b/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch index 694bf90a00..a8ad8c6137 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0476-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 -@@ -228,6 +228,10 @@ static void xhci_pci_quirks(struct devic +@@ -233,6 +233,10 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x3432) xhci->quirks |= XHCI_BROKEN_STREAMS; diff --git a/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index e97e88d63e..0b592ad646 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0573-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0573-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 -@@ -1428,6 +1428,103 @@ command_cleanup: +@@ -1431,6 +1431,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 */ -@@ -5227,6 +5324,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5230,6 +5327,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-4.19/950-0600-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch b/target/linux/bcm27xx/patches-4.19/950-0600-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch index 8f3e72c447..782ee70fa8 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0600-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0600-media-videodev2.h-add-new-capabilities-for-buffer-ty.patch @@ -98,7 +98,7 @@ Signed-off-by: Mauro Carvalho Chehab ============ --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h -@@ -872,9 +872,16 @@ struct v4l2_requestbuffers { +@@ -871,9 +871,16 @@ struct v4l2_requestbuffers { __u32 count; __u32 type; /* enum v4l2_buf_type */ __u32 memory; /* enum v4l2_memory */ @@ -116,7 +116,7 @@ Signed-off-by: Mauro Carvalho Chehab /** * struct v4l2_plane - plane info for multi-planar buffers * @bytesused: number of bytes occupied by data in the plane (payload) -@@ -2318,6 +2325,7 @@ struct v4l2_dbg_chip_info { +@@ -2317,6 +2324,7 @@ struct v4l2_dbg_chip_info { * return: number of created buffers * @memory: enum v4l2_memory; buffer memory type * @format: frame format, for which buffers are requested @@ -124,7 +124,7 @@ Signed-off-by: Mauro Carvalho Chehab * @reserved: future extensions */ struct v4l2_create_buffers { -@@ -2325,7 +2333,8 @@ struct v4l2_create_buffers { +@@ -2324,7 +2332,8 @@ struct v4l2_create_buffers { __u32 count; __u32 memory; struct v4l2_format format; diff --git a/target/linux/bcm27xx/patches-4.19/950-0602-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch b/target/linux/bcm27xx/patches-4.19/950-0602-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch index 755ca34440..9d9b4d68ef 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0602-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0602-media-vb2-Allow-reqbufs-0-with-in-use-MMAP-buffers.patch @@ -120,7 +120,7 @@ Signed-off-by: Mauro Carvalho Chehab if (q->io_modes & VB2_USERPTR) --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h -@@ -881,6 +881,7 @@ struct v4l2_requestbuffers { +@@ -880,6 +880,7 @@ struct v4l2_requestbuffers { #define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1) #define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2) #define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3) diff --git a/target/linux/bcm27xx/patches-4.19/950-0608-tty-amba-pl011-Make-TX-optimisation-conditional.patch b/target/linux/bcm27xx/patches-4.19/950-0608-tty-amba-pl011-Make-TX-optimisation-conditional.patch index 8d40afb444..dc801a53ce 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0608-tty-amba-pl011-Make-TX-optimisation-conditional.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0608-tty-amba-pl011-Make-TX-optimisation-conditional.patch @@ -42,7 +42,7 @@ Signed-off-by: Phil Elwell #ifdef CONFIG_DMA_ENGINE /* DMA stuff */ bool using_tx_dma; -@@ -813,6 +814,7 @@ __acquires(&uap->port.lock) +@@ -816,6 +817,7 @@ __acquires(&uap->port.lock) if (!uap->using_tx_dma) return; @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell dmaengine_terminate_async(uap->dmatx.chan); if (uap->dmatx.queued) { -@@ -939,6 +941,7 @@ static void pl011_dma_rx_chars(struct ua +@@ -942,6 +944,7 @@ static void pl011_dma_rx_chars(struct ua fifotaken = pl011_fifo_to_tty(uap); } @@ -58,7 +58,7 @@ Signed-off-by: Phil Elwell spin_unlock(&uap->port.lock); dev_vdbg(uap->port.dev, "Took %d chars from DMA buffer and %d chars from the FIFO\n", -@@ -1347,6 +1350,7 @@ __acquires(&uap->port.lock) +@@ -1350,6 +1353,7 @@ __acquires(&uap->port.lock) { pl011_fifo_to_tty(uap); @@ -66,7 +66,7 @@ Signed-off-by: Phil Elwell spin_unlock(&uap->port.lock); tty_flip_buffer_push(&uap->port.state->port); /* -@@ -1482,6 +1486,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1485,6 +1489,7 @@ static irqreturn_t pl011_int(int irq, vo int handled = 0; spin_lock_irqsave(&uap->port.lock, flags); @@ -74,7 +74,7 @@ Signed-off-by: Phil Elwell status = pl011_read(uap, REG_RIS) & uap->im; if (status) { do { -@@ -1501,7 +1506,7 @@ static irqreturn_t pl011_int(int irq, vo +@@ -1504,7 +1509,7 @@ static irqreturn_t pl011_int(int irq, vo UART011_CTSMIS|UART011_RIMIS)) pl011_modem_status(uap); if (status & UART011_TXIS) diff --git a/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index 29dc71d95f..eb01b0f386 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0609-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 -@@ -229,8 +229,10 @@ static void xhci_pci_quirks(struct devic +@@ -234,8 +234,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_VIA && @@ -85,6 +85,6 @@ Signed-off-by: Jonathan Bell #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) +#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36) + #define XHCI_DISABLE_SPARSE BIT_ULL(38) unsigned int num_active_eps; - unsigned int limit_active_eps; diff --git a/target/linux/bcm27xx/patches-4.19/950-0795-tty-amba-pl011-Add-un-throttle-support.patch b/target/linux/bcm27xx/patches-4.19/950-0795-tty-amba-pl011-Add-un-throttle-support.patch index 0ab6cf2fe9..43044de10e 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0795-tty-amba-pl011-Add-un-throttle-support.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0795-tty-amba-pl011-Add-un-throttle-support.patch @@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1323,6 +1323,32 @@ static void pl011_start_tx(struct uart_p +@@ -1326,6 +1326,32 @@ static void pl011_start_tx(struct uart_p pl011_start_tx_pio(uap); } @@ -50,7 +50,7 @@ Signed-off-by: Phil Elwell static void pl011_stop_rx(struct uart_port *port) { struct uart_amba_port *uap = -@@ -2165,6 +2191,8 @@ static const struct uart_ops amba_pl011_ +@@ -2168,6 +2194,8 @@ static const struct uart_ops amba_pl011_ .stop_tx = pl011_stop_tx, .start_tx = pl011_start_tx, .stop_rx = pl011_stop_rx, diff --git a/target/linux/bcm27xx/patches-4.19/950-0806-tty-amba-pl011-Avoid-rare-write-when-full-error.patch b/target/linux/bcm27xx/patches-4.19/950-0806-tty-amba-pl011-Avoid-rare-write-when-full-error.patch index 8deb882a98..b635a0ac59 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0806-tty-amba-pl011-Avoid-rare-write-when-full-error.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0806-tty-amba-pl011-Avoid-rare-write-when-full-error.patch @@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c -@@ -1444,6 +1444,10 @@ static bool pl011_tx_chars(struct uart_a +@@ -1447,6 +1447,10 @@ static bool pl011_tx_chars(struct uart_a if (likely(from_irq) && count-- == 0) break; diff --git a/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index cd4d963966..230d01fc1c 100644 --- a/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -132,6 +132,6 @@ it on BCM4708 family. #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) +#define XHCI_FAKE_DOORBELL BIT_ULL(36) + #define XHCI_DISABLE_SPARSE BIT_ULL(38) unsigned int num_active_eps; - unsigned int limit_active_eps; diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch index 76fe68a315..9b5a3e42b7 100644 --- a/target/linux/generic/hack-4.19/204-module_strip.patch +++ b/target/linux/generic/hack-4.19/204-module_strip.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -1997,6 +1997,13 @@ config TRIM_UNUSED_KSYMS +@@ -1998,6 +1998,13 @@ config TRIM_UNUSED_KSYMS If unsure, or if you need to build out-of-tree modules, say N. diff --git a/target/linux/generic/hack-4.19/930-crashlog.patch b/target/linux/generic/hack-4.19/930-crashlog.patch index bb16f22915..56367e2565 100644 --- a/target/linux/generic/hack-4.19/930-crashlog.patch +++ b/target/linux/generic/hack-4.19/930-crashlog.patch @@ -41,7 +41,7 @@ Signed-off-by: Felix Fietkau +#endif --- a/init/Kconfig +++ b/init/Kconfig -@@ -1049,6 +1049,10 @@ config RELAY +@@ -1050,6 +1050,10 @@ config RELAY If unsure, say N. diff --git a/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch index 9230279fca..13dd1f3106 100644 --- a/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-4.19/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -1149,6 +1149,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1150,6 +1150,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference diff --git a/target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch b/target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch index 035a84b1e4..da858f025a 100644 --- a/target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch +++ b/target/linux/generic/pending-4.19/342-powerpc-Enable-kernel-XZ-compression-option-on-PPC_8.patch @@ -14,7 +14,7 @@ Signed-off-by: Pawel Dembicki --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -197,7 +197,7 @@ config PPC +@@ -198,7 +198,7 @@ config PPC select HAVE_IOREMAP_PROT select HAVE_IRQ_EXIT_ON_IRQ_STACK select HAVE_KERNEL_GZIP diff --git a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch index 0750ab77c2..e4c001bd1f 100644 --- a/target/linux/generic/pending-4.19/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-4.19/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1531,6 +1531,15 @@ config EMBEDDED +@@ -1532,6 +1532,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration. diff --git a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index b7b9c991e0..7738765e64 100644 --- a/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-4.19/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1926,6 +1926,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1928,6 +1928,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. diff --git a/target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch index 7bdbd79538..09365de2be 100644 --- a/target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch +++ b/target/linux/mpc85xx/patches-4.19/102-powerpc-add-cmdline-override.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig -@@ -810,6 +810,14 @@ config CMDLINE_FORCE +@@ -811,6 +811,14 @@ config CMDLINE_FORCE This is useful if you cannot or don't want to change the command-line options your boot loader passes to the kernel. diff --git a/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch index 0cb9e99602..585688c667 100644 --- a/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch @@ -28,7 +28,7 @@ Signed-off-by: Michael Gray --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1926,6 +1926,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1928,6 +1928,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. diff --git a/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch index 93d1e93505..6505875409 100644 --- a/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-4.19/110-er200-ethernet_probe_order.patch @@ -1,6 +1,6 @@ --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c -@@ -670,6 +670,7 @@ static int cvm_oct_probe(struct platform +@@ -671,6 +671,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; @@ -8,7 +8,7 @@ struct device_node *pip; int mtu_overhead = ETH_HLEN + ETH_FCS_LEN; -@@ -793,13 +794,19 @@ static int cvm_oct_probe(struct platform +@@ -794,13 +795,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces();