[PATCH v1] arm64: errata: pass REVIDR when matching target implementation CPUs

[PATCH v1] arm64: errata: pass REVIDR when matching target implementation CPUs

[Khushit Shah]

When target implementation CPUs are provided, is_affected_midr_range()
accidentally passed the MIDR as both arguments to __is_affected_midr_range(),
so the REVIDR mask check operated on the wrong register.

Pass REVIDR as intended.

Fixes: 86edf6bdcf05 ("smccc/kvm_guest: Enable errata based on implementation CPUs")
Cc: stable@vger.kernel.org
Signed-off-by: Khushit Shah <khushit.shah@nutanix.com>
---
 arch/arm64/kernel/cpu_errata.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 5db8f0619e4b..b33dccfafaf8 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -82,7 +82,7 @@ is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)
 
 	for (i = 0; i < target_impl_cpu_num; i++) {
 		if (__is_affected_midr_range(entry, target_impl_cpus[i].midr,
-					     target_impl_cpus[i].midr))
+					     target_impl_cpus[i].revidr))
 			return true;
 	}
 	return false;
-- 
2.39.3

RE: [PATCH v1] arm64: errata: pass REVIDR when matching target implementation CPUs

[Shameer Kolothum Thodi]

> -----Original Message-----
> From: Khushit Shah <khushit.shah@nutanix.com>
> Sent: 31 August 2026 11:55
> To: Catalin Marinas <catalin.marinas@arm.com>; Will Deacon
> <will@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>; Marc Zyngier <maz@kernel.org>;
> Shameer Kolothum Thodi <skolothumtho@nvidia.com>; Oliver Upton
> <oupton@kernel.org>; linux-arm-kernel@lists.infradead.org; linux-
> kernel@vger.kernel.org; stable@vger.kernel.org; Khushit Shah
> <khushit.shah@nutanix.com>
> Subject: [PATCH v1] arm64: errata: pass REVIDR when matching target
> implementation CPUs
> 
> External email: Use caution opening links or attachments
> 
> 
> When target implementation CPUs are provided, is_affected_midr_range()
> accidentally passed the MIDR as both arguments to
> __is_affected_midr_range(),
> so the REVIDR mask check operated on the wrong register.
> 
> Pass REVIDR as intended.
> 
> Fixes: 86edf6bdcf05 ("smccc/kvm_guest: Enable errata based on
> implementation CPUs")
> Cc: stable@vger.kernel.org
> Signed-off-by: Khushit Shah <khushit.shah@nutanix.com>

Reviewed-by: Shameer Kolothum <skolothumtho@nvidia.com>

Thanks,
Shameer

> ---
>  arch/arm64/kernel/cpu_errata.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/cpu_errata.c
> b/arch/arm64/kernel/cpu_errata.c
> index 5db8f0619e4b..b33dccfafaf8 100644
> --- a/arch/arm64/kernel/cpu_errata.c
> +++ b/arch/arm64/kernel/cpu_errata.c
> @@ -82,7 +82,7 @@ is_affected_midr_range(const struct
> arm64_cpu_capabilities *entry, int scope)
> 
>         for (i = 0; i < target_impl_cpu_num; i++) {
>                 if (__is_affected_midr_range(entry, target_impl_cpus[i].midr,
> -                                            target_impl_cpus[i].midr))
> +                                            target_impl_cpus[i].revidr))
>                         return true;
>         }
>         return false;
> --
> 2.39.3

Re: [PATCH v1] arm64: errata: pass REVIDR when matching target implementation CPUs

[Marc Zyngier]

On Mon, 31 Aug 2026 11:54:44 +0100,
Khushit Shah <khushit.shah@nutanix.com> wrote:
> 
> When target implementation CPUs are provided, is_affected_midr_range()
> accidentally passed the MIDR as both arguments to __is_affected_midr_range(),
> so the REVIDR mask check operated on the wrong register.
> 
> Pass REVIDR as intended.
> 
> Fixes: 86edf6bdcf05 ("smccc/kvm_guest: Enable errata based on implementation CPUs")
> Cc: stable@vger.kernel.org
> Signed-off-by: Khushit Shah <khushit.shah@nutanix.com>

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

	M.

-- 
Jazz isn't dead. It just smells funny.

Re: [PATCH v1] arm64: errata: pass REVIDR when matching target implementation CPUs

[Zenghui Yu]

On 8/31/26 6:54 PM, Khushit Shah wrote:
> When target implementation CPUs are provided, is_affected_midr_range()
> accidentally passed the MIDR as both arguments to __is_affected_midr_range(),
> so the REVIDR mask check operated on the wrong register.
> 
> Pass REVIDR as intended.
> 
> Fixes: 86edf6bdcf05 ("smccc/kvm_guest: Enable errata based on implementation CPUs")
> Cc: stable@vger.kernel.org
> Signed-off-by: Khushit Shah <khushit.shah@nutanix.com>
> ---
>  arch/arm64/kernel/cpu_errata.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
> index 5db8f0619e4b..b33dccfafaf8 100644
> --- a/arch/arm64/kernel/cpu_errata.c
> +++ b/arch/arm64/kernel/cpu_errata.c
> @@ -82,7 +82,7 @@ is_affected_midr_range(const struct arm64_cpu_capabilities *entry, int scope)
>  
>  	for (i = 0; i < target_impl_cpu_num; i++) {
>  		if (__is_affected_midr_range(entry, target_impl_cpus[i].midr,
> -					     target_impl_cpus[i].midr))
> +					     target_impl_cpus[i].revidr))
>  			return true;
>  	}
>  	return false;

Reviewed-by: Zenghui Yu (Huawei) <zenghui.yu@linux.dev>

Thanks,
Zenghui

Re: [PATCH v1] arm64: errata: pass REVIDR when matching target implementation CPUs

[Will Deacon]

On Mon, 31 Aug 2026 10:54:44 +0000, Khushit Shah wrote:
> When target implementation CPUs are provided, is_affected_midr_range()
> accidentally passed the MIDR as both arguments to __is_affected_midr_range(),
> so the REVIDR mask check operated on the wrong register.
> 
> Pass REVIDR as intended.
> 
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: errata: pass REVIDR when matching target implementation CPUs
      https://git.kernel.org/arm64/c/5541432e09dc

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev