ppc: Enable 2nd DAWR support on Power10
v4 cover ppc: Enable 2nd DAWR support on Power10
This series enables 2nd DAWR support on p10 qemu guest. 2nd DAWR is new watchpoint added in Power10 processor. Kernel/kvm patches are already in[1]. Watchpoint on powerpc TCG guest is not supported and thus 2nd DAWR is not enabled for TCG mode.
Patches apply fine on qemu/master branch (11577d85b1a6).
v3: https://lore.kernel.org/r/[email protected]v3->v4:
- spapr_dt_pa_features(): POWER10 processor is compatible with 3.0
(PCR_COMPAT_3_00). No need to ppc_check_compat(3_10) for now as
ppc_check_compati(3_00) will also be true. ppc_check_compat(3_10)
can be added while introducing pa_features_310 in future. - Use error_append_hint() for hints. Also add ERRP_GUARD().
- Add kvmppc_set_cap_dawr1() stub function for CONFIG_KVM=n.
v2: https://lore.kernel.org/r/[email protected]v2->v3:
- Don't introduce pa_features_310[], instead, reuse pa_features_300[] for 3.1 guests, as there is no difference between initial values of them atm.
- Call gen_spr_book3s_310_dbg() from init_proc_POWER10() instead of
init_proc_POWER8(). Also, Don't call gen_spr_book3s_207_dbg() from
gen_spr_book3s_310_dbg() as init_proc_POWER10() already calls it.v1: https://lore.kernel.org/r/[email protected]
[Apologies for long gap]v1->v2:
- Introduce machine capability cap-dawr1 to enable/disable
the feature. By default, 2nd DAWR is OFF for guests even
when host kvm supports it. User has to manually enable it
with -machine cap-dawr1=on if he wishes to use it.
- Split the header file changes into separate patch. (Sync
headers from v5.12-rc3)
[1] https://git.kernel.org/torvalds/c/bd1de1a0e6eff
Ravi Bangoria (3):
Linux headers: update from 5.12-rc3
ppc: Rename current DAWR macros and variables
ppc: Enable 2nd DAWR support on p10
hw/ppc/spapr.c | 7 +- hw/ppc/spapr_caps.c | 32 +++++++ include/hw/ppc/spapr.h | 8 +- include/standard-headers/drm/drm_fourcc.h | 23 ++++- include/standard-headers/linux/input.h | 2 +- .../standard-headers/rdma/vmw_pvrdma-abi.h | 7 ++ linux-headers/asm-generic/unistd.h | 4 +- linux-headers/asm-mips/unistd_n32.h | 1 + linux-headers/asm-mips/unistd_n64.h | 1 + linux-headers/asm-mips/unistd_o32.h | 1 + linux-headers/asm-powerpc/kvm.h | 2 + linux-headers/asm-powerpc/unistd_32.h | 1 + linux-headers/asm-powerpc/unistd_64.h | 1 + linux-headers/asm-s390/unistd_32.h | 1 + linux-headers/asm-s390/unistd_64.h | 1 + linux-headers/asm-x86/kvm.h | 1 + linux-headers/asm-x86/unistd_32.h | 1 + linux-headers/asm-x86/unistd_64.h | 1 + linux-headers/asm-x86/unistd_x32.h | 1 + linux-headers/linux/kvm.h | 89 +++++++++++++++++++ linux-headers/linux/vfio.h | 27 ++++++ target/ppc/cpu.h | 6 +- target/ppc/kvm.c | 12 +++ target/ppc/kvm_ppc.h | 12 +++ target/ppc/translate_init.c.inc | 19 +++- 25 files changed, 250 insertions(+), 11 deletions(-)
Signature · 1 line
2.17.1
PATCH v4 1/3 Linux headers: update from 5.12-rc3
Update against Linux 5.12-rc3
--- include/standard-headers/drm/drm_fourcc.h | 23 ++++- include/standard-headers/linux/input.h | 2 +- .../standard-headers/rdma/vmw_pvrdma-abi.h | 7 ++ linux-headers/asm-generic/unistd.h | 4 +- linux-headers/asm-mips/unistd_n32.h | 1 + linux-headers/asm-mips/unistd_n64.h | 1 + linux-headers/asm-mips/unistd_o32.h | 1 + linux-headers/asm-powerpc/kvm.h | 2 + linux-headers/asm-powerpc/unistd_32.h | 1 + linux-headers/asm-powerpc/unistd_64.h | 1 + linux-headers/asm-s390/unistd_32.h | 1 + linux-headers/asm-s390/unistd_64.h | 1 + linux-headers/asm-x86/kvm.h | 1 + linux-headers/asm-x86/unistd_32.h | 1 + linux-headers/asm-x86/unistd_64.h | 1 + linux-headers/asm-x86/unistd_x32.h | 1 + linux-headers/linux/kvm.h | 89 +++++++++++++++++++ linux-headers/linux/vfio.h | 27 ++++++ 18 files changed, 161 insertions(+), 4 deletions(-)
include/standard-headers/drm/drm_fourcc.h +21 -2
@@ -526,6 +526,25 @@ extern "C" {*/ #define I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS fourcc_mod_code(INTEL, 7) +/* +* Intel Color Control Surface with Clear Color (CCS) for Gen-12 render +* compression. +* +* The main surface is Y-tiled and is at plane index 0 whereas CCS is linear +* and at index 1. The clear color is stored at index 2, and the pitch should +* be ignored. The clear color structure is 256 bits. The first 128 bits +* represents Raw Clear Color Red, Green, Blue and Alpha color each represented +* by 32 bits. The raw clear color is consumed by the 3d engine and generates +* the converted clear color of size 64 bits. The first 32 bits store the Lower +* Converted Clear Color value and the next 32 bits store the Higher Converted +* Clear Color value when applicable. The Converted Clear Color values are +* consumed by the DE. The last 64 bits are used to store Color Discard Enable +* and Depth Clear Value Valid which are ignored by the DE. A CCS cache line +* corresponds to an area of 4x1 tiles in the main surface. The main surface +* pitch is required to be a multiple of 4 tile widths. +*/ +#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC fourcc_mod_code(INTEL, 8) +/* * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks *
@@ -1035,9 +1054,9 @@ drm_fourcc_canonicalize_nvidia_format_mod(uint64_t modifier)* Not all combinations are valid, and different SoCs may support different * combinations of layout and options. */ -#define __fourcc_mod_amlogic_layout_mask 0xf +#define __fourcc_mod_amlogic_layout_mask 0xff#define __fourcc_mod_amlogic_options_shift 8 -#define __fourcc_mod_amlogic_options_mask 0xf +#define __fourcc_mod_amlogic_options_mask 0xff#define DRM_FORMAT_MOD_AMLOGIC_FBC (__layout, __options) \ fourcc_mod_code(AMLOGIC, \
include/standard-headers/linux/input.h +1 -1
@@ -81,7 +81,7 @@ struct input_id {* in units per radian. * When INPUT_PROP_ACCELEROMETER is set the resolution changes. * The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in -* in units per g (units/g) and in units per degree per second +* units per g (units/g) and in units per degree per second * (units/deg/s) for rotational axes (ABS_RX, ABS_RY, ABS_RZ). */ struct input_absinfo {
include/standard-headers/rdma/vmw_pvrdma-abi.h +7 -0
@@ -133,6 +133,13 @@ enum pvrdma_wc_flags { PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_NETWORK_HDR_TYPE, }; +enum pvrdma_network_type { +PVRDMA_NETWORK_IB , +PVRDMA_NETWORK_ROCE_V1 =PVRDMA_NETWORK_IB , +PVRDMA_NETWORK_IPV4 , +PVRDMA_NETWORK_IPV6 +}; +struct pvrdma_alloc_ucontext_resp {uint32_t qp_tab_size;uint32_t reserved;
linux-headers/asm-generic/unistd.h +3 -1
@@ -861,9 +861,11 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2) __SYSCALL(__NR_process_madvise, sys_process_madvise)#define __NR_epoll_pwait2 441 __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2) +#define __NR_mount_setattr 442 +__SYSCALL(__NR_mount_setattr, sys_mount_setattr)#undef __NR_syscalls -#define __NR_syscalls 442 +#define __NR_syscalls 443/* * 32 bit systems traditionally used different
linux-headers/asm-mips/unistd_n32.h +1 -0
@@ -371,6 +371,7 @@#define __NR_faccessat2 (__NR_Linux + 439)#define __NR_process_madvise (__NR_Linux + 440)#define __NR_epoll_pwait2 (__NR_Linux + 441) +#define __NR_mount_setattr (__NR_Linux + 442)#endif /* _ASM_MIPS_UNISTD_N32_H */
linux-headers/asm-mips/unistd_n64.h +1 -0
@@ -347,6 +347,7 @@#define __NR_faccessat2 (__NR_Linux + 439)#define __NR_process_madvise (__NR_Linux + 440)#define __NR_epoll_pwait2 (__NR_Linux + 441) +#define __NR_mount_setattr (__NR_Linux + 442)#endif /* _ASM_MIPS_UNISTD_N64_H */
linux-headers/asm-mips/unistd_o32.h +1 -0
@@ -417,6 +417,7 @@#define __NR_faccessat2 (__NR_Linux + 439)#define __NR_process_madvise (__NR_Linux + 440)#define __NR_epoll_pwait2 (__NR_Linux + 441) +#define __NR_mount_setattr (__NR_Linux + 442)#endif /* _ASM_MIPS_UNISTD_O32_H */
linux-headers/asm-powerpc/kvm.h +2 -0
@@ -644,6 +644,8 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_MMCR3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc1)#define KVM_REG_PPC_SIER2 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc2)#define KVM_REG_PPC_SIER3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc3) +#define KVM_REG_PPC_DAWR1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc4) +#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
linux-headers/asm-powerpc/unistd_32.h +1 -0
@@ -424,6 +424,7 @@#define __NR_faccessat2 439#define __NR_process_madvise 440#define __NR_epoll_pwait2 441 +#define __NR_mount_setattr 442#endif /* _ASM_POWERPC_UNISTD_32_H */
linux-headers/asm-powerpc/unistd_64.h +1 -0
@@ -396,6 +396,7 @@#define __NR_faccessat2 439#define __NR_process_madvise 440#define __NR_epoll_pwait2 441 +#define __NR_mount_setattr 442#endif /* _ASM_POWERPC_UNISTD_64_H */
linux-headers/asm-s390/unistd_32.h +1 -0
@@ -414,5 +414,6 @@#define __NR_faccessat2 439#define __NR_process_madvise 440#define __NR_epoll_pwait2 441 +#define __NR_mount_setattr 442#endif /* _ASM_S390_UNISTD_32_H */
linux-headers/asm-s390/unistd_64.h +1 -0
@@ -362,5 +362,6 @@#define __NR_faccessat2 439#define __NR_process_madvise 440#define __NR_epoll_pwait2 441 +#define __NR_mount_setattr 442#endif /* _ASM_S390_UNISTD_64_H */
linux-headers/asm-x86/kvm.h +1 -0
@@ -112,6 +112,7 @@ struct kvm_ioapic_state {#define KVM_NR_IRQCHIPS 3#define KVM_RUN_X86_SMM (1 << 0) +#define KVM_RUN_X86_BUS_LOCK (1 << 1)/* for KVM_GET_REGS and KVM_SET_REGS */ struct kvm_regs {
linux-headers/asm-x86/unistd_32.h +1 -0
@@ -432,6 +432,7 @@#define __NR_faccessat2 439#define __NR_process_madvise 440#define __NR_epoll_pwait2 441 +#define __NR_mount_setattr 442#endif /* _ASM_X86_UNISTD_32_H */
linux-headers/asm-x86/unistd_64.h +1 -0
@@ -354,6 +354,7 @@#define __NR_faccessat2 439#define __NR_process_madvise 440#define __NR_epoll_pwait2 441 +#define __NR_mount_setattr 442#endif /* _ASM_X86_UNISTD_64_H */
linux-headers/asm-x86/unistd_x32.h +1 -0
@@ -307,6 +307,7 @@#define __NR_faccessat2 (__X32_SYSCALL_BIT + 439)#define __NR_process_madvise (__X32_SYSCALL_BIT + 440)#define __NR_epoll_pwait2 (__X32_SYSCALL_BIT + 441) +#define __NR_mount_setattr (__X32_SYSCALL_BIT + 442)#define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)#define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)#define __NR_ioctl (__X32_SYSCALL_BIT + 514)
linux-headers/linux/kvm.h +89 -0
147 lines not on this page · raw message
linux-headers/linux/vfio.h +27 -0
@@ -46,6 +46,12 @@*/ #define VFIO_NOIOMMU_IOMMU 8 +/* Supports VFIO_DMA_UNMAP_FLAG_ALL */ +#define VFIO_UNMAP_ALL 9 + +/* Supports the vaddr flag for DMA map and unmap */ +#define VFIO_UPDATE_VADDR 10 +/* * The IOCTL interface is designed for extensibility by embedding the * structure length (argsz) and flags into structures passed between
@@ -1074,12 +1080,22 @@ struct vfio_iommu_type1_info_dma_avail {* * Map process virtual addresses to IO virtual addresses using the * provided struct vfio_dma_map. Caller sets argsz. READ &/ WRITE required. +* +* If flags & VFIO_DMA_MAP_FLAG_VADDR, update the base vaddr for iova, and +* unblock translation of host virtual addresses in the iova range. The vaddr +* must have previously been invalidated with VFIO_DMA_UNMAP_FLAG_VADDR. To +* maintain memory consistency within the user application, the updated vaddr +* must address the same memory object as originally mapped. Failure to do so +* will result in user memory corruption and/or device misbehavior. iova and +* size must match those in the original MAP_DMA call. Protection is not +* changed, and the READ & WRITE flags must be 0. */ struct vfio_iommu_type1_dma_map {__u32 argsz;__u32 flags;#define VFIO_DMA_MAP_FLAG_READ (1 << 0)/* readable from device */ #define VFIO_DMA_MAP_FLAG_WRITE (1 << 1)/* writable from device */ +#define VFIO_DMA_MAP_FLAG_VADDR (1 << 2)__u64 vaddr;/* Process virtual address */ __u64 iova;/* IO virtual address */ __u64 size;/* Size of mapping (bytes) */
@@ -1102,6 +1118,7 @@ struct vfio_bitmap {* field. No guarantee is made to the user that arbitrary unmaps of iova * or size different from those used in the original mapping call will * succeed. +* * VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP should be set to get the dirty bitmap * before unmapping IO virtual addresses. When this flag is set, the user must * provide a struct vfio_bitmap in data[]. User must provide zero-allocated
@@ -1111,11 +1128,21 @@ struct vfio_bitmap {* indicates that the page at that offset from iova is dirty. A Bitmap of the * pages in the range of unmapped size is returned in the user-provided * vfio_bitmap.data. +* +* If flags & VFIO_DMA_UNMAP_FLAG_ALL, unmap all addresses. iova and size +* must be 0. This cannot be combined with the get-dirty-bitmap flag. +* +* If flags & VFIO_DMA_UNMAP_FLAG_VADDR, do not unmap, but invalidate host +* virtual addresses in the iova range. Tasks that attempt to translate an +* iova's vaddr will block. DMA to already-mapped pages continues. This +* cannot be combined with the get-dirty-bitmap flag. */ struct vfio_iommu_type1_dma_unmap {__u32 argsz;__u32 flags;#define VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP (1 << 0) +#define VFIO_DMA_UNMAP_FLAG_ALL (1 << 1) +#define VFIO_DMA_UNMAP_FLAG_VADDR (1 << 2)__u64 iova;/* IO virtual address */ __u64 size;/* Size of mapping (bytes) */ __u8 data[];
Signature · 1 line
2.17.1
PATCH v4 2/3 ppc: Rename current DAWR macros and variables
In reply to Ravi BangoriaPower10 is introducing second DAWR. Use real register names (with suffix 0) from ISA for current macros and variables used by Qemu.
One exception to this is KVM_REG_PPC_DAWR[X]. This is from kernel uapi header and thus not changed in kernel as well as Qemu.
--- include/hw/ppc/spapr.h | 2 +- target/ppc/cpu.h | 4 ++-- target/ppc/translate_init.c.inc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
include/hw/ppc/spapr.h +1 -1
@@ -363,7 +363,7 @@ struct SpaprMachineState {/* Values for 2nd argument to H_SET_MODE */ #define H_SET_MODE_RESOURCE_SET_CIABR 1 -#define H_SET_MODE_RESOURCE_SET_DAWR 2 +#define H_SET_MODE_RESOURCE_SET_DAWR0 2#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE 3#define H_SET_MODE_RESOURCE_LE 4
target/ppc/cpu.h +2 -2
@@ -1459,10 +1459,10 @@ typedef PowerPCCPU ArchCPU;#define SPR_MPC_BAR (0x09F)#define SPR_PSPB (0x09F)#define SPR_DPDES (0x0B0) -#define SPR_DAWR (0x0B4) +#define SPR_DAWR0 (0x0B4)#define SPR_RPR (0x0BA)#define SPR_CIABR (0x0BB) -#define SPR_DAWRX (0x0BC) +#define SPR_DAWRX0 (0x0BC)#define SPR_HFSCR (0x0BE)#define SPR_VRSAVE (0x100)#define SPR_USPRG0 (0x100)
target/ppc/translate_init.c.inc +2 -2
@@ -7748,12 +7748,12 @@ static void gen_spr_book3s_dbg(CPUPPCState *env) static void gen_spr_book3s_207_dbg(CPUPPCState *env) { - spr_register_kvm_hv(env, SPR_DAWR, "DAWR", + spr_register_kvm_hv(env, SPR_DAWR0, "DAWR0", SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, KVM_REG_PPC_DAWR, 0x00000000); - spr_register_kvm_hv(env, SPR_DAWRX, "DAWRX", + spr_register_kvm_hv(env, SPR_DAWRX0, "DAWRX0", SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic,
Signature · 1 line
2.17.1
PATCH v4 3/3 ppc: Enable 2nd DAWR support on p10
In reply to Ravi BangoriaAs per the PAPR, bit 0 of byte 64 in pa-features property indicates availability of 2nd DAWR registers. i.e. If this bit is set, 2nd DAWR is present, otherwise not. Use KVM_CAP_PPC_DAWR1 capability to find whether kvm supports 2nd DAWR or not. If it's supported, allow user to set the pa-feature bit in guest DT using cap-dawr1 machine capability. Though, watchpoint on powerpc TCG guest is not supported and thus 2nd DAWR is not enabled for TCG mode.
--- hw/ppc/spapr.c | 7 ++++++- hw/ppc/spapr_caps.c | 32 ++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 6 +++++- target/ppc/cpu.h | 2 ++ target/ppc/kvm.c | 12 ++++++++++++ target/ppc/kvm_ppc.h | 12 ++++++++++++ target/ppc/translate_init.c.inc | 15 +++++++++++++++ 7 files changed, 84 insertions(+), 2 deletions(-)
hw/ppc/spapr.c +6 -1
@@ -238,7 +238,7 @@ static void spapr_dt_pa_features(SpaprMachineState *spapr,0x80 ,0x00 ,0x80 ,0x00 ,0x80 ,0x00 ,/* 48 - 53 */ /* 54: DecFP, 56: DecI, 58: SHA */ 0x80 ,0x00 ,0x80 ,0x00 ,0x80 ,0x00 ,/* 54 - 59 */ -/* 60: NM atomic, 62: RNG */ +/* 60: NM atomic, 62: RNG, 64: DAWR1 (ISA 3.1) */ 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ };uint8_t *pa_features =NULL ;
@@ -279,6 +279,9 @@ static void spapr_dt_pa_features(SpaprMachineState *spapr,* in pa-features. So hide it from them. */ pa_features[40 +2 ] &= ~0x80 ;/* Radix MMU */ } +if (spapr_get_cap (spapr,SPAPR_CAP_DAWR1 )) { + pa_features[66 ] |=0x80 ; + }_FDT ((fdt_setprop (fdt, offset,"ibm,pa-features" , pa_features, pa_size))); }
@@ -2003,6 +2006,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_cap_ccf_assist, &vmstate_spapr_cap_fwnmi, &vmstate_spapr_fwnmi, + &vmstate_spapr_cap_dawr1, NULL } };
@@ -4542,6 +4546,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_FWNMI ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_DAWR1 ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc); smc->irq = &spapr_irq_dual; smc->dr_phb_enabled = true;
hw/ppc/spapr_caps.c +32 -0
@@ -523,6 +523,28 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, } } +static void cap_dawr1_apply (SpaprMachineState *spapr,uint8_t val, +Error **errp) +{ +ERRP_GUARD (); +if (!val) { +return ;/* Disable by default */ + } + +if (tcg_enabled ()) { +error_setg (errp,"DAWR1 not supported in TCG." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvm_enabled ()) { +if (!kvmppc_has_cap_dawr1 ()) { +error_setg (errp,"DAWR1 not supported by KVM." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvmppc_set_cap_dawr1 (val) <0 ) { +error_setg (errp,"DAWR1 not supported by KVM." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + } + } +} +SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM ] = { [SPAPR_CAP_HTM ] = { .name ="htm" ,
@@ -631,6 +653,15 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = { .type = "bool", .apply = cap_fwnmi_apply, }, + [SPAPR_CAP_DAWR1] = { + .name = "dawr1", + .description = "Allow 2nd Data Address Watchpoint Register (DAWR1)", + .index = SPAPR_CAP_DAWR1, + .get = spapr_cap_get_bool, + .set = spapr_cap_set_bool, + .type = "bool", + .apply = cap_dawr1_apply, + }, }; static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,
@@ -771,6 +802,7 @@ SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);SPAPR_CAP_MIG_STATE (large_decr,SPAPR_CAP_LARGE_DECREMENTER );SPAPR_CAP_MIG_STATE (ccf_assist,SPAPR_CAP_CCF_ASSIST );SPAPR_CAP_MIG_STATE (fwnmi,SPAPR_CAP_FWNMI ); +SPAPR_CAP_MIG_STATE (dawr1,SPAPR_CAP_DAWR1 );void spapr_caps_init (SpaprMachineState *spapr) {
include/hw/ppc/spapr.h +5 -1
@@ -74,8 +74,10 @@ typedef enum {#define SPAPR_CAP_CCF_ASSIST 0x09/* Implements PAPR FWNMI option */ #define SPAPR_CAP_FWNMI 0x0A +/* DAWR1 */ +#define SPAPR_CAP_DAWR1 0x0B/* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_DAWR1 + 1)/* * Capability Values
@@ -366,6 +368,7 @@ struct SpaprMachineState {#define H_SET_MODE_RESOURCE_SET_DAWR0 2#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE 3#define H_SET_MODE_RESOURCE_LE 4 +#define H_SET_MODE_RESOURCE_SET_DAWR1 5/* Flags for H_SET_MODE_RESOURCE_LE */ #define H_SET_MODE_ENDIAN_BIG 0
@@ -921,6 +924,7 @@ extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;extern const VMStateDescription vmstate_spapr_cap_large_decr;extern const VMStateDescription vmstate_spapr_cap_ccf_assist;extern const VMStateDescription vmstate_spapr_cap_fwnmi; +extern const VMStateDescription vmstate_spapr_cap_dawr1;static inline uint8_t spapr_get_cap (SpaprMachineState *spapr,int cap) {
target/ppc/cpu.h +2 -0
@@ -1460,9 +1460,11 @@ typedef PowerPCCPU ArchCPU;#define SPR_PSPB (0x09F)#define SPR_DPDES (0x0B0)#define SPR_DAWR0 (0x0B4) +#define SPR_DAWR1 (0x0B5)#define SPR_RPR (0x0BA)#define SPR_CIABR (0x0BB)#define SPR_DAWRX0 (0x0BC) +#define SPR_DAWRX1 (0x0BD)#define SPR_HFSCR (0x0BE)#define SPR_VRSAVE (0x100)#define SPR_USPRG0 (0x100)
target/ppc/kvm.c +12 -0
@@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;static int cap_ppc_nested_kvm_hv;static int cap_large_decr;static int cap_fwnmi; +static int cap_dawr1;static uint32_t debug_inst_opcode;
@@ -138,6 +139,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_ppc_nested_kvm_hv =kvm_vm_check_extension (s,KVM_CAP_PPC_NESTED_HV ); cap_large_decr =kvmppc_get_dec_bits (); cap_fwnmi =kvm_vm_check_extension (s,KVM_CAP_PPC_FWNMI ); + cap_dawr1 =kvm_vm_check_extension (s,KVM_CAP_PPC_DAWR1 );/* * Note: setting it to false because there is not such capability * in KVM at this moment.
@@ -2091,6 +2093,16 @@ int kvmppc_set_fwnmi(PowerPCCPU *cpu)return kvm_vcpu_enable_cap (cs,KVM_CAP_PPC_FWNMI ,0 ); } +bool kvmppc_has_cap_dawr1 (void ) +{ +return !!cap_dawr1; +} + +int kvmppc_set_cap_dawr1 (int enable) +{ +return kvm_vm_enable_cap (kvm_state,KVM_CAP_PPC_DAWR1 ,0 , enable); +} +int kvmppc_smt_threads (void ) {return cap_ppc_smt ? cap_ppc_smt :1 ;
target/ppc/kvm_ppc.h +12 -0
@@ -63,6 +63,8 @@ bool kvmppc_has_cap_htm(void);bool kvmppc_has_cap_mmu_radix (void );bool kvmppc_has_cap_mmu_hash_v3 (void );bool kvmppc_has_cap_xive (void ); +bool kvmppc_has_cap_dawr1 (void ); +int kvmppc_set_cap_dawr1 (int enable);int kvmppc_get_cap_safe_cache (void );int kvmppc_get_cap_safe_bounds_check (void );int kvmppc_get_cap_safe_indirect_branch (void );
@@ -341,6 +343,16 @@ static inline bool kvmppc_has_cap_xive(void)return false; } +static inline bool kvmppc_has_cap_dawr1 (void ) +{ +return false; +} + +static inline int kvmppc_set_cap_dawr1 (int enable) +{ +abort (); +} +static inline int kvmppc_get_cap_safe_cache (void ) {return 0 ;
target/ppc/translate_init.c.inc +15 -0
@@ -7765,6 +7765,20 @@ static void gen_spr_book3s_207_dbg(CPUPPCState *env) KVM_REG_PPC_CIABR, 0x00000000); } +static void gen_spr_book3s_310_dbg(CPUPPCState *env) +{ + spr_register_kvm_hv(env, SPR_DAWR1, "DAWR1", + SPR_NOACCESS, SPR_NOACCESS, + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DAWR1, 0x00000000); + spr_register_kvm_hv(env, SPR_DAWRX1, "DAWRX1", + SPR_NOACCESS, SPR_NOACCESS, + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DAWRX1, 0x00000000); +} + static void gen_spr_970_dbg(CPUPPCState *env) { /* Breakpoints */
@@ -9142,6 +9156,7 @@ static void init_proc_POWER10(CPUPPCState *env) /* Common Registers */ init_proc_book3s_common(env); gen_spr_book3s_207_dbg(env); + gen_spr_book3s_310_dbg(env); /* POWER8 Specific Registers */ gen_spr_book3s_ids(env);
Signature · 1 line
2.17.1
Re: [PATCH v4 3/3] ppc: Enable 2nd DAWR support on p10
Quoted 73 lines · On Tue, 6 Apr 2021 11:08:33 +0530 Ravi Bangoria <[email protected]>…
As per the PAPR, bit 0 of byte 64 in pa-features property indicates availability of 2nd DAWR registers. i.e. If this bit is set, 2nd DAWR is present, otherwise not. Use
KVM_CAP_PPC_DAWR1capability to find whether kvm supports 2nd DAWR or not. If it's supported, allow user to set the pa-feature bit in guest DT using cap-dawr1 machine capability. Though, watchpoint on powerpc TCG guest is not supported and thus 2nd DAWR is not enabled for TCG mode.Signed-off-by Ravi Bangoria <[email protected]>--- hw/ppc/spapr.c | 7 ++++++- hw/ppc/spapr_caps.c | 32 ++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 6 +++++- target/ppc/cpu.h | 2 ++ target/ppc/kvm.c | 12 ++++++++++++ target/ppc/kvm_ppc.h | 12 ++++++++++++ target/ppc/translate_init.c.inc | 15 +++++++++++++++ 7 files changed, 84 insertions(+), 2 deletions(-)hw/ppc/spapr.c +6
-1@@ -238,7 +238,7 @@ static void spapr_dt_pa_features(SpaprMachineState *spapr,0x80 ,0x00 ,0x80 ,0x00 ,0x80 ,0x00 ,/* 48 - 53 */ /* 54: DecFP, 56: DecI, 58: SHA */ 0x80 ,0x00 ,0x80 ,0x00 ,0x80 ,0x00 ,/* 54 - 59 */ -/* 60: NM atomic, 62: RNG */ +/* 60: NM atomic, 62: RNG, 64: DAWR1 (ISA 3.1) */ 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ };uint8_t *pa_features =NULL ;@@ -279,6 +279,9 @@ static void spapr_dt_pa_features(SpaprMachineState *spapr,* in pa-features. So hide it from them. */ pa_features[40 +2 ] &= ~0x80 ;/* Radix MMU */ } +if (spapr_get_cap (spapr,SPAPR_CAP_DAWR1 )) { + pa_features[66 ] |=0x80 ; + }_FDT ((fdt_setprop (fdt, offset,"ibm,pa-features" , pa_features, pa_size))); }@@ -2003,6 +2006,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_cap_ccf_assist, &vmstate_spapr_cap_fwnmi, &vmstate_spapr_fwnmi, + &vmstate_spapr_cap_dawr1, NULL } };@@ -4542,6 +4546,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_FWNMI ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_DAWR1 ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc); smc->irq = &spapr_irq_dual; smc->dr_phb_enabled = true;hw/ppc/spapr_caps.c +7
-0@@ -523,6 +523,28 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, } } +static void cap_dawr1_apply (SpaprMachineState *spapr,uint8_t val, +Error **errp) +{ +ERRP_GUARD (); +if (!val) { +return ;/* Disable by default */ + }
hw/ppc/spapr_caps.c static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, · line 542
Quoted 10 lines
hw/ppc/spapr_caps.c +10
-0+ +if (tcg_enabled ()) { +error_setg (errp,"DAWR1 not supported in TCG." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvm_enabled ()) { +if (!kvmppc_has_cap_dawr1 ()) { +error_setg (errp,"DAWR1 not supported by KVM." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvmppc_set_cap_dawr1 (val) <0 ) { +error_setg (errp,"DAWR1 not supported by KVM." );
Well... technically KVM does support DAWR1 but something went wrong when trying to enable it. In case you need to repost, maybe change the error message in this path, e.g. like in cap_nested_kvm_hv_apply().
Apart from that, LGTM.
Quoted 180 lines
hw/ppc/spapr_caps.c +15
-0+error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + } + } +} +SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM ] = { [SPAPR_CAP_HTM ] = { .name ="htm" ,@@ -631,6 +653,15 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = { .type = "bool", .apply = cap_fwnmi_apply, }, + [SPAPR_CAP_DAWR1] = { + .name = "dawr1", + .description = "Allow 2nd Data Address Watchpoint Register (DAWR1)", + .index = SPAPR_CAP_DAWR1, + .get = spapr_cap_get_bool, + .set = spapr_cap_set_bool, + .type = "bool", + .apply = cap_dawr1_apply, + }, }; static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,@@ -771,6 +802,7 @@ SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);SPAPR_CAP_MIG_STATE (large_decr,SPAPR_CAP_LARGE_DECREMENTER );SPAPR_CAP_MIG_STATE (ccf_assist,SPAPR_CAP_CCF_ASSIST );SPAPR_CAP_MIG_STATE (fwnmi,SPAPR_CAP_FWNMI ); +SPAPR_CAP_MIG_STATE (dawr1,SPAPR_CAP_DAWR1 );void spapr_caps_init (SpaprMachineState *spapr) {include/hw/ppc/spapr.h +5
-1@@ -74,8 +74,10 @@ typedef enum {#define SPAPR_CAP_CCF_ASSIST 0x09/* Implements PAPR FWNMI option */ #define SPAPR_CAP_FWNMI 0x0A +/* DAWR1 */ +#define SPAPR_CAP_DAWR1 0x0B/* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_DAWR1 + 1)/* * Capability Values @@ -366,6 +368,7 @@ struct SpaprMachineState {#define H_SET_MODE_RESOURCE_SET_DAWR0 2#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE 3#define H_SET_MODE_RESOURCE_LE 4 +#define H_SET_MODE_RESOURCE_SET_DAWR1 5/* Flags for H_SET_MODE_RESOURCE_LE */ #define H_SET_MODE_ENDIAN_BIG 0@@ -921,6 +924,7 @@ extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;extern const VMStateDescription vmstate_spapr_cap_large_decr;extern const VMStateDescription vmstate_spapr_cap_ccf_assist;extern const VMStateDescription vmstate_spapr_cap_fwnmi; +extern const VMStateDescription vmstate_spapr_cap_dawr1;static inline uint8_t spapr_get_cap (SpaprMachineState *spapr,int cap) {target/ppc/cpu.h +2
-0@@ -1460,9 +1460,11 @@ typedef PowerPCCPU ArchCPU;#define SPR_PSPB (0x09F)#define SPR_DPDES (0x0B0)#define SPR_DAWR0 (0x0B4) +#define SPR_DAWR1 (0x0B5)#define SPR_RPR (0x0BA)#define SPR_CIABR (0x0BB)#define SPR_DAWRX0 (0x0BC) +#define SPR_DAWRX1 (0x0BD)#define SPR_HFSCR (0x0BE)#define SPR_VRSAVE (0x100)#define SPR_USPRG0 (0x100)target/ppc/kvm.c +12
-0@@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;static int cap_ppc_nested_kvm_hv;static int cap_large_decr;static int cap_fwnmi; +static int cap_dawr1;static uint32_t debug_inst_opcode;@@ -138,6 +139,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_ppc_nested_kvm_hv =kvm_vm_check_extension (s,KVM_CAP_PPC_NESTED_HV ); cap_large_decr =kvmppc_get_dec_bits (); cap_fwnmi =kvm_vm_check_extension (s,KVM_CAP_PPC_FWNMI ); + cap_dawr1 =kvm_vm_check_extension (s,KVM_CAP_PPC_DAWR1 );/* * Note: setting it to false because there is not such capability * in KVM at this moment. @@ -2091,6 +2093,16 @@ int kvmppc_set_fwnmi(PowerPCCPU *cpu)return kvm_vcpu_enable_cap (cs,KVM_CAP_PPC_FWNMI ,0 ); } +bool kvmppc_has_cap_dawr1 (void ) +{ +return !!cap_dawr1; +} + +int kvmppc_set_cap_dawr1 (int enable) +{ +return kvm_vm_enable_cap (kvm_state,KVM_CAP_PPC_DAWR1 ,0 , enable); +} +int kvmppc_smt_threads (void ) {return cap_ppc_smt ? cap_ppc_smt :1 ;target/ppc/kvm_ppc.h +12
-0@@ -63,6 +63,8 @@ bool kvmppc_has_cap_htm(void);bool kvmppc_has_cap_mmu_radix (void );bool kvmppc_has_cap_mmu_hash_v3 (void );bool kvmppc_has_cap_xive (void ); +bool kvmppc_has_cap_dawr1 (void ); +int kvmppc_set_cap_dawr1 (int enable);int kvmppc_get_cap_safe_cache (void );int kvmppc_get_cap_safe_bounds_check (void );int kvmppc_get_cap_safe_indirect_branch (void );@@ -341,6 +343,16 @@ static inline bool kvmppc_has_cap_xive(void)return false; } +static inline bool kvmppc_has_cap_dawr1 (void ) +{ +return false; +} + +static inline int kvmppc_set_cap_dawr1 (int enable) +{ +abort (); +} +static inline int kvmppc_get_cap_safe_cache (void ) {return 0 ;target/ppc/translate_init.c.inc +15
-0@@ -7765,6 +7765,20 @@ static void gen_spr_book3s_207_dbg(CPUPPCState *env) KVM_REG_PPC_CIABR, 0x00000000); } +static void gen_spr_book3s_310_dbg(CPUPPCState *env) +{ + spr_register_kvm_hv(env, SPR_DAWR1, "DAWR1", + SPR_NOACCESS, SPR_NOACCESS, + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DAWR1, 0x00000000); + spr_register_kvm_hv(env, SPR_DAWRX1, "DAWRX1", + SPR_NOACCESS, SPR_NOACCESS, + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DAWRX1, 0x00000000); +} + static void gen_spr_970_dbg(CPUPPCState *env) { /* Breakpoints */@@ -9142,6 +9156,7 @@ static void init_proc_POWER10(CPUPPCState *env) /* Common Registers */ init_proc_book3s_common(env); gen_spr_book3s_207_dbg(env); + gen_spr_book3s_310_dbg(env); /* POWER8 Specific Registers */ gen_spr_book3s_ids(env);
Re: [PATCH v4 3/3] ppc: Enable 2nd DAWR support on p10
Quoted 82 lines · Greg Kurz
Quoted 79 lines · On Tue, 6 Apr 2021 11:08:33 +0530 Ravi Bangoria <[email protected]>…
As per the PAPR, bit 0 of byte 64 in pa-features property indicates availability of 2nd DAWR registers. i.e. If this bit is set, 2nd DAWR is present, otherwise not. Use
KVM_CAP_PPC_DAWR1capability to find whether kvm supports 2nd DAWR or not. If it's supported, allow user to set the pa-feature bit in guest DT using cap-dawr1 machine capability. Though, watchpoint on powerpc TCG guest is not supported and thus 2nd DAWR is not enabled for TCG mode.Signed-off-by Ravi Bangoria <[email protected]>--- hw/ppc/spapr.c | 7 ++++++- hw/ppc/spapr_caps.c | 32 ++++++++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 6 +++++- target/ppc/cpu.h | 2 ++ target/ppc/kvm.c | 12 ++++++++++++ target/ppc/kvm_ppc.h | 12 ++++++++++++ target/ppc/translate_init.c.inc | 15 +++++++++++++++ 7 files changed, 84 insertions(+), 2 deletions(-)hw/ppc/spapr.c +6
-1@@ -238,7 +238,7 @@ static void spapr_dt_pa_features(SpaprMachineState *spapr,0x80 ,0x00 ,0x80 ,0x00 ,0x80 ,0x00 ,/* 48 - 53 */ /* 54: DecFP, 56: DecI, 58: SHA */ 0x80 ,0x00 ,0x80 ,0x00 ,0x80 ,0x00 ,/* 54 - 59 */ -/* 60: NM atomic, 62: RNG */ +/* 60: NM atomic, 62: RNG, 64: DAWR1 (ISA 3.1) */ 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, /* 60 - 65 */ };uint8_t *pa_features =NULL ;@@ -279,6 +279,9 @@ static void spapr_dt_pa_features(SpaprMachineState *spapr,* in pa-features. So hide it from them. */ pa_features[40 +2 ] &= ~0x80 ;/* Radix MMU */ } +if (spapr_get_cap (spapr,SPAPR_CAP_DAWR1 )) { + pa_features[66 ] |=0x80 ; + }_FDT ((fdt_setprop (fdt, offset,"ibm,pa-features" , pa_features, pa_size))); }@@ -2003,6 +2006,7 @@ static const VMStateDescription vmstate_spapr = { &vmstate_spapr_cap_ccf_assist, &vmstate_spapr_cap_fwnmi, &vmstate_spapr_fwnmi, + &vmstate_spapr_cap_dawr1, NULL } };@@ -4542,6 +4546,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST ] =SPAPR_CAP_ON ; smc->default_caps.caps[SPAPR_CAP_FWNMI ] =SPAPR_CAP_ON ; + smc->default_caps.caps[SPAPR_CAP_DAWR1 ] =SPAPR_CAP_OFF ;spapr_caps_add_properties (smc); smc->irq = &spapr_irq_dual; smc->dr_phb_enabled = true;hw/ppc/spapr_caps.c +13
-0@@ -523,6 +523,28 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, } } +static void cap_dawr1_apply (SpaprMachineState *spapr,uint8_t val, +Error **errp) +{ +ERRP_GUARD (); +if (!val) { +return ;/* Disable by default */ + } + +if (tcg_enabled ()) { +error_setg (errp,"DAWR1 not supported in TCG." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvm_enabled ()) { +if (!kvmppc_has_cap_dawr1 ()) {
Quoted 8 lines
hw/ppc/spapr_caps.c static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, · line 542
Quoted 4 lines
hw/ppc/spapr_caps.c +4
-0+error_setg (errp,"DAWR1 not supported by KVM." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvmppc_set_cap_dawr1 (val) <0 ) { +error_setg (errp,"DAWR1 not supported by KVM." );Well... technically KVM does support DAWR1 but something went wrong when trying to enable it. In case you need to repost, maybe change the error message in this path, e.g. like in
cap_nested_kvm_hv_apply().
This won't be going in until 6.1 anyway, so please to update the message.
I'd probably prefer to actually wait until the 6.1 tree opens to apply this, rather than pre-queueing it in ppc-for-6.1, because there's a fairly good chance the header update patch will conflict with someone else's during the 6.1 merge flurry.
Quoted 186 lines
Apart from that, LGTM.
Reviewed-by Greg Kurz <[email protected]>Quoted 180 lines
hw/ppc/spapr_caps.c +15
-0+error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + } + } +} +SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM ] = { [SPAPR_CAP_HTM ] = { .name ="htm" ,@@ -631,6 +653,15 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = { .type = "bool", .apply = cap_fwnmi_apply, }, + [SPAPR_CAP_DAWR1] = { + .name = "dawr1", + .description = "Allow 2nd Data Address Watchpoint Register (DAWR1)", + .index = SPAPR_CAP_DAWR1, + .get = spapr_cap_get_bool, + .set = spapr_cap_set_bool, + .type = "bool", + .apply = cap_dawr1_apply, + }, }; static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,@@ -771,6 +802,7 @@ SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);SPAPR_CAP_MIG_STATE (large_decr,SPAPR_CAP_LARGE_DECREMENTER );SPAPR_CAP_MIG_STATE (ccf_assist,SPAPR_CAP_CCF_ASSIST );SPAPR_CAP_MIG_STATE (fwnmi,SPAPR_CAP_FWNMI ); +SPAPR_CAP_MIG_STATE (dawr1,SPAPR_CAP_DAWR1 );void spapr_caps_init (SpaprMachineState *spapr) {include/hw/ppc/spapr.h +5
-1@@ -74,8 +74,10 @@ typedef enum {#define SPAPR_CAP_CCF_ASSIST 0x09/* Implements PAPR FWNMI option */ #define SPAPR_CAP_FWNMI 0x0A +/* DAWR1 */ +#define SPAPR_CAP_DAWR1 0x0B/* Num Caps */ -#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI + 1) +#define SPAPR_CAP_NUM (SPAPR_CAP_DAWR1 + 1)/* * Capability Values @@ -366,6 +368,7 @@ struct SpaprMachineState {#define H_SET_MODE_RESOURCE_SET_DAWR0 2#define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE 3#define H_SET_MODE_RESOURCE_LE 4 +#define H_SET_MODE_RESOURCE_SET_DAWR1 5/* Flags for H_SET_MODE_RESOURCE_LE */ #define H_SET_MODE_ENDIAN_BIG 0@@ -921,6 +924,7 @@ extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;extern const VMStateDescription vmstate_spapr_cap_large_decr;extern const VMStateDescription vmstate_spapr_cap_ccf_assist;extern const VMStateDescription vmstate_spapr_cap_fwnmi; +extern const VMStateDescription vmstate_spapr_cap_dawr1;static inline uint8_t spapr_get_cap (SpaprMachineState *spapr,int cap) {target/ppc/cpu.h +2
-0@@ -1460,9 +1460,11 @@ typedef PowerPCCPU ArchCPU;#define SPR_PSPB (0x09F)#define SPR_DPDES (0x0B0)#define SPR_DAWR0 (0x0B4) +#define SPR_DAWR1 (0x0B5)#define SPR_RPR (0x0BA)#define SPR_CIABR (0x0BB)#define SPR_DAWRX0 (0x0BC) +#define SPR_DAWRX1 (0x0BD)#define SPR_HFSCR (0x0BE)#define SPR_VRSAVE (0x100)#define SPR_USPRG0 (0x100)target/ppc/kvm.c +12
-0@@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;static int cap_ppc_nested_kvm_hv;static int cap_large_decr;static int cap_fwnmi; +static int cap_dawr1;static uint32_t debug_inst_opcode;@@ -138,6 +139,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_ppc_nested_kvm_hv =kvm_vm_check_extension (s,KVM_CAP_PPC_NESTED_HV ); cap_large_decr =kvmppc_get_dec_bits (); cap_fwnmi =kvm_vm_check_extension (s,KVM_CAP_PPC_FWNMI ); + cap_dawr1 =kvm_vm_check_extension (s,KVM_CAP_PPC_DAWR1 );/* * Note: setting it to false because there is not such capability * in KVM at this moment. @@ -2091,6 +2093,16 @@ int kvmppc_set_fwnmi(PowerPCCPU *cpu)return kvm_vcpu_enable_cap (cs,KVM_CAP_PPC_FWNMI ,0 ); } +bool kvmppc_has_cap_dawr1 (void ) +{ +return !!cap_dawr1; +} + +int kvmppc_set_cap_dawr1 (int enable) +{ +return kvm_vm_enable_cap (kvm_state,KVM_CAP_PPC_DAWR1 ,0 , enable); +} +int kvmppc_smt_threads (void ) {return cap_ppc_smt ? cap_ppc_smt :1 ;target/ppc/kvm_ppc.h +12
-0@@ -63,6 +63,8 @@ bool kvmppc_has_cap_htm(void);bool kvmppc_has_cap_mmu_radix (void );bool kvmppc_has_cap_mmu_hash_v3 (void );bool kvmppc_has_cap_xive (void ); +bool kvmppc_has_cap_dawr1 (void ); +int kvmppc_set_cap_dawr1 (int enable);int kvmppc_get_cap_safe_cache (void );int kvmppc_get_cap_safe_bounds_check (void );int kvmppc_get_cap_safe_indirect_branch (void );@@ -341,6 +343,16 @@ static inline bool kvmppc_has_cap_xive(void)return false; } +static inline bool kvmppc_has_cap_dawr1 (void ) +{ +return false; +} + +static inline int kvmppc_set_cap_dawr1 (int enable) +{ +abort (); +} +static inline int kvmppc_get_cap_safe_cache (void ) {return 0 ;target/ppc/translate_init.c.inc +15
-0@@ -7765,6 +7765,20 @@ static void gen_spr_book3s_207_dbg(CPUPPCState *env) KVM_REG_PPC_CIABR, 0x00000000); } +static void gen_spr_book3s_310_dbg(CPUPPCState *env) +{ + spr_register_kvm_hv(env, SPR_DAWR1, "DAWR1", + SPR_NOACCESS, SPR_NOACCESS, + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DAWR1, 0x00000000); + spr_register_kvm_hv(env, SPR_DAWRX1, "DAWRX1", + SPR_NOACCESS, SPR_NOACCESS, + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DAWRX1, 0x00000000); +} + static void gen_spr_970_dbg(CPUPPCState *env) { /* Breakpoints */@@ -9142,6 +9156,7 @@ static void init_proc_POWER10(CPUPPCState *env) /* Common Registers */ init_proc_book3s_common(env); gen_spr_book3s_207_dbg(env); + gen_spr_book3s_310_dbg(env); /* POWER8 Specific Registers */ gen_spr_book3s_ids(env);
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [PATCH v4 3/3] ppc: Enable 2nd DAWR support on p10
Quoted 23 lines
Quoted 14 lines
Quoted 14 lines
hw/ppc/spapr_caps.c +13
-0+static void cap_dawr1_apply (SpaprMachineState *spapr,uint8_t val, +Error **errp) +{ +ERRP_GUARD (); +if (!val) { +return ;/* Disable by default */ + } + +if (tcg_enabled ()) { +error_setg (errp,"DAWR1 not supported in TCG." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvm_enabled ()) { +if (!kvmppc_has_cap_dawr1 ()) {Quoted 8 lines
hw/ppc/spapr_caps.c static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val, · line 542
Quoted 4 lines
hw/ppc/spapr_caps.c +4
-0+error_setg (errp,"DAWR1 not supported by KVM." ); +error_append_hint (errp,"Try appending -machine cap-dawr1=off\n" ); + }else if (kvmppc_set_cap_dawr1 (val) <0 ) { +error_setg (errp,"DAWR1 not supported by KVM." );Well... technically KVM does support DAWR1 but something went wrong when trying to enable it. In case you need to repost, maybe change the error message in this path, e.g. like in
cap_nested_kvm_hv_apply().
Quoted 2 lines
This won't be going in until 6.1 anyway, so please to update the message.
Sure. Will post v5 with updated message.
Quoted 5 lines
I'd probably prefer to actually wait until the 6.1 tree opens to apply this, rather than pre-queueing it in ppc-for-6.1, because there's a fairly good chance the header update patch will conflict with someone else's during the 6.1 merge flurry.
No worries.
Thanks Greg, David for the review.
Ravi