diff mbox series

[1/1,SRU,Jammy/OEM-5.17/Kinetic] UBUNTU: SAUCE: crypto: ccp: Add support for TEE for PCI ID 0x14CA

Message ID 20221006173813.758910-2-vicamo.yang@canonical.com
State New
Headers show
Series Add support for TEE for PCI ID 0x14CA | expand

Commit Message

You-Sheng Yang Oct. 6, 2022, 5:38 p.m. UTC 
From: Mario Limonciello <mario.limonciello@amd.com>

BugLink: https://bugs.launchpad.net/bugs/1991608

SoCs containing 0x14CA are present both in datacenter parts that
support SEV as well as client parts that support TEE.

Cc: stable@vger.kernel.org # 5.15+
Tested-by: Rijo-john Thomas <Rijo-john.Thomas@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
(cherry picked from https://lore.kernel.org/linux-crypto/20220928184506.13981-1-mario.limonciello@amd.com/T/#m1b933ea4b961d17cb1be5be74e2d22a860507ca0)
Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
---
 drivers/crypto/ccp/sp-pci.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Comments

Tim Gardner Nov. 10, 2022, 4:03 p.m. UTC | #1 
On 10/6/22 11:38 AM, You-Sheng Yang wrote:
> From: Mario Limonciello <mario.limonciello@amd.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1991608
> 
> SoCs containing 0x14CA are present both in datacenter parts that
> support SEV as well as client parts that support TEE.
> 
> Cc: stable@vger.kernel.org # 5.15+
> Tested-by: Rijo-john Thomas <Rijo-john.Thomas@amd.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> (cherry picked from https://lore.kernel.org/linux-crypto/20220928184506.13981-1-mario.limonciello@amd.com/T/#m1b933ea4b961d17cb1be5be74e2d22a860507ca0)
> Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
> ---
>   drivers/crypto/ccp/sp-pci.c | 11 ++++++++++-
>   1 file changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
> index b5970ae54d0e..77b0b724de73 100644
> --- a/drivers/crypto/ccp/sp-pci.c
> +++ b/drivers/crypto/ccp/sp-pci.c
> @@ -381,6 +381,15 @@ static const struct psp_vdata pspv3 = {
>   	.inten_reg		= 0x10690,
>   	.intsts_reg		= 0x10694,
>   };
> +
> +static const struct psp_vdata pspv4 = {
> +	.sev			= &sevv2,
> +	.tee			= &teev1,
> +	.feature_reg		= 0x109fc,
> +	.inten_reg		= 0x10690,
> +	.intsts_reg		= 0x10694,
> +};
> +
>   #endif
>   
>   static const struct sp_dev_vdata dev_vdata[] = {
> @@ -426,7 +435,7 @@ static const struct sp_dev_vdata dev_vdata[] = {
>   	{	/* 5 */
>   		.bar = 2,
>   #ifdef CONFIG_CRYPTO_DEV_SP_PSP
> -		.psp_vdata = &pspv2,
> +		.psp_vdata = &pspv4,
>   #endif
>   	},
>   };
Acked-by: Tim Gardner <tim.gardner@canonical.com>

Patch is in linux-next:

10da230a4df1dfe32a58eb09246f5ffe82346f27 crypto: ccp - Add support for 
TEE for PCI ID 0x14CA
diff mbox series

Patch

diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index b5970ae54d0e..77b0b724de73 100644
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -381,6 +381,15 @@  static const struct psp_vdata pspv3 = {
 	.inten_reg		= 0x10690,
 	.intsts_reg		= 0x10694,
 };
+
+static const struct psp_vdata pspv4 = {
+	.sev			= &sevv2,
+	.tee			= &teev1,
+	.feature_reg		= 0x109fc,
+	.inten_reg		= 0x10690,
+	.intsts_reg		= 0x10694,
+};
+
 #endif
 
 static const struct sp_dev_vdata dev_vdata[] = {
@@ -426,7 +435,7 @@  static const struct sp_dev_vdata dev_vdata[] = {
 	{	/* 5 */
 		.bar = 2,
 #ifdef CONFIG_CRYPTO_DEV_SP_PSP
-		.psp_vdata = &pspv2,
+		.psp_vdata = &pspv4,
 #endif
 	},
 };