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

Commit f4ec443b authored by Peter P Waskiewicz Jr's avatar Peter P Waskiewicz Jr Committed by David S. Miller
Browse files

ixgbe: Remove legacy descriptor support 



The ethtool offline test is the only consumer of the legacy descriptors.
Update that path to only use advanced descriptors, and remove all support
for legacy descriptors.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c482c568

drivers/net/ixgbe/ixgbe.h

+0 −4
Original line number Diff line number Diff line
@@ -229,10 +229,6 @@ struct ixgbe_q_vector { 
#define IXGBE_TX_CTXTDESC_ADV(R, i)	    \

	(&(((struct ixgbe_adv_tx_context_desc *)((R).desc))[i]))



#define IXGBE_GET_DESC(R, i, type)	(&(((struct type *)((R).desc))[i]))

#define IXGBE_TX_DESC(R, i)	IXGBE_GET_DESC(R, i, ixgbe_legacy_tx_desc)

#define IXGBE_RX_DESC(R, i)	IXGBE_GET_DESC(R, i, ixgbe_legacy_rx_desc)



#define IXGBE_MAX_JUMBO_FRAME_SIZE        16128

#ifdef IXGBE_FCOE

/* Use 3K as the baby jumbo frame size for FCoE */

drivers/net/ixgbe/ixgbe_ethtool.c

+19 −14
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
		goto err_nomem;

	}



	tx_ring->size = tx_ring->count * sizeof(struct ixgbe_legacy_tx_desc);

	tx_ring->size = tx_ring->count * sizeof(union ixgbe_adv_tx_desc);

	tx_ring->size = ALIGN(tx_ring->size, 4096);

	if (!(tx_ring->desc = pci_alloc_consistent(pdev, tx_ring->size,

						   &tx_ring->dma))) {
@@ -1454,7 +1454,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
	IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDBAH(0),

			((u64) tx_ring->dma >> 32));

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDLEN(0),

			tx_ring->count * sizeof(struct ixgbe_legacy_tx_desc));

			tx_ring->count * sizeof(union ixgbe_adv_tx_desc));

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDH(0), 0);

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_TDT(0), 0);
@@ -1472,7 +1472,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
	IXGBE_WRITE_REG(&adapter->hw, IXGBE_TXDCTL(0), reg_data);



	for (i = 0; i < tx_ring->count; i++) {

		struct ixgbe_legacy_tx_desc *desc = IXGBE_TX_DESC(*tx_ring, i);

		union ixgbe_adv_tx_desc *desc = IXGBE_TX_DESC_ADV(*tx_ring, i);

		struct sk_buff *skb;

		unsigned int size = 1024;
@@ -1487,12 +1487,17 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
		tx_ring->tx_buffer_info[i].dma =

			pci_map_single(pdev, skb->data, skb->len,

			               PCI_DMA_TODEVICE);

		desc->buffer_addr = cpu_to_le64(tx_ring->tx_buffer_info[i].dma);

		desc->lower.data = cpu_to_le32(skb->len);

		desc->lower.data |= cpu_to_le32(IXGBE_TXD_CMD_EOP |

		desc->read.buffer_addr =

		                    cpu_to_le64(tx_ring->tx_buffer_info[i].dma);

		desc->read.cmd_type_len = cpu_to_le32(skb->len);

		desc->read.cmd_type_len |= cpu_to_le32(IXGBE_TXD_CMD_EOP |

		                                       IXGBE_TXD_CMD_IFCS |

		                                       IXGBE_TXD_CMD_RS);

		desc->upper.data = 0;

		desc->read.olinfo_status = 0;

		if (adapter->hw.mac.type == ixgbe_mac_82599EB)

			desc->read.olinfo_status |=

			                (skb->len << IXGBE_ADVTXD_PAYLEN_SHIFT);



	}



	/* Setup Rx Descriptor ring and Rx buffers */
@@ -1508,7 +1513,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
		goto err_nomem;

	}



	rx_ring->size = rx_ring->count * sizeof(struct ixgbe_legacy_rx_desc);

	rx_ring->size = rx_ring->count * sizeof(union ixgbe_adv_rx_desc);

	rx_ring->size = ALIGN(rx_ring->size, 4096);

	if (!(rx_ring->desc = pci_alloc_consistent(pdev, rx_ring->size,

						   &rx_ring->dma))) {
@@ -1566,8 +1571,8 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
	IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXCTRL, rctl);



	for (i = 0; i < rx_ring->count; i++) {

		struct ixgbe_legacy_rx_desc *rx_desc =

					IXGBE_RX_DESC(*rx_ring, i);

		union ixgbe_adv_rx_desc *rx_desc =

		                                 IXGBE_RX_DESC_ADV(*rx_ring, i);

		struct sk_buff *skb;



		skb = alloc_skb(IXGBE_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);
@@ -1580,7 +1585,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter) 
		rx_ring->rx_buffer_info[i].dma =

			pci_map_single(pdev, skb->data, IXGBE_RXBUFFER_2048,

			               PCI_DMA_FROMDEVICE);

		rx_desc->buffer_addr =

		rx_desc->read.pkt_addr =

				cpu_to_le64(rx_ring->rx_buffer_info[i].dma);

		memset(skb->data, 0x00, skb->len);

	}

drivers/net/ixgbe/ixgbe_type.h

+0 −31
Original line number Diff line number Diff line
@@ -1893,27 +1893,6 @@ enum ixgbe_fdir_pballoc_type { 
#define IXGBE_FDIR_INIT_DONE_POLL               10

#define IXGBE_FDIRCMD_CMD_POLL                  10



/* Transmit Descriptor - Legacy */

struct ixgbe_legacy_tx_desc {

	u64 buffer_addr;       /* Address of the descriptor's data buffer */

	union {

		__le32 data;

		struct {

			__le16 length;    /* Data buffer length */

			u8 cso;           /* Checksum offset */

			u8 cmd;           /* Descriptor control */

		} flags;

	} lower;

	union {

		__le32 data;

		struct {

			u8 status;        /* Descriptor status */

			u8 css;           /* Checksum start */

			__le16 vlan;

		} fields;

	} upper;

};



/* Transmit Descriptor - Advanced */

union ixgbe_adv_tx_desc {

	struct {
@@ -1928,16 +1907,6 @@ union ixgbe_adv_tx_desc { 
	} wb;

};



/* Receive Descriptor - Legacy */

struct ixgbe_legacy_rx_desc {

	__le64 buffer_addr; /* Address of the descriptor's data buffer */

	__le16 length;      /* Length of data DMAed into data buffer */

	__le16 csum;        /* Packet checksum */

	u8 status;          /* Descriptor status */

	u8 errors;          /* Descriptor Errors */

	__le16 vlan;

};



/* Receive Descriptor - Advanced */

union ixgbe_adv_rx_desc {

	struct {