Commit 01121ab7 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: enetc: save the DMA device for enetc_free_cbdr 



We shouldn't need to pass the struct device *dev to enetc CBDR APIs over
and over again, so save this inside struct enetc_cbdr::dma_dev and avoid
calling it from the enetc_free_cbdr functions.

This breaks the dependency of the cbdr API from struct enetc_si (the
station interface).

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 176769d1

drivers/net/ethernet/freescale/enetc/enetc.c

+2 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ int enetc_alloc_si_resources(struct enetc_ndev_priv *priv) 


err_alloc_cls:

	enetc_clear_cbdr(&si->hw);

	enetc_free_cbdr(priv->dev, &si->cbd_ring);

	enetc_free_cbdr(&si->cbd_ring);



	return err;

}
@@ -1087,7 +1087,7 @@ void enetc_free_si_resources(struct enetc_ndev_priv *priv) 
	struct enetc_si *si = priv->si;



	enetc_clear_cbdr(&si->hw);

	enetc_free_cbdr(priv->dev, &si->cbd_ring);

	enetc_free_cbdr(&si->cbd_ring);



	kfree(priv->cls_rules);

}

drivers/net/ethernet/freescale/enetc/enetc.h

+2 −1
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct enetc_cbdr { 
	int next_to_clean;



	dma_addr_t bd_dma_base;

	struct device *dma_dev;

};



#define ENETC_TXBD(BDR, i) (&(((union enetc_tx_bd *)((BDR).bd_base))[i]))
@@ -311,7 +312,7 @@ void enetc_set_ethtool_ops(struct net_device *ndev); 


/* control buffer descriptor ring (CBDR) */

int enetc_alloc_cbdr(struct device *dev, struct enetc_cbdr *cbdr);

void enetc_free_cbdr(struct device *dev, struct enetc_cbdr *cbdr);

void enetc_free_cbdr(struct enetc_cbdr *cbdr);

void enetc_setup_cbdr(struct enetc_hw *hw, struct enetc_cbdr *cbdr);

void enetc_clear_cbdr(struct enetc_hw *hw);

int enetc_set_mac_flt_entry(struct enetc_si *si, int index,

drivers/net/ethernet/freescale/enetc/enetc_cbdr.c

+21 −16
Original line number Diff line number Diff line
@@ -14,22 +14,26 @@ int enetc_alloc_cbdr(struct device *dev, struct enetc_cbdr *cbdr) 


	/* h/w requires 128B alignment */

	if (!IS_ALIGNED(cbdr->bd_dma_base, 128)) {

		dma_free_coherent(dev, size, cbdr->bd_base, cbdr->bd_dma_base);

		dma_free_coherent(dev, size, cbdr->bd_base,

				  cbdr->bd_dma_base);

		return -EINVAL;

	}



	cbdr->next_to_clean = 0;

	cbdr->next_to_use = 0;

	cbdr->dma_dev = dev;



	return 0;

}



void enetc_free_cbdr(struct device *dev, struct enetc_cbdr *cbdr)

void enetc_free_cbdr(struct enetc_cbdr *cbdr)

{

	int size = cbdr->bd_count * sizeof(struct enetc_cbd);



	dma_free_coherent(dev, size, cbdr->bd_base, cbdr->bd_dma_base);

	dma_free_coherent(cbdr->dma_dev, size, cbdr->bd_base,

			  cbdr->bd_dma_base);

	cbdr->bd_base = NULL;

	cbdr->dma_dev = NULL;

}



void enetc_setup_cbdr(struct enetc_hw *hw, struct enetc_cbdr *cbdr)
@@ -57,9 +61,8 @@ void enetc_clear_cbdr(struct enetc_hw *hw) 
	enetc_wr(hw, ENETC_SICBDRMR, 0);

}



static void enetc_clean_cbdr(struct enetc_si *si)

static void enetc_clean_cbdr(struct enetc_cbdr *ring)

{

	struct enetc_cbdr *ring = &si->cbd_ring;

	struct enetc_cbd *dest_cbd;

	int i, status;
@@ -69,7 +72,7 @@ static void enetc_clean_cbdr(struct enetc_si *si) 
		dest_cbd = ENETC_CBD(*ring, i);

		status = dest_cbd->status_flags & ENETC_CBD_STATUS_MASK;

		if (status)

			dev_warn(&si->pdev->dev, "CMD err %04x for cmd %04x\n",

			dev_warn(ring->dma_dev, "CMD err %04x for cmd %04x\n",

				 status, dest_cbd->cmd);



		memset(dest_cbd, 0, sizeof(*dest_cbd));
@@ -97,7 +100,7 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd) 
		return -EIO;



	if (unlikely(!enetc_cbd_unused(ring)))

		enetc_clean_cbdr(si);

		enetc_clean_cbdr(ring);



	i = ring->next_to_use;

	dest_cbd = ENETC_CBD(*ring, i);
@@ -123,7 +126,7 @@ int enetc_send_cmd(struct enetc_si *si, struct enetc_cbd *cbd) 
	/* CBD may writeback data, feedback up level */

	*cbd = *dest_cbd;



	enetc_clean_cbdr(si);

	enetc_clean_cbdr(ring);



	return 0;

}
@@ -171,6 +174,7 @@ int enetc_set_mac_flt_entry(struct enetc_si *si, int index, 
int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse,

		       int index)

{

	struct enetc_cbdr *ring = &si->cbd_ring;

	struct enetc_cbd cbd = {.cmd = 0};

	dma_addr_t dma, dma_align;

	void *tmp, *tmp_align;
@@ -183,10 +187,10 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse, 
	cbd.length = cpu_to_le16(sizeof(*rfse));

	cbd.opt[3] = cpu_to_le32(0); /* SI */



	tmp = dma_alloc_coherent(&si->pdev->dev, sizeof(*rfse) + RFSE_ALIGN,

	tmp = dma_alloc_coherent(ring->dma_dev, sizeof(*rfse) + RFSE_ALIGN,

				 &dma, GFP_KERNEL);

	if (!tmp) {

		dev_err(&si->pdev->dev, "DMA mapping of RFS entry failed!\n");

		dev_err(ring->dma_dev, "DMA mapping of RFS entry failed!\n");

		return -ENOMEM;

	}
@@ -199,9 +203,9 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse, 


	err = enetc_send_cmd(si, &cbd);

	if (err)

		dev_err(&si->pdev->dev, "FS entry add failed (%d)!", err);

		dev_err(ring->dma_dev, "FS entry add failed (%d)!", err);



	dma_free_coherent(&si->pdev->dev, sizeof(*rfse) + RFSE_ALIGN,

	dma_free_coherent(ring->dma_dev, sizeof(*rfse) + RFSE_ALIGN,

			  tmp, dma);



	return err;
@@ -211,6 +215,7 @@ int enetc_set_fs_entry(struct enetc_si *si, struct enetc_cmd_rfse *rfse, 
static int enetc_cmd_rss_table(struct enetc_si *si, u32 *table, int count,

			       bool read)

{

	struct enetc_cbdr *ring = &si->cbd_ring;

	struct enetc_cbd cbd = {.cmd = 0};

	dma_addr_t dma, dma_align;

	u8 *tmp, *tmp_align;
@@ -220,10 +225,10 @@ static int enetc_cmd_rss_table(struct enetc_si *si, u32 *table, int count, 
		/* HW only takes in a full 64 entry table */

		return -EINVAL;



	tmp = dma_alloc_coherent(&si->pdev->dev, count + RSSE_ALIGN,

	tmp = dma_alloc_coherent(ring->dma_dev, count + RSSE_ALIGN,

				 &dma, GFP_KERNEL);

	if (!tmp) {

		dev_err(&si->pdev->dev, "DMA mapping of RSS table failed!\n");

		dev_err(ring->dma_dev, "DMA mapping of RSS table failed!\n");

		return -ENOMEM;

	}

	dma_align = ALIGN(dma, RSSE_ALIGN);
@@ -243,13 +248,13 @@ static int enetc_cmd_rss_table(struct enetc_si *si, u32 *table, int count, 


	err = enetc_send_cmd(si, &cbd);

	if (err)

		dev_err(&si->pdev->dev, "RSS cmd failed (%d)!", err);

		dev_err(ring->dma_dev, "RSS cmd failed (%d)!", err);



	if (read)

		for (i = 0; i < count; i++)

			table[i] = tmp_align[i];



	dma_free_coherent(&si->pdev->dev, count + RSSE_ALIGN, tmp, dma);

	dma_free_coherent(ring->dma_dev, count + RSSE_ALIGN, tmp, dma);



	return err;

}

drivers/net/ethernet/freescale/enetc/enetc_pf.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static void enetc_init_unused_port(struct enetc_si *si) 
	enetc_init_port_rss_memory(si);



	enetc_clear_cbdr(hw);

	enetc_free_cbdr(dev, &si->cbd_ring);

	enetc_free_cbdr(&si->cbd_ring);

}



static int enetc_pf_probe(struct pci_dev *pdev,