From: Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> Hi, As part of the ongoing rebase effort, the following configuration options need to be reviewed. As a reminder, the ARK configuration flow involves moving unreviewed configuration options from the pending directory to the ark directory. In the diff below, options are removed from the pending directory and added to the ark hierarchy. The final options that need to be ACKed are the files that are being added to the ark hierarchy. If the value for a file that is added should be changed, please reply with a better option. CONFIG_CRYPTO_DEV_HISI_TRNG: Support for HiSilicon TRNG Driver. Symbol: CRYPTO_DEV_HISI_TRNG [=n] Type : tristate Defined at drivers/crypto/hisilicon/Kconfig:75 Prompt: Support for HISI TRNG Driver Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && ARM64 [=y] && ACPI [=y] Location: -> Cryptographic API (CRYPTO [=y]) -> Hardware crypto devices (CRYPTO_HW [=y]) Selects: HW_RANDOM [=y] && CRYPTO_RNG [=y] --- CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4: Support for Intel Keem Bay Offload and Crypto Subsystem (OCS) AES and SM4 cihper hardware acceleration for use with Crypto API. Provides HW acceleration for the following transformations: cbc(aes), ctr(aes), ccm(aes), gcm(aes), cbc(sm4), ctr(sm4), ccm(sm4) and gcm(sm4). Optionally, support for the following transformations can also be enabled: ecb(aes), cts(cbc(aes)), ecb(sm4) and cts(cbc(sm4)). Symbol: CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 [=n] Type : tristate Defined at drivers/crypto/keembay/Kconfig:1 Prompt: Support for Intel Keem Bay OCS AES/SM4 HW acceleration Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && (OF [=y] || COMPILE_TEST [=n]) Location: -> Cryptographic API (CRYPTO [=y]) -> Hardware crypto devices (CRYPTO_HW [=y]) Selects: CRYPTO_SKCIPHER [=y] && CRYPTO_AEAD [=y] && CRYPTO_ENGINE [=n] --- CONFIG_CRYPTO_DEV_QAT_4XXX: Support for Intel(R) QuickAssist Technology QAT_4xxx for accelerating crypto and compression workloads. To compile this as a module, choose M here: the module will be called qat_4xxx. Symbol: CRYPTO_DEV_QAT_4XXX [=n] Type : tristate Defined at drivers/crypto/qat/Kconfig:49 Prompt: Support for Intel(R) QAT_4XXX Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && X86 [=y] && PCI [=y] Location: -> Cryptographic API (CRYPTO [=y]) -> Hardware crypto devices (CRYPTO_HW [=y]) Selects: CRYPTO_DEV_QAT [=m] --- Cc: Herbert Xu <herbert.xu@xxxxxxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxx> Cc: Ondrej Mosnacek <omosnace@xxxxxxxxxx> Signed-off-by: Fedora Kernel Team <kernel-team@xxxxxxxxxxxxxxxxx> --- .../generic/CONFIG_CRYPTO_DEV_HISI_TRNG | 1 + .../CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 | 1 + .../common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX | 1 + .../generic/CONFIG_CRYPTO_DEV_HISI_TRNG | 17 ------------- .../CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 | 25 ------------------- .../generic/CONFIG_CRYPTO_DEV_QAT_4XXX | 21 ---------------- 6 files changed, 3 insertions(+), 63 deletions(-) create mode 100644 redhat/configs/common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG create mode 100644 redhat/configs/common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 create mode 100644 redhat/configs/common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 delete mode 100644 redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG b/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG new file mode 100644 index 000000000000..44184cc72db2 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG @@ -0,0 +1 @@ +# CONFIG_CRYPTO_DEV_HISI_TRNG is not set diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 b/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 new file mode 100644 index 000000000000..415503dd9113 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 @@ -0,0 +1 @@ +# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 is not set diff --git a/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX b/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX new file mode 100644 index 000000000000..54fd0faec1c8 --- /dev/null +++ b/redhat/configs/common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX @@ -0,0 +1 @@ +# CONFIG_CRYPTO_DEV_QAT_4XXX is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG deleted file mode 100644 index 273befa0d40a..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_HISI_TRNG +++ /dev/null @@ -1,17 +0,0 @@ -# CONFIG_CRYPTO_DEV_HISI_TRNG: -# -# Support for HiSilicon TRNG Driver. -# -# Symbol: CRYPTO_DEV_HISI_TRNG [=n] -# Type : tristate -# Defined at drivers/crypto/hisilicon/Kconfig:75 -# Prompt: Support for HISI TRNG Driver -# Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && ARM64 [=y] && ACPI [=y] -# Location: -# -> Cryptographic API (CRYPTO [=y]) -# -> Hardware crypto devices (CRYPTO_HW [=y]) -# Selects: HW_RANDOM [=y] && CRYPTO_RNG [=y] -# -# -# -# CONFIG_CRYPTO_DEV_HISI_TRNG is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 deleted file mode 100644 index 2a2234550e3d..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 +++ /dev/null @@ -1,25 +0,0 @@ -# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4: -# -# Support for Intel Keem Bay Offload and Crypto Subsystem (OCS) AES and -# SM4 cihper hardware acceleration for use with Crypto API. -# -# Provides HW acceleration for the following transformations: -# cbc(aes), ctr(aes), ccm(aes), gcm(aes), cbc(sm4), ctr(sm4), ccm(sm4) -# and gcm(sm4). -# -# Optionally, support for the following transformations can also be -# enabled: ecb(aes), cts(cbc(aes)), ecb(sm4) and cts(cbc(sm4)). -# -# Symbol: CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 [=n] -# Type : tristate -# Defined at drivers/crypto/keembay/Kconfig:1 -# Prompt: Support for Intel Keem Bay OCS AES/SM4 HW acceleration -# Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && (OF [=y] || COMPILE_TEST [=n]) -# Location: -# -> Cryptographic API (CRYPTO [=y]) -# -> Hardware crypto devices (CRYPTO_HW [=y]) -# Selects: CRYPTO_SKCIPHER [=y] && CRYPTO_AEAD [=y] && CRYPTO_ENGINE [=n] -# -# -# -# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 is not set diff --git a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX b/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX deleted file mode 100644 index 5b3262998540..000000000000 --- a/redhat/configs/pending-common/generic/CONFIG_CRYPTO_DEV_QAT_4XXX +++ /dev/null @@ -1,21 +0,0 @@ -# CONFIG_CRYPTO_DEV_QAT_4XXX: -# -# Support for Intel(R) QuickAssist Technology QAT_4xxx -# for accelerating crypto and compression workloads. -# -# To compile this as a module, choose M here: the module -# will be called qat_4xxx. -# -# Symbol: CRYPTO_DEV_QAT_4XXX [=n] -# Type : tristate -# Defined at drivers/crypto/qat/Kconfig:49 -# Prompt: Support for Intel(R) QAT_4XXX -# Depends on: CRYPTO [=y] && CRYPTO_HW [=y] && X86 [=y] && PCI [=y] -# Location: -# -> Cryptographic API (CRYPTO [=y]) -# -> Hardware crypto devices (CRYPTO_HW [=y]) -# Selects: CRYPTO_DEV_QAT [=m] -# -# -# -# CONFIG_CRYPTO_DEV_QAT_4XXX is not set -- GitLab _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx