Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2018-10-31 13:27:38 +0100
committerMichal Suchanek <msuchanek@suse.de>2018-10-31 23:28:42 +0100
commitedfa6fc416520d0ef4843629bf7794f2c8adfba1 (patch)
treeeaf09b75fa41dbd5d6df1f8d7bdaf27380a50720
parent37fbbd25e05b842f5335834879471ecd1cbbd5ae (diff)
powerpc/powernv/ioda: Finish removing explicit max window size
check (bsc#1061840).
-rw-r--r--patches.arch/powerpc-powernv-ioda-Finish-removing-explicit-max-wi.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.arch/powerpc-powernv-ioda-Finish-removing-explicit-max-wi.patch b/patches.arch/powerpc-powernv-ioda-Finish-removing-explicit-max-wi.patch
new file mode 100644
index 0000000000..39b9c74ea4
--- /dev/null
+++ b/patches.arch/powerpc-powernv-ioda-Finish-removing-explicit-max-wi.patch
@@ -0,0 +1,37 @@
+From ae677ff02f2ddb0980953efd4afed1c90a56c88f Mon Sep 17 00:00:00 2001
+From: Alexey Kardashevskiy <aik@ozlabs.ru>
+Date: Thu, 18 Jan 2018 13:51:03 +1100
+Subject: [PATCH] powerpc/powernv/ioda: Finish removing explicit max window
+ size check
+
+References: bsc#1061840
+Patch-mainline: v4.16-rc1
+Git-commit: ae677ff02f2ddb0980953efd4afed1c90a56c88f
+
+9003a2498 removed checn from the DMA window pages allocator, however
+the VFIO driver tests limits before doing so by calling
+the get_table_size hook which was left behind; this fixes it.
+
+Fixes: 9003a2498 "powerpc/powernv/ioda: Remove explicit max window size check"
+Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Acked-by: Michal Suchanek <msuchanek@suse.de>
+---
+ arch/powerpc/platforms/powernv/pci-ioda.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
+index b9146d5aef81..1069f9cb273a 100644
+--- a/arch/powerpc/platforms/powernv/pci-ioda.c
++++ b/arch/powerpc/platforms/powernv/pci-ioda.c
+@@ -2572,7 +2572,6 @@ static unsigned long pnv_pci_ioda2_get_table_size(__u32 page_shift,
+ unsigned long direct_table_size;
+
+ if (!levels || (levels > POWERNV_IOMMU_MAX_LEVELS) ||
+- (window_size > memory_hotplug_max()) ||
+ !is_power_of_2(window_size))
+ return 0;
+
+--
+2.13.7
+
diff --git a/series.conf b/series.conf
index 661518573e..313aee125c 100644
--- a/series.conf
+++ b/series.conf
@@ -12825,6 +12825,7 @@
patches.arch/powerpc-Enable-pkey-subsystem.patch
patches.arch/powerpc-sys_pkey_alloc-and-sys_pkey_free-system-call.patch
patches.arch/powerpc-sys_pkey_mprotect-system-call.patch
+ patches.arch/powerpc-powernv-ioda-Finish-removing-explicit-max-wi.patch
patches.arch/powerpc-firmware-Add-definitions-for-new-drc-info-fi.patch
patches.arch/powerpc-xive-Move-definition-of-ESB-bits.patch
patches.arch/powerpc-xive-Add-interrupt-flag-to-disable-automatic.patch