mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 09:12:39 +00:00
ec6293febc
Ran update_kernel.sh in a fresh clone without any existing toolchains.
Manually rebased:
pending-5.4/611-netfilter_match_bypass_default_table.patch
The upstream change affecting this patch is the revert of an earlier
kernel commit. Therefore, we just revert our corresponding changes
in [1].
Build system: x86_64
Build-tested: ipq806x/R7800
[1] 9b1b89229f ("kernel: bump 5.4 to 5.4.86")
Signed-off-by: John Audia <graysky@archlinux.us>
[adjust manually rebased patch, add explanation]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
151 lines
4.2 KiB
Diff
151 lines
4.2 KiB
Diff
From 18219eaa3f37f375584789b95876967e97b8da3e Mon Sep 17 00:00:00 2001
|
|
From: Ran Wang <ran.wang_1@nxp.com>
|
|
Date: Wed, 25 Dec 2019 14:00:27 +0800
|
|
Subject: [PATCH] arm64: dts: layerscape: apply dma-coherent for dwc3 nodes
|
|
|
|
Since dwc3 cache type has been set to cacheable, apply dma-coherent to
|
|
all dwc3 nodes accordingly.
|
|
|
|
Note: For LS1043A and LS1046A, since QE-HDLC still doesn't support
|
|
dma-coherent, we cannot directly revert cd1a4f3c (sdk: dts: ls104x move
|
|
dma-coherent from soc to its child nodes) to recover dma-coherent for
|
|
soc.
|
|
|
|
Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 1 +
|
|
arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 ++
|
|
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +++
|
|
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 +++
|
|
arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 ++
|
|
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 ++
|
|
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 1 +
|
|
7 files changed, 14 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
|
|
@@ -454,6 +454,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
sata: sata@3200000 {
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
|
|
@@ -381,6 +381,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,quirk-frame-length-adjustment = <0x20>;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
usb1: usb@3110000 {
|
|
@@ -391,6 +392,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,quirk-frame-length-adjustment = <0x20>;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
sata: sata@3200000 {
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
@@ -706,6 +706,7 @@
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
configure-gfladj;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
usb1: usb3@3000000 {
|
|
@@ -720,6 +721,7 @@
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
configure-gfladj;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
usb2: usb3@3100000 {
|
|
@@ -734,6 +736,7 @@
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
configure-gfladj;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
sata: sata@3200000 {
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
@@ -604,6 +604,7 @@
|
|
usb3-lpm-capable;
|
|
snps,dis-u1u2-when-u3-quirk;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
usb1: usb@3000000 {
|
|
@@ -617,6 +618,7 @@
|
|
usb3-lpm-capable;
|
|
snps,dis-u1u2-when-u3-quirk;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
usb2: usb@3100000 {
|
|
@@ -630,6 +632,7 @@
|
|
usb3-lpm-capable;
|
|
snps,dis-u1u2-when-u3-quirk;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
sata: sata@3200000 {
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
|
|
@@ -402,6 +402,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -414,6 +415,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
status = "disabled";
|
|
};
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
|
|
@@ -738,6 +738,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
usb1: usb3@3110000 {
|
|
@@ -750,6 +751,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
};
|
|
|
|
ccn@4000000 {
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
@@ -874,6 +874,7 @@
|
|
snps,dis_rxdet_inp3_quirk;
|
|
snps,incr-burst-type-adjustment = <1>, <4>, <8>, <16>;
|
|
snps,host-vbus-glitches;
|
|
+ dma-coherent;
|
|
status = "disabled";
|
|
};
|
|
|