On Mon, Dec 16, 2024 at 09:38:30AM +0530, Anshuman Khandual wrote: > Fine grained trap control for MDSELR_EL1 register needs to be configured in > HDFGRTR2_EL2, and HDFGWTR2_EL2 registers when kernel enters at EL1, but EL2 > is also present. Shouldn't this be "when kernel enters at EL2, and EL3 is also present"? Though it is really "If EL3 set FGTEn2 and the kernel is entered in EL2, then FGT2 must be initialized for MDSELR_EL1." If it was me, I'd just plagarize what was written for prior FGT commits for this code. :) > This adds a new helper __init_el2_fgt2() initializing this > new FEAT_FGT2 based fine grained registers. "This adds" is the same as saying "This patch/commit adds" which is well documented to avoid. Use imperative "Add a new helper...". Though it is clear from the diff that is what you are doing... > MDCR_EL2.EBWE needs to be enabled for additional (beyond 16) breakpoint and > watchpoint exceptions when kernel enters at EL1, but EL2 is also present. > This updates __init_el2_debug() as required for FEAT_Debugv8p9. > > While here, also update booting.rst with MDCR_EL3 and SCR_EL3 requirements. > > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Will Deacon <will@xxxxxxxxxx> > Cc: Jonathan Corbet <corbet@xxxxxxx> > Cc: Marc Zyngier <maz@xxxxxxxxxx> > Cc: Oliver Upton <oliver.upton@xxxxxxxxx> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: linux-doc@xxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > Cc: kvmarm@xxxxxxxxxxxxxxx > Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx> > --- > Changes in V3: > > - Dropped MDCR_EL3.TDA boot requirement from documentation (separate series) > - Dropped MDCR_EL2_EBWE definition as MDCR_EL2 is now defined in tools sysreg > > https://lore.kernel.org/all/20241211065425.1106683-1-anshuman.khandual@xxxxxxx/ > > Documentation/arch/arm64/booting.rst | 18 ++++++++++++++++++ > arch/arm64/include/asm/el2_setup.h | 26 ++++++++++++++++++++++++++ > 2 files changed, 44 insertions(+) > > diff --git a/Documentation/arch/arm64/booting.rst b/Documentation/arch/arm64/booting.rst > index 3278fb4bf219..054cfe1cad18 100644 > --- a/Documentation/arch/arm64/booting.rst > +++ b/Documentation/arch/arm64/booting.rst > @@ -288,6 +288,12 @@ Before jumping into the kernel, the following conditions must be met: > > - SCR_EL3.FGTEn (bit 27) must be initialised to 0b1. > > + For CPUs with the Fine Grained Traps (FEAT_FGT2) extension present: > + > + - If EL3 is present and the kernel is entered at EL2: > + > + - SCR_EL3.FGTEn2 (bit 59) must be initialised to 0b1. > + > For CPUs with support for HCRX_EL2 (FEAT_HCX) present: > > - If EL3 is present and the kernel is entered at EL2: > @@ -322,6 +328,18 @@ Before jumping into the kernel, the following conditions must be met: > - ZCR_EL2.LEN must be initialised to the same value for all CPUs the > kernel will execute on. > > + For CPUs with FEAT_Debugv8p9 extension present: > + > + - If the kernel is entered at EL1 and EL2 is present: > + > + - HDFGRTR2_EL2.nMDSELR_EL1 (bit 5) must be initialized to 0b1 > + - HDFGWTR2_EL2.nMDSELR_EL1 (bit 5) must be initialized to 0b1 > + - MDCR_EL2.EBWE (bit 43) must be initialized to 0b1 > + > + - If EL3 is present: > + > + - MDCR_EL3.EBWE (bit 43) must be initialized to 0b1 > + > For CPUs with the Scalable Matrix Extension (FEAT_SME): > > - If EL3 is present: > diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h > index 4ef52d7245bb..2fbfe27d38b5 100644 > --- a/arch/arm64/include/asm/el2_setup.h > +++ b/arch/arm64/include/asm/el2_setup.h > @@ -105,6 +105,13 @@ > // to own it. > > .Lskip_trace_\@: > + mrs x1, id_aa64dfr0_el1 > + ubfx x1, x1, #ID_AA64DFR0_EL1_DebugVer_SHIFT, #4 > + cmp x1, #ID_AA64DFR0_EL1_DebugVer_V8P9 > + b.lt .Lskip_dbg_v8p9_\@ > + > + orr x2, x2, #MDCR_EL2_EBWE > +.Lskip_dbg_v8p9_\@: > msr mdcr_el2, x2 // Configure debug traps > .endm > > @@ -244,6 +251,24 @@ > .Lskip_gcs_\@: > .endm > > +.macro __init_el2_fgt2 > + mrs x1, id_aa64mmfr0_el1 > + ubfx x1, x1, #ID_AA64MMFR0_EL1_FGT_SHIFT, #4 > + cmp x1, #ID_AA64MMFR0_EL1_FGT_FGT2 We already read this field in __init_el2_fgt, shouldn't we leverage that and move all this there rather than read the feature reg twice. > + b.lt .Lskip_fgt2_\@ > + > + mrs x1, id_aa64dfr0_el1 > + ubfx x1, x1, #ID_AA64DFR0_EL1_DebugVer_SHIFT, #4 > + cmp x1, #ID_AA64DFR0_EL1_DebugVer_V8P9 > + b.lt .Lskip_dbg_v8p9_\@ > + > + mov_q x0, HDFGWTR2_EL2_nMDSELR_EL1 > + msr_s SYS_HDFGWTR2_EL2, x0 > + msr_s SYS_HDFGRTR2_EL2, x0 If Debug v8.9 is not present, but FGT2 is, shouldn't we write 0 to these registers? That is what we do for FGT. I just realized I forgot to add FGT2 setup for the PMUv3.9 features I already added in 6.12 and 6.13. So this really needs to land sooner rather than later to add that. Rob
