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

Commit b1ef9daa authored by Gary R Hook's avatar Gary R Hook Committed by Greg Kroah-Hartman
Browse files

crypto: ccp - Assign DMA commands to the channel's CCP 



commit 7c468447f40645fbf2a033dfdaa92b1957130d50 upstream.

The CCP driver generally uses a round-robin approach when
assigning operations to available CCPs. For the DMA engine,
however, the DMA mappings of the SGs are associated with a
specific CCP. When an IOMMU is enabled, the IOMMU is
programmed based on this specific device.

If the DMA operations are not performed by that specific
CCP then addressing errors and I/O page faults will occur.

Update the CCP driver to allow a specific CCP device to be
requested for an operation and use this in the DMA engine
support.

Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb6e07ba

drivers/crypto/ccp/ccp-dev.c

+4 −1
Original line number Diff line number Diff line
@@ -283,11 +283,14 @@ EXPORT_SYMBOL_GPL(ccp_version); 
 */

int ccp_enqueue_cmd(struct ccp_cmd *cmd)

{

	struct ccp_device *ccp = ccp_get_device();

	struct ccp_device *ccp;

	unsigned long flags;

	unsigned int i;

	int ret;



	/* Some commands might need to be sent to a specific device */

	ccp = cmd->ccp ? cmd->ccp : ccp_get_device();



	if (!ccp)

		return -ENODEV;

drivers/crypto/ccp/ccp-dmaengine.c

+1 −0
Original line number Diff line number Diff line
@@ -390,6 +390,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan, 
			goto err;



		ccp_cmd = &cmd->ccp_cmd;

		ccp_cmd->ccp = chan->ccp;

		ccp_pt = &ccp_cmd->u.passthru_nomap;

		ccp_cmd->flags = CCP_CMD_MAY_BACKLOG;

		ccp_cmd->flags |= CCP_CMD_PASSTHRU_NO_DMA_MAP;

include/linux/ccp.h

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ enum ccp_engine { 
 * struct ccp_cmd - CPP operation request

 * @entry: list element (ccp driver use only)

 * @work: work element used for callbacks (ccp driver use only)

 * @ccp: CCP device to be run on (ccp driver use only)

 * @ccp: CCP device to be run on

 * @ret: operation return code (ccp driver use only)

 * @flags: cmd processing flags

 * @engine: CCP operation to perform