net/sfc: implement Rx subsystem stubs

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

diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile
index 89fc2f3..f8969af 100644 (file)
--- a/drivers/net/sfc/Makefile
+++ b/drivers/net/sfc/Makefile
@@ -87,6 +87,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c
 SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c
 SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c
 SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c
+SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c
 
 VPATH += $(SRCDIR)/base
 

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index dad8c2b..a473b64 100644 (file)
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -37,6 +37,7 @@
 #include "sfc.h"
 #include "sfc_log.h"
 #include "sfc_ev.h"
+#include "sfc_rx.h"
 
 
 int
@@ -349,10 +350,17 @@ sfc_configure(struct sfc_adapter *sa)
        if (rc != 0)
                goto fail_port_init;
 
+       rc = sfc_rx_init(sa);
+       if (rc != 0)
+               goto fail_rx_init;
+
        sa->state = SFC_ADAPTER_CONFIGURED;
        sfc_log_init(sa, "done");
        return 0;
 
+fail_rx_init:
+       sfc_port_fini(sa);
+
 fail_port_init:
        sfc_ev_fini(sa);
 
@@ -376,6 +384,7 @@ sfc_close(struct sfc_adapter *sa)
        SFC_ASSERT(sa->state == SFC_ADAPTER_CONFIGURED);
        sa->state = SFC_ADAPTER_CLOSING;
 
+       sfc_rx_fini(sa);
        sfc_port_fini(sa);
        sfc_ev_fini(sa);
        sfc_intr_fini(sa);

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 22631e2..e3397ac 100644 (file)
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -117,6 +117,7 @@ struct sfc_intr {
 };
 
 struct sfc_evq_info;
+struct sfc_rxq_info;
 
 struct sfc_port {
        unsigned int                    flow_ctrl;
@@ -155,6 +156,9 @@ struct sfc_adapter {
 
        unsigned int                    mgmt_evq_index;
        rte_spinlock_t                  mgmt_evq_lock;
+
+       unsigned int                    rxq_count;
+       struct sfc_rxq_info             *rxq_info;
 };
 
 /*

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 5cc152c..fe6beb3 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -49,6 +49,16 @@ sfc_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->pci_dev = RTE_DEV_TO_PCI(dev->device);
        dev_info->max_rx_pktlen = EFX_MAC_PDU_MAX;
+
+       /* By default packets are dropped if no descriptors are available */
+       dev_info->default_rxconf.rx_drop_en = 1;
+
+       dev_info->rx_desc_lim.nb_max = EFX_RXQ_MAXNDESCS;
+       dev_info->rx_desc_lim.nb_min = EFX_RXQ_MINNDESCS;
+       /* The RXQ hardware requires that the descriptor count is a power
+        * of 2, but rx_desc_lim cannot properly describe that constraint.
+        */
+       dev_info->rx_desc_lim.nb_align = EFX_RXQ_MINNDESCS;
 }
 
 static int

diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
new file mode 100644 (file)
index 0000000..e2c7d00
--- /dev/null
+++ b/drivers/net/sfc/sfc_rx.c
@@ -0,0 +1,103 @@
+/*-
+ * Copyright (c) 2016 Solarflare Communications Inc.
+ * All rights reserved.
+ *
+ * This software was jointly developed between OKTET Labs (under contract
+ * for Solarflare) and Solarflare Communications, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "efx.h"
+
+#include "sfc.h"
+#include "sfc_log.h"
+#include "sfc_rx.h"
+
+static int
+sfc_rx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)
+{
+       struct sfc_rxq_info *rxq_info = &sa->rxq_info[sw_index];
+       unsigned int max_entries;
+
+       max_entries = EFX_RXQ_MAXNDESCS;
+       SFC_ASSERT(rte_is_power_of_2(max_entries));
+
+       rxq_info->max_entries = max_entries;
+
+       return 0;
+}
+
+/**
+ * Initialize Rx subsystem.
+ *
+ * Called at device configuration stage when number of receive queues is
+ * specified together with other device level receive configuration.
+ *
+ * It should be used to allocate NUMA-unaware resources.
+ */
+int
+sfc_rx_init(struct sfc_adapter *sa)
+{
+       unsigned int sw_index;
+       int rc;
+
+       sa->rxq_count = sa->eth_dev->data->nb_rx_queues;
+
+       rc = ENOMEM;
+       sa->rxq_info = rte_calloc_socket("sfc-rxqs", sa->rxq_count,
+                                        sizeof(struct sfc_rxq_info), 0,
+                                        sa->socket_id);
+       if (sa->rxq_info == NULL)
+               goto fail_rxqs_alloc;
+
+       for (sw_index = 0; sw_index < sa->rxq_count; ++sw_index) {
+               rc = sfc_rx_qinit_info(sa, sw_index);
+               if (rc != 0)
+                       goto fail_rx_qinit_info;
+       }
+
+       return 0;
+
+fail_rx_qinit_info:
+       rte_free(sa->rxq_info);
+       sa->rxq_info = NULL;
+
+fail_rxqs_alloc:
+       sa->rxq_count = 0;
+       sfc_log_init(sa, "failed %d", rc);
+       return rc;
+}
+
+/**
+ * Shutdown Rx subsystem.
+ *
+ * Called at device close stage, for example, before device
+ * reconfiguration or shutdown.
+ */
+void
+sfc_rx_fini(struct sfc_adapter *sa)
+{
+       rte_free(sa->rxq_info);
+       sa->rxq_info = NULL;
+       sa->rxq_count = 0;
+}

diff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h
new file mode 100644 (file)
index 0000000..2e27b53
--- /dev/null
+++ b/drivers/net/sfc/sfc_rx.h
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2016 Solarflare Communications Inc.
+ * All rights reserved.
+ *
+ * This software was jointly developed between OKTET Labs (under contract
+ * for Solarflare) and Solarflare Communications, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _SFC_RX_H
+#define _SFC_RX_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct sfc_adapter;
+
+/**
+ * Receive queue information used during setup/release only.
+ * Allocated on the same socket as adapter data.
+ */
+struct sfc_rxq_info {
+       unsigned int            max_entries;
+};
+
+int sfc_rx_init(struct sfc_adapter *sa);
+void sfc_rx_fini(struct sfc_adapter *sa);
+
+#ifdef __cplusplus
+}
+#endif
+#endif  /* _SFC_RX_H */