d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/qede/base: add APIs for dscp priority map configuration

Browse Source 
Add APIs for dscp priority map configuration. APIs added are
ecore_dcbx_get_dscp_priority(), ecore_dcbx_set_dscp_priority().
These base driver APIs can be used for dscp-map query/config.

Configure the doorbell queue (DORQ) to use vlan-id/priority.

Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>
This commit is contained in:
Rasesh Mody 2018-09-29 08:14:37 +00:00 committed by Ferruh Yigit
parent e290ccf8c6
commit 9aea0e7daf
3 changed files with 85 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
drivers/net/qede/base/ecore_dcbx.c
View File

@ -129,7 +129,7 @@ u8 ecore_dcbx_get_dscp_value(struct ecore_hwfn *p_hwfn, u8 pri)
static void static void
ecore_dcbx_set_params(struct ecore_dcbx_results *p_data, ecore_dcbx_set_params(struct ecore_dcbx_results *p_data,
struct ecore_hwfn *p_hwfn, struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
bool enable, u8 prio, u8 tc, bool enable, u8 prio, u8 tc,
enum dcbx_protocol_type type, enum dcbx_protocol_type type,
enum ecore_pci_personality personality) enum ecore_pci_personality personality)
@ -154,12 +154,19 @@ ecore_dcbx_set_params(struct ecore_dcbx_results *p_data,
/* QM reconf data */ /* QM reconf data */
if (p_hwfn->hw_info.personality == personality) if (p_hwfn->hw_info.personality == personality)
p_hwfn->hw_info.offload_tc = tc; p_hwfn->hw_info.offload_tc = tc;
/* Configure dcbx vlan priority in doorbell block for roce EDPM */
if (OSAL_TEST_BIT(ECORE_MF_UFP_SPECIFIC, &p_hwfn->p_dev->mf_bits) &&
(type == DCBX_PROTOCOL_ROCE)) {
ecore_wr(p_hwfn, p_ptt, DORQ_REG_TAG1_OVRD_MODE, 1);
ecore_wr(p_hwfn, p_ptt, DORQ_REG_PF_PCP_BB_K2, prio << 1);
}
} }
/* Update app protocol data and hw_info fields with the TLV info */ /* Update app protocol data and hw_info fields with the TLV info */
static void static void
ecore_dcbx_update_app_info(struct ecore_dcbx_results *p_data, ecore_dcbx_update_app_info(struct ecore_dcbx_results *p_data,
struct ecore_hwfn *p_hwfn, struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
bool enable, u8 prio, u8 tc, bool enable, u8 prio, u8 tc,
enum dcbx_protocol_type type) enum dcbx_protocol_type type)
{ {
@ -175,7 +182,7 @@ ecore_dcbx_update_app_info(struct ecore_dcbx_results *p_data,
personality = ecore_dcbx_app_update[i].personality; personality = ecore_dcbx_app_update[i].personality;
ecore_dcbx_set_params(p_data, p_hwfn, enable, ecore_dcbx_set_params(p_data, p_hwfn, p_ptt, enable,
prio, tc, type, personality); prio, tc, type, personality);
} }
} }
@ -231,7 +238,7 @@ ecore_dcbx_get_app_protocol_type(struct ecore_hwfn *p_hwfn,
* reconfiguring QM. Get protocol specific data for PF update ramrod command. * reconfiguring QM. Get protocol specific data for PF update ramrod command.
*/ */
static enum _ecore_status_t static enum _ecore_status_t
ecore_dcbx_process_tlv(struct ecore_hwfn *p_hwfn, ecore_dcbx_process_tlv(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
struct ecore_dcbx_results *p_data, struct ecore_dcbx_results *p_data,
struct dcbx_app_priority_entry *p_tbl, u32 pri_tc_tbl, struct dcbx_app_priority_entry *p_tbl, u32 pri_tc_tbl,
int count, u8 dcbx_version) int count, u8 dcbx_version)
@ -280,8 +287,8 @@ ecore_dcbx_process_tlv(struct ecore_hwfn *p_hwfn,
enable = true; enable = true;
} }
ecore_dcbx_update_app_info(p_data, p_hwfn, enable, ecore_dcbx_update_app_info(p_data, p_hwfn, p_ptt,
priority, tc, type); enable, priority, tc, type);
} }
} }
@ -302,8 +309,8 @@ ecore_dcbx_process_tlv(struct ecore_hwfn *p_hwfn,
if (p_data->arr[type].update) if (p_data->arr[type].update)
continue; continue;
enable = (type == DCBX_PROTOCOL_ETH) ? false : !!dcbx_version; /* if no app tlv was present, don't override in FW */
ecore_dcbx_update_app_info(p_data, p_hwfn, enable, ecore_dcbx_update_app_info(p_data, p_hwfn, p_ptt, false,
priority, tc, type); priority, tc, type);
} }
@ -314,7 +321,7 @@ ecore_dcbx_process_tlv(struct ecore_hwfn *p_hwfn,
* reconfiguring QM. Get protocol specific data for PF update ramrod command. * reconfiguring QM. Get protocol specific data for PF update ramrod command.
*/ */
static enum _ecore_status_t static enum _ecore_status_t
ecore_dcbx_process_mib_info(struct ecore_hwfn *p_hwfn) ecore_dcbx_process_mib_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt)
{ {
struct dcbx_app_priority_feature *p_app; struct dcbx_app_priority_feature *p_app;
struct dcbx_app_priority_entry *p_tbl; struct dcbx_app_priority_entry *p_tbl;
@ -338,7 +345,7 @@ ecore_dcbx_process_mib_info(struct ecore_hwfn *p_hwfn)
p_info = &p_hwfn->hw_info; p_info = &p_hwfn->hw_info;
num_entries = GET_MFW_FIELD(p_app->flags, DCBX_APP_NUM_ENTRIES); num_entries = GET_MFW_FIELD(p_app->flags, DCBX_APP_NUM_ENTRIES);
rc = ecore_dcbx_process_tlv(p_hwfn, &data, p_tbl, pri_tc_tbl, rc = ecore_dcbx_process_tlv(p_hwfn, p_ptt, &data, p_tbl, pri_tc_tbl,
num_entries, dcbx_version); num_entries, dcbx_version);
if (rc != ECORE_SUCCESS) if (rc != ECORE_SUCCESS)
return rc; return rc;
@ -879,7 +886,7 @@ ecore_dcbx_mib_update_event(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
if (type == ECORE_DCBX_OPERATIONAL_MIB) { if (type == ECORE_DCBX_OPERATIONAL_MIB) {
ecore_dcbx_get_dscp_params(p_hwfn, &p_hwfn->p_dcbx_info->get); ecore_dcbx_get_dscp_params(p_hwfn, &p_hwfn->p_dcbx_info->get);
rc = ecore_dcbx_process_mib_info(p_hwfn); rc = ecore_dcbx_process_mib_info(p_hwfn, p_ptt);
if (!rc) { if (!rc) {
/* reconfigure tcs of QM queues according /* reconfigure tcs of QM queues according
* to negotiation results * to negotiation results
@ -1540,3 +1547,59 @@ ecore_lldp_set_system_tlvs(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
return rc; return rc;
} }
enum _ecore_status_t
ecore_dcbx_get_dscp_priority(struct ecore_hwfn *p_hwfn,
u8 dscp_index, u8 *p_dscp_pri)
{
struct ecore_dcbx_get *p_dcbx_info;
enum _ecore_status_t rc;
if (dscp_index >= ECORE_DCBX_DSCP_SIZE) {
DP_ERR(p_hwfn, "Invalid dscp index %d\n", dscp_index);
return ECORE_INVAL;
}
p_dcbx_info = OSAL_ALLOC(p_hwfn->p_dev, GFP_KERNEL,
sizeof(*p_dcbx_info));
if (!p_dcbx_info)
return ECORE_NOMEM;
OSAL_MEMSET(p_dcbx_info, 0, sizeof(*p_dcbx_info));
rc = ecore_dcbx_query_params(p_hwfn, p_dcbx_info,
ECORE_DCBX_OPERATIONAL_MIB);
if (rc) {
OSAL_FREE(p_hwfn->p_dev, p_dcbx_info);
return rc;
}
*p_dscp_pri = p_dcbx_info->dscp.dscp_pri_map[dscp_index];
OSAL_FREE(p_hwfn->p_dev, p_dcbx_info);
return ECORE_SUCCESS;
}
enum _ecore_status_t
ecore_dcbx_set_dscp_priority(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
u8 dscp_index, u8 pri_val)
{
struct ecore_dcbx_set dcbx_set;
enum _ecore_status_t rc;
if (dscp_index >= ECORE_DCBX_DSCP_SIZE ||
pri_val >= ECORE_MAX_PFC_PRIORITIES) {
DP_ERR(p_hwfn, "Invalid dscp params: index = %d pri = %d\n",
dscp_index, pri_val);
return ECORE_INVAL;
}
OSAL_MEMSET(&dcbx_set, 0, sizeof(dcbx_set));
rc = ecore_dcbx_get_config_params(p_hwfn, &dcbx_set);
if (rc)
return rc;
dcbx_set.override_flags = ECORE_DCBX_OVERRIDE_DSCP_CFG;
dcbx_set.dscp.dscp_pri_map[dscp_index] = pri_val;
return ecore_dcbx_config_params(p_hwfn, p_ptt, &dcbx_set, 1);
}

10
drivers/net/qede/base/ecore_dcbx_api.h
View File

@ -228,6 +228,16 @@ enum _ecore_status_t
ecore_lldp_set_system_tlvs(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, ecore_lldp_set_system_tlvs(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
struct ecore_lldp_sys_tlvs *p_params); struct ecore_lldp_sys_tlvs *p_params);
/* Returns priority value for a given dscp index */
enum _ecore_status_t
ecore_dcbx_get_dscp_priority(struct ecore_hwfn *p_hwfn,
u8 dscp_index, u8 *p_dscp_pri);
/* Sets priority value for a given dscp index */
enum _ecore_status_t
ecore_dcbx_set_dscp_priority(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
u8 dscp_index, u8 pri_val);
static const struct ecore_dcbx_app_metadata ecore_dcbx_app_update[] = { static const struct ecore_dcbx_app_metadata ecore_dcbx_app_update[] = {
{DCBX_PROTOCOL_ISCSI, "ISCSI", ECORE_PCI_ISCSI}, {DCBX_PROTOCOL_ISCSI, "ISCSI", ECORE_PCI_ISCSI},
{DCBX_PROTOCOL_FCOE, "FCOE", ECORE_PCI_FCOE}, {DCBX_PROTOCOL_FCOE, "FCOE", ECORE_PCI_FCOE},

1
drivers/net/qede/base/reg_addr.h
View File

@ -1233,6 +1233,7 @@
#define NIG_REG_LLH_FUNC_TAG_EN 0x5019b0UL #define NIG_REG_LLH_FUNC_TAG_EN 0x5019b0UL
#define NIG_REG_LLH_FUNC_TAG_VALUE 0x5019d0UL #define NIG_REG_LLH_FUNC_TAG_VALUE 0x5019d0UL
#define DORQ_REG_TAG1_OVRD_MODE 0x1008b4UL #define DORQ_REG_TAG1_OVRD_MODE 0x1008b4UL
#define DORQ_REG_PF_PCP_BB_K2 0x1008c4UL
#define DORQ_REG_PF_EXT_VID_BB_K2 0x1008c8UL #define DORQ_REG_PF_EXT_VID_BB_K2 0x1008c8UL
#define PRS_REG_SEARCH_NON_IP_AS_GFT 0x1f11c0UL #define PRS_REG_SEARCH_NON_IP_AS_GFT 0x1f11c0UL
#define NIG_REG_LLH_PPFID2PFID_TBL_0 0x501970UL #define NIG_REG_LLH_PPFID2PFID_TBL_0 0x501970UL