KVM: PPC: Book3S HV: XIVE: Show VP id in debugfs

Print out the VP id of each connected vCPU, this allow to see:
- the VP block base in which OPAL encodes information that may be
  useful when debugging
- the packed vCPU id which may differ from the raw vCPU id if the
  latter is >= KVM_MAX_VCPUS (2048)

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index baa740815b3cb9705ec20890b432bfb5cf9a9133..0b7859e40f6643d2d201ebceafb8e2559a5463dd 100644 (file)
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -2107,9 +2107,9 @@ static int xive_debug_show(struct seq_file *m, void *private)
                if (!xc)
                        continue;
 
-               seq_printf(m, "cpu server %#x CPPR:%#x HWCPPR:%#x"
+               seq_printf(m, "cpu server %#x VP:%#x CPPR:%#x HWCPPR:%#x"
                           " MFRR:%#x PEND:%#x h_xirr: R=%lld V=%lld\n",
-                          xc->server_num, xc->cppr, xc->hw_cppr,
+                          xc->server_num, xc->vp_id, xc->cppr, xc->hw_cppr,
                           xc->mfrr, xc->pending,
                           xc->stat_rm_h_xirr, xc->stat_vm_h_xirr);
 

diff --git a/arch/powerpc/kvm/book3s_xive_native.c b/arch/powerpc/kvm/book3s_xive_native.c
index ebb4215baf453685bf9e18e2d5fa5b3b560ed391..43a86858390a85dd6425675e9568d17f021d55f3 100644 (file)
--- a/arch/powerpc/kvm/book3s_xive_native.c
+++ b/arch/powerpc/kvm/book3s_xive_native.c
@@ -1204,8 +1204,8 @@ static int xive_native_debug_show(struct seq_file *m, void *private)
                if (!xc)
                        continue;
 
-               seq_printf(m, "cpu server %#x NSR=%02x CPPR=%02x IBP=%02x PIPR=%02x w01=%016llx w2=%08x\n",
-                          xc->server_num,
+               seq_printf(m, "cpu server %#x VP=%#x NSR=%02x CPPR=%02x IBP=%02x PIPR=%02x w01=%016llx w2=%08x\n",
+                          xc->server_num, xc->vp_id,
                           vcpu->arch.xive_saved_state.nsr,
                           vcpu->arch.xive_saved_state.cppr,
                           vcpu->arch.xive_saved_state.ipb,