Skip to content

Commit 367eb09

Browse files
author
Marc Zyngier
committed
Merge branch kvm-arm64/selftest/misc-6.4 into kvmarm-master/next
* kvm-arm64/selftest/misc-6.4: : . : Misc selftest updates for 6.4 : : - Add comments for recently added ID registers : . KVM: selftests: Comment newly defined aarch64 ID registers Signed-off-by: Marc Zyngier <maz@kernel.org>
2 parents e2e321a + 767cc05 commit 367eb09

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

tools/testing/selftests/kvm/aarch64/get-reg-list.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -807,10 +807,10 @@ static __u64 base_regs[] = {
807807
ARM64_SYS_REG(3, 0, 0, 3, 7),
808808
ARM64_SYS_REG(3, 0, 0, 4, 0), /* ID_AA64PFR0_EL1 */
809809
ARM64_SYS_REG(3, 0, 0, 4, 1), /* ID_AA64PFR1_EL1 */
810-
ARM64_SYS_REG(3, 0, 0, 4, 2),
810+
ARM64_SYS_REG(3, 0, 0, 4, 2), /* ID_AA64PFR2_EL1 */
811811
ARM64_SYS_REG(3, 0, 0, 4, 3),
812812
ARM64_SYS_REG(3, 0, 0, 4, 4), /* ID_AA64ZFR0_EL1 */
813-
ARM64_SYS_REG(3, 0, 0, 4, 5),
813+
ARM64_SYS_REG(3, 0, 0, 4, 5), /* ID_AA64SMFR0_EL1 */
814814
ARM64_SYS_REG(3, 0, 0, 4, 6),
815815
ARM64_SYS_REG(3, 0, 0, 4, 7),
816816
ARM64_SYS_REG(3, 0, 0, 5, 0), /* ID_AA64DFR0_EL1 */
@@ -823,7 +823,7 @@ static __u64 base_regs[] = {
823823
ARM64_SYS_REG(3, 0, 0, 5, 7),
824824
ARM64_SYS_REG(3, 0, 0, 6, 0), /* ID_AA64ISAR0_EL1 */
825825
ARM64_SYS_REG(3, 0, 0, 6, 1), /* ID_AA64ISAR1_EL1 */
826-
ARM64_SYS_REG(3, 0, 0, 6, 2),
826+
ARM64_SYS_REG(3, 0, 0, 6, 2), /* ID_AA64ISAR2_EL1 */
827827
ARM64_SYS_REG(3, 0, 0, 6, 3),
828828
ARM64_SYS_REG(3, 0, 0, 6, 4),
829829
ARM64_SYS_REG(3, 0, 0, 6, 5),
@@ -832,8 +832,8 @@ static __u64 base_regs[] = {
832832
ARM64_SYS_REG(3, 0, 0, 7, 0), /* ID_AA64MMFR0_EL1 */
833833
ARM64_SYS_REG(3, 0, 0, 7, 1), /* ID_AA64MMFR1_EL1 */
834834
ARM64_SYS_REG(3, 0, 0, 7, 2), /* ID_AA64MMFR2_EL1 */
835-
ARM64_SYS_REG(3, 0, 0, 7, 3),
836-
ARM64_SYS_REG(3, 0, 0, 7, 4),
835+
ARM64_SYS_REG(3, 0, 0, 7, 3), /* ID_AA64MMFR3_EL1 */
836+
ARM64_SYS_REG(3, 0, 0, 7, 4), /* ID_AA64MMFR4_EL1 */
837837
ARM64_SYS_REG(3, 0, 0, 7, 5),
838838
ARM64_SYS_REG(3, 0, 0, 7, 6),
839839
ARM64_SYS_REG(3, 0, 0, 7, 7),

0 commit comments

Comments
 (0)