New upstream version 18.08

[deb_dpdk.git] / drivers / net / bnx2x / ecore_sp.h

diff --git a/drivers/net/bnx2x/ecore_sp.h b/drivers/net/bnx2x/ecore_sp.h
index 9c1f55d..6b65a49 100644 (file)
--- a/drivers/net/bnx2x/ecore_sp.h
+++ b/drivers/net/bnx2x/ecore_sp.h
@@ -1,16 +1,14 @@
-/*-
- * Copyright (c) 2007-2013 QLogic Corporation. All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2007-2013 Broadcom Corporation.
  *
  * Eric Davis        <edavis@broadcom.com>
  * David Christensen <davidch@broadcom.com>
  * Gary Zambrano     <zambrano@broadcom.com>
  *
  * Copyright (c) 2013-2015 Brocade Communications Systems, Inc.
- * Copyright (c) 2015 QLogic Corporation.
+ * Copyright (c) 2015-2018 Cavium Inc.
  * All rights reserved.
- * www.qlogic.com
- *
- * See LICENSE.bnx2x_pmd for copyright and licensing details.
+ * www.cavium.com
  */
 
 #ifndef ECORE_SP_H
@@ -36,7 +34,7 @@
 #include "ecore_reg.h"
 
 struct bnx2x_softc;
-typedef phys_addr_t ecore_dma_addr_t; /* expected to be 64 bit wide */
+typedef rte_iova_t ecore_dma_addr_t; /* expected to be 64 bit wide */
 typedef volatile int ecore_atomic_t;
 
 
@@ -113,7 +111,7 @@ typedef rte_spinlock_t ECORE_MUTEX_SPIN;
 #define ECORE_FCOE_CID(sc) ((sc)->fp[FCOE_IDX(sc)].cl_id)
 
 #define ECORE_MEMCMP(_a, _b, _s) memcmp(_a, _b, _s)
-#define ECORE_MEMCPY(_a, _b, _s) (void)rte_memcpy(_a, _b, _s)
+#define ECORE_MEMCPY(_a, _b, _s) rte_memcpy(_a, _b, _s)
 #define ECORE_MEMSET(_a, _c, _s) memset(_a, _c, _s)
 
 #define ECORE_CPU_TO_LE16(x) htole16(x)
@@ -1116,10 +1114,10 @@ struct ecore_config_rss_params {
        /* RSS hash values */
        uint32_t                rss_key[10];
 
-       /* valid only iff ECORE_RSS_UPDATE_TOE is set */
+       /* valid only if ECORE_RSS_UPDATE_TOE is set */
        uint16_t                toe_rss_bitmap;
 
-       /* valid iff ECORE_RSS_TUNNELING is set */
+       /* valid if ECORE_RSS_TUNNELING is set */
        uint16_t                tunnel_value;
        uint16_t                tunnel_mask;
 };
@@ -1286,14 +1284,14 @@ struct rxq_pause_params {
        uint16_t                bd_th_hi;
        uint16_t                rcq_th_lo;
        uint16_t                rcq_th_hi;
-       uint16_t                sge_th_lo; /* valid iff ECORE_Q_FLG_TPA */
-       uint16_t                sge_th_hi; /* valid iff ECORE_Q_FLG_TPA */
+       uint16_t                sge_th_lo; /* valid if ECORE_Q_FLG_TPA */
+       uint16_t                sge_th_hi; /* valid if ECORE_Q_FLG_TPA */
        uint16_t                pri_map;
 };
 
 /* general */
 struct ecore_general_setup_params {
-       /* valid iff ECORE_Q_FLG_STATS */
+       /* valid if ECORE_Q_FLG_STATS */
        uint8_t         stat_id;
 
        uint8_t         spcl_id;
@@ -1312,19 +1310,19 @@ struct ecore_rxq_setup_params {
        uint8_t         fw_sb_id;
        uint8_t         cl_qzone_id;
 
-       /* valid iff ECORE_Q_FLG_TPA */
+       /* valid if ECORE_Q_FLG_TPA */
        uint16_t                tpa_agg_sz;
        uint8_t         max_tpa_queues;
        uint8_t         rss_engine_id;
 
-       /* valid iff ECORE_Q_FLG_MCAST */
+       /* valid if ECORE_Q_FLG_MCAST */
        uint8_t         mcast_engine_id;
 
        uint8_t         cache_line_log;
 
        uint8_t         sb_cq_index;
 
-       /* valid iff BXN2X_Q_FLG_SILENT_VLAN_REM */
+       /* valid if BXN2X_Q_FLG_SILENT_VLAN_REM */
        uint16_t silent_removal_value;
        uint16_t silent_removal_mask;
 };
@@ -1335,12 +1333,12 @@ struct ecore_txq_setup_params {
 
        uint8_t         fw_sb_id;
        uint8_t         sb_cq_index;
-       uint8_t         cos;            /* valid iff ECORE_Q_FLG_COS */
+       uint8_t         cos;            /* valid if ECORE_Q_FLG_COS */
        uint16_t                traffic_type;
        /* equals to the leading rss client id, used for TX classification*/
        uint8_t         tss_leading_cl_id;
 
-       /* valid iff ECORE_Q_FLG_DEF_VLAN */
+       /* valid if ECORE_Q_FLG_DEF_VLAN */
        uint16_t                default_vlan;
 };
 
@@ -1733,7 +1731,7 @@ void ecore_init_mcast_obj(struct bnx2x_softc *sc,
  * the current command will be enqueued to the tail of the
  * pending commands list.
  *
- * Return: 0 is operation was successfull and there are no pending completions,
+ * Return: 0 is operation was successful and there are no pending completions,
  *         negative if there were errors, positive if there are pending
  *         completions.
  */