diff options
| author | Kevin Scott <kevin.c.scott@intel.com> | 2015-04-07 19:45:38 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-04-14 23:25:45 -0400 |
| commit | 73b23402bb232ce655cf45aaca4f7feee317deb1 (patch) | |
| tree | 12310c6d21679fc58c218a7189b95fc4cf5ff5fc /drivers/net/ethernet | |
| parent | 3169c323cf9dc3b00b0a6a3d434968832daa4147 (diff) | |
i40e/i40evf: Save WR_CSR_PROT field from DEV/FUNC capabilities
Store the 8 bytes of the WR_CSR_PROT field returned as part of the get
device/function capabilities AQ command.
Change-ID: Ifcaeea2ff29885fa769e4f384c7db88a25e8afd0
Signed-off-by: Kevin Scott <kevin.c.scott@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_common.c | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_type.h | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c index ce522d76811d..0bae22da014d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c | |||
| @@ -2397,6 +2397,7 @@ i40e_aq_erase_nvm_exit: | |||
| 2397 | #define I40E_DEV_FUNC_CAP_LED 0x61 | 2397 | #define I40E_DEV_FUNC_CAP_LED 0x61 |
| 2398 | #define I40E_DEV_FUNC_CAP_SDP 0x62 | 2398 | #define I40E_DEV_FUNC_CAP_SDP 0x62 |
| 2399 | #define I40E_DEV_FUNC_CAP_MDIO 0x63 | 2399 | #define I40E_DEV_FUNC_CAP_MDIO 0x63 |
| 2400 | #define I40E_DEV_FUNC_CAP_WR_CSR_PROT 0x64 | ||
| 2400 | 2401 | ||
| 2401 | /** | 2402 | /** |
| 2402 | * i40e_parse_discover_capabilities | 2403 | * i40e_parse_discover_capabilities |
| @@ -2541,6 +2542,10 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, | |||
| 2541 | p->fd_filters_guaranteed = number; | 2542 | p->fd_filters_guaranteed = number; |
| 2542 | p->fd_filters_best_effort = logical_id; | 2543 | p->fd_filters_best_effort = logical_id; |
| 2543 | break; | 2544 | break; |
| 2545 | case I40E_DEV_FUNC_CAP_WR_CSR_PROT: | ||
| 2546 | p->wr_csr_prot = (u64)number; | ||
| 2547 | p->wr_csr_prot |= (u64)logical_id << 32; | ||
| 2548 | break; | ||
| 2544 | default: | 2549 | default: |
| 2545 | break; | 2550 | break; |
| 2546 | } | 2551 | } |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h index 67c7bc9e9c21..568e855da0f3 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_type.h +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h | |||
| @@ -242,6 +242,7 @@ struct i40e_hw_capabilities { | |||
| 242 | u8 rx_buf_chain_len; | 242 | u8 rx_buf_chain_len; |
| 243 | u32 enabled_tcmap; | 243 | u32 enabled_tcmap; |
| 244 | u32 maxtc; | 244 | u32 maxtc; |
| 245 | u64 wr_csr_prot; | ||
| 245 | }; | 246 | }; |
| 246 | 247 | ||
| 247 | struct i40e_mac_info { | 248 | struct i40e_mac_info { |
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h index 9c79cb6abb2b..ec9d83a93379 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_type.h +++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h | |||
| @@ -242,6 +242,7 @@ struct i40e_hw_capabilities { | |||
| 242 | u8 rx_buf_chain_len; | 242 | u8 rx_buf_chain_len; |
| 243 | u32 enabled_tcmap; | 243 | u32 enabled_tcmap; |
| 244 | u32 maxtc; | 244 | u32 maxtc; |
| 245 | u64 wr_csr_prot; | ||
| 245 | }; | 246 | }; |
| 246 | 247 | ||
| 247 | struct i40e_mac_info { | 248 | struct i40e_mac_info { |
