arm64/vmm: Save dbgclaimset_el1

zxombie · zxombie · commit 4954ec00c420 · 2025-10-02T17:21:33.000+01:00
It may be used by the guest. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D52803
diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h
@@ -87,6 +87,7 @@ struct hypctx {
 	uint64_t	pmevcntr_el0[31];
 	uint64_t	pmevtyper_el0[31];
 
+	uint64_t	dbgclaimset_el1;
 	uint64_t	dbgbcr_el1[16];	/* Debug Breakpoint Control Registers */
 	uint64_t	dbgbvr_el1[16];	/* Debug Breakpoint Value Registers */
 	uint64_t	dbgwcr_el1[16];	/* Debug Watchpoint Control Registers */
diff --git a/sys/arm64/vmm/vmm_hyp.c b/sys/arm64/vmm/vmm_hyp.c
@@ -121,6 +121,8 @@ vmm_hyp_reg_store(struct hypctx *hypctx, struct hyp *hyp, bool guest,
 		}
 	}
 
+	hypctx->dbgclaimset_el1 = READ_SPECIALREG(dbgclaimset_el1);
+
 	dfr0 = READ_SPECIALREG(id_aa64dfr0_el1);
 	switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) {
 #define	STORE_DBG_BRP(x)						\
@@ -394,6 +396,9 @@ vmm_hyp_reg_restore(struct hypctx *hypctx, struct hyp *hyp, bool guest,
 #undef LOAD_PMU
 	}
 
+	WRITE_SPECIALREG(dbgclaimclr_el1, ~0ul);
+	WRITE_SPECIALREG(dbgclaimclr_el1, hypctx->dbgclaimset_el1);
+
 	dfr0 = READ_SPECIALREG(id_aa64dfr0_el1);
 	switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) {
 #define	LOAD_DBG_BRP(x)							\

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,8 @@ vmm_hyp_reg_store(struct hypctx hypctx, struct hyp hyp, bool guest,`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
	`124`	`+ hypctx->dbgclaimset_el1 = READ_SPECIALREG(dbgclaimset_el1);`
	`125`	`+`
`124`	`126`	`dfr0 = READ_SPECIALREG(id_aa64dfr0_el1);`
`125`	`127`	`switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) {`
`126`	`128`	`#define STORE_DBG_BRP(x) \`
`@@ -394,6 +396,9 @@ vmm_hyp_reg_restore(struct hypctx hypctx, struct hyp hyp, bool guest,`
`394`	`396`	`#undef LOAD_PMU`
`395`	`397`	`}`
`396`	`398`
	`399`	`+ WRITE_SPECIALREG(dbgclaimclr_el1, ~0ul);`
	`400`	`+ WRITE_SPECIALREG(dbgclaimclr_el1, hypctx->dbgclaimset_el1);`
	`401`	`+`
`397`	`402`	`dfr0 = READ_SPECIALREG(id_aa64dfr0_el1);`
`398`	`403`	`switch (ID_AA64DFR0_BRPs_VAL(dfr0) - 1) {`
`399`	`404`	`#define LOAD_DBG_BRP(x) \`