RISC-V: make ARCH_THEAD preclude XIP_KERNEL

[PATCH v1] RISC-V: make ARCH_THEAD preclude XIP_KERNEL

Posted by Conor Dooley 2 years, 7 months ago

From: Conor Dooley <conor.dooley@microchip.com>

Randy reported build errors in linux-next where XIP_KERNEL was enabled.
ARCH_THEAD requires alternatives to support the non-standard ISA
extensions used by the THEAD cores, which are mutually exclusive with
XIP kernels. Clone the dependency list from the Allwinner entry, since
Allwinner's D1 uses T-Head cores with the same non-standard extensions.

Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lore.kernel.org/all/ab38f6af-cb68-a918-1a63-2e7c927a8ffc@infradead.org/
Fixes: da47ce003963 ("riscv: Add the T-HEAD SoC family Kconfig option")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
CC: Paul Walmsley <paul.walmsley@sifive.com>
CC: Palmer Dabbelt <palmer@dabbelt.com>
CC: Albert Ou <aou@eecs.berkeley.edu>
CC: Jisheng Zhang <jszhang@kernel.org>
CC: linux-riscv@lists.infradead.org
CC: linux-kernel@vger.kernel.org
---
 arch/riscv/Kconfig.socs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
index ce10a38dff37..6833d01e2e70 100644
--- a/arch/riscv/Kconfig.socs
+++ b/arch/riscv/Kconfig.socs
@@ -43,6 +43,7 @@ config ARCH_SUNXI
 
 config ARCH_THEAD
 	bool "T-HEAD RISC-V SoCs"
+	depends on MMU && !XIP_KERNEL
 	select ERRATA_THEAD
 	help
 	  This enables support for the RISC-V based T-HEAD SoCs.
-- 
2.39.2

Re: [PATCH v1] RISC-V: make ARCH_THEAD preclude XIP_KERNEL

Posted by Conor Dooley 2 years, 7 months ago

From: Conor Dooley <conor.dooley@microchip.com>

On Wed, 21 Jun 2023 20:00:31 +0100, Conor Dooley wrote:
> Randy reported build errors in linux-next where XIP_KERNEL was enabled.
> ARCH_THEAD requires alternatives to support the non-standard ISA
> extensions used by the THEAD cores, which are mutually exclusive with
> XIP kernels. Clone the dependency list from the Allwinner entry, since
> Allwinner's D1 uses T-Head cores with the same non-standard extensions.
> 
> 
> [...]

Applied to riscv-dt-for-next, thanks!

[1/1] RISC-V: make ARCH_THEAD preclude XIP_KERNEL
      https://git.kernel.org/conor/c/273235194e4d

Thanks,
Conor.

Re: [PATCH v1] RISC-V: make ARCH_THEAD preclude XIP_KERNEL

Posted by Palmer Dabbelt 2 years, 7 months ago

On Wed, 21 Jun 2023 12:00:31 PDT (-0700), Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
>
> Randy reported build errors in linux-next where XIP_KERNEL was enabled.
> ARCH_THEAD requires alternatives to support the non-standard ISA
> extensions used by the THEAD cores, which are mutually exclusive with
> XIP kernels. Clone the dependency list from the Allwinner entry, since
> Allwinner's D1 uses T-Head cores with the same non-standard extensions.
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Reviewed-by: Randy Dunlap <rdunlap@infradead.org>
> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
> Link: https://lore.kernel.org/all/ab38f6af-cb68-a918-1a63-2e7c927a8ffc@infradead.org/
> Fixes: da47ce003963 ("riscv: Add the T-HEAD SoC family Kconfig option")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> CC: Paul Walmsley <paul.walmsley@sifive.com>
> CC: Palmer Dabbelt <palmer@dabbelt.com>
> CC: Albert Ou <aou@eecs.berkeley.edu>
> CC: Jisheng Zhang <jszhang@kernel.org>
> CC: linux-riscv@lists.infradead.org
> CC: linux-kernel@vger.kernel.org
> ---
>  arch/riscv/Kconfig.socs | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
> index ce10a38dff37..6833d01e2e70 100644
> --- a/arch/riscv/Kconfig.socs
> +++ b/arch/riscv/Kconfig.socs
> @@ -43,6 +43,7 @@ config ARCH_SUNXI
>
>  config ARCH_THEAD
>  	bool "T-HEAD RISC-V SoCs"
> +	depends on MMU && !XIP_KERNEL
>  	select ERRATA_THEAD
>  	help
>  	  This enables support for the RISC-V based T-HEAD SoCs.

Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>

I don't have an ARCH_THEAD, though, so not sure where this is aimed at.

Re: [PATCH v1] RISC-V: make ARCH_THEAD preclude XIP_KERNEL

Posted by Conor Dooley 2 years, 7 months ago

On Wed, Jun 21, 2023 at 12:57:02PM -0700, Palmer Dabbelt wrote:

> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
> 
> I don't have an ARCH_THEAD, though, so not sure where this is aimed at.

I need to take it, I applied the patches.
Sorry, probably should have said it below the --- line.

Re: [PATCH v1] RISC-V: make ARCH_THEAD preclude XIP_KERNEL

Posted by Palmer Dabbelt 2 years, 7 months ago

On Wed, 21 Jun 2023 13:00:38 PDT (-0700), Conor Dooley wrote:
> On Wed, Jun 21, 2023 at 12:57:02PM -0700, Palmer Dabbelt wrote:
>
>> Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
>> Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
>> 
>> I don't have an ARCH_THEAD, though, so not sure where this is aimed at.
>
> I need to take it, I applied the patches.
> Sorry, probably should have said it below the --- line.

No problem, I figured they were over there somewhere -- just kind of 
hard to keep track with how much is in flight right now ;)