[PATCH] riscv: Disallow to build XIP_KERNEL with SOC_SIFIVE

[Alex Ghiti]

Le 4/29/21 à 5:04 AM, Anup Patel a écrit :
> On Thu, Apr 29, 2021 at 2:15 PM Alexandre Ghiti <alex at ghiti.fr> wrote:
>>
>> RISCV_ERRATA_ALTERNATIVE patches text at runtime which is not possible when
>> the kernel is executed from the flash in XIP mode, and as the SIFIVE
>> errata must be fixed somehow, disallow to build a XIP kernel that
>> supports SIFIVE socs.
>>
>> Signed-off-by: Alexandre Ghiti <alex at ghiti.fr>
>> ---
>>   arch/riscv/Kconfig.erratas | 2 +-
>>   arch/riscv/Kconfig.socs    | 1 +
>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/riscv/Kconfig.erratas b/arch/riscv/Kconfig.erratas
>> index d5d03ae8d685..9537dbd67357 100644
>> --- a/arch/riscv/Kconfig.erratas
>> +++ b/arch/riscv/Kconfig.erratas
>> @@ -2,7 +2,7 @@ menu "CPU errata selection"
>>
>>   config RISCV_ERRATA_ALTERNATIVE
>>          bool "RISC-V alternative scheme"
>> -       default y
>> +       default y if !XIP_KERNEL
>>          help
>>            This Kconfig allows the kernel to automatically patch the
>>            errata required by the execution platform at run time. The
>> diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs
>> index 00c2b205654c..9cb38bc9d7cd 100644
>> --- a/arch/riscv/Kconfig.socs
>> +++ b/arch/riscv/Kconfig.socs
>> @@ -9,6 +9,7 @@ config SOC_MICROCHIP_POLARFIRE
>>
>>   config SOC_SIFIVE
>>          bool "SiFive SoCs"
>> +       depends on !XIP_KERNEL
> 
> Does this mean that now all SOCs will have to explicitly say
> "depends on !XIP_KERNEL"
>  > How about adding "depends on !XIP_KERNEL" for RISCV_ERRATA_ALTERNATIVE ?

In any case, I had to add this because I could not get rid of the 
following warnings:

WARNING: unmet direct dependencies detected for ERRATA_SIFIVE
   Depends on [n]: RISCV_ERRATA_ALTERNATIVE [=n]
   Selected by [y]:
   - SOC_SIFIVE [=y]

If you have a solution for that, without touching any SOC_* config, I'll 
take it.

I'll try to implement what Vitaly proposed as it sounds way better than 
this "bandage" patch.

Thanks Anup,

Alex

> 
> Regards,
> Anup
> 
>>          select SERIAL_SIFIVE if TTY
>>          select SERIAL_SIFIVE_CONSOLE if TTY
>>          select CLK_SIFIVE
>> --
>> 2.20.1
>>
> 
> _______________________________________________
> linux-riscv mailing list
> linux-riscv at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
>