powerpc/kvm: Create proper names for the kvm_host_state PMU fields

We have two arrays in kvm_host_state that contain register values for
the PMU. Currently we only create an asm-offsets symbol for the base of
the arrays, and do the array offset in the assembly code.

Creating an asm-offsets symbol for each field individually makes the
code much nicer to read, particularly for the MMCRx/SIxR/SDAR fields, and
might have helped us notice the recent double restore bug we had in this
code.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Acked-by: Alexander Graf <agraf@suse.de>

1 files changed, 13 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index e624f9646350..4717859fdd04 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -644,8 +644,19 @@ int main(void)
         HSTATE_FIELD(HSTATE_SAVED_XIRR, saved_xirr);
         HSTATE_FIELD(HSTATE_HOST_IPI, host_ipi);
         HSTATE_FIELD(HSTATE_PTID, ptid);
-        HSTATE_FIELD(HSTATE_MMCR, host_mmcr);
-        HSTATE_FIELD(HSTATE_PMC, host_pmc);
+        HSTATE_FIELD(HSTATE_MMCR0, host_mmcr[0]);
+        HSTATE_FIELD(HSTATE_MMCR1, host_mmcr[1]);
+        HSTATE_FIELD(HSTATE_MMCRA, host_mmcr[2]);
+        HSTATE_FIELD(HSTATE_SIAR, host_mmcr[3]);
+        HSTATE_FIELD(HSTATE_SDAR, host_mmcr[4]);
+        HSTATE_FIELD(HSTATE_MMCR2, host_mmcr[5]);
+        HSTATE_FIELD(HSTATE_SIER, host_mmcr[6]);
+        HSTATE_FIELD(HSTATE_PMC1, host_pmc[0]);
+        HSTATE_FIELD(HSTATE_PMC2, host_pmc[1]);
+        HSTATE_FIELD(HSTATE_PMC3, host_pmc[2]);
+        HSTATE_FIELD(HSTATE_PMC4, host_pmc[3]);
+        HSTATE_FIELD(HSTATE_PMC5, host_pmc[4]);
+        HSTATE_FIELD(HSTATE_PMC6, host_pmc[5]);
         HSTATE_FIELD(HSTATE_PURR, host_purr);
         HSTATE_FIELD(HSTATE_SPURR, host_spurr);
         HSTATE_FIELD(HSTATE_DSCR, host_dscr);