net: add rte prefix to ether defines

[dpdk.git] / drivers / net / bnxt / bnxt.h

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 2b42639..caacc72 100644 (file)
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -33,6 +33,13 @@
 #define BNXT_MAX_RX_RING_DESC  8192
 #define BNXT_DB_SIZE           0x80
 
+/* Chimp Communication Channel */
+#define GRCPF_REG_CHIMP_CHANNEL_OFFSET         0x0
+#define GRCPF_REG_CHIMP_COMM_TRIGGER           0x100
+/* Kong Communication Channel */
+#define GRCPF_REG_KONG_CHANNEL_OFFSET          0xA00
+#define GRCPF_REG_KONG_COMM_TRIGGER            0xB00
+
 #define BNXT_INT_LAT_TMR_MIN                   75
 #define BNXT_INT_LAT_TMR_MAX                   150
 #define BNXT_NUM_CMPL_AGGR_INT                 36
@@ -252,13 +259,19 @@ struct bnxt {
 #define BNXT_FLAG_MULTI_HOST    (1 << 7)
 #define BNXT_FLAG_EXT_RX_PORT_STATS    (1 << 8)
 #define BNXT_FLAG_EXT_TX_PORT_STATS    (1 << 9)
+#define BNXT_FLAG_KONG_MB_EN   (1 << 10)
+#define BNXT_FLAG_TRUSTED_VF_EN        (1 << 11)
+#define BNXT_FLAG_DFLT_VNIC_SET        (1 << 12)
 #define BNXT_FLAG_NEW_RM       (1 << 30)
-#define BNXT_FLAG_INIT_DONE    (1 << 31)
+#define BNXT_FLAG_INIT_DONE    (1U << 31)
 #define BNXT_PF(bp)            (!((bp)->flags & BNXT_FLAG_VF))
 #define BNXT_VF(bp)            ((bp)->flags & BNXT_FLAG_VF)
 #define BNXT_NPAR(bp)          ((bp)->port_partition_type)
 #define BNXT_MH(bp)             ((bp)->flags & BNXT_FLAG_MULTI_HOST)
 #define BNXT_SINGLE_PF(bp)      (BNXT_PF(bp) && !BNXT_NPAR(bp) && !BNXT_MH(bp))
+#define BNXT_USE_CHIMP_MB      0 //For non-CFA commands, everything uses Chimp.
+#define BNXT_USE_KONG(bp)      ((bp)->flags & BNXT_FLAG_KONG_MB_EN)
+#define BNXT_VF_IS_TRUSTED(bp) ((bp)->flags & BNXT_FLAG_TRUSTED_VF_EN)
 
        unsigned int            rx_nr_rings;
        unsigned int            rx_cp_nr_rings;
@@ -296,9 +309,10 @@ struct bnxt {
        struct bnxt_irq         *irq_tbl;
 
 #define MAX_NUM_MAC_ADDR       32
-       uint8_t                 mac_addr[ETHER_ADDR_LEN];
+       uint8_t                 mac_addr[RTE_ETHER_ADDR_LEN];
 
        uint16_t                        hwrm_cmd_seq;
+       uint16_t                        kong_cmd_seq;
        void                            *hwrm_cmd_resp_addr;
        rte_iova_t                      hwrm_cmd_resp_dma_addr;
        void                            *hwrm_short_cmd_req_addr;
@@ -312,7 +326,7 @@ struct bnxt {
        uint8_t                 tx_cosq_id;
 
        uint16_t                fw_fid;
-       uint8_t                 dflt_mac_addr[ETHER_ADDR_LEN];
+       uint8_t                 dflt_mac_addr[RTE_ETHER_ADDR_LEN];
        uint16_t                max_rsscos_ctx;
        uint16_t                max_cp_rings;
        uint16_t                max_tx_rings;