summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bringmann <mwb@linux.vnet.ibm.com>2018-02-13 21:02:53 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2018-02-22 04:32:41 +0100
commitc7a3275e0f9e461bb8942132aa6914aae59e7103 (patch)
tree7fdcddeb05180cb6ef395a1e40585d9d277c658e
parentpowerpc/pseries: Fix duplicate firmware feature for DRC_INFO (diff)
downloadlinux-c7a3275e0f9e461bb8942132aa6914aae59e7103.tar.xz
linux-c7a3275e0f9e461bb8942132aa6914aae59e7103.zip
powerpc/pseries: Revert support for ibm,drc-info devtree property
This reverts commit 02ef6dd8109b581343ebeb1c4c973513682535d6. The earlier patch tried to enable support for a new property "ibm,drc-info" on powerpc systems. Unfortunately, some errors in the associated patch set break things in some of the DLPAR operations. In particular when attempting to hot-add a new CPU or set of CPUs, the original patch failed to properly calculate the available resources, and aborted the operation. In addition, the original set missed several opportunities to compress and reuse common code. As the associated patch set was meant to provide an optimization of storage and performance of a set of device-tree properties for future systems with large amounts of resources, reverting just restores the previous behavior for existing systems. It seems unnecessary to enable this feature and introduce the consequent problems in the field that it will cause at this time, so please revert it for now until testing of the corrections are finished properly. Fixes: 02ef6dd8109b ("powerpc: Enable support for ibm,drc-info devtree property") Signed-off-by: Michael W. Bringmann <mwb@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/kernel/prom_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index adf044daafd7..d22c41c26bb3 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -874,7 +874,7 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
.mmu = 0,
.hash_ext = 0,
.radix_ext = 0,
- .byte22 = OV5_FEAT(OV5_DRC_INFO),
+ .byte22 = 0,
},
/* option vector 6: IBM PAPR hints */