New upstream version 18.11-rc1
[deb_dpdk.git] / drivers / net / enic / base / vnic_devcmd.h
index b3d5a6c..3aad2db 100644 (file)
@@ -1,35 +1,6 @@
-/*
- * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2008-2017 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
- *
- * Copyright (c) 2014, Cisco Systems, Inc.
- * All rights reserved.
- *
- * 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 HOLDER 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 _VNIC_DEVCMD_H_
@@ -92,6 +63,8 @@
 #define _CMD_VTYPE(cmd)          (((cmd) >> _CMD_VTYPESHIFT) & _CMD_VTYPEMASK)
 #define _CMD_N(cmd)              (((cmd) >> _CMD_NSHIFT) & _CMD_NMASK)
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
 enum vnic_devcmd_cmd {
        CMD_NONE                = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_NONE, 0),
 
@@ -126,7 +99,8 @@ enum vnic_devcmd_cmd {
 
        /* dev-specific block member:
         *    in: (u16)a0=offset,(u8)a1=size
-        *    out: a0=value */
+        *    out: a0=value
+        */
        CMD_DEV_SPEC            = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 2),
 
        /* stats clear */
@@ -146,8 +120,9 @@ enum vnic_devcmd_cmd {
        CMD_HANG_NOTIFY         = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ALL, 8),
 
        /* MAC address in (u48)a0 */
-       CMD_GET_MAC_ADDR        = _CMDC(_CMD_DIR_READ,
+       CMD_MAC_ADDR            = _CMDC(_CMD_DIR_READ,
                                        _CMD_VTYPE_ENET | _CMD_VTYPE_FC, 9),
+#define CMD_GET_MAC_ADDR CMD_MAC_ADDR   /* some uses are aliased */
 
        /* add addr from (u48)a0 */
        CMD_ADDR_ADD            = _CMDCNW(_CMD_DIR_WRITE,
@@ -163,9 +138,27 @@ enum vnic_devcmd_cmd {
        /* del VLAN id in (u16)a0 */
        CMD_VLAN_DEL            = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 15),
 
-       /* nic_cfg in (u32)a0 */
+       /*
+        * nic_cfg in (u32)a0
+        *
+        * Capability query:
+        * out: (u64) a0= 1 if a1 is valid
+        *      (u64) a1= (NIC_CFG bits supported) | (flags << 32)
+        *                              (flags are CMD_NIC_CFG_CAPF_xxx)
+        */
        CMD_NIC_CFG             = _CMDCNW(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 16),
 
+       /*
+        * nic_cfg_chk  (same as nic_cfg, but may return error)
+        * in (u32)a0
+        *
+        * Capability query:
+        * out: (u64) a0= 1 if a1 is valid
+        *      (u64) a1= (NIC_CFG bits supported) | (flags << 32)
+        *                              (flags are CMD_NIC_CFG_CAPF_xxx)
+        */
+       CMD_NIC_CFG_CHK         = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 16),
+
        /* union vnic_rss_key in mem: (u64)a0=paddr, (u16)a1=len */
        CMD_RSS_KEY             = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 17),
 
@@ -387,9 +380,8 @@ enum vnic_devcmd_cmd {
         * Subvnic migration from MQ <--> VF.
         * Enable the LIF migration from MQ to VF and vice versa. MQ and VF
         * indexes are statically bound at the time of initialization.
-        * Based on the
-        * direction of migration, the resources of either MQ or the VF shall
-        * be attached to the LIF.
+        * Based on the direction of migration, the resources of either MQ or
+        * the VF shall be attached to the LIF.
         * in:        (u32)a0=Direction of Migration
         *                                      0=> Migrate to VF
         *                                      1=> Migrate to MQ
@@ -397,7 +389,6 @@ enum vnic_devcmd_cmd {
         */
        CMD_MIGRATE_SUBVNIC = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 53),
 
-
        /*
         * Register / Deregister the notification block for MQ subvnics
         * in:
@@ -433,6 +424,10 @@ enum vnic_devcmd_cmd {
         * in: (u64) a0= filter address
         *     (u32) a1= size of filter
         * out: (u32) a0=filter identifier
+        *
+        * Capability query:
+        * out: (u64) a0= 1 if capability query supported
+        *      (u64) a1= MAX filter type supported
         */
        CMD_ADD_FILTER = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 58),
 
@@ -471,35 +466,208 @@ enum vnic_devcmd_cmd {
        CMD_QP_STATS_CLEAR = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 63),
 
        /*
-        * Enable/Disable overlay offloads on the given vnic
+        * UEFI BOOT API: (u64)a0= UEFI FLS_CMD_xxx
+        * (ui64)a1= paddr for the info buffer
+        */
+       CMD_FC_REQ = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_FC, 64),
+
+       /*
+        * Return the iSCSI config details required by the EFI Option ROM
+        * in:  (u32) a0=0 Get Boot Info for PXE eNIC as per pxe_boot_config_t
+        *            a0=1 Get Boot info for iSCSI enic as per
+        *            iscsi_boot_efi_cfg_t
+        * in:  (u64) a1=Host address where iSCSI config info is returned
+        */
+       CMD_VNIC_BOOT_CONFIG_INFO = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ALL, 65),
+
+       /*
+        * Create a Queue Pair (RoCE)
+        * in: (u32) a0 = Queue Pair number
+        *     (u32) a1 = Remote QP
+        *     (u32) a2 = RDMA-RQ
+        *     (u16) a3 = RQ Res Group
+        *     (u16) a4 = SQ Res Group
+        *     (u32) a5 = Protection Domain
+        *     (u64) a6 = Remote MAC
+        *     (u32) a7 = start PSN
+        *     (u16) a8 = MSS
+        *     (u32) a9 = protocol version
+        */
+       CMD_RDMA_QP_CREATE = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 66),
+
+       /*
+        * Delete a Queue Pair (RoCE)
+        * in: (u32) a0 = Queue Pair number
+        */
+       CMD_RDMA_QP_DELETE = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 67),
+
+       /*
+        * Retrieve a Queue Pair's status information (RoCE)
+        * in: (u32) a0 = Queue Pair number
+        *     (u64) a1 = host buffer addr for QP status struct
+        *     (u32) a2 = length of the buffer
+        */
+       CMD_RDMA_QP_STATUS = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 68),
+
+       /*
+        * Use this devcmd for agreeing on the highest common version supported
+        * by both driver and fw for by features who need such a facility.
+        *  in:  (u64) a0 = feature (driver requests for the supported versions
+        *                  on this feature)
+        *  out: (u64) a0 = bitmap of all supported versions for that feature
+        */
+       CMD_GET_SUPP_FEATURE_VER = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 69),
+
+       /*
+        * Initialize the RDMA notification work queue
+        * in: (u64) a0 = host buffer address
+        * in: (u16) a1 = number of entries in buffer
+        * in: (u16) a2 = resource group number
+        * in: (u16) a3 = CQ number to post completion
+        */
+       CMD_RDMA_INIT_INFO_BUF = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 70),
+
+       /*
+        * De-init the RDMA notification work queue
+        * in: (u64) a0=resource group number
+        */
+       CMD_RDMA_DEINIT_INFO_BUF = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 71),
+
+       /*
+        * Control (Enable/Disable) overlay offloads on the given vnic
         * in: (u8) a0 = OVERLAY_FEATURE_NVGRE : NVGRE
         *          a0 = OVERLAY_FEATURE_VXLAN : VxLAN
-        * in: (u8) a1 = OVERLAY_OFFLOAD_ENABLE : Enable
-        *          a1 = OVERLAY_OFFLOAD_DISABLE : Disable
+        * in: (u8) a1 = OVERLAY_OFFLOAD_ENABLE : Enable or
+        *          a1 = OVERLAY_OFFLOAD_DISABLE : Disable or
+        *          a1 = OVERLAY_OFFLOAD_ENABLE_V2 : Enable with version 2
         */
-       CMD_OVERLAY_OFFLOAD_ENABLE_DISABLE =
-               _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 72),
+       CMD_OVERLAY_OFFLOAD_CTRL =
+                               _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 72),
 
        /*
         * Configuration of overlay offloads feature on a given vNIC
-        * in: (u8) a0 = DEVCMD_OVERLAY_NVGRE : NVGRE
-        *          a0 = DEVCMD_OVERLAY_VXLAN : VxLAN
-        * in: (u8) a1 = VXLAN_PORT_UPDATE : VxLAN
-        * in: (u16) a2 = unsigned short int port information
+        * in: (u8) a0 = OVERLAY_CFG_VXLAN_PORT_UPDATE : VxLAN
+        * in: (u16) a1 = unsigned short int port information
         */
        CMD_OVERLAY_OFFLOAD_CFG = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 73),
+
+       /*
+        * Return the configured name for the device
+        * in: (u64) a0=Host address where the name is copied
+        *     (u32) a1=Size of the buffer
+        */
+       CMD_GET_CONFIG_NAME = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ALL, 74),
+
+       /*
+        * Enable group interrupt for the VF
+        * in: (u32) a0 = GRPINTR_ENABLE : enable
+        *           a0 = GRPINTR_DISABLE : disable
+        *           a0 = GRPINTR_UPD_VECT: update group vector addr
+        * in: (u32) a1 = interrupt group count
+        * in: (u64) a2 = Start of host buffer address for DMAing group
+        *           vector bitmap
+        * in: (u64) a3 = Stride between group vectors
+        */
+       CMD_CONFIG_GRPINTR = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 75),
+
+       /*
+        * Set cq arrary base and size in a list of consective wqs and
+        * rqs for a device
+        * in: (u16) a0 = the wq relative index in the device.
+        *              -1 indicates skipping wq configuration
+        * in: (u16) a1 = the wcq relative index in the device
+        * in: (u16) a2 = the rq relative index in the device
+        *              -1 indicates skipping rq configuration
+        * in: (u16) a3 = the rcq relative index in the device
+        */
+       CMD_CONFIG_CQ_ARRAY = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 76),
+
+       /*
+        * Add an advanced filter.
+        * in: (u64) a0= filter address
+        *     (u32) a1= size of filter
+        * out: (u32) a0=filter identifier
+        *
+        * Capability query:
+        * in:  (u64) a1= supported filter capability exchange modes
+        * out: (u64) a0= 1 if capability query supported
+        *      if (u64) a1 = 0: a1 = MAX filter type supported
+        *      if (u64) a1 & FILTER_CAP_MODE_V1_FLAG:
+        *                       a1 = bitmask of supported filters
+        *                       a2 = FILTER_CAP_MODE_V1
+        *                       a3 = bitmask of supported actions
+        */
+       CMD_ADD_ADV_FILTER = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 77),
+
+       /*
+        * Allocate a counter for use with CMD_ADD_FILTER
+        * out:(u32) a0 = counter index
+        */
+       CMD_COUNTER_ALLOC = _CMDC(_CMD_DIR_READ, _CMD_VTYPE_ENET, 85),
+
+       /*
+        * Free a counter
+        * in: (u32) a0 = counter_id
+        */
+       CMD_COUNTER_FREE = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 86),
+
+       /*
+        * Read a counter
+        * in: (u32) a0 = counter_id
+        *     (u32) a1 = clear counter if non-zero
+        * out:(u64) a0 = packet count
+        *     (u64) a1 = byte count
+        */
+       CMD_COUNTER_QUERY = _CMDC(_CMD_DIR_RW, _CMD_VTYPE_ENET, 87),
+
+       /*
+        * Configure periodic counter DMA.  This will trigger an immediate
+        * DMA of the counters (unless period == 0), and then schedule a DMA
+        * of the counters every <period> seconds until disdabled.
+        * Each new COUNTER_DMA_CONFIG will override all previous commands on
+        * this vnic.
+        * Setting a2 (period) = 0 will disable periodic DMAs
+        * If a0 (num_counters) != 0, an immediate DMA will always be done,
+        * irrespective of the value in a2.
+        * in: (u32) a0 = number of counters to DMA
+        *     (u64) a1 = host target DMA address
+        *     (u32) a2 = DMA period in milliseconds (0 to disable)
+        */
+       CMD_COUNTER_DMA_CONFIG = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 88),
+#define VNIC_COUNTER_DMA_MIN_PERIOD 500
+
+       /*
+        * Clear all counters on a vnic
+        */
+       CMD_COUNTER_CLEAR_ALL = _CMDC(_CMD_DIR_NONE, _CMD_VTYPE_ENET, 89),
 };
 
+/* Modes for exchanging advanced filter capabilities. The modes supported by
+ * the driver are passed in the CMD_ADD_ADV_FILTER capability command and the
+ * mode selected is returned.
+ *    V0: the maximum filter type supported is returned
+ *    V1: bitmasks of supported filters and actions are returned
+ */
+enum filter_cap_mode {
+       FILTER_CAP_MODE_V0 = 0,  /* Must always be 0 for legacy drivers */
+       FILTER_CAP_MODE_V1 = 1,
+};
+#define FILTER_CAP_MODE_V1_FLAG (1 << FILTER_CAP_MODE_V1)
+
 /* CMD_ENABLE2 flags */
 #define CMD_ENABLE2_STANDBY 0x0
 #define CMD_ENABLE2_ACTIVE  0x1
 
 /* flags for CMD_OPEN */
 #define CMD_OPENF_OPROM                0x1     /* open coming from option rom */
+#define CMD_OPENF_IG_DESCCACHE 0x2     /* Do not flush IG DESC cache */
 
 /* flags for CMD_INIT */
 #define CMD_INITF_DEFAULT_MAC  0x1     /* init with default mac addr */
 
+/* flags for CMD_NIC_CFG */
+#define CMD_NIC_CFG_CAPF_UDP_WEAK      (1ULL << 0) /* Bodega-style UDP RSS */
+
 /* flags for CMD_PACKET_FILTER */
 #define CMD_PFILTER_DIRECTED           0x01
 #define CMD_PFILTER_MULTICAST          0x02
@@ -520,6 +688,9 @@ enum vnic_devcmd_status {
        STAT_NONE = 0,
        STAT_BUSY = 1 << 0,     /* cmd in progress */
        STAT_ERROR = 1 << 1,    /* last cmd caused error (code in a0) */
+       STAT_FAILOVER = 1 << 2, /* always set on vnics in pci standby state
+                                * if seen a failover to the standby happened
+                                */
 };
 
 enum vnic_devcmd_error {
@@ -558,9 +729,9 @@ enum fwinfo_asic_type {
        FWINFO_ASIC_TYPE_UNKNOWN,
        FWINFO_ASIC_TYPE_PALO,
        FWINFO_ASIC_TYPE_SERENO,
+       FWINFO_ASIC_TYPE_CRUZ,
 };
 
-
 struct vnic_devcmd_notify {
        u32 csum;               /* checksum over following words */
 
@@ -595,25 +766,16 @@ struct vnic_devcmd_provinfo {
  */
 #define FILTER_FIELD_VALID(fld) (1 << (fld - 1))
 
-#define FILTER_FIELDS_USNIC (FILTER_FIELD_VALID(1) | \
-                            FILTER_FIELD_VALID(2) | \
-                            FILTER_FIELD_VALID(3) | \
-                            FILTER_FIELD_VALID(4))
-
-#define FILTER_FIELDS_IPV4_5TUPLE (FILTER_FIELD_VALID(1) | \
-                                  FILTER_FIELD_VALID(2) | \
-                                  FILTER_FIELD_VALID(3) | \
-                                  FILTER_FIELD_VALID(4) | \
-                                  FILTER_FIELD_VALID(5))
-
-#define FILTER_FIELDS_MAC_VLAN (FILTER_FIELD_VALID(1) | \
-                               FILTER_FIELD_VALID(2))
-
 #define FILTER_FIELD_USNIC_VLAN    FILTER_FIELD_VALID(1)
 #define FILTER_FIELD_USNIC_ETHTYPE FILTER_FIELD_VALID(2)
 #define FILTER_FIELD_USNIC_PROTO   FILTER_FIELD_VALID(3)
 #define FILTER_FIELD_USNIC_ID      FILTER_FIELD_VALID(4)
 
+#define FILTER_FIELDS_USNIC (FILTER_FIELD_USNIC_VLAN | \
+                            FILTER_FIELD_USNIC_ETHTYPE | \
+                            FILTER_FIELD_USNIC_PROTO | \
+                            FILTER_FIELD_USNIC_ID)
+
 struct filter_usnic_id {
        u32 flags;
        u16 vlan;
@@ -628,10 +790,18 @@ struct filter_usnic_id {
 #define FILTER_FIELD_5TUP_SRC_PT FILTER_FIELD_VALID(4)
 #define FILTER_FIELD_5TUP_DST_PT FILTER_FIELD_VALID(5)
 
+#define FILTER_FIELDS_IPV4_5TUPLE (FILTER_FIELD_5TUP_PROTO | \
+                                  FILTER_FIELD_5TUP_SRC_AD | \
+                                  FILTER_FIELD_5TUP_DST_AD | \
+                                  FILTER_FIELD_5TUP_SRC_PT | \
+                                  FILTER_FIELD_5TUP_DST_PT)
+
 /* Enums for the protocol field. */
 enum protocol_e {
        PROTO_UDP = 0,
        PROTO_TCP = 1,
+       PROTO_IPV4 = 2,
+       PROTO_IPV6 = 3
 };
 
 struct filter_ipv4_5tuple {
@@ -646,15 +816,82 @@ struct filter_ipv4_5tuple {
 #define FILTER_FIELD_VMQ_VLAN   FILTER_FIELD_VALID(1)
 #define FILTER_FIELD_VMQ_MAC    FILTER_FIELD_VALID(2)
 
+#define FILTER_FIELDS_MAC_VLAN (FILTER_FIELD_VMQ_VLAN | \
+                               FILTER_FIELD_VMQ_MAC)
+
+#define FILTER_FIELDS_NVGRE    FILTER_FIELD_VMQ_MAC
+
 struct filter_mac_vlan {
        u32 flags;
        u16 vlan;
        u8 mac_addr[6];
 } __attribute__((packed));
 
+#define FILTER_FIELD_VLAN_IP_3TUP_VLAN      FILTER_FIELD_VALID(1)
+#define FILTER_FIELD_VLAN_IP_3TUP_L3_PROTO  FILTER_FIELD_VALID(2)
+#define FILTER_FIELD_VLAN_IP_3TUP_DST_AD    FILTER_FIELD_VALID(3)
+#define FILTER_FIELD_VLAN_IP_3TUP_L4_PROTO  FILTER_FIELD_VALID(4)
+#define FILTER_FIELD_VLAN_IP_3TUP_DST_PT    FILTER_FIELD_VALID(5)
+
+#define FILTER_FIELDS_VLAN_IP_3TUP (FILTER_FIELD_VLAN_IP_3TUP_VLAN | \
+                                   FILTER_FIELD_VLAN_IP_3TUP_L3_PROTO | \
+                                   FILTER_FIELD_VLAN_IP_3TUP_DST_AD | \
+                                   FILTER_FIELD_VLAN_IP_3TUP_L4_PROTO | \
+                                   FILTER_FIELD_VLAN_IP_3TUP_DST_PT)
+
+struct filter_vlan_ip_3tuple {
+       u32 flags;
+       u16 vlan;
+       u16 l3_protocol;
+       union {
+               u32 dst_addr_v4;
+               u8 dst_addr_v6[16];
+       } u;
+       u32 l4_protocol;
+       u16 dst_port;
+} __attribute__((packed));
+
+#define FILTER_GENERIC_1_BYTES 64
+
+enum filter_generic_1_layer {
+       FILTER_GENERIC_1_L2,
+       FILTER_GENERIC_1_L3,
+       FILTER_GENERIC_1_L4,
+       FILTER_GENERIC_1_L5,
+       FILTER_GENERIC_1_NUM_LAYERS
+};
+
+#define FILTER_GENERIC_1_IPV4       (1 << 0)
+#define FILTER_GENERIC_1_IPV6       (1 << 1)
+#define FILTER_GENERIC_1_UDP        (1 << 2)
+#define FILTER_GENERIC_1_TCP        (1 << 3)
+#define FILTER_GENERIC_1_TCP_OR_UDP (1 << 4)
+#define FILTER_GENERIC_1_IP4SUM_OK  (1 << 5)
+#define FILTER_GENERIC_1_L4SUM_OK   (1 << 6)
+#define FILTER_GENERIC_1_IPFRAG     (1 << 7)
+
+#define FILTER_GENERIC_1_KEY_LEN 64
+
+/*
+ * Version 1 of generic filter specification
+ * position is only 16 bits, reserving positions > 64k to be used by firmware
+ */
+struct filter_generic_1 {
+       u16 position;       /* lower position comes first */
+       u32 mask_flags;
+       u32 val_flags;
+       u16 mask_vlan;
+       u16 val_vlan;
+       struct {
+               u8 mask[FILTER_GENERIC_1_KEY_LEN]; /* 0 bit means "don't care"*/
+               u8 val[FILTER_GENERIC_1_KEY_LEN];
+       } __attribute__((packed)) layer[FILTER_GENERIC_1_NUM_LAYERS];
+} __attribute__((packed));
+
 /* Specifies the filter_action type. */
 enum {
        FILTER_ACTION_RQ_STEERING = 0,
+       FILTER_ACTION_V2 = 1,
        FILTER_ACTION_MAX
 };
 
@@ -665,20 +902,81 @@ struct filter_action {
        } u;
 } __attribute__((packed));
 
+#define FILTER_ACTION_RQ_STEERING_FLAG (1 << 0)
+#define FILTER_ACTION_FILTER_ID_FLAG   (1 << 1)
+#define FILTER_ACTION_DROP_FLAG                (1 << 2)
+#define FILTER_ACTION_COUNTER_FLAG      (1 << 3)
+#define FILTER_ACTION_V2_ALL           (FILTER_ACTION_RQ_STEERING_FLAG \
+                                        | FILTER_ACTION_FILTER_ID_FLAG \
+                                        | FILTER_ACTION_DROP_FLAG \
+                                        | FILTER_ACTION_COUNTER_FLAG)
+
+/* Version 2 of filter action must be a strict extension of struct filter_action
+ * where the first fields exactly match in size and meaning.
+ */
+struct filter_action_v2 {
+       u32 type;
+       u32 rq_idx;
+       u32 flags;                     /* use FILTER_ACTION_XXX_FLAG defines */
+       u16 filter_id;
+       u32 counter_index;
+       uint8_t reserved[28];         /* for future expansion */
+} __attribute__((packed));
+
 /* Specifies the filter type. */
 enum filter_type {
        FILTER_USNIC_ID = 0,
        FILTER_IPV4_5TUPLE = 1,
        FILTER_MAC_VLAN = 2,
+       FILTER_VLAN_IP_3TUPLE = 3,
+       FILTER_NVGRE_VMQ = 4,
+       FILTER_USNIC_IP = 5,
+       FILTER_DPDK_1 = 6,
        FILTER_MAX
 };
 
+#define FILTER_USNIC_ID_FLAG           (1 << FILTER_USNIC_ID)
+#define FILTER_IPV4_5TUPLE_FLAG                (1 << FILTER_IPV4_5TUPLE)
+#define FILTER_MAC_VLAN_FLAG           (1 << FILTER_MAC_VLAN)
+#define FILTER_VLAN_IP_3TUPLE_FLAG     (1 << FILTER_VLAN_IP_3TUPLE)
+#define FILTER_NVGRE_VMQ_FLAG          (1 << FILTER_NVGRE_VMQ)
+#define FILTER_USNIC_IP_FLAG           (1 << FILTER_USNIC_IP)
+#define FILTER_DPDK_1_FLAG             (1 << FILTER_DPDK_1)
+#define FILTER_V1_ALL                  (FILTER_USNIC_ID_FLAG | \
+                                       FILTER_IPV4_5TUPLE_FLAG | \
+                                       FILTER_MAC_VLAN_FLAG | \
+                                       FILTER_VLAN_IP_3TUPLE_FLAG | \
+                                       FILTER_NVGRE_VMQ_FLAG | \
+                                       FILTER_USNIC_IP_FLAG | \
+                                       FILTER_DPDK_1_FLAG)
+
 struct filter {
        u32 type;
        union {
                struct filter_usnic_id usnic;
                struct filter_ipv4_5tuple ipv4;
                struct filter_mac_vlan mac_vlan;
+               struct filter_vlan_ip_3tuple vlan_3tuple;
+       } u;
+} __attribute__((packed));
+
+/*
+ * This is a strict superset of "struct filter" and exists only
+ * because many drivers use "sizeof (struct filter)" in deciding TLV size.
+ * This new, larger struct filter would cause any code that uses that method
+ * to not work with older firmware, so we add filter_v2 to hold the
+ * new filter types.  Drivers should use vnic_filter_size() to determine
+ * the TLV size instead of sizeof (struct fiter_v2) to guard against future
+ * growth.
+ */
+struct filter_v2 {
+       u32 type;
+       union {
+               struct filter_usnic_id usnic;
+               struct filter_ipv4_5tuple ipv4;
+               struct filter_mac_vlan mac_vlan;
+               struct filter_vlan_ip_3tuple vlan_3tuple;
+               struct filter_generic_1 generic_1;
        } u;
 } __attribute__((packed));
 
@@ -687,19 +985,84 @@ enum {
        CLSF_TLV_ACTION = 1,
 };
 
-#define FILTER_MAX_BUF_SIZE 100  /* Maximum size of buffer to CMD_ADD_FILTER */
-
 struct filter_tlv {
        uint32_t type;
        uint32_t length;
        uint32_t val[0];
 };
 
+/* Data for CMD_ADD_FILTER is 2 TLV and filter + action structs */
+#define FILTER_MAX_BUF_SIZE 100
+#define FILTER_V2_MAX_BUF_SIZE (sizeof(struct filter_v2) + \
+       sizeof(struct filter_action_v2) + \
+       (2 * sizeof(struct filter_tlv)))
+
+/*
+ * Compute actual structure size given filter type.  To be "future-proof,"
+ * drivers should use this instead of "sizeof (struct filter_v2)" when
+ * computing length for TLV.
+ */
+static inline uint32_t
+vnic_filter_size(struct filter_v2 *fp)
+{
+       uint32_t size;
+
+       switch (fp->type) {
+       case FILTER_USNIC_ID:
+               size = sizeof(fp->u.usnic);
+               break;
+       case FILTER_IPV4_5TUPLE:
+               size = sizeof(fp->u.ipv4);
+               break;
+       case FILTER_MAC_VLAN:
+       case FILTER_NVGRE_VMQ:
+               size = sizeof(fp->u.mac_vlan);
+               break;
+       case FILTER_VLAN_IP_3TUPLE:
+               size = sizeof(fp->u.vlan_3tuple);
+               break;
+       case FILTER_USNIC_IP:
+       case FILTER_DPDK_1:
+               size = sizeof(fp->u.generic_1);
+               break;
+       default:
+               size = sizeof(fp->u);
+               break;
+       }
+       size += sizeof(fp->type);
+       return size;
+}
+
+
 enum {
        CLSF_ADD = 0,
        CLSF_DEL = 1,
 };
 
+/*
+ * Get the action structure size given action type. To be "future-proof,"
+ * drivers should use this instead of "sizeof (struct filter_action_v2)"
+ * when computing length for TLV.
+ */
+static inline uint32_t
+vnic_action_size(struct filter_action_v2 *fap)
+{
+       uint32_t size;
+
+       switch (fap->type) {
+       case FILTER_ACTION_RQ_STEERING:
+               size = sizeof(struct filter_action);
+               break;
+       case FILTER_ACTION_V2:
+               size = sizeof(struct filter_action_v2);
+               break;
+       default:
+               size = sizeof(struct filter_action);
+               break;
+       }
+       return size;
+}
+
 /*
  * Writing cmd register causes STAT_BUSY to get set in status register.
  * When cmd completes, STAT_BUSY will be cleared.
@@ -766,8 +1129,51 @@ typedef enum {
        OVERLAY_FEATURE_MAX,
 } overlay_feature_t;
 
-#define OVERLAY_OFFLOAD_ENABLE 0
-#define OVERLAY_OFFLOAD_DISABLE 1
+#define OVERLAY_OFFLOAD_ENABLE          0
+#define OVERLAY_OFFLOAD_DISABLE         1
+#define OVERLAY_OFFLOAD_ENABLE_V2       2
 
 #define OVERLAY_CFG_VXLAN_PORT_UPDATE 0
+
+/*
+ * Use this enum to get the supported versions for each of these features
+ * If you need to use the devcmd_get_supported_feature_version(), add
+ * the new feature into this enum and install function handler in devcmd.c
+ */
+typedef enum {
+       VIC_FEATURE_VXLAN,
+       VIC_FEATURE_RDMA,
+       VIC_FEATURE_MAX,
+} vic_feature_t;
+
+/*
+ * These flags are used in args[1] of devcmd CMD_GET_SUPP_FEATURE_VER
+ * to indicate the host driver about the VxLAN and Multi WQ features
+ * supported
+ */
+#define FEATURE_VXLAN_IPV6_INNER       (1 << 0)
+#define FEATURE_VXLAN_IPV6_OUTER       (1 << 1)
+#define FEATURE_VXLAN_MULTI_WQ         (1 << 2)
+
+#define FEATURE_VXLAN_IPV6             (FEATURE_VXLAN_IPV6_INNER | \
+                                        FEATURE_VXLAN_IPV6_OUTER)
+
+/*
+ * CMD_CONFIG_GRPINTR subcommands
+ */
+typedef enum {
+       GRPINTR_ENABLE = 1,
+       GRPINTR_DISABLE,
+       GRPINTR_UPD_VECT,
+} grpintr_subcmd_t;
+
+/*
+ * Structure for counter DMA
+ * (DMAed by CMD_COUNTER_DMA_CONFIG)
+ */
+struct vnic_counter_counts {
+       u64 vcc_packets;
+       u64 vcc_bytes;
+};
+
 #endif /* _VNIC_DEVCMD_H_ */