Commit 482d746f authored by Xin Jiang's avatar Xin Jiang Committed by hanliyang
Browse files

crypto: ccp: Add support to detect CCP devices on Hygon 4th CPUs 

hygon inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I98NP1


CVE: NA

---------------------------

Since Hygon 4th CPUs, there are new Secure Processor devices with 3
different PCI device IDs, add them in the device list.

Signed-off-by: default avatarXin Jiang <jiangxin@hygon.cn>
Signed-off-by: default avatarhanliyang <hanliyang@hygon.cn>
parent 39023e2d

drivers/crypto/ccp/hygon/sp-pci.c

+16 −0
Original line number Diff line number Diff line
@@ -28,6 +28,13 @@ static const struct psp_vdata pspv1 = { 
	.intsts_reg		= 0x10614,	/* P2CMSG_INTSTS */

};



static const struct psp_vdata pspv2 = {

	.sev			= &csvv1,

	.feature_reg		= 0x105fc,

	.inten_reg		= 0x10670,

	.intsts_reg		= 0x10674,

};



#endif



const struct sp_dev_vdata hygon_dev_vdata[] = {
@@ -44,6 +51,15 @@ const struct sp_dev_vdata hygon_dev_vdata[] = { 
		.bar = 2,

#ifdef CONFIG_CRYPTO_DEV_SP_CCP

		.ccp_vdata = &ccpv5b,

#endif

	},

	{	/* 2 */

		.bar = 2,

#ifdef CONFIG_CRYPTO_DEV_SP_CCP

		.ccp_vdata = &ccpv5a,

#endif

#ifdef CONFIG_CRYPTO_DEV_SP_PSP

		.psp_vdata = &pspv2,

#endif

	},

};

drivers/crypto/ccp/sp-pci.c

+3 −0
Original line number Diff line number Diff line
@@ -580,6 +580,9 @@ static const struct pci_device_id sp_pci_table[] = { 
	{ PCI_VDEVICE(AMD, 0x156E), (kernel_ulong_t)&dev_vdata[8] },

	{ PCI_VDEVICE(HYGON, 0x1456), (kernel_ulong_t)&hygon_dev_vdata[0] },

	{ PCI_VDEVICE(HYGON, 0x1468), (kernel_ulong_t)&hygon_dev_vdata[1] },

	{ PCI_VDEVICE(HYGON, 0x1486), (kernel_ulong_t)&hygon_dev_vdata[2] },

	{ PCI_VDEVICE(HYGON, 0x14b8), (kernel_ulong_t)&hygon_dev_vdata[1] },

	{ PCI_VDEVICE(HYGON, 0x14a6), (kernel_ulong_t)&hygon_dev_vdata[2] },

	/* Last entry must be zero */

	{ 0, }

};