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

Commit 3290d655 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fec' 



Fugang Duan says:

====================
net: fec: Code cleanup

This patches does several things:
  - Fixing multiqueue issue.
  - Removing the unnecessary errata workaround.
  - Aligning the data buffer dma map/unmap size.
  - Freeing resource after probe failed.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f4a775d1 e3c9614f

drivers/net/ethernet/freescale/fec.h

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ struct bufdesc_ex { 
#define RCMR_CMP_2		(RCMR_CMP_CFG(4, 0) | RCMR_CMP_CFG(5, 1) | \

				RCMR_CMP_CFG(6, 2) | RCMR_CMP_CFG(7, 3))

#define RCMR_CMP(X)		((X == 1) ? RCMR_CMP_1 : RCMR_CMP_2)

#define FEC_TX_BD_FTYPE(X)	((X & 0xF) << 20)



/* The number of Tx and Rx buffers.  These are allocated from the page

 * pool.  The code may assume these are power of two, so it it best

drivers/net/ethernet/freescale/fec_main.c

+20 −5
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ static struct platform_device_id fec_devtype[] = { 
		.name = "imx6sx-fec",

		.driver_data = FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT |

				FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM |

				FEC_QUIRK_HAS_VLAN | FEC_QUIRK_ERR006358 |

				FEC_QUIRK_HAS_AVB | FEC_QUIRK_ERR007885,

				FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB |

				FEC_QUIRK_ERR007885,

	}, {

		/* sentinel */

	}
@@ -426,6 +426,8 @@ fec_enet_txq_submit_frag_skb(struct fec_enet_priv_tx_q *txq, 
		}



		if (fep->bufdesc_ex) {

			if (id_entry->driver_data & FEC_QUIRK_HAS_AVB)

				estatus |= FEC_TX_BD_FTYPE(queue);

			if (skb->ip_summed == CHECKSUM_PARTIAL)

				estatus |= BD_ENET_TX_PINS | BD_ENET_TX_IINS;

			ebdp->cbd_bdu = 0;
@@ -555,6 +557,9 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, 
			fep->hwts_tx_en))

			skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;



		if (id_entry->driver_data & FEC_QUIRK_HAS_AVB)

			estatus |= FEC_TX_BD_FTYPE(queue);



		if (skb->ip_summed == CHECKSUM_PARTIAL)

			estatus |= BD_ENET_TX_PINS | BD_ENET_TX_IINS;
@@ -599,6 +604,7 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb, 
	const struct platform_device_id *id_entry =

				platform_get_device_id(fep->pdev);

	struct bufdesc_ex *ebdp = container_of(bdp, struct bufdesc_ex, desc);

	unsigned short queue = skb_get_queue_mapping(skb);

	unsigned short status;

	unsigned int estatus = 0;

	dma_addr_t addr;
@@ -629,6 +635,8 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb, 
	bdp->cbd_bufaddr = addr;



	if (fep->bufdesc_ex) {

		if (id_entry->driver_data & FEC_QUIRK_HAS_AVB)

			estatus |= FEC_TX_BD_FTYPE(queue);

		if (skb->ip_summed == CHECKSUM_PARTIAL)

			estatus |= BD_ENET_TX_PINS | BD_ENET_TX_IINS;

		ebdp->cbd_bdu = 0;
@@ -659,6 +667,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq, 
				platform_get_device_id(fep->pdev);

	int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);

	struct bufdesc_ex *ebdp = container_of(bdp, struct bufdesc_ex, desc);

	unsigned short queue = skb_get_queue_mapping(skb);

	void *bufaddr;

	unsigned long dmabuf;

	unsigned short status;
@@ -692,6 +701,8 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq, 
	bdp->cbd_datlen = hdr_len;



	if (fep->bufdesc_ex) {

		if (id_entry->driver_data & FEC_QUIRK_HAS_AVB)

			estatus |= FEC_TX_BD_FTYPE(queue);

		if (skb->ip_summed == CHECKSUM_PARTIAL)

			estatus |= BD_ENET_TX_PINS | BD_ENET_TX_IINS;

		ebdp->cbd_bdu = 0;
@@ -1392,7 +1403,8 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) 
		index = fec_enet_get_bd_index(rxq->rx_bd_base, bdp, fep);

		data = rxq->rx_skbuff[index]->data;

		dma_sync_single_for_cpu(&fep->pdev->dev, bdp->cbd_bufaddr,

					FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);

					FEC_ENET_RX_FRSIZE - fep->rx_align,

					DMA_FROM_DEVICE);



		if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME)

			swap_buffer(data, pkt_len);
@@ -1464,7 +1476,8 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) 
		}



		dma_sync_single_for_device(&fep->pdev->dev, bdp->cbd_bufaddr,

					FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE);

					   FEC_ENET_RX_FRSIZE - fep->rx_align,

					   DMA_FROM_DEVICE);

rx_processing_done:

		/* Clear the status flags for this buffer */

		status &= ~BD_ENET_RX_STATS;
@@ -2437,7 +2450,7 @@ static void fec_enet_free_buffers(struct net_device *ndev) 
			if (skb) {

				dma_unmap_single(&fep->pdev->dev,

						 bdp->cbd_bufaddr,

						 FEC_ENET_RX_FRSIZE,

						 FEC_ENET_RX_FRSIZE - fep->rx_align,

						 DMA_FROM_DEVICE);

				dev_kfree_skb(skb);

			}
@@ -2662,6 +2675,8 @@ fec_enet_open(struct net_device *ndev) 
	ret = fec_enet_mii_probe(ndev);

	if (ret) {

		fec_enet_free_buffers(ndev);

		fec_enet_clk_enable(ndev, false);

		pinctrl_pm_select_sleep_state(&fep->pdev->dev);

		return ret;

	}