KVM: PPC: Fix typo on H_DISABLE_AND_GET hcall

On PAPR+ the hcall() on 0x1B0 is called H_DISABLE_AND_GET, but got
defined as H_DISABLE_AND_GETC instead.

This define was introduced with a typo in commit <b13a96cfb055>
("[PATCH] powerpc: Extends HCALL interface for InfiniBand usage"), and was
later used without having the typo noticed.

Signed-off-by: Leonardo Bras <leobras.c@gmail.com>
Acked-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200707004812.190765-1-leobras.c@gmail.com

diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 43486e7..8d7ee3b 100644 (file)
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -237,7 +237,7 @@
 #define H_CREATE_RPT            0x1A4
 #define H_REMOVE_RPT            0x1A8
 #define H_REGISTER_RPAGES       0x1AC
-#define H_DISABLE_AND_GETC      0x1B0
+#define H_DISABLE_AND_GET       0x1B0
 #define H_ERROR_DATA            0x1B4
 #define H_GET_HCA_INFO          0x1B8
 #define H_GET_PERF_COUNT        0x1BC

diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h
index 4a61a97..830a126 100644 (file)
--- a/arch/powerpc/kvm/trace_hv.h
+++ b/arch/powerpc/kvm/trace_hv.h
@@ -89,7 +89,7 @@
        {H_CREATE_RPT,                  "H_CREATE_RPT"}, \
        {H_REMOVE_RPT,                  "H_REMOVE_RPT"}, \
        {H_REGISTER_RPAGES,             "H_REGISTER_RPAGES"}, \
-       {H_DISABLE_AND_GETC,            "H_DISABLE_AND_GETC"}, \
+       {H_DISABLE_AND_GET,             "H_DISABLE_AND_GET"}, \
        {H_ERROR_DATA,                  "H_ERROR_DATA"}, \
        {H_GET_HCA_INFO,                "H_GET_HCA_INFO"}, \
        {H_GET_PERF_COUNT,              "H_GET_PERF_COUNT"}, \

diff --git a/tools/perf/arch/powerpc/util/book3s_hcalls.h b/tools/perf/arch/powerpc/util/book3s_hcalls.h
index 54cfa05..488f433 100644 (file)
--- a/tools/perf/arch/powerpc/util/book3s_hcalls.h
+++ b/tools/perf/arch/powerpc/util/book3s_hcalls.h
@@ -84,7 +84,7 @@
        {0x1a4, "H_CREATE_RPT"},                                \
        {0x1a8, "H_REMOVE_RPT"},                                \
        {0x1ac, "H_REGISTER_RPAGES"},                           \
-       {0x1b0, "H_DISABLE_AND_GETC"},                          \
+       {0x1b0, "H_DISABLE_AND_GET"},                           \
        {0x1b4, "H_ERROR_DATA"},                                \
        {0x1b8, "H_GET_HCA_INFO"},                              \
        {0x1bc, "H_GET_PERF_COUNT"},                            \