Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7019c4d authored by Gary R Hook's avatar Gary R Hook Committed by Herbert Xu
Browse files

crypto: ccp - CCP versioning support 



Future hardware may introduce new algorithms wherein the
driver will need to manage resources for different versions
of the cryptographic coprocessor. This precursor patch
determines the version of the available device, and marks
and registers algorithms accordingly. A structure is added
which manages the version-specific data.

Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Acked-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 553d2374

drivers/crypto/ccp/ccp-crypto-aes.c

+11 −1
Original line number Diff line number Diff line 
/*

 * AMD Cryptographic Coprocessor (CCP) AES crypto API support

 *

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

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

 *

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

 *
@@ -259,6 +259,7 @@ static struct crypto_alg ccp_aes_rfc3686_defaults = { 


struct ccp_aes_def {

	enum ccp_aes_mode mode;

	unsigned int version;

	const char *name;

	const char *driver_name;

	unsigned int blocksize;
@@ -269,6 +270,7 @@ struct ccp_aes_def { 
static struct ccp_aes_def aes_algs[] = {

	{

		.mode		= CCP_AES_MODE_ECB,

		.version	= CCP_VERSION(3, 0),

		.name		= "ecb(aes)",

		.driver_name	= "ecb-aes-ccp",

		.blocksize	= AES_BLOCK_SIZE,
@@ -277,6 +279,7 @@ static struct ccp_aes_def aes_algs[] = { 
	},

	{

		.mode		= CCP_AES_MODE_CBC,

		.version	= CCP_VERSION(3, 0),

		.name		= "cbc(aes)",

		.driver_name	= "cbc-aes-ccp",

		.blocksize	= AES_BLOCK_SIZE,
@@ -285,6 +288,7 @@ static struct ccp_aes_def aes_algs[] = { 
	},

	{

		.mode		= CCP_AES_MODE_CFB,

		.version	= CCP_VERSION(3, 0),

		.name		= "cfb(aes)",

		.driver_name	= "cfb-aes-ccp",

		.blocksize	= AES_BLOCK_SIZE,
@@ -293,6 +297,7 @@ static struct ccp_aes_def aes_algs[] = { 
	},

	{

		.mode		= CCP_AES_MODE_OFB,

		.version	= CCP_VERSION(3, 0),

		.name		= "ofb(aes)",

		.driver_name	= "ofb-aes-ccp",

		.blocksize	= 1,
@@ -301,6 +306,7 @@ static struct ccp_aes_def aes_algs[] = { 
	},

	{

		.mode		= CCP_AES_MODE_CTR,

		.version	= CCP_VERSION(3, 0),

		.name		= "ctr(aes)",

		.driver_name	= "ctr-aes-ccp",

		.blocksize	= 1,
@@ -309,6 +315,7 @@ static struct ccp_aes_def aes_algs[] = { 
	},

	{

		.mode		= CCP_AES_MODE_CTR,

		.version	= CCP_VERSION(3, 0),

		.name		= "rfc3686(ctr(aes))",

		.driver_name	= "rfc3686-ctr-aes-ccp",

		.blocksize	= 1,
@@ -357,8 +364,11 @@ static int ccp_register_aes_alg(struct list_head *head, 
int ccp_register_aes_algs(struct list_head *head)

{

	int i, ret;

	unsigned int ccpversion = ccp_version();



	for (i = 0; i < ARRAY_SIZE(aes_algs); i++) {

		if (aes_algs[i].version > ccpversion)

			continue;

		ret = ccp_register_aes_alg(head, &aes_algs[i]);

		if (ret)

			return ret;

drivers/crypto/ccp/ccp-crypto-sha.c

+8 −1
Original line number Diff line number Diff line 
/*

 * AMD Cryptographic Coprocessor (CCP) SHA crypto API support

 *

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

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

 *

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

 *
@@ -341,6 +341,7 @@ static void ccp_hmac_sha_cra_exit(struct crypto_tfm *tfm) 
}



struct ccp_sha_def {

	unsigned int version;

	const char *name;

	const char *drv_name;

	enum ccp_sha_type type;
@@ -350,6 +351,7 @@ struct ccp_sha_def { 


static struct ccp_sha_def sha_algs[] = {

	{

		.version	= CCP_VERSION(3, 0),

		.name		= "sha1",

		.drv_name	= "sha1-ccp",

		.type		= CCP_SHA_TYPE_1,
@@ -357,6 +359,7 @@ static struct ccp_sha_def sha_algs[] = { 
		.block_size	= SHA1_BLOCK_SIZE,

	},

	{

		.version	= CCP_VERSION(3, 0),

		.name		= "sha224",

		.drv_name	= "sha224-ccp",

		.type		= CCP_SHA_TYPE_224,
@@ -364,6 +367,7 @@ static struct ccp_sha_def sha_algs[] = { 
		.block_size	= SHA224_BLOCK_SIZE,

	},

	{

		.version	= CCP_VERSION(3, 0),

		.name		= "sha256",

		.drv_name	= "sha256-ccp",

		.type		= CCP_SHA_TYPE_256,
@@ -480,8 +484,11 @@ static int ccp_register_sha_alg(struct list_head *head, 
int ccp_register_sha_algs(struct list_head *head)

{

	int i, ret;

	unsigned int ccpversion = ccp_version();



	for (i = 0; i < ARRAY_SIZE(sha_algs); i++) {

		if (sha_algs[i].version > ccpversion)

			continue;

		ret = ccp_register_sha_alg(head, &sha_algs[i]);

		if (ret)

			return ret;

drivers/crypto/ccp/ccp-dev.c

+27 −0
Original line number Diff line number Diff line
@@ -149,6 +149,29 @@ int ccp_present(void) 
}

EXPORT_SYMBOL_GPL(ccp_present);



/**

 * ccp_version - get the version of the CCP device

 *

 * Returns the version from the first unit on the list;

 * otherwise a zero if no CCP device is present

 */

unsigned int ccp_version(void)

{

	struct ccp_device *dp;

	unsigned long flags;

	int ret = 0;



	read_lock_irqsave(&ccp_unit_lock, flags);

	if (!list_empty(&ccp_units)) {

		dp = list_first_entry(&ccp_units, struct ccp_device, entry);

		ret = dp->vdata->version;

	}

	read_unlock_irqrestore(&ccp_unit_lock, flags);



	return ret;

}

EXPORT_SYMBOL_GPL(ccp_version);



/**

 * ccp_enqueue_cmd - queue an operation for processing by the CCP

 *
@@ -664,6 +687,10 @@ bool ccp_queues_suspended(struct ccp_device *ccp) 
}

#endif



struct ccp_vdata ccpv3 = {

	.version = CCP_VERSION(3, 0),

};



static int __init ccp_mod_init(void)

{

#ifdef CONFIG_X86

drivers/crypto/ccp/ccp-dev.h

+8 −0
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ 
#define CCP_ECC_RESULT_OFFSET		60

#define CCP_ECC_RESULT_SUCCESS		0x0001



/* Structure to hold CCP version-specific values */

struct ccp_vdata {

	unsigned int version;

};



extern struct ccp_vdata ccpv3;



struct ccp_device;

struct ccp_cmd;
@@ -187,6 +194,7 @@ struct ccp_cmd_queue { 
struct ccp_device {

	struct list_head entry;



	struct ccp_vdata *vdata;

	unsigned int ord;

	char name[MAX_CCP_NAME_LEN];

	char rngname[MAX_CCP_NAME_LEN];

drivers/crypto/ccp/ccp-pci.c

+7 −1
Original line number Diff line number Diff line
@@ -180,6 +180,12 @@ static int ccp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto e_err;



	ccp->dev_specific = ccp_pci;

	ccp->vdata = (struct ccp_vdata *)id->driver_data;

	if (!ccp->vdata || !ccp->vdata->version) {

		ret = -ENODEV;

		dev_err(dev, "missing driver data\n");

		goto e_err;

	}

	ccp->get_irq = ccp_get_irqs;

	ccp->free_irq = ccp_free_irqs;
@@ -313,7 +319,7 @@ static int ccp_pci_resume(struct pci_dev *pdev) 
#endif



static const struct pci_device_id ccp_pci_table[] = {

	{ PCI_VDEVICE(AMD, 0x1537), },

	{ PCI_VDEVICE(AMD, 0x1537), (kernel_ulong_t)&ccpv3 },

	/* Last entry must be zero */

	{ 0, }

};