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

Commit 1bf91cdc authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Drop references to deprecated pci_ DMA api and instead use dma_ API 



The networking side of the code had already been updated to use dma_ calls
instead of the old pci_ calls. However it looks like the FCoE code was
never updated.  This change goes through and moves everything from the pci
APIs to the dma APIs.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d773d131

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -104,10 +104,10 @@ int ixgbe_fcoe_ddp_put(struct net_device *netdev, u16 xid) 
			udelay(100);

			udelay(100);

	}

	}

	if (ddp->sgl)

	if (ddp->sgl)

		pci_unmap_sg(adapter->pdev, ddp->sgl, ddp->sgc,

		dma_unmap_sg(&adapter->pdev->dev, ddp->sgl, ddp->sgc,

			     DMA_FROM_DEVICE);

			     DMA_FROM_DEVICE);

	if (ddp->pool) {

	if (ddp->pool) {

		pci_pool_free(ddp->pool, ddp->udl, ddp->udp);

		dma_pool_free(ddp->pool, ddp->udl, ddp->udp);

		ddp->pool = NULL;

		ddp->pool = NULL;

	}

	}
@@ -144,7 +144,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	unsigned int thislen = 0;

	unsigned int thislen = 0;

	u32 fcbuff, fcdmarw, fcfltrw, fcrxctl;

	u32 fcbuff, fcdmarw, fcfltrw, fcrxctl;

	dma_addr_t addr = 0;

	dma_addr_t addr = 0;

	struct pci_pool *pool;

	struct dma_pool *pool;

	unsigned int cpu;

	unsigned int cpu;





	if (!netdev || !sgl)

	if (!netdev || !sgl)
@@ -176,7 +176,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	ixgbe_fcoe_clear_ddp(ddp);

	ixgbe_fcoe_clear_ddp(ddp);





	/* setup dma from scsi command sgl */

	/* setup dma from scsi command sgl */

	dmacount = pci_map_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);

	dmacount = dma_map_sg(&adapter->pdev->dev, sgl, sgc, DMA_FROM_DEVICE);

	if (dmacount == 0) {

	if (dmacount == 0) {

		e_err(drv, "xid 0x%x DMA map error\n", xid);

		e_err(drv, "xid 0x%x DMA map error\n", xid);

		return 0;

		return 0;
@@ -185,7 +185,7 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	/* alloc the udl from per cpu ddp pool */

	/* alloc the udl from per cpu ddp pool */

	cpu = get_cpu();

	cpu = get_cpu();

	pool = *per_cpu_ptr(fcoe->pool, cpu);

	pool = *per_cpu_ptr(fcoe->pool, cpu);

	ddp->udl = pci_pool_alloc(pool, GFP_ATOMIC, &ddp->udp);

	ddp->udl = dma_pool_alloc(pool, GFP_ATOMIC, &ddp->udp);

	if (!ddp->udl) {

	if (!ddp->udl) {

		e_err(drv, "failed allocated ddp context\n");

		e_err(drv, "failed allocated ddp context\n");

		goto out_noddp_unmap;

		goto out_noddp_unmap;
@@ -293,11 +293,11 @@ static int ixgbe_fcoe_ddp_setup(struct net_device *netdev, u16 xid, 
	return 1;

	return 1;





out_noddp_free:

out_noddp_free:

	pci_pool_free(pool, ddp->udl, ddp->udp);

	dma_pool_free(pool, ddp->udl, ddp->udp);

	ixgbe_fcoe_clear_ddp(ddp);

	ixgbe_fcoe_clear_ddp(ddp);





out_noddp_unmap:

out_noddp_unmap:

	pci_unmap_sg(adapter->pdev, sgl, sgc, DMA_FROM_DEVICE);

	dma_unmap_sg(&adapter->pdev->dev, sgl, sgc, DMA_FROM_DEVICE);

	put_cpu();

	put_cpu();

	return 0;

	return 0;

}

}
@@ -409,7 +409,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter, 
		break;

		break;

	/* unmap the sg list when FCPRSP is received */

	/* unmap the sg list when FCPRSP is received */

	case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_FCPRSP):

	case __constant_cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_FCPRSP):

		pci_unmap_sg(adapter->pdev, ddp->sgl,

		dma_unmap_sg(&adapter->pdev->dev, ddp->sgl,

			     ddp->sgc, DMA_FROM_DEVICE);

			     ddp->sgc, DMA_FROM_DEVICE);

		ddp->err = ddp_err;

		ddp->err = ddp_err;

		ddp->sgl = NULL;

		ddp->sgl = NULL;
@@ -566,12 +566,12 @@ int ixgbe_fso(struct ixgbe_ring *tx_ring, 
static void ixgbe_fcoe_ddp_pools_free(struct ixgbe_fcoe *fcoe)

static void ixgbe_fcoe_ddp_pools_free(struct ixgbe_fcoe *fcoe)

{

{

	unsigned int cpu;

	unsigned int cpu;

	struct pci_pool **pool;

	struct dma_pool **pool;





	for_each_possible_cpu(cpu) {

	for_each_possible_cpu(cpu) {

		pool = per_cpu_ptr(fcoe->pool, cpu);

		pool = per_cpu_ptr(fcoe->pool, cpu);

		if (*pool)

		if (*pool)

			pci_pool_destroy(*pool);

			dma_pool_destroy(*pool);

	}

	}

	free_percpu(fcoe->pool);

	free_percpu(fcoe->pool);

	fcoe->pool = NULL;

	fcoe->pool = NULL;
@@ -581,10 +581,10 @@ static void ixgbe_fcoe_ddp_pools_alloc(struct ixgbe_adapter *adapter) 
{

{

	struct ixgbe_fcoe *fcoe = &adapter->fcoe;

	struct ixgbe_fcoe *fcoe = &adapter->fcoe;

	unsigned int cpu;

	unsigned int cpu;

	struct pci_pool **pool;

	struct dma_pool **pool;

	char pool_name[32];

	char pool_name[32];





	fcoe->pool = alloc_percpu(struct pci_pool *);

	fcoe->pool = alloc_percpu(struct dma_pool *);

	if (!fcoe->pool)

	if (!fcoe->pool)

		return;

		return;
@@ -592,9 +592,9 @@ static void ixgbe_fcoe_ddp_pools_alloc(struct ixgbe_adapter *adapter) 
	for_each_possible_cpu(cpu) {

	for_each_possible_cpu(cpu) {

		snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu);

		snprintf(pool_name, 32, "ixgbe_fcoe_ddp_%d", cpu);

		pool = per_cpu_ptr(fcoe->pool, cpu);

		pool = per_cpu_ptr(fcoe->pool, cpu);

		*pool = pci_pool_create(pool_name,

		*pool = dma_pool_create(pool_name, &adapter->pdev->dev,

					adapter->pdev, IXGBE_FCPTR_MAX,

					IXGBE_FCPTR_MAX, IXGBE_FCPTR_ALIGN,

					IXGBE_FCPTR_ALIGN, PAGE_SIZE);

					PAGE_SIZE);

		if (!*pool) {

		if (!*pool) {

			e_err(drv, "failed to alloc DDP pool on cpu:%d\n", cpu);

			e_err(drv, "failed to alloc DDP pool on cpu:%d\n", cpu);

			ixgbe_fcoe_ddp_pools_free(fcoe);

			ixgbe_fcoe_ddp_pools_free(fcoe);

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -62,11 +62,11 @@ struct ixgbe_fcoe_ddp { 
	struct scatterlist *sgl;

	struct scatterlist *sgl;

	dma_addr_t udp;

	dma_addr_t udp;

	u64 *udl;

	u64 *udl;

	struct pci_pool *pool;

	struct dma_pool *pool;

};

};





struct ixgbe_fcoe {

struct ixgbe_fcoe {

	struct pci_pool **pool;

	struct dma_pool **pool;

	atomic_t refcnt;

	atomic_t refcnt;

	spinlock_t lock;

	spinlock_t lock;

	struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];

	struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];