diff mbox series

[FIX] powerpc/pseries: Fix vector5 in ibm architecture vector table

Message ID 20180306081432.3653-1-bharata@linux.vnet.ibm.com (mailing list archive)
State Accepted
Commit b0c41b8b6e43120d7c35e4709508a3d90a09646e
Headers show
Series [FIX] powerpc/pseries: Fix vector5 in ibm architecture vector table | expand

Commit Message

Bharata B Rao March 6, 2018, 8:14 a.m. UTC
With ibm,dynamic-memory-v2 and ibm,drc-info coming around the
same time, byte22 in vector5 of ibm architecture vector table
got set twice separately. The end result is that guest kernel
isn't advertising support for ibm,dynamic-memory-v2.

Fix this by removing the duplicate assignment of byte22.

Fixes: 02ef6dd8109b5 (powerpc: Enable support for ibm,drc-info devtree property)
Fixes: c7a3275e0f9e4 (powerpc/pseries: Revert support for ibm,drc-info devtree property)

Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>
---
 arch/powerpc/kernel/prom_init.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Michael Ellerman March 6, 2018, 1:29 p.m. UTC | #1
On Tue, 2018-03-06 at 08:14:32 UTC, Bharata B Rao wrote:
> With ibm,dynamic-memory-v2 and ibm,drc-info coming around the
> same time, byte22 in vector5 of ibm architecture vector table
> got set twice separately. The end result is that guest kernel
> isn't advertising support for ibm,dynamic-memory-v2.
> 
> Fix this by removing the duplicate assignment of byte22.
> 
> Fixes: 02ef6dd8109b5 (powerpc: Enable support for ibm,drc-info devtree property)
> Fixes: c7a3275e0f9e4 (powerpc/pseries: Revert support for ibm,drc-info devtree property)
> 
> Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/b0c41b8b6e43120d7c35e4709508a3

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index d22c41c26bb3..acf4b2e0530c 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -874,7 +874,6 @@  struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
 		.mmu = 0,
 		.hash_ext = 0,
 		.radix_ext = 0,
-		.byte22 = 0,
 	},
 
 	/* option vector 6: IBM PAPR hints */