From 82aeae7d94d696a48f0a5248fb69f5dd3c73dce3 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Wed, 26 Sep 2018 02:12:31 -0700 Subject: Linux v4.18.10 --- arm-tegra-fix-nouveau-crash.patch | 64 --------------------------------------- kernel.spec | 7 +++-- sources | 2 +- 3 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 arm-tegra-fix-nouveau-crash.patch diff --git a/arm-tegra-fix-nouveau-crash.patch b/arm-tegra-fix-nouveau-crash.patch deleted file mode 100644 index d1d7c61a6..000000000 --- a/arm-tegra-fix-nouveau-crash.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 369971aa0101c4cfb84dacaaaa1b5cc5790c14ff Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Wed, 11 Apr 2018 10:34:17 +0200 -Subject: [PATCH] drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping - -Depending on the kernel configuration, early ARM architecture setup code -may have attached the GPU to a DMA/IOMMU mapping that transparently uses -the IOMMU to back the DMA API. Tegra requires special handling for IOMMU -backed buffers (a special bit in the GPU's MMU page tables indicates the -memory path to take: via the SMMU or directly to the memory controller). -Transparently backing DMA memory with an IOMMU prevents Nouveau from -properly handling such memory accesses and causes memory access faults. - -As a side-note: buffers other than those allocated in instance memory -don't need to be physically contiguous from the GPU's perspective since -the GPU can map them into contiguous buffers using its own MMU. Mapping -these buffers through the IOMMU is unnecessary and will even lead to -performance degradation because of the additional translation. - -Signed-off-by: Thierry Reding ---- - drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c -index 1f07999aea1d..ac7706f56f6f 100644 ---- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c -+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c -@@ -19,6 +19,11 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+ -+#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) -+#include -+#endif -+ - #include - #ifdef CONFIG_NOUVEAU_PLATFORM_DRIVER - #include "priv.h" -@@ -105,6 +110,20 @@ nvkm_device_tegra_probe_iommu(struct nvkm_device_tegra *tdev) - unsigned long pgsize_bitmap; - int ret; - -+#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) -+ if (dev->archdata.mapping) { -+ struct dma_iommu_mapping *mapping = to_dma_iommu_mapping(dev); -+ -+ arm_iommu_release_mapping(mapping); -+ arm_iommu_detach_device(dev); -+ -+ if (dev->archdata.dma_coherent) -+ set_dma_ops(dev, &arm_coherent_dma_ops); -+ else -+ set_dma_ops(dev, &arm_dma_ops); -+ } -+#endif -+ - if (!tdev->func->iommu_bit) - return; - --- -2.16.3 - diff --git a/kernel.spec b/kernel.spec index 97a98a3ea..65fac6610 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 9 +%define stable_update 10 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -590,8 +590,6 @@ Patch305: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861 Patch306: arm-sdhci-esdhc-imx-fixes.patch -Patch307: arm-tegra-fix-nouveau-crash.patch - # https://patchwork.kernel.org/patch/10539291/ Patch308: mmc-sunxi-allow-3.3V-DDR-when-DDR-is-available.patch # https://patchwork.kernel.org/patch/10540521/ @@ -1883,6 +1881,9 @@ fi # # %changelog +* Wed Sep 26 2018 Laura Abbott - 4.18.10-200 +- Linux v4.18.10 + * Wed Sep 26 2018 Laura Abbott - Fix powerpc IPv6 (rhbz 1628394) diff --git a/sources b/sources index bfb351316..e56e0a5d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 -SHA512 (patch-4.18.9.xz) = 1ef82764f93a96e759a1b969ce965c0981f86a5d6e2376e7f637209ea1114ce2636bb41971e616973ce8a55692999086f75e465dd96deb77876e9a2fd6ceddc4 +SHA512 (patch-4.18.10.xz) = ff00f5b50921654494bf0cc290a82871bf3f053dc170abbde906499e3bffe1f368a94a6c09196ded618ae46fe2fa74e05b4e594f31ccc08a7071efa1e9ec4a68 -- cgit