[v1] perf: starfive: fix 64-bit only COMPILE_TEST condition

Commit Message

Conor Dooley March 18, 2024, 3:35 p.m. UTC

From: Conor Dooley <[e-mail]>

ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's
addition of a 64-bit only condition satisfied the build robots doing
COMPILE_TEST builds, Palmer ran into the same problems with writeq()
being undefined during regular rv32 builds.

Promote the dependency on 64-bit to its own `depends on` so that the
driver can never be included in 32-bit builds.

Reported-by: Palmer Dabbelt <[e-mail]>
Fixes: c2b24812f7bc ("perf: starfive: Add StarLink PMU support")
Fixes: f0dbc6d0de38 ("perf: starfive: Only allow COMPILE_TEST for 64-bit architectures")
Signed-off-by: Conor Dooley <[e-mail]>
---
CC: Will Deacon <[e-mail]>
CC: Mark Rutland <[e-mail]>
CC: Ji Sheng Teoh <[e-mail]>
CC: [e-mail]
CC: [e-mail]
---
 drivers/perf/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Palmer Dabbelt March 18, 2024, 4:15 p.m. UTC | #1

On Mon, 18 Mar 2024 08:35:04 PDT (-0700), Conor Dooley wrote:
> From: Conor Dooley <[e-mail]>
>
> ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's
> addition of a 64-bit only condition satisfied the build robots doing
> COMPILE_TEST builds, Palmer ran into the same problems with writeq()
> being undefined during regular rv32 builds.
>
> Promote the dependency on 64-bit to its own `depends on` so that the
> driver can never be included in 32-bit builds.
>
> Reported-by: Palmer Dabbelt <[e-mail]>
> Fixes: c2b24812f7bc ("perf: starfive: Add StarLink PMU support")
> Fixes: f0dbc6d0de38 ("perf: starfive: Only allow COMPILE_TEST for 64-bit architectures")
> Signed-off-by: Conor Dooley <[e-mail]>
> ---
> CC: Will Deacon <[e-mail]>
> CC: Mark Rutland <[e-mail]>
> CC: Ji Sheng Teoh <[e-mail]>
> CC: [e-mail]
> CC: [e-mail]
> ---
>  drivers/perf/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
> index 5060e1f1ea10..7526a9e714fa 100644
> --- a/drivers/perf/Kconfig
> +++ b/drivers/perf/Kconfig
> @@ -87,7 +87,8 @@ config RISCV_PMU_SBI
>  	  filtering, counter configuration.
>
>  config STARFIVE_STARLINK_PMU
> -	depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
> +	depends on ARCH_STARFIVE || COMPILE_TEST
> +	depends on 64BIT
>  	bool "StarFive StarLink PMU"
>  	help
>  	   Provide support for StarLink Performance Monitor Unit.

Reviewed-by: Palmer Dabbelt <[e-mail]>
Acked-by: Palmer Dabbelt <[e-mail]>

Ji Sheng Teoh March 18, 2024, 4:25 p.m. UTC | #2

> -----Original Message-----
> From: Palmer Dabbelt <[e-mail]>
> Sent: Tuesday, March 19, 2024 12:15 AM
> To: Conor Dooley <[e-mail]>
> Cc: [e-mail]; Conor Dooley <[e-mail]>; Conor Dooley <[e-mail]>; Will Deacon
> <[e-mail]>; Mark Rutland <[e-mail]>; JiSheng Teoh <[e-mail]>; linux-arm-
> [e-mail]; [e-mail]
> Subject: Re: [PATCH v1] perf: starfive: fix 64-bit only COMPILE_TEST condition
> 
> On Mon, 18 Mar 2024 08:35:04 PDT (-0700), Conor Dooley wrote:
> > From: Conor Dooley <[e-mail]>
> >
> > ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's
> > addition of a 64-bit only condition satisfied the build robots doing
> > COMPILE_TEST builds, Palmer ran into the same problems with writeq()
> > being undefined during regular rv32 builds.
> >
> > Promote the dependency on 64-bit to its own `depends on` so that the
> > driver can never be included in 32-bit builds.
> >
> > Reported-by: Palmer Dabbelt <[e-mail]>
> > Fixes: c2b24812f7bc ("perf: starfive: Add StarLink PMU support")
> > Fixes: f0dbc6d0de38 ("perf: starfive: Only allow COMPILE_TEST for
> > 64-bit architectures")
> > Signed-off-by: Conor Dooley <[e-mail]>
> > ---
> > CC: Will Deacon <[e-mail]>
> > CC: Mark Rutland <[e-mail]>
> > CC: Ji Sheng Teoh <[e-mail]>
> > CC: [e-mail]
> > CC: [e-mail]
> > ---
> >  drivers/perf/Kconfig | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig index
> > 5060e1f1ea10..7526a9e714fa 100644
> > --- a/drivers/perf/Kconfig
> > +++ b/drivers/perf/Kconfig
> > @@ -87,7 +87,8 @@ config RISCV_PMU_SBI
> >  	  filtering, counter configuration.
> >
> >  config STARFIVE_STARLINK_PMU
> > -	depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
> > +	depends on ARCH_STARFIVE || COMPILE_TEST
> > +	depends on 64BIT
> >  	bool "StarFive StarLink PMU"
> >  	help
> >  	   Provide support for StarLink Performance Monitor Unit.
> 
> Reviewed-by: Palmer Dabbelt <[e-mail]>
> Acked-by: Palmer Dabbelt <[e-mail]>

Acked-by: Ji Sheng Teoh <[e-mail]>

Emil Renner Berthing March 18, 2024, 5:12 p.m. UTC | #3

Conor Dooley wrote:
> From: Conor Dooley <[e-mail]>
>
> ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's
> addition of a 64-bit only condition satisfied the build robots doing
> COMPILE_TEST builds, Palmer ran into the same problems with writeq()
> being undefined during regular rv32 builds.
>
> Promote the dependency on 64-bit to its own `depends on` so that the
> driver can never be included in 32-bit builds.
>
> Reported-by: Palmer Dabbelt <[e-mail]>
> Fixes: c2b24812f7bc ("perf: starfive: Add StarLink PMU support")
> Fixes: f0dbc6d0de38 ("perf: starfive: Only allow COMPILE_TEST for 64-bit architectures")
> Signed-off-by: Conor Dooley <[e-mail]>

Acked-by: Emil Renner Berthing <[e-mail]>

> ---
> CC: Will Deacon <[e-mail]>
> CC: Mark Rutland <[e-mail]>
> CC: Ji Sheng Teoh <[e-mail]>
> CC: [e-mail]
> CC: [e-mail]
> ---
>  drivers/perf/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
> index 5060e1f1ea10..7526a9e714fa 100644
> --- a/drivers/perf/Kconfig
> +++ b/drivers/perf/Kconfig
> @@ -87,7 +87,8 @@ config RISCV_PMU_SBI
>  	  filtering, counter configuration.
>
>  config STARFIVE_STARLINK_PMU
> -	depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
> +	depends on ARCH_STARFIVE || COMPILE_TEST
> +	depends on 64BIT
>  	bool "StarFive StarLink PMU"
>  	help
>  	   Provide support for StarLink Performance Monitor Unit.
> --
> 2.43.0
>
>
> _______________________________________________
> linux-riscv mailing list
> [e-mail]
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Will Deacon March 19, 2024, 3:56 p.m. UTC | #4

On Mon, Mar 18, 2024 at 03:35:04PM +0000, Conor Dooley wrote:
> From: Conor Dooley <[e-mail]>
> 
> ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's
> addition of a 64-bit only condition satisfied the build robots doing
> COMPILE_TEST builds, Palmer ran into the same problems with writeq()
> being undefined during regular rv32 builds.
> 
> Promote the dependency on 64-bit to its own `depends on` so that the
> driver can never be included in 32-bit builds.
> 
> Reported-by: Palmer Dabbelt <[e-mail]>
> Fixes: c2b24812f7bc ("perf: starfive: Add StarLink PMU support")
> Fixes: f0dbc6d0de38 ("perf: starfive: Only allow COMPILE_TEST for 64-bit architectures")
> Signed-off-by: Conor Dooley <[e-mail]>
> ---
> CC: Will Deacon <[e-mail]>
> CC: Mark Rutland <[e-mail]>
> CC: Ji Sheng Teoh <[e-mail]>
> CC: [e-mail]
> CC: [e-mail]
> ---
>  drivers/perf/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
> index 5060e1f1ea10..7526a9e714fa 100644
> --- a/drivers/perf/Kconfig
> +++ b/drivers/perf/Kconfig
> @@ -87,7 +87,8 @@ config RISCV_PMU_SBI
>  	  filtering, counter configuration.
>  
>  config STARFIVE_STARLINK_PMU
> -	depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
> +	depends on ARCH_STARFIVE || COMPILE_TEST
> +	depends on 64BIT
>  	bool "StarFive StarLink PMU"
>  	help
>  	   Provide support for StarLink Performance Monitor Unit.
> -- 
> 2.43.0


Thanks guys, I don't know what a starfive is so sorry for not spotting
this when I noticed the build failure on arm64.

Acked-by: Will Deacon <[e-mail]>

Catalin -- please can you pick this into the arm64 fixes branch for -rc1?

Cheers,

Will

Conor Dooley March 19, 2024, 4:12 p.m. UTC | #5

On Tue, Mar 19, 2024 at 03:56:16PM +0000, Will Deacon wrote:

> Thanks guys, I don't know what a starfive is so sorry for not spotting
> this when I noticed the build failure on arm64.

It's a bit like a starfish, I guess you've seen them in sealife? Or
maybe some David Attenborough show?

Catalin Marinas March 19, 2024, 7:04 p.m. UTC | #6

On Mon, 18 Mar 2024 15:35:04 +0000, Conor Dooley wrote:
> ARCH_STARFIVE is not restricted to 64-bit platforms, so while Will's
> addition of a 64-bit only condition satisfied the build robots doing
> COMPILE_TEST builds, Palmer ran into the same problems with writeq()
> being undefined during regular rv32 builds.
> 
> Promote the dependency on 64-bit to its own `depends on` so that the
> driver can never be included in 32-bit builds.
> 
> [...]

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

[1/1] perf: starfive: fix 64-bit only COMPILE_TEST condition
      https://git.kernel.org/arm64/c/1d63d1d9e5c5

Patch

diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
index 5060e1f1ea10..7526a9e714fa 100644
--- a/drivers/perf/Kconfig
+++ b/drivers/perf/Kconfig
@@ -87,7 +87,8 @@  config RISCV_PMU_SBI
 	  filtering, counter configuration.
 
 config STARFIVE_STARLINK_PMU
-	depends on ARCH_STARFIVE || (COMPILE_TEST && 64BIT)
+	depends on ARCH_STARFIVE || COMPILE_TEST
+	depends on 64BIT
 	bool "StarFive StarLink PMU"
 	help
 	   Provide support for StarLink Performance Monitor Unit.