APPLIED: [SRU][F][PATCH] UBUNTU: [Config] Disable hisi_sec2 temporarily

[Kelsey Skunberg]

Applied to Focal/master-next. Thank you! 

-Kelsey

On 2020-06-02 15:29:24 , Ike Panhc wrote:
> BugLink: https://launchpad.net/bugs/1867900
> 
> We have several crypto accelerators for Hisilicon 1620
> but unfortunately one of them is not mature and causes
> stress-ng tests failure. Disabling hisi_sec2 makes
> kernel to run crypto functions without accelerator.
> 
> We don't have hisi_sec2 in Ubuntu kernel in 5.3 and
> before, so this only blocks server certification after
> Bionic HWE kernel rolls to 5.4 and with Focal kernel.
> 
> We are working with Hisilicon to make sure the driver
> work-able and then we can re-enable hisi_sec2.
> 
> Signed-off-by: Ike Panhc <ike.pan at canonical.com>
> ---
>  debian.master/abi/5.4.0-33.37/arm64/generic.modules | 1 -
>  debian.master/config/annotations                    | 2 +-
>  debian.master/config/config.common.ubuntu           | 2 +-
>  3 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/debian.master/abi/5.4.0-33.37/arm64/generic.modules b/debian.master/abi/5.4.0-33.37/arm64/generic.modules
> index ffc79161a91a..2a6b4c7ac7f6 100644
> --- a/debian.master/abi/5.4.0-33.37/arm64/generic.modules
> +++ b/debian.master/abi/5.4.0-33.37/arm64/generic.modules
> @@ -1894,7 +1894,6 @@ hisi_sas_v1_hw
>  hisi_sas_v2_hw
>  hisi_sas_v3_hw
>  hisi_sec
> -hisi_sec2
>  hisi_thermal
>  hisi_zip
>  hix5hd2_gmac
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 3873fcec83d7..41ef968331b6 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -422,7 +422,7 @@ CONFIG_CRYPTO_DEV_SAFEXCEL                      policy<{'amd64': 'm', 'arm64': '
>  CONFIG_CRYPTO_DEV_ARTPEC6                       policy<{'armhf': 'm'}>
>  CONFIG_CRYPTO_DEV_CCREE                         policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', }>
>  CONFIG_CRYPTO_DEV_HISI_SEC                      policy<{'arm64': 'm'}>
> -CONFIG_CRYPTO_DEV_HISI_SEC2                     policy<{'arm64': 'm'}>
> +CONFIG_CRYPTO_DEV_HISI_SEC2                     policy<{'arm64': 'n'}>
>  CONFIG_CRYPTO_DEV_HISI_ZIP                      policy<{'arm64': 'm'}>
>  CONFIG_CRYPTO_DEV_HISI_HPRE                     policy<{'arm64': 'm'}>
>  #
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index e51e3a6df0da..4f4ec76cd0ab 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2092,7 +2092,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
>  CONFIG_CRYPTO_DEV_HISI_HPRE=m
>  CONFIG_CRYPTO_DEV_HISI_QM=m
>  CONFIG_CRYPTO_DEV_HISI_SEC=m
> -CONFIG_CRYPTO_DEV_HISI_SEC2=m
> +# CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
>  CONFIG_CRYPTO_DEV_HISI_ZIP=m
>  CONFIG_CRYPTO_DEV_MARVELL_CESA=m
>  CONFIG_CRYPTO_DEV_MEDIATEK=m
> -- 
> 2.25.1
> 
> 
> -- 
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team