Commit 33960acc authored by Rijo Thomas's avatar Rijo Thomas Committed by Herbert Xu
Browse files

crypto: ccp - add TEE support for Raven Ridge 



Adds a PCI device entry for Raven Ridge. Raven Ridge is an APU with a
dedicated AMD Secure Processor having Trusted Execution Environment (TEE)
support. The TEE provides a secure environment for running Trusted
Applications (TAs) which implement security-sensitive parts of a feature.

This patch configures AMD Secure Processor's TEE interface by initializing
a ring buffer (shared memory between Rich OS and Trusted OS) which can hold
multiple command buffer entries. The TEE interface is facilitated by a set
of CPU to PSP mailbox registers.

The next patch will address how commands are submitted to the ring buffer.

Cc: Jens Wiklander <jens.wiklander@linaro.org>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Co-developed-by: default avatarDevaraj Rangasamy <Devaraj.Rangasamy@amd.com>
Signed-off-by: default avatarDevaraj Rangasamy <Devaraj.Rangasamy@amd.com>
Signed-off-by: default avatarRijo Thomas <Rijo-john.Thomas@amd.com>
Acked-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f100ab62

drivers/crypto/ccp/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ ccp-$(CONFIG_CRYPTO_DEV_SP_CCP) += ccp-dev.o \ 
ccp-$(CONFIG_CRYPTO_DEV_CCP_DEBUGFS) += ccp-debugfs.o

ccp-$(CONFIG_PCI) += sp-pci.o

ccp-$(CONFIG_CRYPTO_DEV_SP_PSP) += psp-dev.o \

                                   sev-dev.o

                                   sev-dev.o \

                                   tee-dev.o



obj-$(CONFIG_CRYPTO_DEV_CCP_CRYPTO) += ccp-crypto.o

ccp-crypto-objs := ccp-crypto-main.o \

drivers/crypto/ccp/psp-dev.c

+38 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "sp-dev.h"

#include "psp-dev.h"

#include "sev-dev.h"

#include "tee-dev.h"



struct psp_device *psp_master;
@@ -45,6 +46,9 @@ static irqreturn_t psp_irq_handler(int irq, void *data) 
	if (status) {

		if (psp->sev_irq_handler)

			psp->sev_irq_handler(irq, psp->sev_irq_data, status);



		if (psp->tee_irq_handler)

			psp->tee_irq_handler(irq, psp->tee_irq_data, status);

	}



	/* Clear the interrupt status by writing the same value we read. */
@@ -109,6 +113,25 @@ static int psp_check_support(struct psp_device *psp, 
	return 0;

}



static int psp_init(struct psp_device *psp, unsigned int capability)

{

	int ret;



	if (!psp_check_sev_support(psp, capability)) {

		ret = sev_dev_init(psp);

		if (ret)

			return ret;

	}



	if (!psp_check_tee_support(psp, capability)) {

		ret = tee_dev_init(psp);

		if (ret)

			return ret;

	}



	return 0;

}



int psp_dev_init(struct sp_device *sp)

{

	struct device *dev = sp->dev;
@@ -151,7 +174,7 @@ int psp_dev_init(struct sp_device *sp) 
		goto e_err;

	}



	ret = sev_dev_init(psp);

	ret = psp_init(psp, capability);

	if (ret)

		goto e_irq;
@@ -189,6 +212,8 @@ void psp_dev_destroy(struct sp_device *sp) 


	sev_dev_destroy(psp);



	tee_dev_destroy(psp);



	sp_free_psp_irq(sp, psp);

}
@@ -204,6 +229,18 @@ void psp_clear_sev_irq_handler(struct psp_device *psp) 
	psp_set_sev_irq_handler(psp, NULL, NULL);

}



void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,

			     void *data)

{

	psp->tee_irq_data = data;

	psp->tee_irq_handler = handler;

}



void psp_clear_tee_irq_handler(struct psp_device *psp)

{

	psp_set_tee_irq_handler(psp, NULL, NULL);

}



struct psp_device *psp_get_master_device(void)

{

	struct sp_device *sp = sp_get_psp_master_device();

drivers/crypto/ccp/psp-dev.h

+8 −0
Original line number Diff line number Diff line
@@ -40,13 +40,21 @@ struct psp_device { 
	psp_irq_handler_t sev_irq_handler;

	void *sev_irq_data;



	psp_irq_handler_t tee_irq_handler;

	void *tee_irq_data;



	void *sev_data;

	void *tee_data;

};



void psp_set_sev_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,

			     void *data);

void psp_clear_sev_irq_handler(struct psp_device *psp);



void psp_set_tee_irq_handler(struct psp_device *psp, psp_irq_handler_t handler,

			     void *data);

void psp_clear_tee_irq_handler(struct psp_device *psp);



struct psp_device *psp_get_master_device(void);



#endif /* __PSP_DEV_H */

drivers/crypto/ccp/sp-dev.h

+10 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * AMD Secure Processor driver

 *

 * Copyright (C) 2017-2018 Advanced Micro Devices, Inc.

 * Copyright (C) 2017-2019 Advanced Micro Devices, Inc.

 *

 * Author: Tom Lendacky <thomas.lendacky@amd.com>

 * Author: Gary R Hook <gary.hook@amd.com>
@@ -45,8 +45,17 @@ struct sev_vdata { 
	const unsigned int cmdbuff_addr_hi_reg;

};



struct tee_vdata {

	const unsigned int cmdresp_reg;

	const unsigned int cmdbuff_addr_lo_reg;

	const unsigned int cmdbuff_addr_hi_reg;

	const unsigned int ring_wptr_reg;

	const unsigned int ring_rptr_reg;

};



struct psp_vdata {

	const struct sev_vdata *sev;

	const struct tee_vdata *tee;

	const unsigned int feature_reg;

	const unsigned int inten_reg;

	const unsigned int intsts_reg;

drivers/crypto/ccp/sp-pci.c

+26 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * AMD Secure Processor device driver

 *

 * Copyright (C) 2013,2018 Advanced Micro Devices, Inc.

 * Copyright (C) 2013,2019 Advanced Micro Devices, Inc.

 *

 * Author: Tom Lendacky <thomas.lendacky@amd.com>

 * Author: Gary R Hook <gary.hook@amd.com>
@@ -274,6 +274,14 @@ static const struct sev_vdata sevv2 = { 
	.cmdbuff_addr_hi_reg	= 0x109e4,

};



static const struct tee_vdata teev1 = {

	.cmdresp_reg		= 0x10544,

	.cmdbuff_addr_lo_reg	= 0x10548,

	.cmdbuff_addr_hi_reg	= 0x1054c,

	.ring_wptr_reg          = 0x10550,

	.ring_rptr_reg          = 0x10554,

};



static const struct psp_vdata pspv1 = {

	.sev			= &sevv1,

	.feature_reg		= 0x105fc,
@@ -287,6 +295,13 @@ static const struct psp_vdata pspv2 = { 
	.inten_reg		= 0x10690,

	.intsts_reg		= 0x10694,

};



static const struct psp_vdata pspv3 = {

	.tee			= &teev1,

	.feature_reg		= 0x109fc,

	.inten_reg		= 0x10690,

	.intsts_reg		= 0x10694,

};

#endif



static const struct sp_dev_vdata dev_vdata[] = {
@@ -318,6 +333,15 @@ static const struct sp_dev_vdata dev_vdata[] = { 
#endif

#ifdef CONFIG_CRYPTO_DEV_SP_PSP

		.psp_vdata = &pspv2,

#endif

	},

	{	/* 4 */

		.bar = 2,

#ifdef CONFIG_CRYPTO_DEV_SP_CCP

		.ccp_vdata = &ccpv5a,

#endif

#ifdef CONFIG_CRYPTO_DEV_SP_PSP

		.psp_vdata = &pspv3,

#endif

	},

};
@@ -326,6 +350,7 @@ static const struct pci_device_id sp_pci_table[] = { 
	{ PCI_VDEVICE(AMD, 0x1456), (kernel_ulong_t)&dev_vdata[1] },

	{ PCI_VDEVICE(AMD, 0x1468), (kernel_ulong_t)&dev_vdata[2] },

	{ PCI_VDEVICE(AMD, 0x1486), (kernel_ulong_t)&dev_vdata[3] },

	{ PCI_VDEVICE(AMD, 0x15DF), (kernel_ulong_t)&dev_vdata[4] },

	/* Last entry must be zero */

	{ 0, }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE