powerpc/sstep: Cover new VSX instructions under CONFIG_VSX

Recently added Power10 prefixed VSX instruction are included
unconditionally in the kernel. If they are executed on a
machine without VSX support, it might create issues. Fix that.
Also fix one mnemonics spelling mistake in comment.

Fixes: 50b80a12e4cc ("powerpc sstep: Add support for prefixed load/stores")
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201011050908.72173-3-ravi.bangoria@linux.ibm.com

diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index bf2cd3d42125dc0bb95ee9207e5b4d2c56fa476f..b18bce1a209fad3b9bb9287133a058222fc502c5 100644 (file)
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -2757,6 +2757,7 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
                        case 41:        /* plwa */
                                op->type = MKOP(LOAD, PREFIXED | SIGNEXT, 4);
                                break;
+#ifdef CONFIG_VSX
                        case 42:        /* plxsd */
                                op->reg = rd + 32;
                                op->type = MKOP(LOAD_VSX, PREFIXED, 8);
@@ -2797,13 +2798,14 @@ int analyse_instr(struct instruction_op *op, const struct pt_regs *regs,
                                op->element_size = 16;
                                op->vsx_flags = VSX_CHECK_VEC;
                                break;
+#endif /* CONFIG_VSX */
                        case 56:        /* plq */
                                op->type = MKOP(LOAD, PREFIXED, 16);
                                break;
                        case 57:        /* pld */
                                op->type = MKOP(LOAD, PREFIXED, 8);
                                break;
-                       case 60:        /* stq */
+                       case 60:        /* pstq */
                                op->type = MKOP(STORE, PREFIXED, 16);
                                break;
                        case 61:        /* pstd */