[Public]
-----Original Message----- From: Limonciello, Mario Mario.Limonciello@amd.com Sent: Wednesday, September 28, 2022 13:45 To: Limonciello, Mario Mario.Limonciello@amd.com; Lendacky, Thomas Thomas.Lendacky@amd.com; Allen, John John.Allen@amd.com Cc: stable@vger.kernel.org; Thomas, Rijo-john <Rijo- john.Thomas@amd.com>; Herbert Xu herbert@gondor.apana.org.au; David S. Miller davem@davemloft.net; linux-crypto@vger.kernel.org; linux-kernel@vger.kernel.org Subject: [PATCH] crypto: ccp: Add support for TEE for PCI ID 0x14CA
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
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 792d6da7f0c0..084d052fddcc 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 }, { /* 6 */ -- 2.34.1
Herbert,
I noticed you sent out the 6.1 PR already. So I Just wanted to make sure this didn't get overlooked as it's already got a T-b/A-b.
Thanks!