Hi Marc, On 7/14/23 18:09, Marc Zyngier wrote: > Hey Eric, > > On Fri, 14 Jul 2023 15:47:20 +0100, > Eric Auger <eric.auger@xxxxxxxxxx> wrote: >> Hi Marc, >> >> On 7/12/23 16:57, Marc Zyngier wrote: >>> The HDFGxTR_EL2 registers trap a (huge) set of debug and trace >>> related registers. Add their encodings (and only that, because >>> we really don't care about what these registers actually do at >>> this stage). >>> >>> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx> >>> --- >>> arch/arm64/include/asm/sysreg.h | 78 +++++++++++++++++++++++++++++++++ >>> 1 file changed, 78 insertions(+) >>> >>> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h >>> index 76289339b43b..9dfd127be55a 100644 >>> --- a/arch/arm64/include/asm/sysreg.h >>> +++ b/arch/arm64/include/asm/sysreg.h >>> @@ -194,6 +194,84 @@ >>> #define SYS_DBGDTRTX_EL0 sys_reg(2, 3, 0, 5, 0)* >>> #define SYS_DBGVCR32_EL2 sys_reg(2, 4, 0, 7, 0)* >>> >>> +#define SYS_BRBINF_EL1(n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 0))* >>> +#define SYS_BRBINFINJ_EL1 sys_reg(2, 1, 9, 1, 0)* >>> +#define SYS_BRBSRC_EL1(n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 1))* >>> +#define SYS_BRBSRCINJ_EL1 sys_reg(2, 1, 9, 1, 1)* >>> +#define SYS_BRBTGT_EL1(n) sys_reg(2, 1, 8, (n & 15), (((n & 16) >> 2) | 2))* >>> +#define SYS_BRBTGTINJ_EL1 sys_reg(2, 1, 9, 1, 2)* >>> +#define SYS_BRBTS_EL1 sys_reg(2, 1, 9, 0, 2)* >>> + >>> +#define SYS_BRBCR_EL1 sys_reg(2, 1, 9, 0, 0)* >>> +#define SYS_BRBFCR_EL1 sys_reg(2, 1, 9, 0, 1)* >>> +#define SYS_BRBIDR0_EL1 sys_reg(2, 1, 9, 2, 0)* >>> + >>> +#define SYS_TRCITECR_EL1 sys_reg(3, 0, 1, 2, 3) >>> +#define SYS_TRCITECR_EL1 sys_reg(3, 0, 1, 2, 3) >> I cannot find this one - which is duplicated by the way - in DDI0487Jaa > Ah, that's one of the sucker I got from peeking at the 2023-03 XML and > wrote it twice for a good measure. You can see it there: > > https://developer.arm.com/documentation/ddi0601/2023-03/AArch64-Registers/TRCITECR-EL1--Instrumentation-Trace-Control-Register--EL1- > >>> +#define SYS_TRCACATR(m) sys_reg(2, 1, 2, ((m & 7) << 1), (2 | (m >> 3)))* >>> +#define SYS_TRCACVR(m) sys_reg(2, 1, 2, ((m & 7) << 1), (0 | (m >> 3)))* >>> +#define SYS_TRCAUTHSTATUS sys_reg(2, 1, 7, 14, 6)* >>> +#define SYS_TRCAUXCTLR sys_reg(2, 1, 0, 6, 0)* >>> +#define SYS_TRCBBCTLR sys_reg(2, 1, 0, 15, 0)* >>> +#define SYS_TRCCCCTLR sys_reg(2, 1, 0, 14, 0)* >>> +#define SYS_TRCCIDCCTLR0 sys_reg(2, 1, 3, 0, 2)* >>> +#define SYS_TRCCIDCCTLR1 sys_reg(2, 1, 3, 1, 2)* >>> +#define SYS_TRCCIDCVR(m) sys_reg(2, 1, 3, ((m & 7) << 1), 0)* >>> +#define SYS_TRCCLAIMCLR sys_reg(2, 1, 7, 9, 6)* >>> +#define SYS_TRCCLAIMSET sys_reg(2, 1, 7, 8, 6)* >>> +#define SYS_TRCCNTCTLR(m) sys_reg(2, 1, 0, (4 | (m & 3)), 5)* >>> +#define SYS_TRCCNTRLDVR(m) sys_reg(2, 1, 0, (0 | (m & 3)), 5)* >>> +#define SYS_TRCCNTVR(m) sys_reg(2, 1, 0, (8 | (m & 3)), 5)* >>> +#define SYS_TRCCONFIGR sys_reg(2, 1, 0, 4, 0)* >>> +#define SYS_TRCDEVARCH sys_reg(2, 1, 7, 15, 6)* >>> +#define SYS_TRCDEVID sys_reg(2, 1, 7, 2, 7)* >>> +#define SYS_TRCEVENTCTL0R sys_reg(2, 1, 0, 8, 0)* >>> +#define SYS_TRCEVENTCTL1R sys_reg(2, 1, 0, 9, 0)* >>> +#define SYS_TRCEXTINSELR(m) sys_reg(2, 1, 0, (8 | (m & 3)), 4)* >>> +#define SYS_TRCIDR0 sys_reg(2, 1, 0, 8, 7)* >>> +#define SYS_TRCIDR10 sys_reg(2, 1, 0, 2, 6)* >>> +#define SYS_TRCIDR11 sys_reg(2, 1, 0, 3, 6)* >>> +#define SYS_TRCIDR12 sys_reg(2, 1, 0, 4, 6)* >>> +#define SYS_TRCIDR13 sys_reg(2, 1, 0, 5, 6)* >>> +#define SYS_TRCIDR1 sys_reg(2, 1, 0, 9, 7)* >>> +#define SYS_TRCIDR2 sys_reg(2, 1, 0, 10, 7)* >>> +#define SYS_TRCIDR3 sys_reg(2, 1, 0, 11, 7)* >>> +#define SYS_TRCIDR4 sys_reg(2, 1, 0, 12, 7)* >>> +#define SYS_TRCIDR5 sys_reg(2, 1, 0, 13, 7)* >>> +#define SYS_TRCIDR6 sys_reg(2, 1, 0, 14, 7)* >>> +#define SYS_TRCIDR7 sys_reg(2, 1, 0, 15, 7)* >>> +#define SYS_TRCIDR8 sys_reg(2, 1, 0, 0, 6)* >>> +#define SYS_TRCIDR9 sys_reg(2, 1, 0, 1, 6)* >>> +#define SYS_TRCIMSPEC0 sys_reg(2, 1, 0, 0, 7)* >>> +#define SYS_TRCIMSPEC(m) sys_reg(2, 1, 0, (m & 7), 7)* >>> +#define SYS_TRCITEEDCR sys_reg(2, 1, 0, 2, 1) >> I cannot find this one in D18-1 or elsewhere in DDI0487Jaa > Same thing. You can find it here: > > https://developer.arm.com/documentation/ddi0601/2023-03/AArch64-Registers/TRCITEEDCR--Instrumentation-Trace-Extension-External-Debug-Control-Register > >>> +#define SYS_TRCOSLSR sys_reg(2, 1, 1, 1, 4)* >>> +#define SYS_TRCPRGCTLR sys_reg(2, 1, 0, 1, 0)* >>> +#define SYS_TRCQCTLR sys_reg(2, 1, 0, 1, 1)* >>> +#define SYS_TRCRSCTLR(m) sys_reg(2, 1, 1, (m & 15), (0 | (m >> 4)))* >>> +#define SYS_TRCRSR sys_reg(2, 1, 0, 10, 0)* >>> +#define SYS_TRCSEQEVR(m) sys_reg(2, 1, 0, (m & 3), 4)* >>> +#define SYS_TRCSEQRSTEVR sys_reg(2, 1, 0, 6, 4)* >>> +#define SYS_TRCSEQSTR sys_reg(2, 1, 0, 7, 4)* >>> +#define SYS_TRCSSCCR(m) sys_reg(2, 1, 1, (m & 7), 2)* >>> +#define SYS_TRCSSCSR(m) sys_reg(2, 1, 1, (8 | (m & 7)), 2)* >>> +#define SYS_TRCSSPCICR(m) sys_reg(2, 1, 1, (m & 7), 3)* >>> +#define SYS_TRCSTALLCTLR sys_reg(2, 1, 0, 11, 0)* >>> +#define SYS_TRCSTATR sys_reg(2, 1, 0, 3, 0)* >>> +#define SYS_TRCSYNCPR sys_reg(2, 1, 0, 13, 0)* >>> +#define SYS_TRCTRACEIDR sys_reg(2, 1, 0, 0, 1)* >>> +#define SYS_TRCTSCTLR sys_reg(2, 1, 0, 12, 0)* >>> +#define SYS_TRCVICTLR sys_reg(2, 1, 0, 0, 2)* >>> +#define SYS_TRCVIIECTLR sys_reg(2, 1, 0, 1, 2)* >>> +#define SYS_TRCVIPCSSCTLR sys_reg(2, 1, 0, 3, 2)* >>> +#define SYS_TRCVISSCTLR sys_reg(2, 1, 0, 2, 2)* >>> +#define SYS_TRCVMIDCCTLR0 sys_reg(2, 1, 3, 2, 2)* >>> +#define SYS_TRCVMIDCCTLR1 sys_reg(2, 1, 3, 3, 2)* >>> +#define SYS_TRCVMIDCVR(m) sys_reg(2, 1, 3, ((m & 7) << 1), 1)* >>> + >>> +/* ETM */ >>> +#define SYS_TRCOSLAR sys_reg(2, 1, 1, 0, 4) >> not able to locate this one either. I see the bit of HDFGWTR_EL2 though > This one lives in the ETM spec: > > https://documentation-service.arm.com/static/60017fbb3f22832ff1d6872b > > Page 7-342 has the register number, and the encoding is computed as > per the formula in 4.3.6 "System instructions", page 4-169. OK then feel free to add my Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx> Thanks Eric > > Thanks, > > M. >
