arm: fix Kconfig symbol dependency on arm features

[PATCH for 4.17] arm: fix Kconfig symbol dependency on arm features

Posted by Luca Fancellu 3 years, 3 months ago

The commit 3c2a14ea81c7 is introducing some unsupported arm features
that by default are disabled and are used for the cpufeature.c code.

As they are disabled by default, a typo in the Kconfig symbol they
depend on has landed in the codebase unnoticed, instead of depending
on ARM64 which does not exist, fix the code to depend on ARM_64 that
is the intended symbol.

Fixes: 3c2a14ea81c7 ("arm: Define kconfig symbols used by arm64 cpufeatures")
Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
---
 xen/arch/arm/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 1fe5faf847b8..52a05f704da5 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -105,28 +105,28 @@ config HARDEN_BRANCH_PREDICTOR
 
 config ARM64_PTR_AUTH
 	def_bool n
-	depends on ARM64
+	depends on ARM_64
 	help
 	  Pointer authentication support.
 	  This feature is not supported in Xen.
 
 config ARM64_SVE
 	def_bool n
-	depends on ARM64
+	depends on ARM_64
 	help
 	  Scalar Vector Extension support.
 	  This feature is not supported in Xen.
 
 config ARM64_MTE
 	def_bool n
-	depends on ARM64
+	depends on ARM_64
 	help
 	  Memory Tagging Extension support.
 	  This feature is not supported in Xen.
 
 config ARM64_BTI
 	def_bool n
-	depends on ARM64
+	depends on ARM_64
 	help
 	  Branch Target Identification support.
 	  This feature is not supported in Xen.
-- 
2.17.1

Re: [PATCH for 4.17] arm: fix Kconfig symbol dependency on arm features

Posted by Bertrand Marquis 3 years, 3 months ago

Hi Luca,

> On 9 Nov 2022, at 14:04, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
> 
> The commit 3c2a14ea81c7 is introducing some unsupported arm features
> that by default are disabled and are used for the cpufeature.c code.
> 
> As they are disabled by default, a typo in the Kconfig symbol they
> depend on has landed in the codebase unnoticed, instead of depending
> on ARM64 which does not exist, fix the code to depend on ARM_64 that
> is the intended symbol.
> 
> Fixes: 3c2a14ea81c7 ("arm: Define kconfig symbols used by arm64 cpufeatures")
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>

Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>

I think this should go in 4.17 as it is fixing an invalid depends in Kconfig.
The change cannot create any issue as those config options are hidden and default to n at the moment.

Cheers
Bertrand

> ---
> xen/arch/arm/Kconfig | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
> index 1fe5faf847b8..52a05f704da5 100644
> --- a/xen/arch/arm/Kconfig
> +++ b/xen/arch/arm/Kconfig
> @@ -105,28 +105,28 @@ config HARDEN_BRANCH_PREDICTOR
> 
> config ARM64_PTR_AUTH
> 	def_bool n
> -	depends on ARM64
> +	depends on ARM_64
> 	help
> 	  Pointer authentication support.
> 	  This feature is not supported in Xen.
> 
> config ARM64_SVE
> 	def_bool n
> -	depends on ARM64
> +	depends on ARM_64
> 	help
> 	  Scalar Vector Extension support.
> 	  This feature is not supported in Xen.
> 
> config ARM64_MTE
> 	def_bool n
> -	depends on ARM64
> +	depends on ARM_64
> 	help
> 	  Memory Tagging Extension support.
> 	  This feature is not supported in Xen.
> 
> config ARM64_BTI
> 	def_bool n
> -	depends on ARM64
> +	depends on ARM_64
> 	help
> 	  Branch Target Identification support.
> 	  This feature is not supported in Xen.
> -- 
> 2.17.1
>

Re: [PATCH for 4.17] arm: fix Kconfig symbol dependency on arm features

Posted by Julien Grall 3 years, 3 months ago

Hi Bertrand,

On 10/11/2022 08:46, Bertrand Marquis wrote:
>> On 9 Nov 2022, at 14:04, Luca Fancellu <Luca.Fancellu@arm.com> wrote:
>>
>> The commit 3c2a14ea81c7 is introducing some unsupported arm features
>> that by default are disabled and are used for the cpufeature.c code.
>>
>> As they are disabled by default, a typo in the Kconfig symbol they
>> depend on has landed in the codebase unnoticed, instead of depending
>> on ARM64 which does not exist, fix the code to depend on ARM_64 that
>> is the intended symbol.
>>
>> Fixes: 3c2a14ea81c7 ("arm: Define kconfig symbols used by arm64 cpufeatures")
>> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>
> 
> Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
> 
> I think this should go in 4.17 as it is fixing an invalid depends in Kconfig.
> The change cannot create any issue as those config options are hidden and default to n at the moment.

Committed.

Cheers,

-- 
Julien Grall

RE: [PATCH for 4.17] arm: fix Kconfig symbol dependency on arm features

Posted by Henry Wang 3 years, 3 months ago

Hi Luca,

> -----Original Message-----
> From: Luca Fancellu <luca.fancellu@arm.com>
> Subject: [PATCH for 4.17] arm: fix Kconfig symbol dependency on arm
> features
> 
> The commit 3c2a14ea81c7 is introducing some unsupported arm features
> that by default are disabled and are used for the cpufeature.c code.
> 
> As they are disabled by default, a typo in the Kconfig symbol they
> depend on has landed in the codebase unnoticed, instead of depending
> on ARM64 which does not exist, fix the code to depend on ARM_64 that
> is the intended symbol.
> 
> Fixes: 3c2a14ea81c7 ("arm: Define kconfig symbols used by arm64
> cpufeatures")
> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com>

As IIUC this is a harmless patch, so it is fine to consider this in the release,
but I will let the Arm maintainers to do the final call.

If Arm maintainers agree this patch should go to 4.17, feel free to add:

Release-acked-by: Henry Wang <Henry.Wang@arm.com>

Kind regards,
Henry