From: Marc Zyngier <maz@kernel.org>
Date: Fri, 17 Jan 2025 11:05:44 +0000 (+0000)
Subject: Merge branch kvm-arm64/coresight-6.14 into kvmarm-master/next
X-Git-Tag: v6.14-rc1~60^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=946904e728eaf1d505d396516bed1eecac02939b;p=thirdparty%2Fkernel%2Flinux.git

Merge branch kvm-arm64/coresight-6.14 into kvmarm-master/next

* kvm-arm64/coresight-6.14:
  : .
  : Trace filtering update from James Clark. From the cover letter:
  :
  : "The guest filtering rules from the Perf session are now honored for both
  : nVHE and VHE modes. This is done by either writing to TRFCR_EL12 at the
  : start of the Perf session and doing nothing else further, or caching the
  : guest value and writing it at guest switch for nVHE. In pKVM, trace is
  : now be disabled for both protected and unprotected guests."
  : .
  KVM: arm64: Fix selftests after sysreg field name update
  coresight: Pass guest TRFCR value to KVM
  KVM: arm64: Support trace filtering for guests
  KVM: arm64: coresight: Give TRBE enabled state to KVM
  coresight: trbe: Remove redundant disable call
  arm64/sysreg/tools: Move TRFCR definitions to sysreg
  tools: arm64: Update sysreg.h header files

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

946904e728eaf1d505d396516bed1eecac02939b
diff --cc arch/arm64/tools/sysreg
index 40a9e4e2cae69,c28870251220d..4c2c9c6767c93
--- a/arch/arm64/tools/sysreg
+++ b/arch/arm64/tools/sysreg
@@@ -1997,8 -1989,28 +1997,24 @@@ Field	21:20	FPE
  Res0	19:18
  Field	17:16	ZEN
  Res0	15:0
 -EndSysregFields
 -
 -Sysreg	CPACR_EL1	3	0	1	0	2
 -Fields	CPACR_ELx
  EndSysreg
  
+ SysregFields TRFCR_ELx
+ Res0	63:7
+ UnsignedEnum	6:5	TS
+ 	0b0001	VIRTUAL
+ 	0b0010	GUEST_PHYSICAL
+ 	0b0011	PHYSICAL
+ EndEnum
+ Res0	4:2
+ Field	1	ExTRE
+ Field	0	E0TRE
+ EndSysregFields
+ 
+ Sysreg	TRFCR_EL1	3	0	1	2	1
+ Fields	TRFCR_ELx
+ EndSysreg
+ 
  Sysreg	SMPRI_EL1	3	0	1	2	4
  Res0	63:4
  Field	3:0	PRIORITY
@@@ -2955,11 -2983,15 +2987,15 @@@ Mapping	CPACR_EL
  EndSysreg
  
  Sysreg	ZCR_EL12	3	5	1	2	0
 -Fields	ZCR_ELx
 +Mapping	ZCR_EL1
  EndSysreg
  
+ Sysreg	TRFCR_EL12	3	5	1	2	1
+ Fields	TRFCR_ELx
+ EndSysreg
+ 
  Sysreg	SMCR_EL12	3	5	1	2	6
 -Fields	SMCR_ELx
 +Mapping	SMCR_EL1
  EndSysreg
  
  Sysreg	GCSCR_EL12	3	5	2	5	0