From: Conor Dooley <[email protected]>
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 <[email protected]>
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 <[email protected]>
---
CC: Will Deacon <[email protected]>
CC: Mark Rutland <[email protected]>
CC: Ji Sheng Teoh <[email protected]>
CC: [email protected]
CC: [email protected]
---
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
On Mon, 18 Mar 2024 08:35:04 PDT (-0700), Conor Dooley wrote:
> From: Conor Dooley <[email protected]>
>
> 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 <[email protected]>
> 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 <[email protected]>
> ---
> CC: Will Deacon <[email protected]>
> CC: Mark Rutland <[email protected]>
> CC: Ji Sheng Teoh <[email protected]>
> CC: [email protected]
> CC: [email protected]
> ---
> 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 <[email protected]>
Acked-by: Palmer Dabbelt <[email protected]>
> -----Original Message-----
> From: Palmer Dabbelt <[email protected]>
> Sent: Tuesday, March 19, 2024 12:15 AM
> To: Conor Dooley <[email protected]>
> Cc: [email protected]; Conor Dooley <[email protected]>; Conor Dooley <[email protected]>; Will Deacon
> <[email protected]>; Mark Rutland <[email protected]>; JiSheng Teoh <[email protected]>; linux-arm-
> [email protected]; [email protected]
> 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 <[email protected]>
> >
> > 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 <[email protected]>
> > 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 <[email protected]>
> > ---
> > CC: Will Deacon <[email protected]>
> > CC: Mark Rutland <[email protected]>
> > CC: Ji Sheng Teoh <[email protected]>
> > CC: [email protected]
> > CC: [email protected]
> > ---
> > 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 <[email protected]>
> Acked-by: Palmer Dabbelt <[email protected]>
Acked-by: Ji Sheng Teoh <[email protected]>
Conor Dooley wrote:
> From: Conor Dooley <[email protected]>
>
> 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 <[email protected]>
> 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 <[email protected]>
Acked-by: Emil Renner Berthing <[email protected]>
> ---
> CC: Will Deacon <[email protected]>
> CC: Mark Rutland <[email protected]>
> CC: Ji Sheng Teoh <[email protected]>
> CC: [email protected]
> CC: [email protected]
> ---
> 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
> [email protected]
> http://lists.infradead.org/mailman/listinfo/linux-riscv
On Mon, Mar 18, 2024 at 03:35:04PM +0000, Conor Dooley wrote:
> From: Conor Dooley <[email protected]>
>
> 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 <[email protected]>
> 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 <[email protected]>
> ---
> CC: Will Deacon <[email protected]>
> CC: Mark Rutland <[email protected]>
> CC: Ji Sheng Teoh <[email protected]>
> CC: [email protected]
> CC: [email protected]
> ---
> 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 <[email protected]>
Catalin -- please can you pick this into the arm64 fixes branch for -rc1?
Cheers,
Will
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?
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
--
Catalin