sfc: get PIO buffer size from the NIC

The 8000 series SFC NICs have 4K PIO buffers, rather than the 2K of
 the 7000 series.  Rather than having a hard-coded PIO buffer size
 (ER_DZ_TX_PIOBUF_SIZE), read it from the GET_CAPABILITIES_V2 MCDI
 response.

Signed-off-by: Edward Cree <ecree@solarflare.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 f6e29a975e4e844db85b1ad052ef37b8fada02c4..2ce576919f97ca1d6d1670a2647d39a041396d34 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -197,11 +197,15 @@ static int efx_ef10_init_datapath_caps(struct efx_nic *efx)
        nic_data->datapath_caps =
                MCDI_DWORD(outbuf, GET_CAPABILITIES_OUT_FLAGS1);
 
-       if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN)
+       if (outlen >= MC_CMD_GET_CAPABILITIES_V2_OUT_LEN) {
                nic_data->datapath_caps2 = MCDI_DWORD(outbuf,
                                GET_CAPABILITIES_V2_OUT_FLAGS2);
-       else
+               nic_data->piobuf_size = MCDI_WORD(outbuf,
+                               GET_CAPABILITIES_V2_OUT_SIZE_PIO_BUFF);
+       } else {
                nic_data->datapath_caps2 = 0;
+               nic_data->piobuf_size = ER_DZ_TX_PIOBUF_SIZE;
+       }
 
        /* record the DPCPU firmware IDs to determine VEB vswitching support.
         */
@@ -823,8 +827,8 @@ static int efx_ef10_link_piobufs(struct efx_nic *efx)
                        offset = ((efx->tx_channel_offset + efx->n_tx_channels -
                                   tx_queue->channel->channel - 1) *
                                  efx_piobuf_size);
-                       index = offset / ER_DZ_TX_PIOBUF_SIZE;
-                       offset = offset % ER_DZ_TX_PIOBUF_SIZE;
+                       index = offset / nic_data->piobuf_size;
+                       offset = offset % nic_data->piobuf_size;
 
                        /* When the host page size is 4K, the first
                         * host page in the WC mapping may be within
@@ -1159,11 +1163,11 @@ static int efx_ef10_dimension_resources(struct efx_nic *efx)
         * functions of the controller.
         */
        if (efx_piobuf_size != 0 &&
-           ER_DZ_TX_PIOBUF_SIZE / efx_piobuf_size * EF10_TX_PIOBUF_COUNT >=
+           nic_data->piobuf_size / efx_piobuf_size * EF10_TX_PIOBUF_COUNT >=
            efx->n_tx_channels) {
                unsigned int n_piobufs =
                        DIV_ROUND_UP(efx->n_tx_channels,
-                                    ER_DZ_TX_PIOBUF_SIZE / efx_piobuf_size);
+                                    nic_data->piobuf_size / efx_piobuf_size);
 
                rc = efx_ef10_alloc_piobufs(efx, n_piobufs);
                if (rc)

diff --git a/drivers/net/ethernet/sfc/nic.h b/drivers/net/ethernet/sfc/nic.h
index 6a69aa3b01291ee97c99dc78dd3c05d33e6d0127..383ff6e1e6470aa7d33794ff9111b524730943ab 100644 (file)
--- a/drivers/net/ethernet/sfc/nic.h
+++ b/drivers/net/ethernet/sfc/nic.h
@@ -343,6 +343,7 @@ enum {
  * @pio_write_base: Base address for writing PIO buffers
  * @pio_write_vi_base: Relative VI number for @pio_write_base
  * @piobuf_handle: Handle of each PIO buffer allocated
+ * @piobuf_size: size of a single PIO buffer
  * @must_restore_piobufs: Flag: PIO buffers have yet to be restored after MC
  *     reboot
  * @rx_rss_context: Firmware handle for our RSS context
@@ -380,6 +381,7 @@ struct efx_ef10_nic_data {
        void __iomem *wc_membase, *pio_write_base;
        unsigned int pio_write_vi_base;
        unsigned int piobuf_handle[EF10_TX_PIOBUF_COUNT];
+       u16 piobuf_size;
        bool must_restore_piobufs;
        u32 rx_rss_context;
        bool rx_rss_context_exclusive;

diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
index beaf98080a0b6d3d1b0ce216b70376bdb7b912cc..ff88d60aa6d5650d04f46938eaf6abc63c4ff568 100644 (file)
--- a/drivers/net/ethernet/sfc/tx.c
+++ b/drivers/net/ethernet/sfc/tx.c
@@ -28,7 +28,6 @@
 
 #ifdef EFX_USE_PIO
 
-#define EFX_PIOBUF_SIZE_MAX ER_DZ_TX_PIOBUF_SIZE
 #define EFX_PIOBUF_SIZE_DEF ALIGN(256, L1_CACHE_BYTES)
 unsigned int efx_piobuf_size __read_mostly = EFX_PIOBUF_SIZE_DEF;