aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Krawczyk <kamil.krawczyk@intel.com>2014-04-23 00:50:14 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-06-05 05:27:39 -0400
commit4f4e17bd1244ce7393349267a214e4f5286a5e3d (patch)
tree475573fa6ab90d8f41ada3db0ca88bfe6c3f9edd
parent263fc48f97f603c348e44ed1f06f06320beed662 (diff)
i40e/i40evf: VEB structure added, GTIME macro update
Structure for VEB context added. Update macro for transition from ms to GTIME (us) time units. Change-ID: Ib3a19587b4cf355348655df8f60c6f37bb1497a3 Signed-off-by: Kamil Krawczyk <kamil.krawczyk@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_type.h14
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40e_type.h14
2 files changed, 24 insertions, 4 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 71f9718caf0a..02e8f9a40b8d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -60,8 +60,8 @@
60/* Max default timeout in ms, */ 60/* Max default timeout in ms, */
61#define I40E_MAX_NVM_TIMEOUT 18000 61#define I40E_MAX_NVM_TIMEOUT 18000
62 62
63/* Switch from mc to the 2usec global time (this is the GTIME resolution) */ 63/* Switch from ms to the 1usec global time (this is the GTIME resolution) */
64#define I40E_MS_TO_GTIME(time) (((time) * 1000) / 2) 64#define I40E_MS_TO_GTIME(time) ((time) * 1000)
65 65
66/* forward declaration */ 66/* forward declaration */
67struct i40e_hw; 67struct i40e_hw;
@@ -955,6 +955,16 @@ struct i40e_vsi_context {
955 struct i40e_aqc_vsi_properties_data info; 955 struct i40e_aqc_vsi_properties_data info;
956}; 956};
957 957
958struct i40e_veb_context {
959 u16 seid;
960 u16 uplink_seid;
961 u16 veb_number;
962 u16 vebs_allocated;
963 u16 vebs_unallocated;
964 u16 flags;
965 struct i40e_aqc_get_veb_parameters_completion info;
966};
967
958/* Statistics collected by each port, VSI, VEB, and S-channel */ 968/* Statistics collected by each port, VSI, VEB, and S-channel */
959struct i40e_eth_stats { 969struct i40e_eth_stats {
960 u64 rx_bytes; /* gorc */ 970 u64 rx_bytes; /* gorc */
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index 67082f7bfcef..eb2e9f318084 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -60,8 +60,8 @@
60/* Max default timeout in ms, */ 60/* Max default timeout in ms, */
61#define I40E_MAX_NVM_TIMEOUT 18000 61#define I40E_MAX_NVM_TIMEOUT 18000
62 62
63/* Switch from mc to the 2usec global time (this is the GTIME resolution) */ 63/* Switch from ms to the 1usec global time (this is the GTIME resolution) */
64#define I40E_MS_TO_GTIME(time) (((time) * 1000) / 2) 64#define I40E_MS_TO_GTIME(time) ((time) * 1000)
65 65
66/* forward declaration */ 66/* forward declaration */
67struct i40e_hw; 67struct i40e_hw;
@@ -955,6 +955,16 @@ struct i40e_vsi_context {
955 struct i40e_aqc_vsi_properties_data info; 955 struct i40e_aqc_vsi_properties_data info;
956}; 956};
957 957
958struct i40e_veb_context {
959 u16 seid;
960 u16 uplink_seid;
961 u16 veb_number;
962 u16 vebs_allocated;
963 u16 vebs_unallocated;
964 u16 flags;
965 struct i40e_aqc_get_veb_parameters_completion info;
966};
967
958/* Statistics collected by each port, VSI, VEB, and S-channel */ 968/* Statistics collected by each port, VSI, VEB, and S-channel */
959struct i40e_eth_stats { 969struct i40e_eth_stats {
960 u64 rx_bytes; /* gorc */ 970 u64 rx_bytes; /* gorc */