import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / dpdk / drivers / bus / fslmc / qbman / include / fsl_qbman_base.h

diff --git a/ceph/src/seastar/dpdk/drivers/bus/fslmc/qbman/include/fsl_qbman_base.h b/ceph/src/seastar/dpdk/drivers/bus/fslmc/qbman/include/fsl_qbman_base.h
index ee4b772c0250d9bba82c751d4ecb46f931c14828..48bdaafa490d18e4eed20df196a4ba9a85759a99 100644 (file)
--- a/ceph/src/seastar/dpdk/drivers/bus/fslmc/qbman/include/fsl_qbman_base.h
+++ b/ceph/src/seastar/dpdk/drivers/bus/fslmc/qbman/include/fsl_qbman_base.h
@@ -1,35 +1,12 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
  * Copyright (C) 2014 Freescale Semiconductor, Inc.
+ * Copyright 2017-2018 NXP
  *
- * 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 Freescale Semiconductor 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 Freescale Semiconductor ``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 Freescale Semiconductor 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 _FSL_QBMAN_BASE_H
 #define _FSL_QBMAN_BASE_H
 
-typedef uint64_t  dma_addr_t;
-
 /**
  * DOC: QBMan basic structures
  *
@@ -38,10 +15,6 @@ typedef uint64_t  dma_addr_t;
  *
  */
 
-#define QMAN_REV_4000   0x04000000
-#define QMAN_REV_4100   0x04010000
-#define QMAN_REV_4101   0x04010001
-
 /**
  * struct qbman_block_desc - qbman block descriptor structure
  * @ccsr_reg_bar: CCSR register map.
@@ -61,7 +34,12 @@ struct qbman_block_desc {
 
 enum qbman_eqcr_mode {
        qman_eqcr_vb_ring = 2, /* Valid bit, with eqcr in ring mode */
-       qman_eqcr_vb_array, /* Valid bit, with eqcr in array mode */
+       qman_eqcr_vb_array,    /* Valid bit, with eqcr in array mode */
+};
+
+enum qbman_cena_access_mode {
+       qman_cena_fastest_access = 0, /* Use memory backed node if available */
+       qman_cena_direct_access,      /* Use direct access to the CENA region */
 };
 
 /**
@@ -74,6 +52,8 @@ enum qbman_eqcr_mode {
  * @qman_version: the qman version.
  * @eqcr_mode: Select the eqcr mode, currently only valid bit ring mode and
  * valid bit array mode are supported.
+ * @cena_access_mode: Mode used to access the CENA region, direct
+ *                    or memory backed.
  *
  * Descriptor for a QBMan software portal, expressed in terms that make sense to
  * the user context. Ie. on MC, this information is likely to be true-physical,
@@ -90,6 +70,7 @@ struct qbman_swp_desc {
        int idx;
        uint32_t qman_version;
        enum qbman_eqcr_mode eqcr_mode;
+       enum qbman_cena_access_mode cena_access_mode;
 };
 
 /* Driver object for managing a QBMan portal */