New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / bus / fslmc / mc / fsl_dpbp_cmd.h

diff --git a/drivers/bus/fslmc/mc/fsl_dpbp_cmd.h b/drivers/bus/fslmc/mc/fsl_dpbp_cmd.h
index ce38c79..55c9fc9 100644 (file)
--- a/drivers/bus/fslmc/mc/fsl_dpbp_cmd.h
+++ b/drivers/bus/fslmc/mc/fsl_dpbp_cmd.h
@@ -1,54 +1,23 @@
-/*-
- * This file is provided under a dual BSD/GPLv2 license. When using or
- * redistributing this file, you may do so under either license.
- *
- *   BSD LICENSE
+/* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
  *
  * Copyright 2013-2016 Freescale Semiconductor Inc.
- * Copyright 2016-2017 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 the above-listed copyright holders nor the
- * names of any contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *   GPL LICENSE SUMMARY
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") as published by the Free Software
- * Foundation, either version 2 of that License or (at your option) any
- * later version.
+ * Copyright 2016-2017 NXP
  *
- * 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 HOLDERS 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 _FSL_DPBP_CMD_H
 #define _FSL_DPBP_CMD_H
 
 /* DPBP Version */
 #define DPBP_VER_MAJOR                         3
-#define DPBP_VER_MINOR                         3
+#define DPBP_VER_MINOR                         4
 
 /* Command versioning */
 #define DPBP_CMD_BASE_VERSION                  1
+#define DPBP_CMD_VERSION_2                     2
 #define DPBP_CMD_ID_OFFSET                     4
 
 #define DPBP_CMD(id)   ((id << DPBP_CMD_ID_OFFSET) | DPBP_CMD_BASE_VERSION)
+#define DPBP_CMD_V2(id)        ((id << DPBP_CMD_ID_OFFSET) | DPBP_CMD_VERSION_2)
 
 /* Command IDs */
 #define DPBP_CMDID_CLOSE               DPBP_CMD(0x800)
@@ -70,8 +39,8 @@
 #define DPBP_CMDID_GET_IRQ_STATUS      DPBP_CMD(0x016)
 #define DPBP_CMDID_CLEAR_IRQ_STATUS    DPBP_CMD(0x017)
 
-#define DPBP_CMDID_SET_NOTIFICATIONS   DPBP_CMD(0x1b0)
-#define DPBP_CMDID_GET_NOTIFICATIONS   DPBP_CMD(0x1b1)
+#define DPBP_CMDID_SET_NOTIFICATIONS   DPBP_CMD_V2(0x1b0)
+#define DPBP_CMDID_GET_NOTIFICATIONS   DPBP_CMD_V2(0x1b1)
 
 #define DPBP_CMDID_GET_FREE_BUFFERS_NUM        DPBP_CMD(0x1b2)
 
@@ -101,8 +70,8 @@ struct dpbp_cmd_set_notifications {
        uint32_t depletion_exit;
        uint32_t surplus_entry;
        uint32_t surplus_exit;
-       uint16_t options;
-       uint16_t pad[3];
+       uint32_t options;
+       uint16_t pad[2];
        uint64_t message_ctx;
        uint64_t message_iova;
 };
@@ -112,8 +81,8 @@ struct dpbp_rsp_get_notifications {
        uint32_t depletion_exit;
        uint32_t surplus_entry;
        uint32_t surplus_exit;
-       uint16_t options;
-       uint16_t pad[3];
+       uint32_t options;
+       uint16_t pad[2];
        uint64_t message_ctx;
        uint64_t message_iova;
 };