Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
On 7/6/17 3:37 AM, kbuild test robot wrote: > Hi Brijesh, > > [auto build test ERROR on cryptodev/master] > [also build test ERROR on next-20170705] > [cannot apply to v4.12] > [if your patch is applied to the wrong git tree, please drop us a note to > help improve the system] > > url: > https://github.com/0day-ci/linux/commits/Brijesh-Singh/Introduce-AMD-Secure-Processor-device/20170625-064400 > base: > https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git > master > config: x86_64-randconfig-x016-07060921 (attached as .config) > compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 > reproduce: > # save the attached .config to linux build tree > make ARCH=x86_64 > > All errors (new ones prefixed by >>): > >>> ERROR: "ccp_dev_resume" [drivers/crypto/ccp/ccp.ko] undefined! >>> ERROR: "ccp_dev_suspend" [drivers/crypto/ccp/ccp.ko] undefined! I will send out v4 soon to fix it. We need to guard sp_dev_resume and sp_dev_suspend with CONFIG_PM. I think in my .config I had CONFIG_PM enabled, whereas the robot config does not have CONFIG_PM. > --- > 0-DAY kernel test infrastructureOpen Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
Hi Brijesh, [auto build test ERROR on cryptodev/master] [also build test ERROR on next-20170705] [cannot apply to v4.12] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Brijesh-Singh/Introduce-AMD-Secure-Processor-device/20170625-064400 base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master config: x86_64-randconfig-x016-07060921 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=x86_64 All errors (new ones prefixed by >>): >> ERROR: "ccp_dev_resume" [drivers/crypto/ccp/ccp.ko] undefined! >> ERROR: "ccp_dev_suspend" [drivers/crypto/ccp/ccp.ko] undefined! --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
On 6/28/2017 3:26 PM, Brijesh Singh wrote: On 06/28/2017 02:53 PM, Tom Lendacky wrote: In this I am leaving the top level config as-is and adding CONFIG_CRYPTO_DEV_SP_CCP to enable the CCP device support inside the SP device driver. [*] Support for AMD Secure Processor Secure Processor device driver Encryption and hashing offload support -*-Cryptographic Coprocessor device I think the "Encryption and hashing offload support" should be indented under "Cryptographic Coprocessor device" since it is a function of the CCP and not the SP. Not sure if we can remove a level of menu somehow, something to explore. Good point, the updated Kconfig looks like this and let me know it works. I think that looks better. Thanks, Tom [*] Support for AMD Secure Processor Secure Processor device driver [*] Cryptographic Coprocessor device Encryption and hashing offload support # cat drivers/crypto/ccp/Kconfig config CRYPTO_DEV_CCP_DD tristate "Secure Processor device driver" default m help Provides AMD Secure Processor device driver. If you choose 'M' here, this module will be called ccp. config CRYPTO_DEV_SP_CCP bool "Cryptographic Coprocessor device" default y depends on CRYPTO_DEV_CCP_DD select HW_RANDOM select DMA_ENGINE select DMADEVICES select CRYPTO_SHA1 select CRYPTO_SHA256 help Provides the support for AMD Cryptographic Coprocessor (CCP) device which can be used to offload encryption operations such as SHA, AES and more. config CRYPTO_DEV_CCP_CRYPTO tristate "Encryption and hashing offload support" default m depends on CRYPTO_DEV_CCP_DD depends on CRYPTO_DEV_SP_CCP select CRYPTO_HASH select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC help Support for using the cryptographic API with the AMD Cryptographic Coprocessor. This module supports offload of SHA and AES algorithms. If you choose 'M' here, this module will be called ccp_crypto.
Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
On 06/28/2017 02:53 PM, Tom Lendacky wrote: In this I am leaving the top level config as-is and adding CONFIG_CRYPTO_DEV_SP_CCP to enable the CCP device support inside the SP device driver. [*] Support for AMD Secure Processor Secure Processor device driver Encryption and hashing offload support -*-Cryptographic Coprocessor device I think the "Encryption and hashing offload support" should be indented under "Cryptographic Coprocessor device" since it is a function of the CCP and not the SP. Not sure if we can remove a level of menu somehow, something to explore. Good point, the updated Kconfig looks like this and let me know it works. [*] Support for AMD Secure Processor Secure Processor device driver [*] Cryptographic Coprocessor device Encryption and hashing offload support # cat drivers/crypto/ccp/Kconfig config CRYPTO_DEV_CCP_DD tristate "Secure Processor device driver" default m help Provides AMD Secure Processor device driver. If you choose 'M' here, this module will be called ccp. config CRYPTO_DEV_SP_CCP bool "Cryptographic Coprocessor device" default y depends on CRYPTO_DEV_CCP_DD select HW_RANDOM select DMA_ENGINE select DMADEVICES select CRYPTO_SHA1 select CRYPTO_SHA256 help Provides the support for AMD Cryptographic Coprocessor (CCP) device which can be used to offload encryption operations such as SHA, AES and more. config CRYPTO_DEV_CCP_CRYPTO tristate "Encryption and hashing offload support" default m depends on CRYPTO_DEV_CCP_DD depends on CRYPTO_DEV_SP_CCP select CRYPTO_HASH select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC help Support for using the cryptographic API with the AMD Cryptographic Coprocessor. This module supports offload of SHA and AES algorithms. If you choose 'M' here, this module will be called ccp_crypto.
Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
On 6/28/2017 2:39 PM, Brijesh Singh wrote: On 06/28/2017 12:47 PM, Tom Lendacky wrote: diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0528a62..418f991 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -512,14 +512,14 @@ config CRYPTO_DEV_ATMEL_SHA To compile this driver as a module, choose M here: the module will be called atmel-sha. -config CRYPTO_DEV_CCP -bool "Support for AMD Cryptographic Coprocessor" +config CRYPTO_DEV_SP +bool "Support for AMD Secure Processor" depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM help - The AMD Cryptographic Coprocessor provides hardware offload support - for encryption, hashing and related operations. + The AMD Secure Processor provides hardware offload support for memory + encryption in virtualization and cryptographic hashing and related operations. -if CRYPTO_DEV_CCP +if CRYPTO_DEV_SP source "drivers/crypto/ccp/Kconfig" endif diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index 2238f77..bc08f03 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -1,26 +1,37 @@ -config CRYPTO_DEV_CCP_DD -tristate "Cryptographic Coprocessor device driver" -depends on CRYPTO_DEV_CCP -default m -select HW_RANDOM -select DMA_ENGINE -select DMADEVICES -select CRYPTO_SHA1 -select CRYPTO_SHA256 -help - Provides the interface to use the AMD Cryptographic Coprocessor - which can be used to offload encryption operations such as SHA, - AES and more. If you choose 'M' here, this module will be called - ccp. - config CRYPTO_DEV_CCP_CRYPTO tristate "Encryption and hashing offload support" -depends on CRYPTO_DEV_CCP_DD +depends on CRYPTO_DEV_SP_DD default m select CRYPTO_HASH select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC +select CRYPTO_DEV_CCP help Support for using the cryptographic API with the AMD Cryptographic Coprocessor. This module supports offload of SHA and AES algorithms. If you choose 'M' here, this module will be called ccp_crypto. + +config CRYPTO_DEV_SP_DD +tristate "Secure Processor device driver" +depends on CRYPTO_DEV_SP +default m +help + Provides the interface to use the AMD Secure Processor. The + AMD Secure Processor support the Platform Security Processor (PSP) + and Cryptographic Coprocessor (CCP). If you choose 'M' here, this + module will be called ccp. + +if CRYPTO_DEV_SP_DD +config CRYPTO_DEV_CCP +bool "Cryptographic Coprocessor interface" +default y +select HW_RANDOM +select DMA_ENGINE +select DMADEVICES +select CRYPTO_SHA1 +select CRYPTO_SHA256 +help + Provides the interface to use the AMD Cryptographic Coprocessor + which can be used to offload encryption operations such as SHA, + AES and more. +endif I think the Kconfig changes need to be looked at a bit closer. The hierarchy of original version is changed and the number of entries might be able to be reduced. Thanks Tom, how about the below patch? In this I am leaving the top level config as-is and adding CONFIG_CRYPTO_DEV_SP_CCP to enable the CCP device support inside the SP device driver. [*] Support for AMD Secure Processor Secure Processor device driver Encryption and hashing offload support -*-Cryptographic Coprocessor device I think the "Encryption and hashing offload support" should be indented under "Cryptographic Coprocessor device" since it is a function of the CCP and not the SP. Not sure if we can remove a level of menu somehow, something to explore. Thanks, Tom diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0528a62..148b516 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -513,11 +513,11 @@ config CRYPTO_DEV_ATMEL_SHA will be called atmel-sha. config CRYPTO_DEV_CCP - bool "Support for AMD Cryptographic Coprocessor" + bool "Support for AMD Secure Processor" depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM help - The AMD Cryptographic Coprocessor provides hardware offload support - for encryption, hashing and related operations. + The AMD Secure Processor provides hardware offload support for memory + encryption in virtualization and cryptographic hashing and related operations. if CRYPTO_DEV_CCP source "drivers/crypto/ccp/Kconfig" diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index 2238f77..ef3a5fb 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -1,26 +1,34 @@ config CRYPTO_DEV_CCP_DD - tristate "Cryptographic Coprocessor device driver" - depends on CRYPTO_DEV_CCP + tristate "Secure Processor device driver" default m - select HW_RANDOM -
Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
On 06/28/2017 12:47 PM, Tom Lendacky wrote: diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0528a62..418f991 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -512,14 +512,14 @@ config CRYPTO_DEV_ATMEL_SHA To compile this driver as a module, choose M here: the module will be called atmel-sha. -config CRYPTO_DEV_CCP -bool "Support for AMD Cryptographic Coprocessor" +config CRYPTO_DEV_SP +bool "Support for AMD Secure Processor" depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM help - The AMD Cryptographic Coprocessor provides hardware offload support - for encryption, hashing and related operations. + The AMD Secure Processor provides hardware offload support for memory + encryption in virtualization and cryptographic hashing and related operations. -if CRYPTO_DEV_CCP +if CRYPTO_DEV_SP source "drivers/crypto/ccp/Kconfig" endif diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index 2238f77..bc08f03 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -1,26 +1,37 @@ -config CRYPTO_DEV_CCP_DD -tristate "Cryptographic Coprocessor device driver" -depends on CRYPTO_DEV_CCP -default m -select HW_RANDOM -select DMA_ENGINE -select DMADEVICES -select CRYPTO_SHA1 -select CRYPTO_SHA256 -help - Provides the interface to use the AMD Cryptographic Coprocessor - which can be used to offload encryption operations such as SHA, - AES and more. If you choose 'M' here, this module will be called - ccp. - config CRYPTO_DEV_CCP_CRYPTO tristate "Encryption and hashing offload support" -depends on CRYPTO_DEV_CCP_DD +depends on CRYPTO_DEV_SP_DD default m select CRYPTO_HASH select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC +select CRYPTO_DEV_CCP help Support for using the cryptographic API with the AMD Cryptographic Coprocessor. This module supports offload of SHA and AES algorithms. If you choose 'M' here, this module will be called ccp_crypto. + +config CRYPTO_DEV_SP_DD +tristate "Secure Processor device driver" +depends on CRYPTO_DEV_SP +default m +help + Provides the interface to use the AMD Secure Processor. The + AMD Secure Processor support the Platform Security Processor (PSP) + and Cryptographic Coprocessor (CCP). If you choose 'M' here, this + module will be called ccp. + +if CRYPTO_DEV_SP_DD +config CRYPTO_DEV_CCP +bool "Cryptographic Coprocessor interface" +default y +select HW_RANDOM +select DMA_ENGINE +select DMADEVICES +select CRYPTO_SHA1 +select CRYPTO_SHA256 +help + Provides the interface to use the AMD Cryptographic Coprocessor + which can be used to offload encryption operations such as SHA, + AES and more. +endif I think the Kconfig changes need to be looked at a bit closer. The hierarchy of original version is changed and the number of entries might be able to be reduced. Thanks Tom, how about the below patch? In this I am leaving the top level config as-is and adding CONFIG_CRYPTO_DEV_SP_CCP to enable the CCP device support inside the SP device driver. [*] Support for AMD Secure Processor Secure Processor device driver Encryption and hashing offload support -*-Cryptographic Coprocessor device diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0528a62..148b516 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -513,11 +513,11 @@ config CRYPTO_DEV_ATMEL_SHA will be called atmel-sha. config CRYPTO_DEV_CCP - bool "Support for AMD Cryptographic Coprocessor" + bool "Support for AMD Secure Processor" depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM help - The AMD Cryptographic Coprocessor provides hardware offload support - for encryption, hashing and related operations. + The AMD Secure Processor provides hardware offload support for memory + encryption in virtualization and cryptographic hashing and related operations. if CRYPTO_DEV_CCP source "drivers/crypto/ccp/Kconfig" diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index 2238f77..ef3a5fb 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -1,26 +1,34 @@ config CRYPTO_DEV_CCP_DD - tristate "Cryptographic Coprocessor device driver" - depends on CRYPTO_DEV_CCP + tristate "Secure Processor device driver" default m - select HW_RANDOM - select DMA_ENGINE - select DMADEVICES - select CRYPTO_SHA1 - select CRYPTO_SHA256 help - Provides the interface to use the AMD Cryptographic Coprocessor - which can be used to offload encryption operations such as SHA, - AES and more. If you choose 'M' here, this
Re: [PATCH v2 2/3] crypto: ccp - Introduce the AMD Secure Processor device
On 6/23/2017 11:06 AM, Brijesh Singh wrote: The CCP device is part of the AMD Secure Processor. In order to expand the usage of the AMD Secure Processor, create a framework that allows functional components of the AMD Secure Processor to be initialized and handled appropriately. Signed-off-by: Brijesh Singh--- drivers/crypto/Kconfig| 10 +-- drivers/crypto/ccp/Kconfig| 43 + drivers/crypto/ccp/Makefile | 6 +- drivers/crypto/ccp/ccp-dev-v3.c | 5 +- drivers/crypto/ccp/ccp-dev-v5.c | 5 +- drivers/crypto/ccp/ccp-dev.c | 106 +- drivers/crypto/ccp/ccp-dev.h | 21 + drivers/crypto/ccp/ccp-pci.c | 81 +++-- drivers/crypto/ccp/ccp-platform.c | 70 --- drivers/crypto/ccp/sp-dev.c | 180 ++ drivers/crypto/ccp/sp-dev.h | 120 + include/linux/ccp.h | 3 +- 12 files changed, 475 insertions(+), 175 deletions(-) create mode 100644 drivers/crypto/ccp/sp-dev.c create mode 100644 drivers/crypto/ccp/sp-dev.h diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0528a62..418f991 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -512,14 +512,14 @@ config CRYPTO_DEV_ATMEL_SHA To compile this driver as a module, choose M here: the module will be called atmel-sha. -config CRYPTO_DEV_CCP - bool "Support for AMD Cryptographic Coprocessor" +config CRYPTO_DEV_SP + bool "Support for AMD Secure Processor" depends on ((X86 && PCI) || (ARM64 && (OF_ADDRESS || ACPI))) && HAS_IOMEM help - The AMD Cryptographic Coprocessor provides hardware offload support - for encryption, hashing and related operations. + The AMD Secure Processor provides hardware offload support for memory + encryption in virtualization and cryptographic hashing and related operations. -if CRYPTO_DEV_CCP +if CRYPTO_DEV_SP source "drivers/crypto/ccp/Kconfig" endif diff --git a/drivers/crypto/ccp/Kconfig b/drivers/crypto/ccp/Kconfig index 2238f77..bc08f03 100644 --- a/drivers/crypto/ccp/Kconfig +++ b/drivers/crypto/ccp/Kconfig @@ -1,26 +1,37 @@ -config CRYPTO_DEV_CCP_DD - tristate "Cryptographic Coprocessor device driver" - depends on CRYPTO_DEV_CCP - default m - select HW_RANDOM - select DMA_ENGINE - select DMADEVICES - select CRYPTO_SHA1 - select CRYPTO_SHA256 - help - Provides the interface to use the AMD Cryptographic Coprocessor - which can be used to offload encryption operations such as SHA, - AES and more. If you choose 'M' here, this module will be called - ccp. - config CRYPTO_DEV_CCP_CRYPTO tristate "Encryption and hashing offload support" - depends on CRYPTO_DEV_CCP_DD + depends on CRYPTO_DEV_SP_DD default m select CRYPTO_HASH select CRYPTO_BLKCIPHER select CRYPTO_AUTHENC + select CRYPTO_DEV_CCP help Support for using the cryptographic API with the AMD Cryptographic Coprocessor. This module supports offload of SHA and AES algorithms. If you choose 'M' here, this module will be called ccp_crypto. + +config CRYPTO_DEV_SP_DD + tristate "Secure Processor device driver" + depends on CRYPTO_DEV_SP + default m + help + Provides the interface to use the AMD Secure Processor. The + AMD Secure Processor support the Platform Security Processor (PSP) + and Cryptographic Coprocessor (CCP). If you choose 'M' here, this + module will be called ccp. + +if CRYPTO_DEV_SP_DD +config CRYPTO_DEV_CCP + bool "Cryptographic Coprocessor interface" + default y + select HW_RANDOM + select DMA_ENGINE + select DMADEVICES + select CRYPTO_SHA1 + select CRYPTO_SHA256 + help + Provides the interface to use the AMD Cryptographic Coprocessor + which can be used to offload encryption operations such as SHA, + AES and more. +endif I think the Kconfig changes need to be looked at a bit closer. The hierarchy of original version is changed and the number of entries might be able to be reduced. Thanks, Tom