sfc: Remove struct efx_special_buffer

The attributes index and entries are no longer needed, so use
struct efx_buffer instead.
next_buffer_table was also Siena specific.
Removed some checkpatch warnings.

Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Acked-by: Edward Cree <ecree.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index fca0cf3385106dcac327202336ea1d088b25886c..6dfa062feebcb62a5a23c7486b6b31e601e0c365 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -2209,7 +2209,7 @@ static int efx_ef10_tx_probe(struct efx_tx_queue *tx_queue)
        /* low two bits of label are what we want for type */
        BUILD_BUG_ON((EFX_TXQ_TYPE_OUTER_CSUM | EFX_TXQ_TYPE_INNER_CSUM) != 3);
        tx_queue->type = tx_queue->label & 3;
-       return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd.buf,
+       return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd,
                                    (tx_queue->ptr_mask + 1) *
                                    sizeof(efx_qword_t),
                                    GFP_KERNEL);

diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c
index 7adde9639c8aba091396236db1aa888241042ba7..f3e8ed578c09e834edf4899ad4ff9f07aa1fe649 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_nic.c
+++ b/drivers/net/ethernet/sfc/ef100_nic.c
@@ -224,7 +224,7 @@ int efx_ef100_init_datapath_caps(struct efx_nic *efx)
 static int ef100_ev_probe(struct efx_channel *channel)
 {
        /* Allocate an extra descriptor for the QMDA status completion entry */
-       return efx_nic_alloc_buffer(channel->efx, &channel->eventq.buf,
+       return efx_nic_alloc_buffer(channel->efx, &channel->eventq,
                                    (channel->eventq_mask + 2) *
                                    sizeof(efx_qword_t),
                                    GFP_KERNEL);

diff --git a/drivers/net/ethernet/sfc/ef100_tx.c b/drivers/net/ethernet/sfc/ef100_tx.c
index 849e5555bd1280a862f2d6e52c236820c4375374..e6b6be5495817de9d9490cc6a137bed1d17da9d4 100644 (file)
--- a/drivers/net/ethernet/sfc/ef100_tx.c
+++ b/drivers/net/ethernet/sfc/ef100_tx.c
@@ -23,7 +23,7 @@
 int ef100_tx_probe(struct efx_tx_queue *tx_queue)
 {
        /* Allocate an extra descriptor for the QMDA status completion entry */
-       return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd.buf,
+       return efx_nic_alloc_buffer(tx_queue->efx, &tx_queue->txd,
                                    (tx_queue->ptr_mask + 2) *
                                    sizeof(efx_oword_t),
                                    GFP_KERNEL);
@@ -101,8 +101,8 @@ static bool ef100_tx_can_tso(struct efx_tx_queue *tx_queue, struct sk_buff *skb)
 
 static efx_oword_t *ef100_tx_desc(struct efx_tx_queue *tx_queue, unsigned int index)
 {
-       if (likely(tx_queue->txd.buf.addr))
-               return ((efx_oword_t *)tx_queue->txd.buf.addr) + index;
+       if (likely(tx_queue->txd.addr))
+               return ((efx_oword_t *)tx_queue->txd.addr) + index;
        else
                return NULL;
 }

diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c
index 41b33a75333cd40224282a958a76e241a407b566..8d2d7ea2ebefc6606488d7b57b3b093000e6126a 100644 (file)
--- a/drivers/net/ethernet/sfc/efx_channels.c
+++ b/drivers/net/ethernet/sfc/efx_channels.c
@@ -713,9 +713,6 @@ int efx_probe_channels(struct efx_nic *efx)
        struct efx_channel *channel;
        int rc;
 
-       /* Restart special buffer allocation */
-       efx->next_buffer_table = 0;
-
        /* Probe channels in reverse, so that any 'extra' channels
         * use the start of the buffer table. This allows the traffic
         * channels to be resized without moving them or wasting the
@@ -849,36 +846,14 @@ int efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries)
        struct efx_channel *other_channel[EFX_MAX_CHANNELS], *channel,
                           *ptp_channel = efx_ptp_channel(efx);
        struct efx_ptp_data *ptp_data = efx->ptp_data;
-       unsigned int i, next_buffer_table = 0;
        u32 old_rxq_entries, old_txq_entries;
+       unsigned int i;
        int rc, rc2;
 
        rc = efx_check_disabled(efx);
        if (rc)
                return rc;
 
-       /* Not all channels should be reallocated. We must avoid
-        * reallocating their buffer table entries.
-        */
-       efx_for_each_channel(channel, efx) {
-               struct efx_rx_queue *rx_queue;
-               struct efx_tx_queue *tx_queue;
-
-               if (channel->type->copy)
-                       continue;
-               next_buffer_table = max(next_buffer_table,
-                                       channel->eventq.index +
-                                       channel->eventq.entries);
-               efx_for_each_channel_rx_queue(rx_queue, channel)
-                       next_buffer_table = max(next_buffer_table,
-                                               rx_queue->rxd.index +
-                                               rx_queue->rxd.entries);
-               efx_for_each_channel_tx_queue(tx_queue, channel)
-                       next_buffer_table = max(next_buffer_table,
-                                               tx_queue->txd.index +
-                                               tx_queue->txd.entries);
-       }
-
        efx_device_detach_sync(efx);
        efx_stop_all(efx);
        efx_soft_disable_interrupts(efx);
@@ -904,9 +879,6 @@ int efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries)
        for (i = 0; i < efx->n_channels; i++)
                swap(efx->channel[i], other_channel[i]);
 
-       /* Restart buffer table allocation */
-       efx->next_buffer_table = next_buffer_table;
-
        for (i = 0; i < efx->n_channels; i++) {
                channel = efx->channel[i];
                if (!channel->type->copy)

diff --git a/drivers/net/ethernet/sfc/mcdi_functions.c b/drivers/net/ethernet/sfc/mcdi_functions.c
index d3e6d8239f5c8f84e3fe8dfc6165e4c4056d47ad..ff8424167384b77000d8d8cf1e066a423cfdcad9 100644 (file)
--- a/drivers/net/ethernet/sfc/mcdi_functions.c
+++ b/drivers/net/ethernet/sfc/mcdi_functions.c
@@ -62,7 +62,7 @@ int efx_mcdi_alloc_vis(struct efx_nic *efx, unsigned int min_vis,
 
 int efx_mcdi_ev_probe(struct efx_channel *channel)
 {
-       return efx_nic_alloc_buffer(channel->efx, &channel->eventq.buf,
+       return efx_nic_alloc_buffer(channel->efx, &channel->eventq,
                                    (channel->eventq_mask + 1) *
                                    sizeof(efx_qword_t),
                                    GFP_KERNEL);
@@ -74,14 +74,14 @@ int efx_mcdi_ev_init(struct efx_channel *channel, bool v1_cut_thru, bool v2)
                         MC_CMD_INIT_EVQ_V2_IN_LEN(EFX_MAX_EVQ_SIZE * 8 /
                                                   EFX_BUF_SIZE));
        MCDI_DECLARE_BUF(outbuf, MC_CMD_INIT_EVQ_V2_OUT_LEN);
-       size_t entries = channel->eventq.buf.len / EFX_BUF_SIZE;
+       size_t entries = channel->eventq.len / EFX_BUF_SIZE;
        struct efx_nic *efx = channel->efx;
        size_t inlen, outlen;
        dma_addr_t dma_addr;
        int rc, i;
 
        /* Fill event queue with all ones (i.e. empty events) */
-       memset(channel->eventq.buf.addr, 0xff, channel->eventq.buf.len);
+       memset(channel->eventq.addr, 0xff, channel->eventq.len);
 
        MCDI_SET_DWORD(inbuf, INIT_EVQ_IN_SIZE, channel->eventq_mask + 1);
        MCDI_SET_DWORD(inbuf, INIT_EVQ_IN_INSTANCE, channel->channel);
@@ -112,7 +112,7 @@ int efx_mcdi_ev_init(struct efx_channel *channel, bool v1_cut_thru, bool v2)
                                      INIT_EVQ_IN_FLAG_CUT_THRU, v1_cut_thru);
        }
 
-       dma_addr = channel->eventq.buf.dma_addr;
+       dma_addr = channel->eventq.dma_addr;
        for (i = 0; i < entries; ++i) {
                MCDI_SET_ARRAY_QWORD(inbuf, INIT_EVQ_IN_DMA_ADDR, i, dma_addr);
                dma_addr += EFX_BUF_SIZE;
@@ -134,7 +134,7 @@ int efx_mcdi_ev_init(struct efx_channel *channel, bool v1_cut_thru, bool v2)
 
 void efx_mcdi_ev_remove(struct efx_channel *channel)
 {
-       efx_nic_free_buffer(channel->efx, &channel->eventq.buf);
+       efx_nic_free_buffer(channel->efx, &channel->eventq);
 }
 
 void efx_mcdi_ev_fini(struct efx_channel *channel)
@@ -166,7 +166,7 @@ int efx_mcdi_tx_init(struct efx_tx_queue *tx_queue)
                                                       EFX_BUF_SIZE));
        bool csum_offload = tx_queue->type & EFX_TXQ_TYPE_OUTER_CSUM;
        bool inner_csum = tx_queue->type & EFX_TXQ_TYPE_INNER_CSUM;
-       size_t entries = tx_queue->txd.buf.len / EFX_BUF_SIZE;
+       size_t entries = tx_queue->txd.len / EFX_BUF_SIZE;
        struct efx_channel *channel = tx_queue->channel;
        struct efx_nic *efx = tx_queue->efx;
        dma_addr_t dma_addr;
@@ -182,7 +182,7 @@ int efx_mcdi_tx_init(struct efx_tx_queue *tx_queue)
        MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_OWNER_ID, 0);
        MCDI_SET_DWORD(inbuf, INIT_TXQ_IN_PORT_ID, efx->vport_id);
 
-       dma_addr = tx_queue->txd.buf.dma_addr;
+       dma_addr = tx_queue->txd.dma_addr;
 
        netif_dbg(efx, hw, efx->net_dev, "pushing TXQ %d. %zu entries (%llx)\n",
                  tx_queue->queue, entries, (u64)dma_addr);
@@ -240,7 +240,7 @@ fail:
 
 void efx_mcdi_tx_remove(struct efx_tx_queue *tx_queue)
 {
-       efx_nic_free_buffer(tx_queue->efx, &tx_queue->txd.buf);
+       efx_nic_free_buffer(tx_queue->efx, &tx_queue->txd);
 }
 
 void efx_mcdi_tx_fini(struct efx_tx_queue *tx_queue)
@@ -269,7 +269,7 @@ fail:
 
 int efx_mcdi_rx_probe(struct efx_rx_queue *rx_queue)
 {
-       return efx_nic_alloc_buffer(rx_queue->efx, &rx_queue->rxd.buf,
+       return efx_nic_alloc_buffer(rx_queue->efx, &rx_queue->rxd,
                                    (rx_queue->ptr_mask + 1) *
                                    sizeof(efx_qword_t),
                                    GFP_KERNEL);
@@ -278,7 +278,7 @@ int efx_mcdi_rx_probe(struct efx_rx_queue *rx_queue)
 void efx_mcdi_rx_init(struct efx_rx_queue *rx_queue)
 {
        struct efx_channel *channel = efx_rx_queue_channel(rx_queue);
-       size_t entries = rx_queue->rxd.buf.len / EFX_BUF_SIZE;
+       size_t entries = rx_queue->rxd.len / EFX_BUF_SIZE;
        MCDI_DECLARE_BUF(inbuf, MC_CMD_INIT_RXQ_V4_IN_LEN);
        struct efx_nic *efx = rx_queue->efx;
        unsigned int buffer_size;
@@ -306,7 +306,7 @@ void efx_mcdi_rx_init(struct efx_rx_queue *rx_queue)
        MCDI_SET_DWORD(inbuf, INIT_RXQ_IN_PORT_ID, efx->vport_id);
        MCDI_SET_DWORD(inbuf, INIT_RXQ_V4_IN_BUFFER_SIZE_BYTES, buffer_size);
 
-       dma_addr = rx_queue->rxd.buf.dma_addr;
+       dma_addr = rx_queue->rxd.dma_addr;
 
        netif_dbg(efx, hw, efx->net_dev, "pushing RXQ %d. %zu entries (%llx)\n",
                  efx_rx_queue_index(rx_queue), entries, (u64)dma_addr);
@@ -325,7 +325,7 @@ void efx_mcdi_rx_init(struct efx_rx_queue *rx_queue)
 
 void efx_mcdi_rx_remove(struct efx_rx_queue *rx_queue)
 {
-       efx_nic_free_buffer(rx_queue->efx, &rx_queue->rxd.buf);
+       efx_nic_free_buffer(rx_queue->efx, &rx_queue->rxd);
 }
 
 void efx_mcdi_rx_fini(struct efx_rx_queue *rx_queue)

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 6654fbb8f4c0178c388a1a7b9faaad3caae5315e..27d86e90a3bb5af23a54e2a16c38e6bdbb5bed79 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -122,26 +122,6 @@ struct efx_buffer {
        unsigned int len;
 };
 
-/**
- * struct efx_special_buffer - DMA buffer entered into buffer table
- * @buf: Standard &struct efx_buffer
- * @index: Buffer index within controller;s buffer table
- * @entries: Number of buffer table entries
- *
- * The NIC has a buffer table that maps buffers of size %EFX_BUF_SIZE.
- * Event and descriptor rings are addressed via one or more buffer
- * table entries (and so can be physically non-contiguous, although we
- * currently do not take advantage of that).  On Falcon and Siena we
- * have to take care of allocating and initialising the entries
- * ourselves.  On later hardware this is managed by the firmware and
- * @index and @entries are left as 0.
- */
-struct efx_special_buffer {
-       struct efx_buffer buf;
-       unsigned int index;
-       unsigned int entries;
-};
-
 /**
  * struct efx_tx_buffer - buffer state for a TX descriptor
  * @skb: When @flags & %EFX_TX_BUF_SKB, the associated socket buffer to be
@@ -268,7 +248,7 @@ struct efx_tx_queue {
        struct netdev_queue *core_txq;
        struct efx_tx_buffer *buffer;
        struct efx_buffer *cb_page;
-       struct efx_special_buffer txd;
+       struct efx_buffer txd;
        unsigned int ptr_mask;
        void __iomem *piobuf;
        unsigned int piobuf_offset;
@@ -397,7 +377,7 @@ struct efx_rx_queue {
        struct efx_nic *efx;
        int core_index;
        struct efx_rx_buffer *buffer;
-       struct efx_special_buffer rxd;
+       struct efx_buffer rxd;
        unsigned int ptr_mask;
        bool refill_enabled;
        bool flush_pending;
@@ -513,7 +493,7 @@ struct efx_channel {
 #ifdef CONFIG_NET_RX_BUSY_POLL
        unsigned long busy_poll_state;
 #endif
-       struct efx_special_buffer eventq;
+       struct efx_buffer eventq;
        unsigned int eventq_mask;
        unsigned int eventq_read_ptr;
        int event_test_cpu;
@@ -881,7 +861,6 @@ struct efx_mae;
  * @tx_dc_base: Base qword address in SRAM of TX queue descriptor caches
  * @rx_dc_base: Base qword address in SRAM of RX queue descriptor caches
  * @sram_lim_qw: Qword address limit of SRAM
- * @next_buffer_table: First available buffer table id
  * @n_channels: Number of channels in use
  * @n_rx_channels: Number of channels used for RX (= number of RX queues)
  * @n_tx_channels: Number of channels used for TX
@@ -1046,7 +1025,6 @@ struct efx_nic {
        unsigned tx_dc_base;
        unsigned rx_dc_base;
        unsigned sram_lim_qw;
-       unsigned next_buffer_table;
 
        unsigned int max_channels;
        unsigned int max_vis;

diff --git a/drivers/net/ethernet/sfc/nic_common.h b/drivers/net/ethernet/sfc/nic_common.h
index e35ecbe8842ec62ef15ab416fee9e3b25faeaecd..47b1c46c069d27b100d742b6e8782b21b23820b6 100644 (file)
--- a/drivers/net/ethernet/sfc/nic_common.h
+++ b/drivers/net/ethernet/sfc/nic_common.h
@@ -32,7 +32,7 @@ static inline int efx_nic_rev(struct efx_nic *efx)
 static inline efx_qword_t *efx_event(struct efx_channel *channel,
                                     unsigned int index)
 {
-       return ((efx_qword_t *) (channel->eventq.buf.addr)) +
+       return ((efx_qword_t *)(channel->eventq.addr)) +
                (index & channel->eventq_mask);
 }
 
@@ -58,7 +58,7 @@ static inline int efx_event_present(efx_qword_t *event)
 static inline efx_qword_t *
 efx_tx_desc(struct efx_tx_queue *tx_queue, unsigned int index)
 {
-       return ((efx_qword_t *) (tx_queue->txd.buf.addr)) + index;
+       return ((efx_qword_t *)(tx_queue->txd.addr)) + index;
 }
 
 /* Report whether this TX queue would be empty for the given write_count.
@@ -98,7 +98,7 @@ static inline bool efx_nic_may_push_tx_desc(struct efx_tx_queue *tx_queue,
 static inline efx_qword_t *
 efx_rx_desc(struct efx_rx_queue *rx_queue, unsigned int index)
 {
-       return ((efx_qword_t *) (rx_queue->rxd.buf.addr)) + index;
+       return ((efx_qword_t *)(rx_queue->rxd.addr)) + index;
 }
 
 /* Alignment of PCIe DMA boundaries (4KB) */

diff --git a/drivers/net/ethernet/sfc/tx_tso.c b/drivers/net/ethernet/sfc/tx_tso.c
index d381d8164f07c9110ccde8f9a0be3157b4c0a423..64a6768f75ea17fb1c8a8bd83764679f13afc9f8 100644 (file)
--- a/drivers/net/ethernet/sfc/tx_tso.c
+++ b/drivers/net/ethernet/sfc/tx_tso.c
@@ -85,7 +85,7 @@ static inline void prefetch_ptr(struct efx_tx_queue *tx_queue)
        prefetch(ptr);
        prefetch(ptr + 0x80);
 
-       ptr = (char *) (((efx_qword_t *)tx_queue->txd.buf.addr) + insert_ptr);
+       ptr = (char *)(((efx_qword_t *)tx_queue->txd.addr) + insert_ptr);
        prefetch(ptr);
        prefetch(ptr + 0x80);
 }