[OpenWrt-Devel] [PATCH] mpc85xx: Enable caam support only for p1020

[John Crispin]

On 09/06/18 11:10, Hauke Mehrtens wrote:
> On 06/08/2018 04:42 PM, Achim Gottinger wrote:
>> Disable caam support in default config and enable it only for the p1020
>> target.
>> The generic target is used for the wdr4900-v1 tp-link router which does
>> not have an enabled caam engine.
>> If caam is build in for this target it adds non functional crypto
>> methods to the kernels crypto framework.
>> Strongswan for example tries to use these methods and as an result does
>> not work.
>> More about the issue is mentioned here
>> https://bugs.openwrt.org/index.php?do=details&task_id=1262
>>
>> Signed-off-by: Achim Gottinger <achim at ag-web.biz>
>> ---
>>   target/linux/mpc85xx/config-4.9             | 10 ----------
>>   target/linux/mpc85xx/generic/config-default | 10 ++++++++++
>>   target/linux/mpc85xx/p1020/config-default   | 10 ++++++++++
>>   3 files changed, 20 insertions(+), 10 deletions(-)
> Hi Felix,
>
> Please have a look at this patch.
>
> This problem was introduced in your commit:
> https://git.openwrt.org/c00e5a4f09115ec976fac7dc380f576ef6a24fab
>
> Hauke

Acked-by: John Crispin <john at phrozen.org>

looks good, but does not apply. please rebase/send. I'll merge a V2.
     John

>> diff --git a/target/linux/mpc85xx/config-4.9
>> b/target/linux/mpc85xx/config-4.9
>> index 68568c4a62..cfbd089d20 100644
>> --- a/target/linux/mpc85xx/config-4.9
>> +++ b/target/linux/mpc85xx/config-4.9
>> @@ -47,16 +47,6 @@ CONFIG_CRYPTO_AEAD2=y
>>   CONFIG_CRYPTO_AKCIPHER=y
>>   CONFIG_CRYPTO_AKCIPHER2=y
>>   CONFIG_CRYPTO_AUTHENC=y
>> -CONFIG_CRYPTO_DEV_FSL_CAAM=y
>> -CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
>> -CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
>> -# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
>> -# CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set
>> -# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
>> -CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
>> -CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
>> -CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
>> -CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
>>   CONFIG_CRYPTO_HASH=y
>>   CONFIG_CRYPTO_HASH2=y
>>   CONFIG_CRYPTO_HW=y
>> diff --git a/target/linux/mpc85xx/generic/config-default
>> b/target/linux/mpc85xx/generic/config-default
>> index 81bf934b33..ca4ab43286 100644
>> --- a/target/linux/mpc85xx/generic/config-default
>> +++ b/target/linux/mpc85xx/generic/config-default
>> @@ -1 +1,11 @@
>>   CONFIG_TL_WDR4900_V1=y
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_JR is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API is not set
>> diff --git a/target/linux/mpc85xx/p1020/config-default
>> b/target/linux/mpc85xx/p1020/config-default
>> index fd9433b59a..d906a06d46 100644
>> --- a/target/linux/mpc85xx/p1020/config-default
>> +++ b/target/linux/mpc85xx/p1020/config-default
>> @@ -2,6 +2,16 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y
>>   CONFIG_AT803X_PHY=y
>>   CONFIG_CMDLINE_OVERRIDE=y
>>   CONFIG_CPU_RMAP=y
>> +CONFIG_CRYPTO_DEV_FSL_CAAM=y
>> +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y
>> +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_IMX is not set
>> +# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set
>> +CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y
>> +CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y
>> +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9
>> +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y
>>   CONFIG_EEPROM_LEGACY=y
>>   CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
>>   CONFIG_GENERIC_TBSYNC=y
>> --
>> 2.11.0
>>
>>
>> _______________________________________________
>> openwrt-devel mailing list
>> openwrt-devel at lists.openwrt.org
>> https://lists.openwrt.org/listinfo/openwrt-devel
>>
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/listinfo/openwrt-devel


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/listinfo/openwrt-devel