Commit 04c67a90 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sh_eth-remove-BE-desc-support' 



Sergei Shtylyov says:

====================
sh_eth: remove unused BE descriptor support

   Here's a set of 2 patches against DaveM's 'net-next.git' repo plus the
recently merged to 'net.git' repo fix for the 16-bit descriptor endianness.
We get rid of ~30 LoCs and ~300 bytes of code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e898bfd 7cf72477

drivers/net/ethernet/renesas/sh_eth.c

+29 −57
Original line number Diff line number Diff line
@@ -967,30 +967,6 @@ static void sh_eth_set_receive_align(struct sk_buff *skb) 
		skb_reserve(skb, SH_ETH_RX_ALIGN - reserve);

}





/* CPU <-> EDMAC endian convert */

static inline __u32 cpu_to_edmac(struct sh_eth_private *mdp, u32 x)

{

	switch (mdp->edmac_endian) {

	case EDMAC_LITTLE_ENDIAN:

		return cpu_to_le32(x);

	case EDMAC_BIG_ENDIAN:

		return cpu_to_be32(x);

	}

	return x;

}



static inline __u32 edmac_to_cpu(struct sh_eth_private *mdp, u32 x)

{

	switch (mdp->edmac_endian) {

	case EDMAC_LITTLE_ENDIAN:

		return le32_to_cpu(x);

	case EDMAC_BIG_ENDIAN:

		return be32_to_cpu(x);

	}

	return x;

}



/* Program the hardware MAC address from dev->dev_addr. */

static void update_mac_address(struct net_device *ndev)

{
@@ -1164,7 +1140,7 @@ static void sh_eth_ring_format(struct net_device *ndev) 
		rxdesc = &mdp->rx_ring[i];

		/* The size of the buffer is a multiple of 32 bytes. */

		buf_len = ALIGN(mdp->rx_buf_sz, 32);

		rxdesc->len = cpu_to_edmac(mdp, buf_len << 16);

		rxdesc->len = cpu_to_le32(buf_len << 16);

		dma_addr = dma_map_single(&ndev->dev, skb->data, buf_len,

					  DMA_FROM_DEVICE);

		if (dma_mapping_error(&ndev->dev, dma_addr)) {
@@ -1172,8 +1148,8 @@ static void sh_eth_ring_format(struct net_device *ndev) 
			break;

		}

		mdp->rx_skbuff[i] = skb;

		rxdesc->addr = cpu_to_edmac(mdp, dma_addr);

		rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);

		rxdesc->addr = cpu_to_le32(dma_addr);

		rxdesc->status = cpu_to_le32(RD_RACT | RD_RFP);



		/* Rx descriptor address set */

		if (i == 0) {
@@ -1187,7 +1163,7 @@ static void sh_eth_ring_format(struct net_device *ndev) 
	mdp->dirty_rx = (u32) (i - mdp->num_rx_ring);



	/* Mark the last entry as wrapping the ring. */

	rxdesc->status |= cpu_to_edmac(mdp, RD_RDLE);

	rxdesc->status |= cpu_to_le32(RD_RDLE);



	memset(mdp->tx_ring, 0, tx_ringsize);
@@ -1195,8 +1171,8 @@ static void sh_eth_ring_format(struct net_device *ndev) 
	for (i = 0; i < mdp->num_tx_ring; i++) {

		mdp->tx_skbuff[i] = NULL;

		txdesc = &mdp->tx_ring[i];

		txdesc->status = cpu_to_edmac(mdp, TD_TFP);

		txdesc->len = cpu_to_edmac(mdp, 0);

		txdesc->status = cpu_to_le32(TD_TFP);

		txdesc->len = cpu_to_le32(0);

		if (i == 0) {

			/* Tx descriptor address set */

			sh_eth_write(ndev, mdp->tx_desc_dma, TDLAR);
@@ -1206,7 +1182,7 @@ static void sh_eth_ring_format(struct net_device *ndev) 
		}

	}



	txdesc->status |= cpu_to_edmac(mdp, TD_TDLE);

	txdesc->status |= cpu_to_le32(TD_TDLE);

}



/* Get skb and descriptor buffer */
@@ -1362,7 +1338,7 @@ static void sh_eth_dev_exit(struct net_device *ndev) 
	 * packet boundary if it's currently running

	 */

	for (i = 0; i < mdp->num_tx_ring; i++)

		mdp->tx_ring[i].status &= ~cpu_to_edmac(mdp, TD_TACT);

		mdp->tx_ring[i].status &= ~cpu_to_le32(TD_TACT);



	/* Disable TX FIFO egress to MAC */

	sh_eth_rcv_snd_disable(ndev);
@@ -1394,29 +1370,28 @@ static int sh_eth_txfree(struct net_device *ndev) 
	for (; mdp->cur_tx - mdp->dirty_tx > 0; mdp->dirty_tx++) {

		entry = mdp->dirty_tx % mdp->num_tx_ring;

		txdesc = &mdp->tx_ring[entry];

		if (txdesc->status & cpu_to_edmac(mdp, TD_TACT))

		if (txdesc->status & cpu_to_le32(TD_TACT))

			break;

		/* TACT bit must be checked before all the following reads */

		dma_rmb();

		netif_info(mdp, tx_done, ndev,

			   "tx entry %d status 0x%08x\n",

			   entry, edmac_to_cpu(mdp, txdesc->status));

			   entry, le32_to_cpu(txdesc->status));

		/* Free the original skb. */

		if (mdp->tx_skbuff[entry]) {

			dma_unmap_single(&ndev->dev,

					 edmac_to_cpu(mdp, txdesc->addr),

					 edmac_to_cpu(mdp, txdesc->len) >> 16,

			dma_unmap_single(&ndev->dev, le32_to_cpu(txdesc->addr),

					 le32_to_cpu(txdesc->len) >> 16,

					 DMA_TO_DEVICE);

			dev_kfree_skb_irq(mdp->tx_skbuff[entry]);

			mdp->tx_skbuff[entry] = NULL;

			free_num++;

		}

		txdesc->status = cpu_to_edmac(mdp, TD_TFP);

		txdesc->status = cpu_to_le32(TD_TFP);

		if (entry >= mdp->num_tx_ring - 1)

			txdesc->status |= cpu_to_edmac(mdp, TD_TDLE);

			txdesc->status |= cpu_to_le32(TD_TDLE);



		ndev->stats.tx_packets++;

		ndev->stats.tx_bytes += edmac_to_cpu(mdp, txdesc->len) >> 16;

		ndev->stats.tx_bytes += le32_to_cpu(txdesc->len) >> 16;

	}

	return free_num;

}
@@ -1440,11 +1415,11 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
	boguscnt = min(boguscnt, *quota);

	limit = boguscnt;

	rxdesc = &mdp->rx_ring[entry];

	while (!(rxdesc->status & cpu_to_edmac(mdp, RD_RACT))) {

	while (!(rxdesc->status & cpu_to_le32(RD_RACT))) {

		/* RACT bit must be checked before all the following reads */

		dma_rmb();

		desc_status = edmac_to_cpu(mdp, rxdesc->status);

		pkt_len = edmac_to_cpu(mdp, rxdesc->len) & RD_RFL;

		desc_status = le32_to_cpu(rxdesc->status);

		pkt_len = le32_to_cpu(rxdesc->len) & RD_RFL;



		if (--boguscnt < 0)

			break;
@@ -1482,7 +1457,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
			if (desc_status & RD_RFS10)

				ndev->stats.rx_over_errors++;

		} else	if (skb) {

			dma_addr = edmac_to_cpu(mdp, rxdesc->addr);

			dma_addr = le32_to_cpu(rxdesc->addr);

			if (!mdp->cd->hw_swap)

				sh_eth_soft_swap(

					phys_to_virt(ALIGN(dma_addr, 4)),
@@ -1511,7 +1486,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
		rxdesc = &mdp->rx_ring[entry];

		/* The size of the buffer is 32 byte boundary. */

		buf_len = ALIGN(mdp->rx_buf_sz, 32);

		rxdesc->len = cpu_to_edmac(mdp, buf_len << 16);

		rxdesc->len = cpu_to_le32(buf_len << 16);



		if (mdp->rx_skbuff[entry] == NULL) {

			skb = netdev_alloc_skb(ndev, skbuff_size);
@@ -1527,15 +1502,14 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota) 
			mdp->rx_skbuff[entry] = skb;



			skb_checksum_none_assert(skb);

			rxdesc->addr = cpu_to_edmac(mdp, dma_addr);

			rxdesc->addr = cpu_to_le32(dma_addr);

		}

		dma_wmb(); /* RACT bit must be set after all the above writes */

		if (entry >= mdp->num_rx_ring - 1)

			rxdesc->status |=

				cpu_to_edmac(mdp, RD_RACT | RD_RFP | RD_RDLE);

				cpu_to_le32(RD_RACT | RD_RFP | RD_RDLE);

		else

			rxdesc->status |=

				cpu_to_edmac(mdp, RD_RACT | RD_RFP);

			rxdesc->status |= cpu_to_le32(RD_RACT | RD_RFP);

	}



	/* Restart Rx engine if stopped. */
@@ -2335,8 +2309,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev) 
	/* Free all the skbuffs in the Rx queue. */

	for (i = 0; i < mdp->num_rx_ring; i++) {

		rxdesc = &mdp->rx_ring[i];

		rxdesc->status = cpu_to_edmac(mdp, 0);

		rxdesc->addr = cpu_to_edmac(mdp, 0xBADF00D0);

		rxdesc->status = cpu_to_le32(0);

		rxdesc->addr = cpu_to_le32(0xBADF00D0);

		dev_kfree_skb(mdp->rx_skbuff[i]);

		mdp->rx_skbuff[i] = NULL;

	}
@@ -2384,14 +2358,14 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
		kfree_skb(skb);

		return NETDEV_TX_OK;

	}

	txdesc->addr = cpu_to_edmac(mdp, dma_addr);

	txdesc->len  = cpu_to_edmac(mdp, skb->len << 16);

	txdesc->addr = cpu_to_le32(dma_addr);

	txdesc->len  = cpu_to_le32(skb->len << 16);



	dma_wmb(); /* TACT bit must be set after all the above writes */

	if (entry >= mdp->num_tx_ring - 1)

		txdesc->status |= cpu_to_edmac(mdp, TD_TACT | TD_TDLE);

		txdesc->status |= cpu_to_le32(TD_TACT | TD_TDLE);

	else

		txdesc->status |= cpu_to_edmac(mdp, TD_TACT);

		txdesc->status |= cpu_to_le32(TD_TACT);



	mdp->cur_tx++;
@@ -3097,8 +3071,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	/* get PHY ID */

	mdp->phy_id = pd->phy;

	mdp->phy_interface = pd->phy_interface;

	/* EDMAC endian */

	mdp->edmac_endian = pd->edmac_endian;

	mdp->no_ether_link = pd->no_ether_link;

	mdp->ether_link_active_low = pd->ether_link_active_low;

drivers/net/ethernet/renesas/sh_eth.h

+0 −1
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ struct sh_eth_private { 
	u32 cur_rx, dirty_rx;		/* Producer/consumer ring indices */

	u32 cur_tx, dirty_tx;

	u32 rx_buf_sz;			/* Based on MTU+slack. */

	int edmac_endian;

	struct napi_struct napi;

	bool irq_enabled;

	/* MII transceiver section. */

include/linux/sh_eth.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <linux/phy.h>

#include <linux/if_ether.h>



enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};

enum {EDMAC_LITTLE_ENDIAN};



struct sh_eth_plat_data {

	int phy;

CRA Git | Maintained and supported by SUSTech CRA and CCSE