Skip to content

Commit 044af1b

Browse files
mpegregkh
authored andcommitted
powerpc/pseries: Fix IBM_ARCH_VEC_NRCORES_OFFSET since POWER8NVL was added
commit 2c2a63e upstream. The recent commit 7cc8510 ("powerpc/pseries: Add POWER8NVL support to ibm,client-architecture-support call") added a new PVR mask & value to the start of the ibm_architecture_vec[] array. However it missed the fact that further down in the array, we hard code the offset of one of the fields, and then at boot use that value to patch the value in the array. This means every update to the array must also update the #define, ugh. This means that on pseries machines we will misreport to firmware the number of cores we support, by a factor of threads_per_core. Fix it for now by updating the #define. Fixes: 7cc8510 ("powerpc/pseries: Add POWER8NVL support to ibm,client-architecture-support call") Signed-off-by: Michael Ellerman <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3abd809 commit 044af1b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/powerpc/kernel/prom_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ unsigned char ibm_architecture_vec[] = {
718718
* must match by the macro below. Update the definition if
719719
* the structure layout changes.
720720
*/
721-
#define IBM_ARCH_VEC_NRCORES_OFFSET 125
721+
#define IBM_ARCH_VEC_NRCORES_OFFSET 133
722722
W(NR_CPUS), /* number of cores supported */
723723
0,
724724
0,

0 commit comments

Comments
 (0)