net/sfc/base: add function to create packed stream RxQ

[dpdk.git] / drivers / net / sfc / base / ef10_impl.h

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 97922f3..a17b471 100644 (file)
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -50,8 +50,9 @@ extern "C" {
  */
 #define        EF10_NVRAM_CHUNK 0x80
 
-/* Alignment requirement for value written to RX WPTR:
- *  the WPTR must be aligned to an 8 descriptor boundary
+/*
+ * Alignment requirement for value written to RX WPTR: the WPTR must be aligned
+ * to an 8 descriptor boundary.
  */
 #define        EF10_RX_WPTR_ALIGN 8
 
@@ -80,7 +81,7 @@ ef10_ev_qcreate(
        __in            efx_nic_t *enp,
        __in            unsigned int index,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint32_t us,
        __in            uint32_t flags,
@@ -117,7 +118,7 @@ ef10_ev_rxlabel_init(
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp,
        __in            unsigned int label,
-       __in            boolean_t packed_stream);
+       __in            efx_rxq_type_t type);
 
                void
 ef10_ev_rxlabel_fini(
@@ -505,8 +506,7 @@ ef10_nvram_buffer_find_item_start(
        __in_bcount(buffer_size)
                                caddr_t bufferp,
        __in                    size_t buffer_size,
-       __out                   uint32_t *startp
-       );
+       __out                   uint32_t *startp);
 
 extern __checkReturn           efx_rc_t
 ef10_nvram_buffer_find_end(
@@ -514,8 +514,7 @@ ef10_nvram_buffer_find_end(
                                caddr_t bufferp,
        __in                    size_t buffer_size,
        __in                    uint32_t offset,
-       __out                   uint32_t *endp
-       );
+       __out                   uint32_t *endp);
 
 extern __checkReturn   __success(return != B_FALSE)    boolean_t
 ef10_nvram_buffer_find_item(
@@ -524,8 +523,7 @@ ef10_nvram_buffer_find_item(
        __in                    size_t buffer_size,
        __in                    uint32_t offset,
        __out                   uint32_t *startp,
-       __out                   uint32_t *lengthp
-       );
+       __out                   uint32_t *lengthp);
 
 extern __checkReturn           efx_rc_t
 ef10_nvram_buffer_get_item(
@@ -537,8 +535,7 @@ ef10_nvram_buffer_get_item(
        __out_bcount_part(item_max_size, *lengthp)
                                caddr_t itemp,
        __in                    size_t item_max_size,
-       __out                   uint32_t *lengthp
-       );
+       __out                   uint32_t *lengthp);
 
 extern __checkReturn           efx_rc_t
 ef10_nvram_buffer_insert_item(
@@ -548,8 +545,7 @@ ef10_nvram_buffer_insert_item(
        __in                    uint32_t offset,
        __in_bcount(length)     caddr_t keyp,
        __in                    uint32_t length,
-       __out                   uint32_t *lengthp
-       );
+       __out                   uint32_t *lengthp);
 
 extern __checkReturn           efx_rc_t
 ef10_nvram_buffer_delete_item(
@@ -558,15 +554,13 @@ ef10_nvram_buffer_delete_item(
        __in                    size_t buffer_size,
        __in                    uint32_t offset,
        __in                    uint32_t length,
-       __in                    uint32_t end
-       );
+       __in                    uint32_t end);
 
 extern __checkReturn           efx_rc_t
 ef10_nvram_buffer_finish(
        __in_bcount(buffer_size)
                                caddr_t bufferp,
-       __in                    size_t buffer_size
-       );
+       __in                    size_t buffer_size);
 
 #endif /* EFSYS_OPT_NVRAM */
 
@@ -668,7 +662,7 @@ ef10_tx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
        __in            uint16_t flags,
        __in            efx_evq_t *eep,
@@ -679,13 +673,13 @@ extern            void
 ef10_tx_qdestroy(
        __in            efx_txq_t *etp);
 
-extern __checkReturn   efx_rc_t
+extern __checkReturn           efx_rc_t
 ef10_tx_qpost(
-       __in            efx_txq_t *etp,
-       __in_ecount(n)  efx_buffer_t *eb,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __inout         unsigned int *addedp);
+       __in                    efx_txq_t *etp,
+       __in_ecount(ndescs)     efx_buffer_t *ebp,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __inout                 unsigned int *addedp);
 
 extern                 void
 ef10_tx_qpush(
@@ -695,8 +689,8 @@ ef10_tx_qpush(
 
 #if EFSYS_OPT_RX_PACKED_STREAM
 extern                 void
-ef10_rx_qps_update_credits(
-       __in    efx_rxq_t *erp);
+ef10_rx_qpush_ps_credits(
+       __in            efx_rxq_t *erp);
 
 extern __checkReturn   uint8_t *
 ef10_rx_qps_packet_info(
@@ -795,7 +789,7 @@ ef10_tx_qstats_update(
 
 typedef uint32_t       efx_piobuf_handle_t;
 
-#define        EFX_PIOBUF_HANDLE_INVALID       ((efx_piobuf_handle_t) -1)
+#define        EFX_PIOBUF_HANDLE_INVALID       ((efx_piobuf_handle_t)-1)
 
 extern __checkReturn   efx_rc_t
 ef10_nic_pio_alloc(
@@ -954,14 +948,14 @@ ef10_rx_prefix_pktlen(
        __in            uint8_t *buffer,
        __out           uint16_t *lengthp);
 
-extern                 void
+extern                         void
 ef10_rx_qpost(
-       __in            efx_rxq_t *erp,
-       __in_ecount(n)  efsys_dma_addr_t *addrp,
-       __in            size_t size,
-       __in            unsigned int n,
-       __in            unsigned int completed,
-       __in            unsigned int added);
+       __in                    efx_rxq_t *erp,
+       __in_ecount(ndescs)     efsys_dma_addr_t *addrp,
+       __in                    size_t size,
+       __in                    unsigned int ndescs,
+       __in                    unsigned int completed,
+       __in                    unsigned int added);
 
 extern                 void
 ef10_rx_qpush(
@@ -983,9 +977,11 @@ ef10_rx_qcreate(
        __in            unsigned int index,
        __in            unsigned int label,
        __in            efx_rxq_type_t type,
+       __in            uint32_t type_data,
        __in            efsys_mem_t *esmp,
-       __in            size_t n,
+       __in            size_t ndescs,
        __in            uint32_t id,
+       __in            unsigned int flags,
        __in            efx_evq_t *eep,
        __in            efx_rxq_t *erp);
 
@@ -1034,7 +1030,7 @@ typedef struct ef10_filter_entry_s {
  * IPv4 or IPv6 outer frame, VXLAN, GENEVE or NVGRE packet type, and unicast or
  * multicast inner frames.
  */
-#define EFX_EF10_FILTER_ENCAP_FILTERS_MAX      12
+#define        EFX_EF10_FILTER_ENCAP_FILTERS_MAX       12
 
 typedef struct ef10_filter_table_s {
        ef10_filter_entry_t     eft_entry[EFX_EF10_FILTER_TBL_ROWS];
@@ -1201,9 +1197,9 @@ ef10_external_port_mapping(
 /* Minimum space for packet in packed stream mode */
 #define        EFX_RX_PACKED_STREAM_MIN_PACKET_SPACE                \
        P2ROUNDUP(EFX_RX_PACKED_STREAM_RX_PREFIX_SIZE +      \
-                 EFX_MAC_PDU_MIN +                          \
-                 EFX_RX_PACKED_STREAM_ALIGNMENT,            \
-                 EFX_RX_PACKED_STREAM_ALIGNMENT)
+           EFX_MAC_PDU_MIN +                                \
+           EFX_RX_PACKED_STREAM_ALIGNMENT,                  \
+           EFX_RX_PACKED_STREAM_ALIGNMENT)
 
 /* Maximum number of credits */
 #define        EFX_RX_PACKED_STREAM_MAX_CREDITS 127