Commit f25b4638 authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul
Browse files

dmaengine: idxd: add IAX configuration support in the IDXD driver 



Add support to allow configuration of Intel Analytics Accelerator (IAX) in
addition to the Intel Data Streaming Accelerator (DSA). The IAX hardware
has the same configuration interface as DSA. The main difference
is the type of operations it performs. We can support the DSA and
IAX devices on the same driver with some tweaks.

IAX has a 64B completion record that needs to be 64B aligned, as opposed to
a 32B completion record that is 32B aligned for DSA. IAX also does not
support token management.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/160564555488.1834439.4261958859935360473.stgit@djiang5-desk3.ch.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 51b69c96

drivers/dma/idxd/cdev.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ struct idxd_cdev_context { 
 */

static struct idxd_cdev_context ictx[IDXD_TYPE_MAX] = {

	{ .name = "dsa" },

	{ .name = "iax" }

};



struct idxd_user_context {

drivers/dma/idxd/device.c

+28 −9
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ int idxd_wq_alloc_resources(struct idxd_wq *wq) 
	struct idxd_device *idxd = wq->idxd;

	struct device *dev = &idxd->pdev->dev;

	int rc, num_descs, i;

	int align;

	u64 tmp;



	if (wq->type != IDXD_WQT_KERNEL)

		return 0;
@@ -142,14 +144,27 @@ int idxd_wq_alloc_resources(struct idxd_wq *wq) 
	if (rc < 0)

		return rc;



	wq->compls_size = num_descs * sizeof(struct dsa_completion_record);

	wq->compls = dma_alloc_coherent(dev, wq->compls_size,

					&wq->compls_addr, GFP_KERNEL);

	if (!wq->compls) {

	if (idxd->type == IDXD_TYPE_DSA)

		align = 32;

	else if (idxd->type == IDXD_TYPE_IAX)

		align = 64;

	else

		return -ENODEV;



	wq->compls_size = num_descs * idxd->compl_size + align;

	wq->compls_raw = dma_alloc_coherent(dev, wq->compls_size,

					    &wq->compls_addr_raw, GFP_KERNEL);

	if (!wq->compls_raw) {

		rc = -ENOMEM;

		goto fail_alloc_compls;

	}



	/* Adjust alignment */

	wq->compls_addr = (wq->compls_addr_raw + (align - 1)) & ~(align - 1);

	tmp = (u64)wq->compls_raw;

	tmp = (tmp + (align - 1)) & ~(align - 1);

	wq->compls = (struct dsa_completion_record *)tmp;



	rc = alloc_descs(wq, num_descs);

	if (rc < 0)

		goto fail_alloc_descs;
@@ -163,9 +178,11 @@ int idxd_wq_alloc_resources(struct idxd_wq *wq) 
		struct idxd_desc *desc = wq->descs[i];



		desc->hw = wq->hw_descs[i];

		if (idxd->type == IDXD_TYPE_DSA)

			desc->completion = &wq->compls[i];

		desc->compl_dma  = wq->compls_addr +

			sizeof(struct dsa_completion_record) * i;

		else if (idxd->type == IDXD_TYPE_IAX)

			desc->iax_completion = &wq->iax_compls[i];

		desc->compl_dma = wq->compls_addr + idxd->compl_size * i;

		desc->id = i;

		desc->wq = wq;

		desc->cpu = -1;
@@ -178,7 +195,8 @@ int idxd_wq_alloc_resources(struct idxd_wq *wq) 
 fail_sbitmap_init:

	free_descs(wq);

 fail_alloc_descs:

	dma_free_coherent(dev, wq->compls_size, wq->compls, wq->compls_addr);

	dma_free_coherent(dev, wq->compls_size, wq->compls_raw,

			  wq->compls_addr_raw);

 fail_alloc_compls:

	free_hw_descs(wq);

	return rc;
@@ -193,7 +211,8 @@ void idxd_wq_free_resources(struct idxd_wq *wq) 


	free_hw_descs(wq);

	free_descs(wq);

	dma_free_coherent(dev, wq->compls_size, wq->compls, wq->compls_addr);

	dma_free_coherent(dev, wq->compls_size, wq->compls_raw,

			  wq->compls_addr_raw);

	sbitmap_queue_free(&wq->sbq);

}

drivers/dma/idxd/idxd.h

+20 −4
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ extern struct kmem_cache *idxd_desc_pool; 
enum idxd_type {

	IDXD_TYPE_UNKNOWN = -1,

	IDXD_TYPE_DSA = 0,

	IDXD_TYPE_MAX

	IDXD_TYPE_IAX,

	IDXD_TYPE_MAX,

};



#define IDXD_NAME_SIZE		128
@@ -114,8 +115,13 @@ struct idxd_wq { 
	u32 vec_ptr;		/* interrupt steering */

	struct dsa_hw_desc **hw_descs;

	int num_descs;

	union {

		struct dsa_completion_record *compls;

		struct iax_completion_record *iax_compls;

	};

	void *compls_raw;

	dma_addr_t compls_addr;

	dma_addr_t compls_addr_raw;

	int compls_size;

	struct idxd_desc **descs;

	struct sbitmap_queue sbq;
@@ -196,6 +202,7 @@ struct idxd_device { 
	int token_limit;

	int nr_tokens;		/* non-reserved tokens */

	unsigned int wqcfg_size;

	int compl_size;



	union sw_err_reg sw_err;

	wait_queue_head_t cmd_waitq;
@@ -210,9 +217,15 @@ struct idxd_device { 


/* IDXD software descriptor */

struct idxd_desc {

	union {

		struct dsa_hw_desc *hw;

		struct iax_hw_desc *iax_hw;

	};

	dma_addr_t desc_dma;

	union {

		struct dsa_completion_record *completion;

		struct iax_completion_record *iax_completion;

	};

	dma_addr_t compl_dma;

	struct dma_async_tx_descriptor txd;

	struct llist_node llnode;
@@ -226,6 +239,7 @@ struct idxd_desc { 
#define confdev_to_wq(dev) container_of(dev, struct idxd_wq, conf_dev)



extern struct bus_type dsa_bus_type;

extern struct bus_type iax_bus_type;



extern bool support_enqcmd;
@@ -271,6 +285,8 @@ static inline void idxd_set_type(struct idxd_device *idxd) 


	if (pdev->device == PCI_DEVICE_ID_INTEL_DSA_SPR0)

		idxd->type = IDXD_TYPE_DSA;

	else if (pdev->device == PCI_DEVICE_ID_INTEL_IAX_SPR0)

		idxd->type = IDXD_TYPE_IAX;

	else

		idxd->type = IDXD_TYPE_UNKNOWN;

}

drivers/dma/idxd/init.c

+14 −0
Original line number Diff line number Diff line
@@ -36,12 +36,16 @@ static struct mutex idxd_idr_lock; 
static struct pci_device_id idxd_pci_tbl[] = {

	/* DSA ver 1.0 platforms */

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_DSA_SPR0) },



	/* IAX ver 1.0 platforms */

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_IAX_SPR0) },

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, idxd_pci_tbl);



static char *idxd_name[] = {

	"dsa",

	"iax"

};



const char *idxd_get_dev_name(struct idxd_device *idxd)
@@ -377,6 +381,14 @@ static int idxd_probe(struct idxd_device *idxd) 
	return rc;

}



static void idxd_type_init(struct idxd_device *idxd)

{

	if (idxd->type == IDXD_TYPE_DSA)

		idxd->compl_size = sizeof(struct dsa_completion_record);

	else if (idxd->type == IDXD_TYPE_IAX)

		idxd->compl_size = sizeof(struct iax_completion_record);

}



static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct device *dev = &pdev->dev;
@@ -412,6 +424,8 @@ static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


	idxd_set_type(idxd);



	idxd_type_init(idxd);



	dev_dbg(dev, "Set PCI master\n");

	pci_set_master(pdev);

	pci_set_drvdata(pdev, idxd);

drivers/dma/idxd/registers.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


/* PCI Config */

#define PCI_DEVICE_ID_INTEL_DSA_SPR0	0x0b25

#define PCI_DEVICE_ID_INTEL_IAX_SPR0	0x0cfe



#define IDXD_MMIO_BAR		0

#define IDXD_WQ_BAR		2