New upstream version 18.02

[deb_dpdk.git] / drivers / net / liquidio / base / lio_23xx_vf.c

diff --git a/drivers/net/liquidio/base/lio_23xx_vf.c b/drivers/net/liquidio/base/lio_23xx_vf.c
index e30c20d..ddbc8c0 100644 (file)
--- a/drivers/net/liquidio/base/lio_23xx_vf.c
+++ b/drivers/net/liquidio/base/lio_23xx_vf.c
@@ -1,39 +1,10 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Cavium, Inc.. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of Cavium, Inc. nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   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(S) 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.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Cavium, Inc
  */
 
 #include <string.h>
 
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_cycles.h>
 #include <rte_malloc.h>
 
@@ -150,6 +121,8 @@ cn23xx_vf_setup_global_output_regs(struct lio_device *lio_dev)
 
                reg_val &= 0xEFFFFFFFFFFFFFFFL;
 
+               lio_write_csr(lio_dev, CN23XX_SLI_OQ_PKTS_SENT(q_no), reg_val);
+
                reg_val =
                    lio_read_csr(lio_dev, CN23XX_SLI_OQ_PKT_CONTROL(q_no));
 
@@ -211,7 +184,7 @@ cn23xx_vf_setup_iq_regs(struct lio_device *lio_dev, uint32_t iq_no)
        /* Write the start of the input queue's ring and its size */
        lio_write_csr64(lio_dev, CN23XX_SLI_IQ_BASE_ADDR64(iq_no),
                        iq->base_addr_dma);
-       lio_write_csr(lio_dev, CN23XX_SLI_IQ_SIZE(iq_no), iq->max_count);
+       lio_write_csr(lio_dev, CN23XX_SLI_IQ_SIZE(iq_no), iq->nb_desc);
 
        /* Remember the doorbell & instruction count register addr
         * for this queue
@@ -243,7 +216,7 @@ cn23xx_vf_setup_oq_regs(struct lio_device *lio_dev, uint32_t oq_no)
 
        lio_write_csr64(lio_dev, CN23XX_SLI_OQ_BASE_ADDR64(oq_no),
                        droq->desc_ring_dma);
-       lio_write_csr(lio_dev, CN23XX_SLI_OQ_SIZE(oq_no), droq->max_count);
+       lio_write_csr(lio_dev, CN23XX_SLI_OQ_SIZE(oq_no), droq->nb_desc);
 
        lio_write_csr(lio_dev, CN23XX_SLI_OQ_BUFF_INFO_SIZE(oq_no),
                      (droq->buffer_size | (OCTEON_RH_SIZE << 16)));
@@ -538,51 +511,3 @@ cn23xx_vf_setup_device(struct lio_device *lio_dev)
        return 0;
 }
 
-int
-cn23xx_vf_set_io_queues_off(struct lio_device *lio_dev)
-{
-       uint32_t loop = CN23XX_VF_BUSY_READING_REG_LOOP_COUNT;
-       uint64_t q_no;
-
-       /* Disable the i/p and o/p queues for this Octeon.
-        * IOQs will already be in reset.
-        * If RST bit is set, wait for Quiet bit to be set
-        * Once Quiet bit is set, clear the RST bit
-        */
-       PMD_INIT_FUNC_TRACE();
-
-       for (q_no = 0; q_no < lio_dev->sriov_info.rings_per_vf; q_no++) {
-               volatile uint64_t reg_val;
-
-               reg_val = lio_read_csr64(lio_dev,
-                                        CN23XX_SLI_IQ_PKT_CONTROL64(q_no));
-               while ((reg_val & CN23XX_PKT_INPUT_CTL_RST) && !(reg_val &
-                                        CN23XX_PKT_INPUT_CTL_QUIET) && loop) {
-                       reg_val = lio_read_csr64(
-                                       lio_dev,
-                                       CN23XX_SLI_IQ_PKT_CONTROL64(q_no));
-                       loop = loop - 1;
-               }
-
-               if (loop == 0) {
-                       lio_dev_err(lio_dev,
-                                   "clearing the reset reg failed or setting the quiet reg failed for qno %lu\n",
-                                   (unsigned long)q_no);
-                       return -1;
-               }
-
-               reg_val = reg_val & ~CN23XX_PKT_INPUT_CTL_RST;
-               lio_write_csr64(lio_dev, CN23XX_SLI_IQ_PKT_CONTROL64(q_no),
-                               reg_val);
-
-               reg_val = lio_read_csr64(lio_dev,
-                                        CN23XX_SLI_IQ_PKT_CONTROL64(q_no));
-               if (reg_val & CN23XX_PKT_INPUT_CTL_RST) {
-                       lio_dev_err(lio_dev, "unable to reset qno %lu\n",
-                                   (unsigned long)q_no);
-                       return -1;
-               }
-       }
-
-       return 0;
-}