| Message ID | 20240318-emphatic-rally-f177a4fe1bdc@spud (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [v1] perf: starfive: fix 64-bit only COMPILE_TEST condition | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On Mon, 18 Mar 2024 08:35:04 PDT (-0700), Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > 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 <palmer@rivosinc.com> > 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 <conor.dooley@microchip.com> > --- > CC: Will Deacon <will@kernel.org> > CC: Mark Rutland <mark.rutland@arm.com> > CC: Ji Sheng Teoh <jisheng.teoh@starfivetech.com> > CC: linux-arm-kernel@lists.infradead.org > CC: linux-kernel@vger.kernel.org > --- > 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 <palmer@rivosinc.com> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> -----Original Message----- > From: Palmer Dabbelt <palmer@rivosinc.com> > Sent: Tuesday, March 19, 2024 12:15 AM > To: Conor Dooley <conor@kernel.org> > Cc: linux-riscv@lists.infradead.org; Conor Dooley <conor@kernel.org>; Conor Dooley <conor.dooley@microchip.com>; Will Deacon > <will@kernel.org>; Mark Rutland <mark.rutland@arm.com>; JiSheng Teoh <jisheng.teoh@starfivetech.com>; linux-arm- > kernel@lists.infradead.org; linux-kernel@vger.kernel.org > 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 <conor.dooley@microchip.com> > > > > 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 <palmer@rivosinc.com> > > 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 <conor.dooley@microchip.com> > > --- > > CC: Will Deacon <will@kernel.org> > > CC: Mark Rutland <mark.rutland@arm.com> > > CC: Ji Sheng Teoh <jisheng.teoh@starfivetech.com> > > CC: linux-arm-kernel@lists.infradead.org > > CC: linux-kernel@vger.kernel.org > > --- > > 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 <palmer@rivosinc.com> > Acked-by: Palmer Dabbelt <palmer@rivosinc.com> Acked-by: Ji Sheng Teoh <jisheng.teoh@starfivetech.com>
Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > 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 <palmer@rivosinc.com> > 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 <conor.dooley@microchip.com> Acked-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> > --- > CC: Will Deacon <will@kernel.org> > CC: Mark Rutland <mark.rutland@arm.com> > CC: Ji Sheng Teoh <jisheng.teoh@starfivetech.com> > CC: linux-arm-kernel@lists.infradead.org > CC: linux-kernel@vger.kernel.org > --- > 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 > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Mon, Mar 18, 2024 at 03:35:04PM +0000, Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > 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 <palmer@rivosinc.com> > 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 <conor.dooley@microchip.com> > --- > CC: Will Deacon <will@kernel.org> > CC: Mark Rutland <mark.rutland@arm.com> > CC: Ji Sheng Teoh <jisheng.teoh@starfivetech.com> > CC: linux-arm-kernel@lists.infradead.org > CC: linux-kernel@vger.kernel.org > --- > 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 <will@kernel.org> 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
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.