Skip to content

L
linux
Commit 406e734a authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files
Options

i40e: define function capabilities in only one place 

The device capabilities were defined in two places, and neither had all
the definitions.  It really belongs with the AQ API definition, so this
patch removes the other set of definitions and fills out the missing item.

Change-ID: I273ba7d79a476cd11d2e0ca5825fec1716740de2
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 209dc4da
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 57 deletions
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
View file @ 406e734a
...@@ -422,6 +422,7 @@ struct i40e_aqc_list_capabilities_element_resp { ...@@ -422,6 +422,7 @@ struct i40e_aqc_list_capabilities_element_resp {
#define I40E_AQ_CAP_ID_LED 0x0061 #define I40E_AQ_CAP_ID_LED 0x0061
#define I40E_AQ_CAP_ID_SDP 0x0062 #define I40E_AQ_CAP_ID_SDP 0x0062
#define I40E_AQ_CAP_ID_MDIO 0x0063 #define I40E_AQ_CAP_ID_MDIO 0x0063
#define I40E_AQ_CAP_ID_WSR_PROT 0x0064
#define I40E_AQ_CAP_ID_FLEX10 0x00F1 #define I40E_AQ_CAP_ID_FLEX10 0x00F1
#define I40E_AQ_CAP_ID_CEM 0x00F2 #define I40E_AQ_CAP_ID_CEM 0x00F2
......
drivers/net/ethernet/intel/i40e/i40e_common.c
View file @ 406e734a
...@@ -2765,35 +2765,6 @@ i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer, ...@@ -2765,35 +2765,6 @@ i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer,
return status; return status;
} }
#define I40E_DEV_FUNC_CAP_SWITCH_MODE 0x01
#define I40E_DEV_FUNC_CAP_MGMT_MODE 0x02
#define I40E_DEV_FUNC_CAP_NPAR 0x03
#define I40E_DEV_FUNC_CAP_OS2BMC 0x04
#define I40E_DEV_FUNC_CAP_VALID_FUNC 0x05
#define I40E_DEV_FUNC_CAP_SRIOV_1_1 0x12
#define I40E_DEV_FUNC_CAP_VF 0x13
#define I40E_DEV_FUNC_CAP_VMDQ 0x14
#define I40E_DEV_FUNC_CAP_802_1_QBG 0x15
#define I40E_DEV_FUNC_CAP_802_1_QBH 0x16
#define I40E_DEV_FUNC_CAP_VSI 0x17
#define I40E_DEV_FUNC_CAP_DCB 0x18
#define I40E_DEV_FUNC_CAP_FCOE 0x21
#define I40E_DEV_FUNC_CAP_ISCSI 0x22
#define I40E_DEV_FUNC_CAP_RSS 0x40
#define I40E_DEV_FUNC_CAP_RX_QUEUES 0x41
#define I40E_DEV_FUNC_CAP_TX_QUEUES 0x42
#define I40E_DEV_FUNC_CAP_MSIX 0x43
#define I40E_DEV_FUNC_CAP_MSIX_VF 0x44
#define I40E_DEV_FUNC_CAP_FLOW_DIRECTOR 0x45
#define I40E_DEV_FUNC_CAP_IEEE_1588 0x46
#define I40E_DEV_FUNC_CAP_FLEX10 0xF1
#define I40E_DEV_FUNC_CAP_CEM 0xF2
#define I40E_DEV_FUNC_CAP_IWARP 0x51
#define I40E_DEV_FUNC_CAP_LED 0x61
#define I40E_DEV_FUNC_CAP_SDP 0x62
#define I40E_DEV_FUNC_CAP_MDIO 0x63
#define I40E_DEV_FUNC_CAP_WR_CSR_PROT 0x64
/** /**
* i40e_parse_discover_capabilities * i40e_parse_discover_capabilities
* @hw: pointer to the hw struct * @hw: pointer to the hw struct
...@@ -2832,79 +2803,79 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, ...@@ -2832,79 +2803,79 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
major_rev = cap->major_rev; major_rev = cap->major_rev;
switch (id) { switch (id) {
case I40E_DEV_FUNC_CAP_SWITCH_MODE: case I40E_AQ_CAP_ID_SWITCH_MODE:
p->switch_mode = number; p->switch_mode = number;
break; break;
case I40E_DEV_FUNC_CAP_MGMT_MODE: case I40E_AQ_CAP_ID_MNG_MODE:
p->management_mode = number; p->management_mode = number;
break; break;
case I40E_DEV_FUNC_CAP_NPAR: case I40E_AQ_CAP_ID_NPAR_ACTIVE:
p->npar_enable = number; p->npar_enable = number;
break; break;
case I40E_DEV_FUNC_CAP_OS2BMC: case I40E_AQ_CAP_ID_OS2BMC_CAP:
p->os2bmc = number; p->os2bmc = number;
break; break;
case I40E_DEV_FUNC_CAP_VALID_FUNC: case I40E_AQ_CAP_ID_FUNCTIONS_VALID:
p->valid_functions = number; p->valid_functions = number;
break; break;
case I40E_DEV_FUNC_CAP_SRIOV_1_1: case I40E_AQ_CAP_ID_SRIOV:
if (number == 1) if (number == 1)
p->sr_iov_1_1 = true; p->sr_iov_1_1 = true;
break; break;
case I40E_DEV_FUNC_CAP_VF: case I40E_AQ_CAP_ID_VF:
p->num_vfs = number; p->num_vfs = number;
p->vf_base_id = logical_id; p->vf_base_id = logical_id;
break; break;
case I40E_DEV_FUNC_CAP_VMDQ: case I40E_AQ_CAP_ID_VMDQ:
if (number == 1) if (number == 1)
p->vmdq = true; p->vmdq = true;
break; break;
case I40E_DEV_FUNC_CAP_802_1_QBG: case I40E_AQ_CAP_ID_8021QBG:
if (number == 1) if (number == 1)
p->evb_802_1_qbg = true; p->evb_802_1_qbg = true;
break; break;
case I40E_DEV_FUNC_CAP_802_1_QBH: case I40E_AQ_CAP_ID_8021QBR:
if (number == 1) if (number == 1)
p->evb_802_1_qbh = true; p->evb_802_1_qbh = true;
break; break;
case I40E_DEV_FUNC_CAP_VSI: case I40E_AQ_CAP_ID_VSI:
p->num_vsis = number; p->num_vsis = number;
break; break;
case I40E_DEV_FUNC_CAP_DCB: case I40E_AQ_CAP_ID_DCB:
if (number == 1) { if (number == 1) {
p->dcb = true; p->dcb = true;
p->enabled_tcmap = logical_id; p->enabled_tcmap = logical_id;
p->maxtc = phys_id; p->maxtc = phys_id;
} }
break; break;
case I40E_DEV_FUNC_CAP_FCOE: case I40E_AQ_CAP_ID_FCOE:
if (number == 1) if (number == 1)
p->fcoe = true; p->fcoe = true;
break; break;
case I40E_DEV_FUNC_CAP_ISCSI: case I40E_AQ_CAP_ID_ISCSI:
if (number == 1) if (number == 1)
p->iscsi = true; p->iscsi = true;
break; break;
case I40E_DEV_FUNC_CAP_RSS: case I40E_AQ_CAP_ID_RSS:
p->rss = true; p->rss = true;
p->rss_table_size = number; p->rss_table_size = number;
p->rss_table_entry_width = logical_id; p->rss_table_entry_width = logical_id;
break; break;
case I40E_DEV_FUNC_CAP_RX_QUEUES: case I40E_AQ_CAP_ID_RXQ:
p->num_rx_qp = number; p->num_rx_qp = number;
p->base_queue = phys_id; p->base_queue = phys_id;
break; break;
case I40E_DEV_FUNC_CAP_TX_QUEUES: case I40E_AQ_CAP_ID_TXQ:
p->num_tx_qp = number; p->num_tx_qp = number;
p->base_queue = phys_id; p->base_queue = phys_id;
break; break;
case I40E_DEV_FUNC_CAP_MSIX: case I40E_AQ_CAP_ID_MSIX:
p->num_msix_vectors = number; p->num_msix_vectors = number;
break; break;
case I40E_DEV_FUNC_CAP_MSIX_VF: case I40E_AQ_CAP_ID_VF_MSIX:
p->num_msix_vectors_vf = number; p->num_msix_vectors_vf = number;
break; break;
case I40E_DEV_FUNC_CAP_FLEX10: case I40E_AQ_CAP_ID_FLEX10:
if (major_rev == 1) { if (major_rev == 1) {
if (number == 1) { if (number == 1) {
p->flex10_enable = true; p->flex10_enable = true;
...@@ -2920,38 +2891,38 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, ...@@ -2920,38 +2891,38 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
p->flex10_mode = logical_id; p->flex10_mode = logical_id;
p->flex10_status = phys_id; p->flex10_status = phys_id;
break; break;
case I40E_DEV_FUNC_CAP_CEM: case I40E_AQ_CAP_ID_CEM:
if (number == 1) if (number == 1)
p->mgmt_cem = true; p->mgmt_cem = true;
break; break;
case I40E_DEV_FUNC_CAP_IWARP: case I40E_AQ_CAP_ID_IWARP:
if (number == 1) if (number == 1)
p->iwarp = true; p->iwarp = true;
break; break;
case I40E_DEV_FUNC_CAP_LED: case I40E_AQ_CAP_ID_LED:
if (phys_id < I40E_HW_CAP_MAX_GPIO) if (phys_id < I40E_HW_CAP_MAX_GPIO)
p->led[phys_id] = true; p->led[phys_id] = true;
break; break;
case I40E_DEV_FUNC_CAP_SDP: case I40E_AQ_CAP_ID_SDP:
if (phys_id < I40E_HW_CAP_MAX_GPIO) if (phys_id < I40E_HW_CAP_MAX_GPIO)
p->sdp[phys_id] = true; p->sdp[phys_id] = true;
break; break;
case I40E_DEV_FUNC_CAP_MDIO: case I40E_AQ_CAP_ID_MDIO:
if (number == 1) { if (number == 1) {
p->mdio_port_num = phys_id; p->mdio_port_num = phys_id;
p->mdio_port_mode = logical_id; p->mdio_port_mode = logical_id;
} }
break; break;
case I40E_DEV_FUNC_CAP_IEEE_1588: case I40E_AQ_CAP_ID_1588:
if (number == 1) if (number == 1)
p->ieee_1588 = true; p->ieee_1588 = true;
break; break;
case I40E_DEV_FUNC_CAP_FLOW_DIRECTOR: case I40E_AQ_CAP_ID_FLOW_DIRECTOR:
p->fd = true; p->fd = true;
p->fd_filters_guaranteed = number; p->fd_filters_guaranteed = number;
p->fd_filters_best_effort = logical_id; p->fd_filters_best_effort = logical_id;
break; break;
case I40E_DEV_FUNC_CAP_WR_CSR_PROT: case I40E_AQ_CAP_ID_WSR_PROT:
p->wr_csr_prot = (u64)number; p->wr_csr_prot = (u64)number;
p->wr_csr_prot |= (u64)logical_id << 32; p->wr_csr_prot |= (u64)logical_id << 32;
break; break;
......
drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
View file @ 406e734a
...@@ -419,6 +419,7 @@ struct i40e_aqc_list_capabilities_element_resp { ...@@ -419,6 +419,7 @@ struct i40e_aqc_list_capabilities_element_resp {
#define I40E_AQ_CAP_ID_LED 0x0061 #define I40E_AQ_CAP_ID_LED 0x0061
#define I40E_AQ_CAP_ID_SDP 0x0062 #define I40E_AQ_CAP_ID_SDP 0x0062
#define I40E_AQ_CAP_ID_MDIO 0x0063 #define I40E_AQ_CAP_ID_MDIO 0x0063
#define I40E_AQ_CAP_ID_WSR_PROT 0x0064
#define I40E_AQ_CAP_ID_FLEX10 0x00F1 #define I40E_AQ_CAP_ID_FLEX10 0x00F1
#define I40E_AQ_CAP_ID_CEM 0x00F2 #define I40E_AQ_CAP_ID_CEM 0x00F2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7