mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
* PAPR nested hypervisor host implementation for spapr TCG
* excp_helper.c code cleanups and improvements * Move more ops to decodetree * Deprecate pseries-2.12 machines and P9 and P10 DD1.0 CPUs * Document running Linux on AmigaNG * Update dt feature advertising POWER CPUs. * Add P10 PMU SPRs * Improve pnv topology calculation for SMT8 CPUs. * Various bug fixes. -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEETkN92lZhb0MpsKeVZ7MCdqhiHK4FAmXwiT8ACgkQZ7MCdqhi HK7C/w//XxEO2bQTFPLFDTrP/voq7pcX8XeQNVyXCkXYjvsbu05oQow50k+Y5UAE US4MFjt8jFz0vuIKuKyoA3kG41zDSOzoX4TQXMM+tyTWbuFF3KAyfizb1xE6SYAN xJEGvmiXv/EgoSBD7BTKQp1tMPdIGZLwSdYiA0lmOo7YaMCgYAXaujW5hnNjQecT 873sN+10pHtQY++mINtD9Nfb6AcDGMWw0b+bykqIXhNRkI8IGOS4WF4vAuMBrwfe UM00wDnNRb86Dk14bv2XVNDr6/i0VRtUMwM4yiptrQ1TQx18LZaPSQFYjQfPaan7 LwN4QkMFnBX54yJ7Npvjvu8BCBF47kwOVu4CIAFJ4sIm0WfTmozDpPttwcZ5w7Ve iXDOB9ECAB4pQ2rCgbSNG8MYUZgoHHOuThqolOP0Vh9NHRRJxpdw6CyAbmCGftc0 lvRDPFiKp8xmCNJ/j3XzoUdHoG7NMwpUmHv9ruGU18SdQ8hyJN9AcQGWYrB4v0RV /hs2RAbwntG7ahkcwd8uy5aFw88Wph/uGXPXc49EWj7i49vHeIV2y5+gtthMywje qqjFXkistXuF+JHVnyoYmqqCyXaHX5CEwtawMv4EQeaJs76bLhMeMTKKl9rRp8qB DtbIZphO8iMsocrBnje48sA5HR0PM+H4HTjw10i8R0fLlWitaIY= =XnY5 -----END PGP SIGNATURE----- Merge tag 'pull-ppc-for-9.0-2-20240313' of https://gitlab.com/npiggin/qemu into staging * PAPR nested hypervisor host implementation for spapr TCG * excp_helper.c code cleanups and improvements * Move more ops to decodetree * Deprecate pseries-2.12 machines and P9 and P10 DD1.0 CPUs * Document running Linux on AmigaNG * Update dt feature advertising POWER CPUs. * Add P10 PMU SPRs * Improve pnv topology calculation for SMT8 CPUs. * Various bug fixes. # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEETkN92lZhb0MpsKeVZ7MCdqhiHK4FAmXwiT8ACgkQZ7MCdqhi # HK7C/w//XxEO2bQTFPLFDTrP/voq7pcX8XeQNVyXCkXYjvsbu05oQow50k+Y5UAE # US4MFjt8jFz0vuIKuKyoA3kG41zDSOzoX4TQXMM+tyTWbuFF3KAyfizb1xE6SYAN # xJEGvmiXv/EgoSBD7BTKQp1tMPdIGZLwSdYiA0lmOo7YaMCgYAXaujW5hnNjQecT # 873sN+10pHtQY++mINtD9Nfb6AcDGMWw0b+bykqIXhNRkI8IGOS4WF4vAuMBrwfe # UM00wDnNRb86Dk14bv2XVNDr6/i0VRtUMwM4yiptrQ1TQx18LZaPSQFYjQfPaan7 # LwN4QkMFnBX54yJ7Npvjvu8BCBF47kwOVu4CIAFJ4sIm0WfTmozDpPttwcZ5w7Ve # iXDOB9ECAB4pQ2rCgbSNG8MYUZgoHHOuThqolOP0Vh9NHRRJxpdw6CyAbmCGftc0 # lvRDPFiKp8xmCNJ/j3XzoUdHoG7NMwpUmHv9ruGU18SdQ8hyJN9AcQGWYrB4v0RV # /hs2RAbwntG7ahkcwd8uy5aFw88Wph/uGXPXc49EWj7i49vHeIV2y5+gtthMywje # qqjFXkistXuF+JHVnyoYmqqCyXaHX5CEwtawMv4EQeaJs76bLhMeMTKKl9rRp8qB # DtbIZphO8iMsocrBnje48sA5HR0PM+H4HTjw10i8R0fLlWitaIY= # =XnY5 # -----END PGP SIGNATURE----- # gpg: Signature made Tue 12 Mar 2024 16:56:31 GMT # gpg: using RSA key 4E437DDA56616F4329B0A79567B30276A8621CAE # gpg: Good signature from "Nicholas Piggin <npiggin@gmail.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 4E43 7DDA 5661 6F43 29B0 A795 67B3 0276 A862 1CAE * tag 'pull-ppc-for-9.0-2-20240313' of https://gitlab.com/npiggin/qemu: (38 commits) spapr: nested: Introduce cap-nested-papr for Nested PAPR API spapr: nested: Introduce H_GUEST_RUN_VCPU hcall. spapr: nested: Use correct source for parttbl info for nested PAPR API. spapr: nested: Introduce H_GUEST_[GET|SET]_STATE hcalls. spapr: nested: Initialize the GSB elements lookup table. spapr: nested: Extend nested_ppc_state for nested PAPR API spapr: nested: Introduce H_GUEST_CREATE_VCPU hcall. spapr: nested: Introduce H_GUEST_[CREATE|DELETE] hcalls. spapr: nested: Introduce H_GUEST_[GET|SET]_CAPABILITIES hcalls. spapr: nested: Document Nested PAPR API spapr: nested: keep nested-hv related code restricted to its API. spapr: nested: Introduce SpaprMachineStateNested to store related info. spapr: nested: move nested part of spapr_get_pate into spapr_nested.c spapr: nested: register nested-hv api hcalls only for cap-nested-hv target/ppc: Remove interrupt handler wrapper functions target/ppc: Clean up ifdefs in excp_helper.c, part 3 target/ppc: Clean up ifdefs in excp_helper.c, part 2 target/ppc: Clean up ifdefs in excp_helper.c, part 1 target/ppc: Add gen_exception_err_nip() function target/ppc: Readability improvements in exception handlers ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
51e31f2140
28 changed files with 2883 additions and 563 deletions
|
@ -147,7 +147,7 @@ struct PnvChipClass {
|
|||
|
||||
DeviceRealize parent_realize;
|
||||
|
||||
uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id);
|
||||
uint32_t (*chip_pir)(PnvChip *chip, uint32_t core_id, uint32_t thread_id);
|
||||
void (*intc_create)(PnvChip *chip, PowerPCCPU *cpu, Error **errp);
|
||||
void (*intc_reset)(PnvChip *chip, PowerPCCPU *cpu);
|
||||
void (*intc_destroy)(PnvChip *chip, PowerPCCPU *cpu);
|
||||
|
|
|
@ -36,6 +36,7 @@ struct PnvCore {
|
|||
/*< public >*/
|
||||
PowerPCCPU **threads;
|
||||
uint32_t pir;
|
||||
uint32_t hwid;
|
||||
uint64_t hrmor;
|
||||
PnvChip *chip;
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
#include "hw/ppc/spapr_xive.h" /* For SpaprXive */
|
||||
#include "hw/ppc/xics.h" /* For ICSState */
|
||||
#include "hw/ppc/spapr_tpm_proxy.h"
|
||||
#include "hw/ppc/spapr_nested.h" /* For SpaprMachineStateNested */
|
||||
|
||||
struct SpaprVioBus;
|
||||
struct SpaprPhbState;
|
||||
|
@ -80,8 +81,10 @@ typedef enum {
|
|||
#define SPAPR_CAP_RPT_INVALIDATE 0x0B
|
||||
/* Support for AIL modes */
|
||||
#define SPAPR_CAP_AIL_MODE_3 0x0C
|
||||
/* Nested PAPR */
|
||||
#define SPAPR_CAP_NESTED_PAPR 0x0D
|
||||
/* Num Caps */
|
||||
#define SPAPR_CAP_NUM (SPAPR_CAP_AIL_MODE_3 + 1)
|
||||
#define SPAPR_CAP_NUM (SPAPR_CAP_NESTED_PAPR + 1)
|
||||
|
||||
/*
|
||||
* Capability Values
|
||||
|
@ -213,7 +216,7 @@ struct SpaprMachineState {
|
|||
uint32_t vsmt; /* Virtual SMT mode (KVM's "core stride") */
|
||||
|
||||
/* Nested HV support (TCG only) */
|
||||
uint64_t nested_ptcr;
|
||||
SpaprMachineStateNested nested;
|
||||
|
||||
Notifier epow_notifier;
|
||||
QTAILQ_HEAD(, SpaprEventLogEntry) pending_events;
|
||||
|
@ -363,6 +366,9 @@ struct SpaprMachineState {
|
|||
#define H_NOOP -63
|
||||
#define H_UNSUPPORTED -67
|
||||
#define H_OVERLAP -68
|
||||
#define H_STATE -75
|
||||
#define H_IN_USE -77
|
||||
#define H_INVALID_ELEMENT_VALUE -81
|
||||
#define H_UNSUPPORTED_FLAG -256
|
||||
#define H_MULTI_THREADS_ACTIVE -9005
|
||||
|
||||
|
@ -582,8 +588,16 @@ struct SpaprMachineState {
|
|||
#define H_RPT_INVALIDATE 0x448
|
||||
#define H_SCM_FLUSH 0x44C
|
||||
#define H_WATCHDOG 0x45C
|
||||
#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_DELETE 0x488
|
||||
|
||||
#define MAX_HCALL_OPCODE H_WATCHDOG
|
||||
#define MAX_HCALL_OPCODE H_GUEST_DELETE
|
||||
|
||||
/* The hcalls above are standardized in PAPR and implemented by pHyp
|
||||
* as well.
|
||||
|
@ -631,6 +645,7 @@ typedef target_ulong (*spapr_hcall_fn)(PowerPCCPU *cpu, SpaprMachineState *sm,
|
|||
target_ulong *args);
|
||||
|
||||
void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn);
|
||||
void spapr_unregister_hypercall(target_ulong opcode);
|
||||
target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,
|
||||
target_ulong *args);
|
||||
|
||||
|
@ -984,6 +999,7 @@ extern const VMStateDescription vmstate_spapr_cap_sbbc;
|
|||
extern const VMStateDescription vmstate_spapr_cap_ibs;
|
||||
extern const VMStateDescription vmstate_spapr_cap_hpt_maxpagesize;
|
||||
extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;
|
||||
extern const VMStateDescription vmstate_spapr_cap_nested_papr;
|
||||
extern const VMStateDescription vmstate_spapr_cap_large_decr;
|
||||
extern const VMStateDescription vmstate_spapr_cap_ccf_assist;
|
||||
extern const VMStateDescription vmstate_spapr_cap_fwnmi;
|
||||
|
@ -1028,5 +1044,10 @@ void spapr_vof_client_dt_finalize(SpaprMachineState *spapr, void *fdt);
|
|||
|
||||
/* H_WATCHDOG */
|
||||
void spapr_watchdog_init(SpaprMachineState *spapr);
|
||||
void spapr_register_nested_hv(void);
|
||||
void spapr_unregister_nested_hv(void);
|
||||
void spapr_nested_reset(SpaprMachineState *spapr);
|
||||
void spapr_register_nested_papr(void);
|
||||
void spapr_unregister_nested_papr(void);
|
||||
|
||||
#endif /* HW_SPAPR_H */
|
||||
|
|
|
@ -3,6 +3,348 @@
|
|||
|
||||
#include "target/ppc/cpu.h"
|
||||
|
||||
/* Guest State Buffer Element IDs */
|
||||
#define GSB_HV_VCPU_IGNORED_ID 0x0000 /* An element whose value is ignored */
|
||||
#define GSB_HV_VCPU_STATE_SIZE 0x0001 /* HV internal format VCPU state size */
|
||||
#define GSB_VCPU_OUT_BUF_MIN_SZ 0x0002 /* Min size of the Run VCPU o/p buffer */
|
||||
#define GSB_VCPU_LPVR 0x0003 /* Logical PVR */
|
||||
#define GSB_TB_OFFSET 0x0004 /* Timebase Offset */
|
||||
#define GSB_PART_SCOPED_PAGETBL 0x0005 /* Partition Scoped Page Table */
|
||||
#define GSB_PROCESS_TBL 0x0006 /* Process Table */
|
||||
/* RESERVED 0x0007 - 0x0BFF */
|
||||
#define GSB_VCPU_IN_BUFFER 0x0C00 /* Run VCPU Input Buffer */
|
||||
#define GSB_VCPU_OUT_BUFFER 0x0C01 /* Run VCPU Out Buffer */
|
||||
#define GSB_VCPU_VPA 0x0C02 /* HRA to Guest VCPU VPA */
|
||||
/* RESERVED 0x0C03 - 0x0FFF */
|
||||
#define GSB_VCPU_GPR0 0x1000
|
||||
#define GSB_VCPU_GPR1 0x1001
|
||||
#define GSB_VCPU_GPR2 0x1002
|
||||
#define GSB_VCPU_GPR3 0x1003
|
||||
#define GSB_VCPU_GPR4 0x1004
|
||||
#define GSB_VCPU_GPR5 0x1005
|
||||
#define GSB_VCPU_GPR6 0x1006
|
||||
#define GSB_VCPU_GPR7 0x1007
|
||||
#define GSB_VCPU_GPR8 0x1008
|
||||
#define GSB_VCPU_GPR9 0x1009
|
||||
#define GSB_VCPU_GPR10 0x100A
|
||||
#define GSB_VCPU_GPR11 0x100B
|
||||
#define GSB_VCPU_GPR12 0x100C
|
||||
#define GSB_VCPU_GPR13 0x100D
|
||||
#define GSB_VCPU_GPR14 0x100E
|
||||
#define GSB_VCPU_GPR15 0x100F
|
||||
#define GSB_VCPU_GPR16 0x1010
|
||||
#define GSB_VCPU_GPR17 0x1011
|
||||
#define GSB_VCPU_GPR18 0x1012
|
||||
#define GSB_VCPU_GPR19 0x1013
|
||||
#define GSB_VCPU_GPR20 0x1014
|
||||
#define GSB_VCPU_GPR21 0x1015
|
||||
#define GSB_VCPU_GPR22 0x1016
|
||||
#define GSB_VCPU_GPR23 0x1017
|
||||
#define GSB_VCPU_GPR24 0x1018
|
||||
#define GSB_VCPU_GPR25 0x1019
|
||||
#define GSB_VCPU_GPR26 0x101A
|
||||
#define GSB_VCPU_GPR27 0x101B
|
||||
#define GSB_VCPU_GPR28 0x101C
|
||||
#define GSB_VCPU_GPR29 0x101D
|
||||
#define GSB_VCPU_GPR30 0x101E
|
||||
#define GSB_VCPU_GPR31 0x101F
|
||||
#define GSB_VCPU_HDEC_EXPIRY_TB 0x1020
|
||||
#define GSB_VCPU_SPR_NIA 0x1021
|
||||
#define GSB_VCPU_SPR_MSR 0x1022
|
||||
#define GSB_VCPU_SPR_LR 0x1023
|
||||
#define GSB_VCPU_SPR_XER 0x1024
|
||||
#define GSB_VCPU_SPR_CTR 0x1025
|
||||
#define GSB_VCPU_SPR_CFAR 0x1026
|
||||
#define GSB_VCPU_SPR_SRR0 0x1027
|
||||
#define GSB_VCPU_SPR_SRR1 0x1028
|
||||
#define GSB_VCPU_SPR_DAR 0x1029
|
||||
#define GSB_VCPU_DEC_EXPIRE_TB 0x102A
|
||||
#define GSB_VCPU_SPR_VTB 0x102B
|
||||
#define GSB_VCPU_SPR_LPCR 0x102C
|
||||
#define GSB_VCPU_SPR_HFSCR 0x102D
|
||||
#define GSB_VCPU_SPR_FSCR 0x102E
|
||||
#define GSB_VCPU_SPR_FPSCR 0x102F
|
||||
#define GSB_VCPU_SPR_DAWR0 0x1030
|
||||
#define GSB_VCPU_SPR_DAWR1 0x1031
|
||||
#define GSB_VCPU_SPR_CIABR 0x1032
|
||||
#define GSB_VCPU_SPR_PURR 0x1033
|
||||
#define GSB_VCPU_SPR_SPURR 0x1034
|
||||
#define GSB_VCPU_SPR_IC 0x1035
|
||||
#define GSB_VCPU_SPR_SPRG0 0x1036
|
||||
#define GSB_VCPU_SPR_SPRG1 0x1037
|
||||
#define GSB_VCPU_SPR_SPRG2 0x1038
|
||||
#define GSB_VCPU_SPR_SPRG3 0x1039
|
||||
#define GSB_VCPU_SPR_PPR 0x103A
|
||||
#define GSB_VCPU_SPR_MMCR0 0x103B
|
||||
#define GSB_VCPU_SPR_MMCR1 0x103C
|
||||
#define GSB_VCPU_SPR_MMCR2 0x103D
|
||||
#define GSB_VCPU_SPR_MMCR3 0x103E
|
||||
#define GSB_VCPU_SPR_MMCRA 0x103F
|
||||
#define GSB_VCPU_SPR_SIER 0x1040
|
||||
#define GSB_VCPU_SPR_SIER2 0x1041
|
||||
#define GSB_VCPU_SPR_SIER3 0x1042
|
||||
#define GSB_VCPU_SPR_BESCR 0x1043
|
||||
#define GSB_VCPU_SPR_EBBHR 0x1044
|
||||
#define GSB_VCPU_SPR_EBBRR 0x1045
|
||||
#define GSB_VCPU_SPR_AMR 0x1046
|
||||
#define GSB_VCPU_SPR_IAMR 0x1047
|
||||
#define GSB_VCPU_SPR_AMOR 0x1048
|
||||
#define GSB_VCPU_SPR_UAMOR 0x1049
|
||||
#define GSB_VCPU_SPR_SDAR 0x104A
|
||||
#define GSB_VCPU_SPR_SIAR 0x104B
|
||||
#define GSB_VCPU_SPR_DSCR 0x104C
|
||||
#define GSB_VCPU_SPR_TAR 0x104D
|
||||
#define GSB_VCPU_SPR_DEXCR 0x104E
|
||||
#define GSB_VCPU_SPR_HDEXCR 0x104F
|
||||
#define GSB_VCPU_SPR_HASHKEYR 0x1050
|
||||
#define GSB_VCPU_SPR_HASHPKEYR 0x1051
|
||||
#define GSB_VCPU_SPR_CTRL 0x1052
|
||||
/* RESERVED 0x1053 - 0x1FFF */
|
||||
#define GSB_VCPU_SPR_CR 0x2000
|
||||
#define GSB_VCPU_SPR_PIDR 0x2001
|
||||
#define GSB_VCPU_SPR_DSISR 0x2002
|
||||
#define GSB_VCPU_SPR_VSCR 0x2003
|
||||
#define GSB_VCPU_SPR_VRSAVE 0x2004
|
||||
#define GSB_VCPU_SPR_DAWRX0 0x2005
|
||||
#define GSB_VCPU_SPR_DAWRX1 0x2006
|
||||
#define GSB_VCPU_SPR_PMC1 0x2007
|
||||
#define GSB_VCPU_SPR_PMC2 0x2008
|
||||
#define GSB_VCPU_SPR_PMC3 0x2009
|
||||
#define GSB_VCPU_SPR_PMC4 0x200A
|
||||
#define GSB_VCPU_SPR_PMC5 0x200B
|
||||
#define GSB_VCPU_SPR_PMC6 0x200C
|
||||
#define GSB_VCPU_SPR_WORT 0x200D
|
||||
#define GSB_VCPU_SPR_PSPB 0x200E
|
||||
/* RESERVED 0x200F - 0x2FFF */
|
||||
#define GSB_VCPU_SPR_VSR0 0x3000
|
||||
#define GSB_VCPU_SPR_VSR1 0x3001
|
||||
#define GSB_VCPU_SPR_VSR2 0x3002
|
||||
#define GSB_VCPU_SPR_VSR3 0x3003
|
||||
#define GSB_VCPU_SPR_VSR4 0x3004
|
||||
#define GSB_VCPU_SPR_VSR5 0x3005
|
||||
#define GSB_VCPU_SPR_VSR6 0x3006
|
||||
#define GSB_VCPU_SPR_VSR7 0x3007
|
||||
#define GSB_VCPU_SPR_VSR8 0x3008
|
||||
#define GSB_VCPU_SPR_VSR9 0x3009
|
||||
#define GSB_VCPU_SPR_VSR10 0x300A
|
||||
#define GSB_VCPU_SPR_VSR11 0x300B
|
||||
#define GSB_VCPU_SPR_VSR12 0x300C
|
||||
#define GSB_VCPU_SPR_VSR13 0x300D
|
||||
#define GSB_VCPU_SPR_VSR14 0x300E
|
||||
#define GSB_VCPU_SPR_VSR15 0x300F
|
||||
#define GSB_VCPU_SPR_VSR16 0x3010
|
||||
#define GSB_VCPU_SPR_VSR17 0x3011
|
||||
#define GSB_VCPU_SPR_VSR18 0x3012
|
||||
#define GSB_VCPU_SPR_VSR19 0x3013
|
||||
#define GSB_VCPU_SPR_VSR20 0x3014
|
||||
#define GSB_VCPU_SPR_VSR21 0x3015
|
||||
#define GSB_VCPU_SPR_VSR22 0x3016
|
||||
#define GSB_VCPU_SPR_VSR23 0x3017
|
||||
#define GSB_VCPU_SPR_VSR24 0x3018
|
||||
#define GSB_VCPU_SPR_VSR25 0x3019
|
||||
#define GSB_VCPU_SPR_VSR26 0x301A
|
||||
#define GSB_VCPU_SPR_VSR27 0x301B
|
||||
#define GSB_VCPU_SPR_VSR28 0x301C
|
||||
#define GSB_VCPU_SPR_VSR29 0x301D
|
||||
#define GSB_VCPU_SPR_VSR30 0x301E
|
||||
#define GSB_VCPU_SPR_VSR31 0x301F
|
||||
#define GSB_VCPU_SPR_VSR32 0x3020
|
||||
#define GSB_VCPU_SPR_VSR33 0x3021
|
||||
#define GSB_VCPU_SPR_VSR34 0x3022
|
||||
#define GSB_VCPU_SPR_VSR35 0x3023
|
||||
#define GSB_VCPU_SPR_VSR36 0x3024
|
||||
#define GSB_VCPU_SPR_VSR37 0x3025
|
||||
#define GSB_VCPU_SPR_VSR38 0x3026
|
||||
#define GSB_VCPU_SPR_VSR39 0x3027
|
||||
#define GSB_VCPU_SPR_VSR40 0x3028
|
||||
#define GSB_VCPU_SPR_VSR41 0x3029
|
||||
#define GSB_VCPU_SPR_VSR42 0x302A
|
||||
#define GSB_VCPU_SPR_VSR43 0x302B
|
||||
#define GSB_VCPU_SPR_VSR44 0x302C
|
||||
#define GSB_VCPU_SPR_VSR45 0x302D
|
||||
#define GSB_VCPU_SPR_VSR46 0x302E
|
||||
#define GSB_VCPU_SPR_VSR47 0x302F
|
||||
#define GSB_VCPU_SPR_VSR48 0x3030
|
||||
#define GSB_VCPU_SPR_VSR49 0x3031
|
||||
#define GSB_VCPU_SPR_VSR50 0x3032
|
||||
#define GSB_VCPU_SPR_VSR51 0x3033
|
||||
#define GSB_VCPU_SPR_VSR52 0x3034
|
||||
#define GSB_VCPU_SPR_VSR53 0x3035
|
||||
#define GSB_VCPU_SPR_VSR54 0x3036
|
||||
#define GSB_VCPU_SPR_VSR55 0x3037
|
||||
#define GSB_VCPU_SPR_VSR56 0x3038
|
||||
#define GSB_VCPU_SPR_VSR57 0x3039
|
||||
#define GSB_VCPU_SPR_VSR58 0x303A
|
||||
#define GSB_VCPU_SPR_VSR59 0x303B
|
||||
#define GSB_VCPU_SPR_VSR60 0x303C
|
||||
#define GSB_VCPU_SPR_VSR61 0x303D
|
||||
#define GSB_VCPU_SPR_VSR62 0x303E
|
||||
#define GSB_VCPU_SPR_VSR63 0x303F
|
||||
/* RESERVED 0x3040 - 0xEFFF */
|
||||
#define GSB_VCPU_SPR_HDAR 0xF000
|
||||
#define GSB_VCPU_SPR_HDSISR 0xF001
|
||||
#define GSB_VCPU_SPR_HEIR 0xF002
|
||||
#define GSB_VCPU_SPR_ASDR 0xF003
|
||||
/* End of list of Guest State Buffer Element IDs */
|
||||
#define GSB_LAST GSB_VCPU_SPR_ASDR
|
||||
|
||||
typedef struct SpaprMachineStateNested {
|
||||
uint64_t ptcr;
|
||||
uint8_t api;
|
||||
#define NESTED_API_KVM_HV 1
|
||||
#define NESTED_API_PAPR 2
|
||||
bool capabilities_set;
|
||||
uint32_t pvr_base;
|
||||
GHashTable *guests;
|
||||
} SpaprMachineStateNested;
|
||||
|
||||
typedef struct SpaprMachineStateNestedGuest {
|
||||
uint32_t pvr_logical;
|
||||
unsigned long nr_vcpus;
|
||||
uint64_t parttbl[2];
|
||||
uint64_t tb_offset;
|
||||
struct SpaprMachineStateNestedGuestVcpu *vcpus;
|
||||
} SpaprMachineStateNestedGuest;
|
||||
|
||||
/* Nested PAPR API related macros */
|
||||
#define H_GUEST_CAPABILITIES_COPY_MEM 0x8000000000000000
|
||||
#define H_GUEST_CAPABILITIES_P9_MODE 0x4000000000000000
|
||||
#define H_GUEST_CAPABILITIES_P10_MODE 0x2000000000000000
|
||||
#define H_GUEST_CAP_VALID_MASK (H_GUEST_CAPABILITIES_P10_MODE | \
|
||||
H_GUEST_CAPABILITIES_P9_MODE)
|
||||
#define H_GUEST_CAP_COPY_MEM_BMAP 0
|
||||
#define H_GUEST_CAP_P9_MODE_BMAP 1
|
||||
#define H_GUEST_CAP_P10_MODE_BMAP 2
|
||||
#define PAPR_NESTED_GUEST_MAX 4096
|
||||
#define H_GUEST_DELETE_ALL_FLAG 0x8000000000000000ULL
|
||||
#define PAPR_NESTED_GUEST_VCPU_MAX 2048
|
||||
#define VCPU_OUT_BUF_MIN_SZ 0x80ULL
|
||||
#define HVMASK_DEFAULT 0xffffffffffffffff
|
||||
#define HVMASK_LPCR 0x0070000003820800
|
||||
#define HVMASK_MSR 0xEBFFFFFFFFBFEFFF
|
||||
#define HVMASK_HDEXCR 0x00000000FFFFFFFF
|
||||
#define HVMASK_TB_OFFSET 0x000000FFFFFFFFFF
|
||||
#define GSB_MAX_BUF_SIZE (1024 * 1024)
|
||||
#define H_GUEST_GETSET_STATE_FLAG_GUEST_WIDE 0x8000000000000000
|
||||
#define GUEST_STATE_REQUEST_GUEST_WIDE 0x1
|
||||
#define GUEST_STATE_REQUEST_SET 0x2
|
||||
|
||||
/*
|
||||
* As per ISA v3.1B, following bits are reserved:
|
||||
* 0:2
|
||||
* 4:57 (ISA mentions bit 58 as well but it should be used for P10)
|
||||
* 61:63 (hence, haven't included PCR bits for v2.06 and v2.05
|
||||
* in LOW BITS)
|
||||
*/
|
||||
#define PCR_LOW_BITS (PCR_COMPAT_3_10 | PCR_COMPAT_3_00)
|
||||
#define HVMASK_PCR (~PCR_LOW_BITS)
|
||||
|
||||
#define GUEST_STATE_ELEMENT(i, sz, s, f, ptr, c) { \
|
||||
.id = (i), \
|
||||
.size = (sz), \
|
||||
.location = ptr, \
|
||||
.offset = offsetof(struct s, f), \
|
||||
.copy = (c) \
|
||||
}
|
||||
|
||||
#define GSBE_NESTED(i, sz, f, c) { \
|
||||
.id = (i), \
|
||||
.size = (sz), \
|
||||
.location = get_guest_ptr, \
|
||||
.offset = offsetof(struct SpaprMachineStateNestedGuest, f),\
|
||||
.copy = (c), \
|
||||
.mask = HVMASK_DEFAULT \
|
||||
}
|
||||
|
||||
#define GSBE_NESTED_MSK(i, sz, f, c, m) { \
|
||||
.id = (i), \
|
||||
.size = (sz), \
|
||||
.location = get_guest_ptr, \
|
||||
.offset = offsetof(struct SpaprMachineStateNestedGuest, f),\
|
||||
.copy = (c), \
|
||||
.mask = (m) \
|
||||
}
|
||||
|
||||
#define GSBE_NESTED_VCPU(i, sz, f, c) { \
|
||||
.id = (i), \
|
||||
.size = (sz), \
|
||||
.location = get_vcpu_ptr, \
|
||||
.offset = offsetof(struct SpaprMachineStateNestedGuestVcpu, f),\
|
||||
.copy = (c), \
|
||||
.mask = HVMASK_DEFAULT \
|
||||
}
|
||||
|
||||
#define GUEST_STATE_ELEMENT_NOP(i, sz) { \
|
||||
.id = (i), \
|
||||
.size = (sz), \
|
||||
.location = NULL, \
|
||||
.offset = 0, \
|
||||
.copy = NULL, \
|
||||
.mask = HVMASK_DEFAULT \
|
||||
}
|
||||
|
||||
#define GUEST_STATE_ELEMENT_NOP_DW(i) \
|
||||
GUEST_STATE_ELEMENT_NOP(i, 8)
|
||||
#define GUEST_STATE_ELEMENT_NOP_W(i) \
|
||||
GUEST_STATE_ELEMENT_NOP(i, 4)
|
||||
|
||||
#define GUEST_STATE_ELEMENT_BASE(i, s, c) { \
|
||||
.id = (i), \
|
||||
.size = (s), \
|
||||
.location = get_vcpu_state_ptr, \
|
||||
.offset = 0, \
|
||||
.copy = (c), \
|
||||
.mask = HVMASK_DEFAULT \
|
||||
}
|
||||
|
||||
#define GUEST_STATE_ELEMENT_OFF(i, s, f, c) { \
|
||||
.id = (i), \
|
||||
.size = (s), \
|
||||
.location = get_vcpu_state_ptr, \
|
||||
.offset = offsetof(struct nested_ppc_state, f), \
|
||||
.copy = (c), \
|
||||
.mask = HVMASK_DEFAULT \
|
||||
}
|
||||
|
||||
#define GUEST_STATE_ELEMENT_MSK(i, s, f, c, m) { \
|
||||
.id = (i), \
|
||||
.size = (s), \
|
||||
.location = get_vcpu_state_ptr, \
|
||||
.offset = offsetof(struct nested_ppc_state, f), \
|
||||
.copy = (c), \
|
||||
.mask = (m) \
|
||||
}
|
||||
|
||||
#define GUEST_STATE_ELEMENT_ENV_QW(i, f) \
|
||||
GUEST_STATE_ELEMENT_OFF(i, 16, f, copy_state_16to16)
|
||||
#define GUEST_STATE_ELEMENT_ENV_DW(i, f) \
|
||||
GUEST_STATE_ELEMENT_OFF(i, 8, f, copy_state_8to8)
|
||||
#define GUEST_STATE_ELEMENT_ENV_W(i, f) \
|
||||
GUEST_STATE_ELEMENT_OFF(i, 4, f, copy_state_4to8)
|
||||
#define GUEST_STATE_ELEMENT_ENV_WW(i, f) \
|
||||
GUEST_STATE_ELEMENT_OFF(i, 4, f, copy_state_4to4)
|
||||
#define GSE_ENV_DWM(i, f, m) \
|
||||
GUEST_STATE_ELEMENT_MSK(i, 8, f, copy_state_8to8, m)
|
||||
|
||||
struct guest_state_element {
|
||||
uint16_t id;
|
||||
uint16_t size;
|
||||
uint8_t value[];
|
||||
} QEMU_PACKED;
|
||||
|
||||
struct guest_state_buffer {
|
||||
uint32_t num_elements;
|
||||
struct guest_state_element elements[];
|
||||
} QEMU_PACKED;
|
||||
|
||||
/* Actual buffer plus some metadata about the request */
|
||||
struct guest_state_request {
|
||||
struct guest_state_buffer *gsb;
|
||||
int64_t buf;
|
||||
int64_t len;
|
||||
uint16_t flags;
|
||||
};
|
||||
|
||||
/*
|
||||
* Register state for entering a nested guest with H_ENTER_NESTED.
|
||||
* New member must be added at the end.
|
||||
|
@ -93,9 +435,90 @@ struct nested_ppc_state {
|
|||
uint64_t ppr;
|
||||
|
||||
int64_t tb_offset;
|
||||
/* Nested PAPR API */
|
||||
uint64_t amor;
|
||||
uint64_t dawr0;
|
||||
uint64_t dawrx0;
|
||||
uint64_t ciabr;
|
||||
uint64_t purr;
|
||||
uint64_t spurr;
|
||||
uint64_t ic;
|
||||
uint64_t vtb;
|
||||
uint64_t hdar;
|
||||
uint64_t hdsisr;
|
||||
uint64_t heir;
|
||||
uint64_t asdr;
|
||||
uint64_t dawr1;
|
||||
uint64_t dawrx1;
|
||||
uint64_t dexcr;
|
||||
uint64_t hdexcr;
|
||||
uint64_t hashkeyr;
|
||||
uint64_t hashpkeyr;
|
||||
ppc_vsr_t vsr[64] QEMU_ALIGNED(16);
|
||||
uint64_t ebbhr;
|
||||
uint64_t tar;
|
||||
uint64_t ebbrr;
|
||||
uint64_t bescr;
|
||||
uint64_t iamr;
|
||||
uint64_t amr;
|
||||
uint64_t uamor;
|
||||
uint64_t dscr;
|
||||
uint64_t fscr;
|
||||
uint64_t pspb;
|
||||
uint64_t ctrl;
|
||||
uint64_t vrsave;
|
||||
uint64_t dar;
|
||||
uint64_t dsisr;
|
||||
uint64_t pmc1;
|
||||
uint64_t pmc2;
|
||||
uint64_t pmc3;
|
||||
uint64_t pmc4;
|
||||
uint64_t pmc5;
|
||||
uint64_t pmc6;
|
||||
uint64_t mmcr0;
|
||||
uint64_t mmcr1;
|
||||
uint64_t mmcr2;
|
||||
uint64_t mmcra;
|
||||
uint64_t sdar;
|
||||
uint64_t siar;
|
||||
uint64_t sier;
|
||||
uint32_t vscr;
|
||||
uint64_t fpscr;
|
||||
int64_t dec_expiry_tb;
|
||||
};
|
||||
|
||||
void spapr_register_nested(void);
|
||||
void spapr_exit_nested(PowerPCCPU *cpu, int excp);
|
||||
struct SpaprMachineStateNestedGuestVcpuRunBuf {
|
||||
uint64_t addr;
|
||||
uint64_t size;
|
||||
};
|
||||
|
||||
typedef struct SpaprMachineStateNestedGuestVcpu {
|
||||
bool enabled;
|
||||
struct nested_ppc_state state;
|
||||
struct SpaprMachineStateNestedGuestVcpuRunBuf runbufin;
|
||||
struct SpaprMachineStateNestedGuestVcpuRunBuf runbufout;
|
||||
int64_t tb_offset;
|
||||
uint64_t hdecr_expiry_tb;
|
||||
} SpaprMachineStateNestedGuestVcpu;
|
||||
|
||||
struct guest_state_element_type {
|
||||
uint16_t id;
|
||||
int size;
|
||||
#define GUEST_STATE_ELEMENT_TYPE_FLAG_GUEST_WIDE 0x1
|
||||
#define GUEST_STATE_ELEMENT_TYPE_FLAG_READ_ONLY 0x2
|
||||
uint16_t flags;
|
||||
void *(*location)(SpaprMachineStateNestedGuest *, target_ulong);
|
||||
size_t offset;
|
||||
void (*copy)(void *, void *, bool);
|
||||
uint64_t mask;
|
||||
};
|
||||
|
||||
void spapr_exit_nested(PowerPCCPU *cpu, int excp);
|
||||
typedef struct SpaprMachineState SpaprMachineState;
|
||||
bool spapr_get_pate_nested_hv(SpaprMachineState *spapr, PowerPCCPU *cpu,
|
||||
target_ulong lpid, ppc_v3_pate_t *entry);
|
||||
uint8_t spapr_nested_api(SpaprMachineState *spapr);
|
||||
void spapr_nested_gsb_init(void);
|
||||
bool spapr_get_pate_nested_papr(SpaprMachineState *spapr, PowerPCCPU *cpu,
|
||||
target_ulong lpid, ppc_v3_pate_t *entry);
|
||||
#endif /* HW_SPAPR_NESTED_H */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue