Comments in the code say that our definitions for the FGT registers are not
the generated ones and are updated only as far as DDI0487 J.a however in
commit 9ff67dd26a9e ("KVM: arm64: Use generated FGT RES0 bits instead of
specifying them") we updated to use the generated definitions, and as of
the release of DDI0487 K.a the XML in DD0601 is in sync with the ARM.
Remove the outdated comment about divergence.

Fixes: 9ff67dd26a9e ("KVM: arm64: Use generated FGT RES0 bits instead of specifying them")
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm64/include/asm/kvm_arm.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index d81cc746e0eb..d347483395b4 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -342,12 +342,7 @@
 /*
  * FGT register definitions
  *
- * RES0 and polarity masks as of DDI0487J.a, to be updated as needed.
- * We're not using the generated masks as they are usually ahead of
- * the published ARM ARM, which we use as a reference.
- *
- * Once we get to a point where the two describe the same thing, we'll
- * merge the definitions. One day.
+ * RES0 and polarity masks for the FGT registers.
  */
 #define __HFGRTR_EL2_RES0	HFGxTR_EL2_RES0
 #define __HFGRTR_EL2_MASK	GENMASK(49, 0)

-- 
2.39.2

On Wed, 31 Jul 2024 19:58:37 +0100,
Mark Brown <broonie@kernel.org> wrote:
> 
> Comments in the code say that our definitions for the FGT registers are not
> the generated ones and are updated only as far as DDI0487 J.a however in
> commit 9ff67dd26a9e ("KVM: arm64: Use generated FGT RES0 bits instead of
> specifying them") we updated to use the generated definitions, and as of
> the release of DDI0487 K.a the XML in DD0601 is in sync with the ARM.

s/ARM/ARM ARM/. Which revision of the XML? K.a and the latest version
of the XML are definitely not in sync.

Also, please make use of punctuation. I can't parse this *single*
sentence as it stands.

> Remove the outdated comment about divergence.
>
> Fixes: 9ff67dd26a9e ("KVM: arm64: Use generated FGT RES0 bits instead of specifying them")

Definitely *not* a fix.

	M.

-- 
Without deviation from the norm, progress is not possible.