2021-08-20 14:58:17

by John Allen

Subject: [PATCH] crypto: ccp - Add support for new CCP/PSP device ID

Add a new CCP/PSP PCI device ID and corresponding entry in the dev_vdata
struct.

Signed-off-by: John Allen <[email protected]>
---
drivers/crypto/ccp/sp-pci.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
index 6fb6ba35f89d..280161292d13 100644
--- a/drivers/crypto/ccp/sp-pci.c
+++ b/drivers/crypto/ccp/sp-pci.c
@@ -349,6 +349,12 @@ static const struct sp_dev_vdata dev_vdata[] = {
#endif
#ifdef CONFIG_CRYPTO_DEV_SP_PSP
.psp_vdata = &pspv3,
+#endif
+ },
+ { /* 5 */
+ .bar = 2,
+#ifdef CONFIG_CRYPTO_DEV_SP_PSP
+ .psp_vdata = &pspv2,
#endif
},
};
@@ -359,6 +365,7 @@ static const struct pci_device_id sp_pci_table[] = {
{ PCI_VDEVICE(AMD, 0x1486), (kernel_ulong_t)&dev_vdata[3] },
{ PCI_VDEVICE(AMD, 0x15DF), (kernel_ulong_t)&dev_vdata[4] },
{ PCI_VDEVICE(AMD, 0x1649), (kernel_ulong_t)&dev_vdata[4] },
+ { PCI_VDEVICE(AMD, 0x14CA), (kernel_ulong_t)&dev_vdata[5] },
/* Last entry must be zero */
{ 0, }
};
--
2.25.1

2021-08-27 08:35:45

by Herbert Xu

Subject: Re: [PATCH] crypto: ccp - Add support for new CCP/PSP device ID

On Fri, Aug 20, 2021 at 02:56:21PM +0000, John Allen wrote:
> Add a new CCP/PSP PCI device ID and corresponding entry in the dev_vdata
> struct.
>
> Signed-off-by: John Allen <[email protected]>
> ---
> drivers/crypto/ccp/sp-pci.c | 7 +++++++
> 1 file changed, 7 insertions(+)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2022-07-20 12:59:52

by Tom Lendacky

Subject: Re: [PATCH] crypto: ccp - Add support for new CCP/PSP device ID

On 7/19/22 11:13, Mario Limonciello wrote:
> Add a new CCP/PSP PCI device ID. This uses same register offsets
> as the previously supported structure.
>
> Signed-off-by: Mario Limonciello <[email protected]>

Acked-by: Tom Lendacky <[email protected]>

> ---
> drivers/crypto/ccp/sp-pci.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
> index b5970ae54d0e..792d6da7f0c0 100644
> --- a/drivers/crypto/ccp/sp-pci.c
> +++ b/drivers/crypto/ccp/sp-pci.c
> @@ -427,6 +427,12 @@ static const struct sp_dev_vdata dev_vdata[] = {
> .bar = 2,
> #ifdef CONFIG_CRYPTO_DEV_SP_PSP
> .psp_vdata = &pspv2,
> +#endif
> + },
> + { /* 6 */
> + .bar = 2,
> +#ifdef CONFIG_CRYPTO_DEV_SP_PSP
> + .psp_vdata = &pspv3,
> #endif
> },
> };
> @@ -438,6 +444,7 @@ static const struct pci_device_id sp_pci_table[] = {
> { PCI_VDEVICE(AMD, 0x15DF), (kernel_ulong_t)&dev_vdata[4] },
> { PCI_VDEVICE(AMD, 0x1649), (kernel_ulong_t)&dev_vdata[4] },
> { PCI_VDEVICE(AMD, 0x14CA), (kernel_ulong_t)&dev_vdata[5] },
> + { PCI_VDEVICE(AMD, 0x15C7), (kernel_ulong_t)&dev_vdata[6] },
> /* Last entry must be zero */
> { 0, }
> };

2022-07-25 07:43:25

by Rijo Thomas

Subject: Re: [PATCH] crypto: ccp - Add support for new CCP/PSP device ID

On 7/20/2022 6:28 PM, Tom Lendacky wrote:
> On 7/19/22 11:13, Mario Limonciello wrote:
>> Add a new CCP/PSP PCI device ID.  This uses same register offsets
>> as the previously supported structure.
>>
>> Signed-off-by: Mario Limonciello <[email protected]>
>
> Acked-by: Tom Lendacky <[email protected]>
>

Acked-by: Rijo Thomas <[email protected]>

>> ---
>>   drivers/crypto/ccp/sp-pci.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/crypto/ccp/sp-pci.c b/drivers/crypto/ccp/sp-pci.c
>> index b5970ae54d0e..792d6da7f0c0 100644
>> --- a/drivers/crypto/ccp/sp-pci.c
>> +++ b/drivers/crypto/ccp/sp-pci.c
>> @@ -427,6 +427,12 @@ static const struct sp_dev_vdata dev_vdata[] = {
>>           .bar = 2,
>>   #ifdef CONFIG_CRYPTO_DEV_SP_PSP
>>           .psp_vdata = &pspv2,
>> +#endif
>> +    },
>> +    {    /* 6 */
>> +        .bar = 2,
>> +#ifdef CONFIG_CRYPTO_DEV_SP_PSP
>> +        .psp_vdata = &pspv3,
>>   #endif
>>       },
>>   };
>> @@ -438,6 +444,7 @@ static const struct pci_device_id sp_pci_table[] = {
>>       { PCI_VDEVICE(AMD, 0x15DF), (kernel_ulong_t)&dev_vdata[4] },
>>       { PCI_VDEVICE(AMD, 0x1649), (kernel_ulong_t)&dev_vdata[4] },
>>       { PCI_VDEVICE(AMD, 0x14CA), (kernel_ulong_t)&dev_vdata[5] },
>> +    { PCI_VDEVICE(AMD, 0x15C7), (kernel_ulong_t)&dev_vdata[6] },
>>       /* Last entry must be zero */
>>       { 0, }
>>   };

2022-07-29 10:36:35

by Herbert Xu

Subject: Re: [PATCH] crypto: ccp - Add support for new CCP/PSP device ID

On Tue, Jul 19, 2022 at 11:13:28AM -0500, Mario Limonciello wrote:
> Add a new CCP/PSP PCI device ID. This uses same register offsets
> as the previously supported structure.
>
> Signed-off-by: Mario Limonciello <[email protected]>
> ---
> drivers/crypto/ccp/sp-pci.c | 7 +++++++
> 1 file changed, 7 insertions(+)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt