From a37098a2d013f89a97ee001d5fb0980e538d2dee Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Thu, 17 Jan 2019 01:01:18 +0200 Subject: kernel: bump 4.19 to 4.19.16 Refresh patches. Remove upstreamed patches: - backport/096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch - backport/096-v4.20-netfilter-ipv6-Preserve-link-scope-traffic-original-.patch - backport/424-v4.20-net-dsa-fix-88e6060-roaming.patch - hack/100-mtd-rawnand-qcom-fix-memory-corruption-that-causes-p.patch - pending/510-f2fs-fix-sanity_check_raw_super-on-big-endian-machines.patch Update patch that no longer applies: - backport/343-netfilter-nft_flow_offload-handle-netdevice-events-f.patch Compile-tested: mesongx Runtime-tested: mesongx Signed-off-by: Stijn Tintel --- .../010-dmaengine-dw-dmac-implement-dma-prot.patch | 24 +++++----------------- .../201-add-amcc-apollo3g-support.patch | 2 +- .../202-add-netgear-wndr4700-support.patch | 2 +- ...d-firmware-loader-for-uPD720201-and-uPD72.patch | 6 +++--- .../802-usb-xhci-force-msi-renesas-xhci.patch | 8 ++++---- 5 files changed, 14 insertions(+), 28 deletions(-) (limited to 'target/linux/apm821xx') diff --git a/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch b/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch index 3c4edff3eb..86da6fcd89 100644 --- a/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch +++ b/target/linux/apm821xx/patches-4.19/010-dmaengine-dw-dmac-implement-dma-prot.patch @@ -55,11 +55,9 @@ Signed-off-by: Christian Lamparter Signed-off-by: Vinod Koul --- -diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c -index d0c3e50b39fb..2c5ca1961256 100644 --- a/drivers/dma/dw/core.c +++ b/drivers/dma/dw/core.c -@@ -160,12 +160,14 @@ static void dwc_initialize_chan_idma32(struct dw_dma_chan *dwc) +@@ -160,12 +160,14 @@ static void dwc_initialize_chan_idma32(s static void dwc_initialize_chan_dw(struct dw_dma_chan *dwc) { @@ -74,11 +72,9 @@ index d0c3e50b39fb..2c5ca1961256 100644 /* Set polarity of handshake interface */ cfglo |= hs_polarity ? DWC_CFGL_HS_DST_POL | DWC_CFGL_HS_SRC_POL : 0; -diff --git a/drivers/dma/dw/platform.c b/drivers/dma/dw/platform.c -index f01b2c173fa6..31ff8113c3de 100644 --- a/drivers/dma/dw/platform.c +++ b/drivers/dma/dw/platform.c -@@ -162,6 +162,12 @@ dw_dma_parse_dt(struct platform_device *pdev) +@@ -162,6 +162,12 @@ dw_dma_parse_dt(struct platform_device * pdata->multi_block[tmp] = 1; } @@ -91,8 +87,6 @@ index f01b2c173fa6..31ff8113c3de 100644 return pdata; } #else -diff --git a/drivers/dma/dw/regs.h b/drivers/dma/dw/regs.h -index 09e7dfdbb790..646c9c960c07 100644 --- a/drivers/dma/dw/regs.h +++ b/drivers/dma/dw/regs.h @@ -200,6 +200,10 @@ enum dw_dma_msize { @@ -106,11 +100,9 @@ index 09e7dfdbb790..646c9c960c07 100644 #define DWC_CFGH_DS_UPD_EN (1 << 5) #define DWC_CFGH_SS_UPD_EN (1 << 6) #define DWC_CFGH_SRC_PER(x) ((x) << 7) -diff --git a/include/linux/platform_data/dma-dw.h b/include/linux/platform_data/dma-dw.h -index 896cb71a382c..1a1d58ebffbf 100644 --- a/include/linux/platform_data/dma-dw.h +++ b/include/linux/platform_data/dma-dw.h -@@ -49,6 +49,7 @@ struct dw_dma_slave { +@@ -49,6 +49,7 @@ struct dw_dma_slave { * @data_width: Maximum data width supported by hardware per AHB master * (in bytes, power of 2) * @multi_block: Multi block transfers supported by hardware per channel. @@ -118,7 +110,7 @@ index 896cb71a382c..1a1d58ebffbf 100644 */ struct dw_dma_platform_data { unsigned int nr_channels; -@@ -65,6 +66,11 @@ struct dw_dma_platform_data { +@@ -65,6 +66,11 @@ struct dw_dma_platform_data { unsigned char nr_masters; unsigned char data_width[DW_DMA_MAX_NR_MASTERS]; unsigned char multi_block[DW_DMA_MAX_NR_CHANNELS]; @@ -130,12 +122,9 @@ index 896cb71a382c..1a1d58ebffbf 100644 }; #endif /* _PLATFORM_DATA_DMA_DW_H */ -diff --git a/include/dt-bindings/dma/dw-dmac.h b/include/dt-bindings/dma/dw-dmac.h -new file mode 100644 -index 000000000000..d1ca705c95b3 --- /dev/null +++ b/include/dt-bindings/dma/dw-dmac.h -@@ -0,0 +1,14 @@ +@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ + +#ifndef __DT_BINDINGS_DMA_DW_DMAC_H__ @@ -150,6 +139,3 @@ index 000000000000..d1ca705c95b3 +#define DW_DMAC_HPROT3_CACHEABLE (1 << 2) /* DMA is cacheable */ + +#endif /* __DT_BINDINGS_DMA_DW_DMAC_H__ */ --- -cgit 1.2-0.3.lf.el7 - diff --git a/target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch b/target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch index 18982392d4..18f4c72de8 100644 --- a/target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch +++ b/target/linux/apm821xx/patches-4.19/201-add-amcc-apollo3g-support.patch @@ -1,6 +1,6 @@ --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig -@@ -144,6 +144,17 @@ config CANYONLANDS +@@ -131,6 +131,17 @@ config CANYONLANDS help This option enables support for the AMCC PPC460EX evaluation board. diff --git a/target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch b/target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch index 77294a8cbd..536a74ef00 100644 --- a/target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch +++ b/target/linux/apm821xx/patches-4.19/202-add-netgear-wndr4700-support.patch @@ -10,7 +10,7 @@ obj-$(CONFIG_WARP) += warp.o --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig -@@ -273,6 +273,19 @@ config ICON +@@ -260,6 +260,19 @@ config ICON help This option enables support for the AMCC PPC440SPe evaluation board. 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 b892674c66..630aaca7e0 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" -@@ -248,6 +250,458 @@ static void xhci_pme_acpi_rtd3_enable(st +@@ -261,6 +263,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) { -@@ -286,6 +740,22 @@ static int xhci_pci_probe(struct pci_dev +@@ -299,6 +753,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 */ -@@ -347,6 +817,16 @@ static void xhci_pci_remove(struct pci_d +@@ -360,6 +830,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 2fba6dcca1..90fb27935a 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 -@@ -206,6 +206,7 @@ static void xhci_pci_quirks(struct devic +@@ -214,6 +214,7 @@ static void xhci_pci_quirks(struct devic pdev->device == 0x0015) { xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_ZERO_64B_REGS; @@ -43,11 +43,11 @@ produce a noisy warning. hcd->msi_enabled = 1; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1857,6 +1857,7 @@ struct xhci_hcd { +@@ -1859,6 +1859,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 */ +#define XHCI_FORCE_MSI (1 << 24) unsigned hw_lpm_support:1; - /* cached usb2 extened protocol capabilites */ - u32 *ext_caps; + /* Broken Suspend flag for SNPS Suspend resume issue */ + unsigned broken_suspend:1; -- cgit v1.2.3