powerpc/hvcall: Reorder Nestedv2 hcall opcodes

Reorder the newly introduced hcall opcodes for Nestedv2 to follow the
increasing-opcode-number convention followed in 'hvcall.h'.

Also updates the value for MAX_HCALL_OPCODE which is used in various
places in arch code for range checking. Notably in the KVM enabled-hcall
logic, and in hcall tracing.

Fixes: 19d31c5f1157 ("KVM: PPC: Add support for nestedv2 guests")
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20231219092309.118151-1-vaibhav@linux.ibm.com

diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index ddb99e982917e90046cbd5d24b40440e1f4a9dee..a41e542ba94dd939782c0b0fbd1e606b4208ff0e 100644 (file)
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -349,7 +349,16 @@
 #define H_GET_ENERGY_SCALE_INFO        0x450
 #define H_PKS_SIGNED_UPDATE    0x454
 #define H_WATCHDOG             0x45C
-#define MAX_HCALL_OPCODE       H_WATCHDOG
+#define H_GUEST_GET_CAPABILITIES 0x460
+#define H_GUEST_SET_CAPABILITIES 0x464
+#define H_GUEST_CREATE         0x470
+#define H_GUEST_CREATE_VCPU    0x474
+#define H_GUEST_GET_STATE      0x478
+#define H_GUEST_SET_STATE      0x47C
+#define H_GUEST_RUN_VCPU       0x480
+#define H_GUEST_COPY_MEMORY    0x484
+#define H_GUEST_DELETE         0x488
+#define MAX_HCALL_OPCODE       H_GUEST_DELETE
 
 /* Scope args for H_SCM_UNBIND_ALL */
 #define H_UNBIND_SCOPE_ALL (0x1)
@@ -393,15 +402,6 @@
 #define H_ENTER_NESTED         0xF804
 #define H_TLB_INVALIDATE       0xF808
 #define H_COPY_TOFROM_GUEST    0xF80C
-#define H_GUEST_GET_CAPABILITIES 0x460
-#define H_GUEST_SET_CAPABILITIES 0x464
-#define H_GUEST_CREATE         0x470
-#define H_GUEST_CREATE_VCPU    0x474
-#define H_GUEST_GET_STATE      0x478
-#define H_GUEST_SET_STATE      0x47C
-#define H_GUEST_RUN_VCPU       0x480
-#define H_GUEST_COPY_MEMORY    0x484
-#define H_GUEST_DELETE         0x488
 
 /* Flags for H_SVM_PAGE_IN */
 #define H_PAGE_IN_SHARED        0x1