aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnjali Singhai Jain <anjali.singhai@intel.com>2013-11-16 05:00:47 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-12-06 02:25:17 -0500
commit91612c331070bfd4f20d7bf7dafccde8c45893ac (patch)
tree66a2bce63b09c8e51c676da9382056b1bcfd387f
parentb7b580a5324f5e14ede59bd094a43a9d8ce3fecf (diff)
i40e: sync header files with hardware
Update the PCTYPE table fix fcoe HMC object sizes Change-Id: I1f12cd2653168859661e8700f929b7c65b0e21b7 Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h4
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_type.h11
2 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
index 00ff35006077..f8afbcb053c5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h
@@ -113,8 +113,8 @@ enum i40e_hmc_lan_object_size {
113#define I40E_HMC_L2OBJ_BASE_ALIGNMENT 512 113#define I40E_HMC_L2OBJ_BASE_ALIGNMENT 512
114#define I40E_HMC_OBJ_SIZE_TXQ 128 114#define I40E_HMC_OBJ_SIZE_TXQ 128
115#define I40E_HMC_OBJ_SIZE_RXQ 32 115#define I40E_HMC_OBJ_SIZE_RXQ 32
116#define I40E_HMC_OBJ_SIZE_FCOE_CNTX 128 116#define I40E_HMC_OBJ_SIZE_FCOE_CNTX 64
117#define I40E_HMC_OBJ_SIZE_FCOE_FILT 32 117#define I40E_HMC_OBJ_SIZE_FCOE_FILT 64
118 118
119enum i40e_hmc_lan_rsrc_type { 119enum i40e_hmc_lan_rsrc_type {
120 I40E_HMC_LAN_FULL = 0, 120 I40E_HMC_LAN_FULL = 0,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index f3f22b20f02f..5f81bd52e6f0 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -852,10 +852,7 @@ struct i40e_filter_program_desc {
852 852
853/* Packet Classifier Types for filters */ 853/* Packet Classifier Types for filters */
854enum i40e_filter_pctype { 854enum i40e_filter_pctype {
855 /* Note: Value 0-25 are reserved for future use */ 855 /* Note: Values 0-28 are reserved for future use */
856 I40E_FILTER_PCTYPE_IPV4_TEREDO_UDP = 26,
857 I40E_FILTER_PCTYPE_IPV6_TEREDO_UDP = 27,
858 I40E_FILTER_PCTYPE_NONF_IPV4_1588_UDP = 28,
859 I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP = 29, 856 I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP = 29,
860 I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP = 30, 857 I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP = 30,
861 I40E_FILTER_PCTYPE_NONF_IPV4_UDP = 31, 858 I40E_FILTER_PCTYPE_NONF_IPV4_UDP = 31,
@@ -864,8 +861,7 @@ enum i40e_filter_pctype {
864 I40E_FILTER_PCTYPE_NONF_IPV4_SCTP = 34, 861 I40E_FILTER_PCTYPE_NONF_IPV4_SCTP = 34,
865 I40E_FILTER_PCTYPE_NONF_IPV4_OTHER = 35, 862 I40E_FILTER_PCTYPE_NONF_IPV4_OTHER = 35,
866 I40E_FILTER_PCTYPE_FRAG_IPV4 = 36, 863 I40E_FILTER_PCTYPE_FRAG_IPV4 = 36,
867 /* Note: Value 37 is reserved for future use */ 864 /* Note: Values 37-38 are reserved for future use */
868 I40E_FILTER_PCTYPE_NONF_IPV6_1588_UDP = 38,
869 I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP = 39, 865 I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP = 39,
870 I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP = 40, 866 I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP = 40,
871 I40E_FILTER_PCTYPE_NONF_IPV6_UDP = 41, 867 I40E_FILTER_PCTYPE_NONF_IPV6_UDP = 41,
@@ -877,7 +873,8 @@ enum i40e_filter_pctype {
877 /* Note: Value 47 is reserved for future use */ 873 /* Note: Value 47 is reserved for future use */
878 I40E_FILTER_PCTYPE_FCOE_OX = 48, 874 I40E_FILTER_PCTYPE_FCOE_OX = 48,
879 I40E_FILTER_PCTYPE_FCOE_RX = 49, 875 I40E_FILTER_PCTYPE_FCOE_RX = 49,
880 /* Note: Value 50-62 are reserved for future use */ 876 I40E_FILTER_PCTYPE_FCOE_OTHER = 50,
877 /* Note: Values 51-62 are reserved for future use */
881 I40E_FILTER_PCTYPE_L2_PAYLOAD = 63, 878 I40E_FILTER_PCTYPE_L2_PAYLOAD = 63,
882}; 879};
883 880