Re: [PATCH v2 02/16] KVM: arm64: Get rid of __kvm_get_mdcr_el2() and related warts

[Oliver Upton <oliver.upton@linux.dev>]

Hi Colton,

On Thu, Nov 28, 2024 at 07:35:10PM +0000, Colton Lewis wrote:
> Oliver Upton <oliver.upton@linux.dev> writes:
> > -/**
> > - * kvm_arm_init_debug - grab what we need for debug
> > - *
> > - * Currently the sole task of this function is to retrieve the initial
> > - * value of mdcr_el2 so we can preserve MDCR_EL2.HPMN which has
> > - * presumably been set-up by some knowledgeable bootcode.
> > - *
> > - * It is called once per-cpu during CPU hyp initialisation.
> > - */
> > -
> > -void kvm_arm_init_debug(void)
> > -{
> > -	__this_cpu_write(mdcr_el2, kvm_call_hyp_ret(__kvm_get_mdcr_el2));
> > -}
> > -
> >   /**
> >    * kvm_arm_setup_mdcr_el2 - configure vcpu mdcr_el2 value
> >    *
> > @@ -94,7 +77,8 @@ static void kvm_arm_setup_mdcr_el2(struct kvm_vcpu
> > *vcpu)
> >   	 * This also clears MDCR_EL2_E2PB_MASK and MDCR_EL2_E2TB_MASK
> >   	 * to disable guest access to the profiling and trace buffers
> >   	 */
> > -	vcpu->arch.mdcr_el2 = __this_cpu_read(mdcr_el2) & MDCR_EL2_HPMN_MASK;
> > +	vcpu->arch.mdcr_el2 = FIELD_PREP(MDCR_EL2_HPMN,
> 
> MDCR_EL2_HPMN is not defined

As of commit 641630313e9c ("arm64: sysreg: Migrate MDCR_EL2 definition to
table") the field definitions for MDCR_EL2 are generated from the sysreg
table.

The generated header defines this macro.

-- 
Thanks,
Oliver