bond: remove memory allocation for PCI driver

[dpdk.git] / lib / librte_pmd_ixgbe / ixgbe / ixgbe_vf.h

diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.h b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.h
index fa07ae9..3c1c168 100644 (file)
--- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.h
+++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_vf.h
@@ -1,6 +1,6 @@
 /*******************************************************************************
 
-Copyright (c) 2001-2012, Intel Corporation
+Copyright (c) 2001-2014, Intel Corporation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -33,29 +33,29 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef __IXGBE_VF_H__
 #define __IXGBE_VF_H__
-#ident "$Id: ixgbe_vf.h,v 1.34 2012/08/09 17:04:18 cmwyborn Exp $"
+#ident "$Id: ixgbe_vf.h,v 1.37 2013/11/07 08:18:53 jtkirshe Exp $"
 
-#define IXGBE_VF_IRQ_CLEAR_MASK     7
-#define IXGBE_VF_MAX_TX_QUEUES      8
-#define IXGBE_VF_MAX_RX_QUEUES      8
+#define IXGBE_VF_IRQ_CLEAR_MASK        7
+#define IXGBE_VF_MAX_TX_QUEUES 8
+#define IXGBE_VF_MAX_RX_QUEUES 8
 
 /* DCB define */
 #define IXGBE_VF_MAX_TRAFFIC_CLASS     8
 
-#define IXGBE_VFCTRL           0x00000
-#define IXGBE_VFSTATUS         0x00008
-#define IXGBE_VFLINKS          0x00010
-#define IXGBE_VFFRTIMER        0x00048
-#define IXGBE_VFRXMEMWRAP      0x03190
-#define IXGBE_VTEICR           0x00100
-#define IXGBE_VTEICS           0x00104
-#define IXGBE_VTEIMS           0x00108
-#define IXGBE_VTEIMC           0x0010C
-#define IXGBE_VTEIAC           0x00110
-#define IXGBE_VTEIAM           0x00114
+#define IXGBE_VFCTRL           0x00000
+#define IXGBE_VFSTATUS         0x00008
+#define IXGBE_VFLINKS          0x00010
+#define IXGBE_VFFRTIMER                0x00048
+#define IXGBE_VFRXMEMWRAP      0x03190
+#define IXGBE_VTEICR           0x00100
+#define IXGBE_VTEICS           0x00104
+#define IXGBE_VTEIMS           0x00108
+#define IXGBE_VTEIMC           0x0010C
+#define IXGBE_VTEIAC           0x00110
+#define IXGBE_VTEIAM           0x00114
 #define IXGBE_VTEITR(x)                (0x00820 + (4 * (x)))
 #define IXGBE_VTIVAR(x)                (0x00120 + (4 * (x)))
-#define IXGBE_VTIVAR_MISC      0x00140
+#define IXGBE_VTIVAR_MISC      0x00140
 #define IXGBE_VTRSCINT(x)      (0x00180 + (4 * (x)))
 /* define IXGBE_VFPBACL  still says TBD in EAS */
 #define IXGBE_VFRDBAL(x)       (0x01000 + (0x40 * (x)))
@@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define IXGBE_VFRXDCTL(x)      (0x01028 + (0x40 * (x)))
 #define IXGBE_VFSRRCTL(x)      (0x01014 + (0x40 * (x)))
 #define IXGBE_VFRSCCTL(x)      (0x0102C + (0x40 * (x)))
-#define IXGBE_VFPSRTYPE        0x00300
+#define IXGBE_VFPSRTYPE                0x00300
 #define IXGBE_VFTDBAL(x)       (0x02000 + (0x40 * (x)))
 #define IXGBE_VFTDBAH(x)       (0x02004 + (0x40 * (x)))
 #define IXGBE_VFTDLEN(x)       (0x02008 + (0x40 * (x)))
@@ -77,13 +77,16 @@ POSSIBILITY OF SUCH DAMAGE.
 #define IXGBE_VFTDWBAH(x)      (0x0203C + (0x40 * (x)))
 #define IXGBE_VFDCA_RXCTRL(x)  (0x0100C + (0x40 * (x)))
 #define IXGBE_VFDCA_TXCTRL(x)  (0x0200c + (0x40 * (x)))
-#define IXGBE_VFGPRC           0x0101C
-#define IXGBE_VFGPTC           0x0201C
-#define IXGBE_VFGORC_LSB       0x01020
-#define IXGBE_VFGORC_MSB       0x01024
-#define IXGBE_VFGOTC_LSB       0x02020
-#define IXGBE_VFGOTC_MSB       0x02024
-#define IXGBE_VFMPRC           0x01034
+#define IXGBE_VFGPRC           0x0101C
+#define IXGBE_VFGPTC           0x0201C
+#define IXGBE_VFGORC_LSB       0x01020
+#define IXGBE_VFGORC_MSB       0x01024
+#define IXGBE_VFGOTC_LSB       0x02020
+#define IXGBE_VFGOTC_MSB       0x02024
+#define IXGBE_VFMPRC           0x01034
+#define IXGBE_VFMRQC           0x3000
+#define IXGBE_VFRSSRK(x)       (0x3100 + ((x) * 4))
+#define IXGBE_VFRETA(x)        (0x3200 + ((x) * 4))
 
 
 struct ixgbevf_hw_stats {
@@ -120,7 +123,7 @@ u32 ixgbe_get_num_of_tx_queues_vf(struct ixgbe_hw *hw);
 u32 ixgbe_get_num_of_rx_queues_vf(struct ixgbe_hw *hw);
 s32 ixgbe_get_mac_addr_vf(struct ixgbe_hw *hw, u8 *mac_addr);
 s32 ixgbe_setup_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed speed,
-                           bool autoneg, bool autoneg_wait_to_complete);
+                           bool autoneg_wait_to_complete);
 s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, ixgbe_link_speed *speed,
                            bool *link_up, bool autoneg_wait_to_complete);
 s32 ixgbe_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,
@@ -135,4 +138,8 @@ int ixgbevf_negotiate_api_version(struct ixgbe_hw *hw, int api);
 int ixgbevf_get_queues(struct ixgbe_hw *hw, unsigned int *num_tcs,
                       unsigned int *default_tc);
 
+#ifdef IXGBEVF_OSDEP2
+#include "ixgbevf_osdep2.h"
+
+#endif /* IXGBEVF_OSDEP2 */
 #endif /* __IXGBE_VF_H__ */