mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 22:18:16 +02: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] 9b1b89229f0e ("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>
68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
From 317d4e577ede33f226d24bd12a8edbaafee22e57 Mon Sep 17 00:00:00 2001
|
|
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
Date: Thu, 17 May 2018 11:56:27 +0300
|
|
Subject: [PATCH] arm64: dts: ls104x: add iommu-map to pci controllers
|
|
|
|
The pci controllers are also behind the smmu so add the iommu-map
|
|
property to reflect this. The bootloader needs to patch the stream id
|
|
ranges to some sane values.
|
|
|
|
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +++
|
|
arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 3 +++
|
|
2 files changed, 6 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
|
|
@@ -808,6 +808,7 @@
|
|
#size-cells = <2>;
|
|
device_type = "pci";
|
|
dma-coherent;
|
|
+ iommu-map = <0 &smmu 0 1>; /* update by bootloader */
|
|
num-viewport = <6>;
|
|
bus-range = <0x0 0xff>;
|
|
ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */
|
|
@@ -834,6 +835,7 @@
|
|
#size-cells = <2>;
|
|
device_type = "pci";
|
|
dma-coherent;
|
|
+ iommu-map = <0 &smmu 0 1>; /* update by bootloader */
|
|
num-viewport = <6>;
|
|
bus-range = <0x0 0xff>;
|
|
ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */
|
|
@@ -860,6 +862,7 @@
|
|
#size-cells = <2>;
|
|
device_type = "pci";
|
|
dma-coherent;
|
|
+ iommu-map = <0 &smmu 0 1>; /* update by bootloader */
|
|
num-viewport = <6>;
|
|
bus-range = <0x0 0xff>;
|
|
ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi
|
|
@@ -716,6 +716,7 @@
|
|
#size-cells = <2>;
|
|
device_type = "pci";
|
|
dma-coherent;
|
|
+ iommu-map = <0 &smmu 0 1>; /* update by bootloader */
|
|
num-viewport = <8>;
|
|
bus-range = <0x0 0xff>;
|
|
ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */
|
|
@@ -752,6 +753,7 @@
|
|
#size-cells = <2>;
|
|
device_type = "pci";
|
|
dma-coherent;
|
|
+ iommu-map = <0 &smmu 0 1>; /* update by bootloader */
|
|
num-viewport = <8>;
|
|
bus-range = <0x0 0xff>;
|
|
ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */
|
|
@@ -788,6 +790,7 @@
|
|
#size-cells = <2>;
|
|
device_type = "pci";
|
|
dma-coherent;
|
|
+ iommu-map = <0 &smmu 0 1>; /* update by bootloader */
|
|
num-viewport = <8>;
|
|
bus-range = <0x0 0xff>;
|
|
ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */
|