net/sfc/base: import Rx scatter support

EFSYS_OPT_RX_SCATTER should be enabled to use it.

From Solarflare Communications Inc.

Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 7635e80..9d24651 100644 (file)
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -573,6 +573,13 @@ extern     __checkReturn   efx_rc_t
 ef10_rx_init(
        __in            efx_nic_t *enp);
 
+#if EFSYS_OPT_RX_SCATTER
+extern __checkReturn   efx_rc_t
+ef10_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size);
+#endif /* EFSYS_OPT_RX_SCATTER */
+
 
 extern __checkReturn   efx_rc_t
 ef10_rx_prefix_pktlen(

diff --git a/drivers/net/sfc/base/ef10_rx.c b/drivers/net/sfc/base/ef10_rx.c
index 170125e..95a182b 100644 (file)
--- a/drivers/net/sfc/base/ef10_rx.c
+++ b/drivers/net/sfc/base/ef10_rx.c
@@ -159,6 +159,17 @@ ef10_rx_init(
        return (0);
 }
 
+#if EFSYS_OPT_RX_SCATTER
+       __checkReturn   efx_rc_t
+ef10_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size)
+{
+       _NOTE(ARGUNUSED(enp, buf_size))
+       return (0);
+}
+#endif /* EFSYS_OPT_RX_SCATTER */
+
 
 /*
  * EF10 RX pseudo-header

diff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h
index 389fe41..1013d5d 100644 (file)
--- a/drivers/net/sfc/base/efx.h
+++ b/drivers/net/sfc/base/efx.h
@@ -1381,6 +1381,13 @@ extern           void
 efx_rx_fini(
        __in            efx_nic_t *enp);
 
+#if EFSYS_OPT_RX_SCATTER
+       __checkReturn   efx_rc_t
+efx_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size);
+#endif /* EFSYS_OPT_RX_SCATTER */
+
 extern __checkReturn   efx_rc_t
 efx_pseudo_hdr_pkt_length_get(
        __in            efx_rxq_t *erp,

diff --git a/drivers/net/sfc/base/efx_check.h b/drivers/net/sfc/base/efx_check.h
index df46410..91a764f 100644 (file)
--- a/drivers/net/sfc/base/efx_check.h
+++ b/drivers/net/sfc/base/efx_check.h
@@ -244,6 +244,13 @@
 # error "RX_HDR_SPLIT is obsolete and is not supported"
 #endif
 
+#if EFSYS_OPT_RX_SCATTER
+/* Support receive scatter DMA */
+# if !(EFSYS_OPT_SIENA || EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD)
+#  error "RX_SCATTER requires SIENA or HUNTINGTON or MEDFORD"
+# endif
+#endif /* EFSYS_OPT_RX_SCATTER */
+
 #ifdef EFSYS_OPT_STAT_NAME
 # error "STAT_NAME is obsolete (replaced by NAMES)."
 #endif

diff --git a/drivers/net/sfc/base/efx_ev.c b/drivers/net/sfc/base/efx_ev.c
index c172a06..a667124 100644 (file)
--- a/drivers/net/sfc/base/efx_ev.c
+++ b/drivers/net/sfc/base/efx_ev.c
@@ -646,6 +646,22 @@ siena_ev_rx_not_ok(
                EFX_EV_QSTAT_INCR(eep, EV_RX_FRM_TRUNC);
                (*flagsp) |= EFX_DISCARD;
 
+#if EFSYS_OPT_RX_SCATTER
+               /*
+                * Lookout for payload queue ran dry errors and ignore them.
+                *
+                * Sadly for the header/data split cases, the descriptor
+                * pointer in this event refers to the header queue and
+                * therefore cannot be easily detected as duplicate.
+                * So we drop these and rely on the receive processing seeing
+                * a subsequent packet with FSF_AZ_RX_EV_SOP set to discard
+                * the partially received packet.
+                */
+               if ((EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_SOP) == 0) &&
+                   (EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_JUMBO_CONT) == 0) &&
+                   (EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_BYTE_CNT) == 0))
+                       ignore = B_TRUE;
+#endif /* EFSYS_OPT_RX_SCATTER */
        }
 
        if (EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_ETH_CRC_ERR) != 0) {
@@ -705,6 +721,10 @@ siena_ev_rx(
        uint32_t size;
        uint32_t label;
        boolean_t ok;
+#if EFSYS_OPT_RX_SCATTER
+       boolean_t sop;
+       boolean_t jumbo_cont;
+#endif /* EFSYS_OPT_RX_SCATTER */
        uint32_t hdr_type;
        boolean_t is_v6;
        uint16_t flags;
@@ -719,6 +739,11 @@ siena_ev_rx(
        label = EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_Q_LABEL);
        ok = (EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_PKT_OK) != 0);
 
+#if EFSYS_OPT_RX_SCATTER
+       sop = (EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_SOP) != 0);
+       jumbo_cont = (EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_JUMBO_CONT) != 0);
+#endif /* EFSYS_OPT_RX_SCATTER */
+
        hdr_type = EFX_QWORD_FIELD(*eqp, FSF_AZ_RX_EV_HDR_TYPE);
 
        is_v6 = (EFX_QWORD_FIELD(*eqp, FSF_CZ_RX_EV_IPV6_PKT) != 0);
@@ -771,6 +796,14 @@ siena_ev_rx(
                break;
        }
 
+#if EFSYS_OPT_RX_SCATTER
+       /* Report scatter and header/lookahead split buffer flags */
+       if (sop)
+               flags |= EFX_PKT_START;
+       if (jumbo_cont)
+               flags |= EFX_PKT_CONT;
+#endif /* EFSYS_OPT_RX_SCATTER */
+
        /* Detect errors included in the FSF_AZ_RX_EV_PKT_OK indication */
        if (!ok) {
                ignore = siena_ev_rx_not_ok(eep, eqp, label, id, &flags);

diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h
index a1eabcd..b7eeee7 100644 (file)
--- a/drivers/net/sfc/base/efx_impl.h
+++ b/drivers/net/sfc/base/efx_impl.h
@@ -148,6 +148,9 @@ typedef struct efx_tx_ops_s {
 typedef struct efx_rx_ops_s {
        efx_rc_t        (*erxo_init)(efx_nic_t *);
        void            (*erxo_fini)(efx_nic_t *);
+#if EFSYS_OPT_RX_SCATTER
+       efx_rc_t        (*erxo_scatter_enable)(efx_nic_t *, unsigned int);
+#endif
        efx_rc_t        (*erxo_prefix_pktlen)(efx_nic_t *, uint8_t *,
                                              uint16_t *);
        void            (*erxo_qpost)(efx_rxq_t *, efsys_dma_addr_t *, size_t,

diff --git a/drivers/net/sfc/base/efx_rx.c b/drivers/net/sfc/base/efx_rx.c
index 2899a0f..7cf07e9 100644 (file)
--- a/drivers/net/sfc/base/efx_rx.c
+++ b/drivers/net/sfc/base/efx_rx.c
@@ -42,6 +42,13 @@ static                       void
 siena_rx_fini(
        __in            efx_nic_t *enp);
 
+#if EFSYS_OPT_RX_SCATTER
+static __checkReturn   efx_rc_t
+siena_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size);
+#endif /* EFSYS_OPT_RX_SCATTER */
+
 static __checkReturn   efx_rc_t
 siena_rx_prefix_pktlen(
        __in            efx_nic_t *enp,
@@ -94,6 +101,9 @@ siena_rx_qdestroy(
 static const efx_rx_ops_t __efx_rx_siena_ops = {
        siena_rx_init,                          /* erxo_init */
        siena_rx_fini,                          /* erxo_fini */
+#if EFSYS_OPT_RX_SCATTER
+       siena_rx_scatter_enable,                /* erxo_scatter_enable */
+#endif
        siena_rx_prefix_pktlen,                 /* erxo_prefix_pktlen */
        siena_rx_qpost,                         /* erxo_qpost */
        siena_rx_qpush,                         /* erxo_qpush */
@@ -108,6 +118,9 @@ static const efx_rx_ops_t __efx_rx_siena_ops = {
 static const efx_rx_ops_t __efx_rx_ef10_ops = {
        ef10_rx_init,                           /* erxo_init */
        ef10_rx_fini,                           /* erxo_fini */
+#if EFSYS_OPT_RX_SCATTER
+       ef10_rx_scatter_enable,                 /* erxo_scatter_enable */
+#endif
        ef10_rx_prefix_pktlen,                  /* erxo_prefix_pktlen */
        ef10_rx_qpost,                          /* erxo_qpost */
        ef10_rx_qpush,                          /* erxo_qpush */
@@ -202,6 +215,29 @@ efx_rx_fini(
        enp->en_mod_flags &= ~EFX_MOD_RX;
 }
 
+#if EFSYS_OPT_RX_SCATTER
+       __checkReturn   efx_rc_t
+efx_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size)
+{
+       const efx_rx_ops_t *erxop = enp->en_erxop;
+       efx_rc_t rc;
+
+       EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
+       EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_RX);
+
+       if ((rc = erxop->erxo_scatter_enable(enp, buf_size)) != 0)
+               goto fail1;
+
+       return (0);
+
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCATTER */
+
                        void
 efx_rx_qpost(
        __in            efx_rxq_t *erp,
@@ -374,6 +410,50 @@ siena_rx_init(
        return (0);
 }
 
+#if EFSYS_OPT_RX_SCATTER
+static __checkReturn   efx_rc_t
+siena_rx_scatter_enable(
+       __in            efx_nic_t *enp,
+       __in            unsigned int buf_size)
+{
+       unsigned int nbuf32;
+       efx_oword_t oword;
+       efx_rc_t rc;
+
+       nbuf32 = buf_size / 32;
+       if ((nbuf32 == 0) ||
+           (nbuf32 >= (1 << FRF_BZ_RX_USR_BUF_SIZE_WIDTH)) ||
+           ((buf_size % 32) != 0)) {
+               rc = EINVAL;
+               goto fail1;
+       }
+
+       if (enp->en_rx_qcount > 0) {
+               rc = EBUSY;
+               goto fail2;
+       }
+
+       /* Set scatter buffer size */
+       EFX_BAR_READO(enp, FR_AZ_RX_CFG_REG, &oword);
+       EFX_SET_OWORD_FIELD(oword, FRF_BZ_RX_USR_BUF_SIZE, nbuf32);
+       EFX_BAR_WRITEO(enp, FR_AZ_RX_CFG_REG, &oword);
+
+       /* Enable scatter for packets not matching a filter */
+       EFX_BAR_READO(enp, FR_AZ_RX_FILTER_CTL_REG, &oword);
+       EFX_SET_OWORD_FIELD(oword, FRF_BZ_SCATTER_ENBL_NO_MATCH_Q, 1);
+       EFX_BAR_WRITEO(enp, FR_AZ_RX_FILTER_CTL_REG, &oword);
+
+       return (0);
+
+fail2:
+       EFSYS_PROBE(fail2);
+fail1:
+       EFSYS_PROBE1(fail1, efx_rc_t, rc);
+
+       return (rc);
+}
+#endif /* EFSYS_OPT_RX_SCATTER */
+
 
 #define        EFX_RX_LFSR_HASH(_enp, _insert)                                 \
        do {                                                            \
@@ -623,6 +703,16 @@ siena_rx_qcreate(
                jumbo = B_FALSE;
                break;
 
+#if EFSYS_OPT_RX_SCATTER
+       case EFX_RXQ_TYPE_SCATTER:
+               if (enp->en_family < EFX_FAMILY_SIENA) {
+                       rc = EINVAL;
+                       goto fail4;
+               }
+               jumbo = B_TRUE;
+               break;
+#endif /* EFSYS_OPT_RX_SCATTER */
+
        default:
                rc = EINVAL;
                goto fail4;