date:20161203

Hi,

This patch set consists of enhancements, new 8.14.x.x firmware support
and semantic changes. It update the QEDE PMD version to 2.0.0.1.

Please include in DPDK 17.02 release.

Thanks!
Rasesh

Rasesh Mody (25):
  net/qede/base: add request for PF FLR before load request
  net/qede/base: improve set field macro
  net/qede/base: add handling of malicious VF
  net/qede/base: change return codes in SR-IOV
  net/qede/base: make API non-static
  net/qede/base: rename macro
  net/qede/base: add check to validate txq
  net/qede/base: fix updating VF queue zone id
  net/qede/base: improve Tx-switching performance
  net/qede/base: semantic change
  net/qede: remove unused struct member
  net/qede/base: enhance resource info set printouts
  net/qede/base: add new enum member to status codes
  net/qede/base: add macros for converting pointer
  net/qede: add new host ring type option
  net/qede/base: add check for get nvm info return code
  net/qede/base: retrieve FW crash dump info
  net/qede/base: add support for external PHY
  net/qede/base: add support for 2x10G mode
  net/qede: add PCI ids for new chip variant
  net/qede: add 50G device PCI id
  net/qede/base: add support for new firmware
  net/qede/base: semantic/formatting changes
  net/qede/base: dcbx changes for base driver
  net/qede: update PMD version to 2.0.0.1

 config/common_base|   2 +-
 doc/guides/nics/qede.rst  |  12 +-
 drivers/net/qede/base/bcm_osal.h  |   1 +
 drivers/net/qede/base/common_hsi.h|  11 +-
 drivers/net/qede/base/ecore.h |  21 +-
 drivers/net/qede/base/ecore_chain.h   |   9 +-
 drivers/net/qede/base/ecore_dcbx.c| 390 +++---
 drivers/net/qede/base/ecore_dcbx.h|   6 -
 drivers/net/qede/base/ecore_dcbx_api.h|   1 +
 drivers/net/qede/base/ecore_dev.c | 349 +--
 drivers/net/qede/base/ecore_dev_api.h |   9 +-
 drivers/net/qede/base/ecore_gtt_reg_addr.h|  20 +-
 drivers/net/qede/base/ecore_hsi_common.h  |  95 ---
 drivers/net/qede/base/ecore_hsi_debug_tools.h |  26 +-
 drivers/net/qede/base/ecore_hsi_eth.h |  10 +-
 drivers/net/qede/base/ecore_hsi_init_tool.h   |  82 +++---
 drivers/net/qede/base/ecore_hw.c  |   6 +-
 drivers/net/qede/base/ecore_init_fw_funcs.c   |  45 +--
 drivers/net/qede/base/ecore_init_ops.c|  26 +-
 drivers/net/qede/base/ecore_int.c |   6 +-
 drivers/net/qede/base/ecore_iov_api.h |  15 +-
 drivers/net/qede/base/ecore_iro_values.h  |   4 +-
 drivers/net/qede/base/ecore_l2.c  |  48 ++--
 drivers/net/qede/base/ecore_l2_api.h  |  20 +-
 drivers/net/qede/base/ecore_mcp.c |  86 +++---
 drivers/net/qede/base/ecore_mcp.h |  25 +-
 drivers/net/qede/base/ecore_mcp_api.h |  33 ++-
 drivers/net/qede/base/ecore_sp_commands.c |   4 +-
 drivers/net/qede/base/ecore_spq.c |  23 +-
 drivers/net/qede/base/ecore_sriov.c   | 211 ++
 drivers/net/qede/base/ecore_sriov.h   |   5 +-
 drivers/net/qede/base/ecore_status.h  |   1 +
 drivers/net/qede/base/ecore_utils.h   |   6 +
 drivers/net/qede/base/ecore_vf.c  |  43 ++-
 drivers/net/qede/base/eth_common.h|  34 ++-
 drivers/net/qede/base/mcp_public.h| 350 +--
 drivers/net/qede/base/nvm_cfg.h   |  68 -
 drivers/net/qede/qede_eth_if.c|   1 +
 drivers/net/qede/qede_ethdev.c|  32 ++-
 drivers/net/qede/qede_ethdev.h|  53 ++--
 drivers/net/qede/qede_if.h|  18 +-
 drivers/net/qede/qede_main.c  |  13 +-
 drivers/net/qede/qede_rxtx.c  |   9 +-
 43 files changed, 1286 insertions(+), 943 deletions(-)

-- 
2.11.0.rc1

[dpdk-dev] [PATCH 01/25] net/qede/base: add request for PF FLR before load request

Add a request for PF FLR before a load request

Fix the location of the PF FLR initiation to be after ecore_get_hw_info()
(which invokes ecore_hw_info_port_num())

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_dev.c | 16 ++--
 drivers/net/qede/base/ecore_dev_api.h |  2 ++
 drivers/net/qede/base/ecore_mcp.c |  4 ++--
 drivers/net/qede/base/ecore_mcp.h | 11 +++
 drivers/net/qede/qede_main.c  |  1 +
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 58b93877..d7a95fed 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2998,12 +2998,6 @@ ecore_hw_prepare_single(struct ecore_hwfn *p_hwfn, void 
OSAL_IOMEM *p_regview,
goto err1;
}
 
-   if (p_hwfn == ECORE_LEADING_HWFN(p_dev) && !p_dev->recov_in_prog) {
-   rc = ecore_mcp_initiate_pf_flr(p_hwfn, p_hwfn->p_main_ptt);
-   if (rc != ECORE_SUCCESS)
-   DP_NOTICE(p_hwfn, false, "Failed to initiate PF FLR\n");
-   }
-
/* Read the device configuration information from the HW and SHMEM */
rc = ecore_get_hw_info(p_hwfn, p_hwfn->p_main_ptt,
   p_params->personality, p_params->drv_resc_alloc);
@@ -3012,6 +3006,16 @@ ecore_hw_prepare_single(struct ecore_hwfn *p_hwfn, void 
OSAL_IOMEM *p_regview,
goto err2;
}
 
+   /* Sending a mailbox to the MFW should be after ecore_get_hw_info() is
+* called, since among others it sets the ports number in an engine.
+*/
+   if (p_params->initiate_pf_flr && p_hwfn == ECORE_LEADING_HWFN(p_dev) &&
+   !p_dev->recov_in_prog) {
+   rc = ecore_mcp_initiate_pf_flr(p_hwfn, p_hwfn->p_main_ptt);
+   if (rc != ECORE_SUCCESS)
+   DP_NOTICE(p_hwfn, false, "Failed to initiate PF FLR\n");
+   }
+
/* Allocate the init RT array and initialize the init-ops engine */
rc = ecore_init_alloc(p_hwfn);
if (rc) {
diff --git a/drivers/net/qede/base/ecore_dev_api.h 
b/drivers/net/qede/base/ecore_dev_api.h
index 042c0af2..cbddd242 100644
--- a/drivers/net/qede/base/ecore_dev_api.h
+++ b/drivers/net/qede/base/ecore_dev_api.h
@@ -147,6 +147,8 @@ struct ecore_hw_prepare_params {
bool drv_resc_alloc;
/* check the reg_fifo after any register access */
bool chk_reg_fifo;
+   /* request the MFW to initiate PF FLR */
+   bool initiate_pf_flr;
 };
 
 /**
diff --git a/drivers/net/qede/base/ecore_mcp.c 
b/drivers/net/qede/base/ecore_mcp.c
index 2ff97155..a5d707b2 100644
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -2448,6 +2448,6 @@ enum _ecore_status_t ecore_mcp_initiate_pf_flr(struct 
ecore_hwfn *p_hwfn,
 {
u32 mcp_resp, mcp_param;
 
-   return ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_INITIATE_PF_FLR,
-0, &mcp_resp, &mcp_param);
+   return ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_INITIATE_PF_FLR, 0,
+&mcp_resp, &mcp_param);
 }
diff --git a/drivers/net/qede/base/ecore_mcp.h 
b/drivers/net/qede/base/ecore_mcp.h
index 831890ca..ae33e84d 100644
--- a/drivers/net/qede/base/ecore_mcp.h
+++ b/drivers/net/qede/base/ecore_mcp.h
@@ -348,6 +348,17 @@ enum _ecore_status_t ecore_mcp_mdump_clear_logs(struct 
ecore_hwfn *p_hwfn,
 enum _ecore_status_t ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn,
  struct ecore_ptt *p_ptt);
 
+/**
+ * @brief - Gets the MFW allocation info for the given resource
+ *
+ *  @param p_hwfn
+ *  @param p_ptt
+ *  @param p_resc_info
+ *  @param p_mcp_resp
+ *  @param p_mcp_param
+ *
+ * @return enum _ecore_status_t - ECORE_SUCCESS - operation was successful.
+ */
 enum _ecore_status_t ecore_mcp_get_resc_info(struct ecore_hwfn *p_hwfn,
 struct ecore_ptt *p_ptt,
 struct resource_info *p_resc_info,
diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index 2c883296..40c3e1f2 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -62,6 +62,7 @@ qed_probe(struct ecore_dev *edev, struct rte_pci_device 
*pci_dev,
hw_prepare_params.personality = ECORE_PCI_ETH;
hw_prepare_params.drv_resc_alloc = false;
hw_prepare_params.chk_reg_fifo = false;
+   hw_prepare_params.initiate_pf_flr = true;
rc = ecore_hw_prepare(edev, &hw_prepare_params);
if (rc) {
DP_ERR(edev, "hw prepare failed\n");
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 02/25] net/qede/base: improve set field macro

Improve robustness of the SET_FIELD macro by using a mask.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 907b35b9..c9f3b003 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -80,7 +80,7 @@ enum ecore_nvm_cmd {
 #define SET_FIELD(value, name, flag)   \
 do {   \
(value) &= ~(name##_MASK << name##_SHIFT);  \
-   (value) |= (((u64)flag) << (name##_SHIFT)); \
+   (value) |= u64)flag) & (u64)name##_MASK) << (name##_SHIFT));\
 } while (0)
 
 #define GET_FIELD(value, name) \
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 04/25] net/qede/base: change return codes in SR-IOV

Change return codes in VF/SR-IOV base driver from int to
enum _ecore_status_t.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_sriov.c | 19 +++
 drivers/net/qede/base/ecore_sriov.h |  4 ++--
 drivers/net/qede/base/ecore_vf.c| 33 ++---
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/drivers/net/qede/base/ecore_sriov.c 
b/drivers/net/qede/base/ecore_sriov.c
index 38c2db3d..afc1db3f 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -1707,9 +1707,10 @@ ecore_iov_reconfigure_unicast_shadow(struct ecore_hwfn 
*p_hwfn,
return rc;
 }
 
-static int ecore_iov_configure_vport_forced(struct ecore_hwfn *p_hwfn,
-   struct ecore_vf_info *p_vf,
-   u64 events)
+static  enum _ecore_status_t
+ecore_iov_configure_vport_forced(struct ecore_hwfn *p_hwfn,
+struct ecore_vf_info *p_vf,
+u64 events)
 {
enum _ecore_status_t rc = ECORE_SUCCESS;
struct ecore_filter_ucast filter;
@@ -3141,9 +3142,10 @@ ecore_iov_single_vf_flr_cleanup(struct ecore_hwfn 
*p_hwfn,
return rc;
 }
 
-int ecore_iov_mark_vf_flr(struct ecore_hwfn *p_hwfn, u32 *p_disabled_vfs)
+bool ecore_iov_mark_vf_flr(struct ecore_hwfn *p_hwfn, u32 *p_disabled_vfs)
 {
-   u16 i, found = 0;
+   bool found;
+   u16 i;
 
DP_VERBOSE(p_hwfn, ECORE_MSG_IOV, "Marking FLR-ed VFs\n");
for (i = 0; i < (VF_MAX_STATIC / 32); i++)
@@ -3153,7 +3155,7 @@ int ecore_iov_mark_vf_flr(struct ecore_hwfn *p_hwfn, u32 
*p_disabled_vfs)
 
if (!p_hwfn->p_dev->p_iov_info) {
DP_NOTICE(p_hwfn, true, "VF flr but no IOV\n");
-   return 0;
+   return false;
}
 
/* Mark VFs */
@@ -3182,7 +3184,7 @@ int ecore_iov_mark_vf_flr(struct ecore_hwfn *p_hwfn, u32 
*p_disabled_vfs)
 * VF flr until ACKs, we're safe.
 */
p_flr[rel_vf_id / 64] |= 1ULL << (rel_vf_id % 64);
-   found = 1;
+   found = true;
}
}
 
@@ -3961,7 +3963,8 @@ bool ecore_iov_is_vf_initialized(struct ecore_hwfn 
*p_hwfn, u16 rel_vf_id)
return (p_vf->state == VF_ENABLED);
 }
 
-int ecore_iov_get_vf_min_rate(struct ecore_hwfn *p_hwfn, int vfid)
+enum _ecore_status_t
+ecore_iov_get_vf_min_rate(struct ecore_hwfn *p_hwfn, int vfid)
 {
struct ecore_wfq_data *vf_vp_wfq;
struct ecore_vf_info *vf_info;
diff --git a/drivers/net/qede/base/ecore_sriov.h 
b/drivers/net/qede/base/ecore_sriov.h
index 3c5c68f9..884a90cb 100644
--- a/drivers/net/qede/base/ecore_sriov.h
+++ b/drivers/net/qede/base/ecore_sriov.h
@@ -277,8 +277,8 @@ u32 ecore_crc32(u32 crc,
  *
  * @return 1 iff one of the PF's vfs got FLRed. 0 otherwise.
  */
-int ecore_iov_mark_vf_flr(struct ecore_hwfn *p_hwfn,
- u32 *disabled_vfs);
+bool ecore_iov_mark_vf_flr(struct ecore_hwfn *p_hwfn,
+  u32 *disabled_vfs);
 
 /**
  * @brief Search extended TLVs in request/reply buffer.
diff --git a/drivers/net/qede/base/ecore_vf.c b/drivers/net/qede/base/ecore_vf.c
index c26b602b..4c44ee7a 100644
--- a/drivers/net/qede/base/ecore_vf.c
+++ b/drivers/net/qede/base/ecore_vf.c
@@ -65,13 +65,15 @@ static void ecore_vf_pf_req_end(struct ecore_hwfn *p_hwfn,
OSAL_MUTEX_RELEASE(&p_hwfn->vf_iov_info->mutex);
 }
 
-static int ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
-u8 *done, u32 resp_size)
+static enum _ecore_status_t
+ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
+ u8 *done, u32 resp_size)
 {
union vfpf_tlvs *p_req = p_hwfn->vf_iov_info->vf2pf_request;
struct ustorm_trigger_vf_zone trigger;
struct ustorm_vf_zone *zone_data;
-   int rc = ECORE_SUCCESS, time = 100;
+   enum _ecore_status_t rc = ECORE_SUCCESS;
+   int time = 100;
 
zone_data = (struct ustorm_vf_zone *)PXP_VF_BAR0_START_USDM_ZONE_B;
 
@@ -475,7 +477,7 @@ enum _ecore_status_t ecore_vf_pf_rxq_start(struct 
ecore_hwfn *p_hwfn,
struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
struct pfvf_start_queue_resp_tlv *resp;
struct vfpf_start_rxq_tlv *req;
-   int rc;
+   enum _ecore_status_t rc;
 
/* clear mailbox and prep first tlv */
req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_START_RXQ, sizeof(*req));
@@ -550,7 +552,7 @@ enum _ecore_status_t ecore_vf_pf_rxq_stop(struct ecore_hwfn 
*p_hwfn,
struct ecore_vf_iov *p_iov = p_hwfn->vf_iov_info;
struct vfpf_stop_rxqs_tlv *req;
struct pfvf_def_resp_tlv *resp;
-   int rc;
+   enum _ecore_status_t rc;
 
/* clear mailbox and prep first tlv */
req = ecore_vf_pf_prep(p_hwfn, CHANNEL_TLV_STOP_RXQS, sizeof(*req));
@@ -591,7 +593,7 @@ enum _ecore_status

[dpdk-dev] [PATCH 07/25] net/qede/base: add check to validate txq

Make sure VF tx_qid and the status block index is in the allocated range,
else fail the request.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_sriov.c | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/qede/base/ecore_sriov.c 
b/drivers/net/qede/base/ecore_sriov.c
index afc1db3f..bdf91647 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -2099,26 +2099,26 @@ static void ecore_iov_vf_mbx_start_txq(struct 
ecore_hwfn *p_hwfn,
pq_params.eth.is_vf = 1;
pq_params.eth.vf_id = vf->relative_vf_id;
 
-   req = &mbx->req_virt->start_txq;
OSAL_MEMSET(&p_params, 0, sizeof(p_params));
+   req = &mbx->req_virt->start_txq;
+
+   if (!ecore_iov_validate_txq(p_hwfn, vf, req->tx_qid) ||
+   !ecore_iov_validate_sb(p_hwfn, vf, req->hw_sb))
+   goto out;
+
p_params.queue_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
p_params.vport_id = vf->vport_id;
p_params.stats_id = vf->abs_vf_id + 0x10,
p_params.sb = req->hw_sb;
p_params.sb_idx = req->sb_index;
 
-   if (!ecore_iov_validate_txq(p_hwfn, vf, req->tx_qid) ||
-   !ecore_iov_validate_sb(p_hwfn, vf, req->hw_sb))
-   goto out;
-
-   rc = ecore_sp_eth_txq_start_ramrod(
-   p_hwfn,
-   vf->opaque_fid,
-   vf->vf_queues[req->tx_qid].fw_cid,
-   &p_params,
-   req->pbl_addr,
-   req->pbl_size,
-   &pq_params);
+   rc = ecore_sp_eth_txq_start_ramrod(p_hwfn,
+  vf->opaque_fid,
+  vf->vf_queues[req->tx_qid].fw_cid,
+  &p_params,
+  req->pbl_addr,
+  req->pbl_size,
+  &pq_params);
 
if (rc)
status = PFVF_STATUS_FAILURE;
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 08/25] net/qede/base: fix updating VF queue zone id

Pass the absolute qzone_id when creating queues.

Fixes: 5cdd769a ("qede: add L2 support")

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_dev.c|  9 ++---
 drivers/net/qede/base/ecore_l2.c | 10 +-
 drivers/net/qede/base/ecore_l2_api.h | 11 +--
 drivers/net/qede/base/ecore_sriov.c  |  1 +
 drivers/net/qede/qede_eth_if.c   |  1 +
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 1d906b73..8b7d1da0 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -542,11 +542,14 @@ enum _ecore_status_t ecore_resc_alloc(struct ecore_dev 
*p_dev)
/* Allocate Memory for the Queue->CID mapping */
for_each_hwfn(p_dev, i) {
struct ecore_hwfn *p_hwfn = &p_dev->hwfns[i];
+   u32 num_tx_conns = RESC_NUM(p_hwfn, ECORE_L2_QUEUE);
+   int tx_size, rx_size;
 
/* @@@TMP - resc management, change to actual required size */
-   int tx_size = sizeof(struct ecore_hw_cid_data) *
-   RESC_NUM(p_hwfn, ECORE_L2_QUEUE);
-   int rx_size = sizeof(struct ecore_hw_cid_data) *
+   if (p_hwfn->pf_params.eth_pf_params.num_cons > num_tx_conns)
+   num_tx_conns = p_hwfn->pf_params.eth_pf_params.num_cons;
+   tx_size = sizeof(struct ecore_hw_cid_data) * num_tx_conns;
+   rx_size = sizeof(struct ecore_hw_cid_data) *
RESC_NUM(p_hwfn, ECORE_L2_QUEUE);
 
p_hwfn->p_tx_cids = OSAL_ZALLOC(p_hwfn->p_dev, GFP_KERNEL,
diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index b139c398..9cb554c6 100644
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -663,7 +663,7 @@ ecore_sp_eth_rx_queue_start(struct ecore_hwfn *p_hwfn,
 
if (IS_VF(p_hwfn->p_dev)) {
return ecore_vf_pf_rxq_start(p_hwfn,
-p_params->queue_id,
+(u8)p_params->queue_id,
 p_params->sb,
 (u8)p_params->sb_idx,
 bd_max_bytes,
@@ -840,9 +840,9 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
struct ecore_spq_entry *p_ent = OSAL_NULL;
struct ecore_sp_init_data init_data;
struct ecore_hw_cid_data *p_tx_cid;
-   u16 pq_id, abs_tx_q_id = 0;
-   u8 abs_vport_id;
+   u16 pq_id, abs_tx_qzone_id = 0;
enum _ecore_status_t rc = ECORE_NOTIMPL;
+   u8 abs_vport_id;
 
/* Store information for the stop */
p_tx_cid = &p_hwfn->p_tx_cids[p_params->queue_id];
@@ -853,7 +853,7 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
if (rc != ECORE_SUCCESS)
return rc;
 
-   rc = ecore_fw_l2_queue(p_hwfn, p_params->queue_id, &abs_tx_q_id);
+   rc = ecore_fw_l2_queue(p_hwfn, p_params->qzone_id, &abs_tx_qzone_id);
if (rc != ECORE_SUCCESS)
return rc;
 
@@ -876,7 +876,7 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
p_ramrod->sb_index = (u8)p_params->sb_idx;
p_ramrod->stats_counter_id = p_params->stats_id;
 
-   p_ramrod->queue_zone_id = OSAL_CPU_TO_LE16(abs_tx_q_id);
+   p_ramrod->queue_zone_id = OSAL_CPU_TO_LE16(abs_tx_qzone_id);
 
p_ramrod->pbl_size = OSAL_CPU_TO_LE16(pbl_size);
DMA_REGPAIR_LE(p_ramrod->pbl_base_addr, pbl_addr);
diff --git a/drivers/net/qede/base/ecore_l2_api.h 
b/drivers/net/qede/base/ecore_l2_api.h
index c12d97c9..247316b8 100644
--- a/drivers/net/qede/base/ecore_l2_api.h
+++ b/drivers/net/qede/base/ecore_l2_api.h
@@ -28,10 +28,17 @@ enum ecore_rss_caps {
 #endif
 
 struct ecore_queue_start_common_params {
-   /* Rx/Tx queue id */
-   u8 queue_id;
+   /* Rx/Tx queue relative id to keep obtained cid in corresponding array
+* RX - upper-bounded by number of FW-queues
+*/
+   u16 queue_id;
u8 vport_id;
 
+   /* q_zone_id is relative, may be different from queue id
+* currently used by Tx-only, upper-bounded by number of FW-queues
+*/
+   u8 qzone_id;
+
/* stats_id is relative or absolute depends on function */
u8 stats_id;
u16 sb;
diff --git a/drivers/net/qede/base/ecore_sriov.c 
b/drivers/net/qede/base/ecore_sriov.c
index bdf91647..0e2b3248 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -2107,6 +2107,7 @@ static void ecore_iov_vf_mbx_start_txq(struct ecore_hwfn 
*p_hwfn,
goto out;
 
p_params.queue_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
+   p_params.qzone_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
p_params.vport_id = vf->vport_id;
p_params.stats_id = vf->abs_vf_id + 0x10,

[dpdk-dev] [PATCH 05/25] net/qede/base: make API non-static

Move ecore_set_fw_mac_addr from ecore_l2.c to ecore_dev.c to
facilitate future code reuse.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore.h |  2 ++
 drivers/net/qede/base/ecore_dev.c | 13 +
 drivers/net/qede/base/ecore_l2.c  | 11 ---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index c9f3b003..19e9e020 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -811,6 +811,8 @@ int ecore_configure_pf_min_bandwidth(struct ecore_dev 
*p_dev, u8 min_bw);
 void ecore_clean_wfq_db(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt);
 int ecore_device_num_engines(struct ecore_dev *p_dev);
 int ecore_device_num_ports(struct ecore_dev *p_dev);
+void ecore_set_fw_mac_addr(__le16 *fw_msb, __le16 *fw_mid, __le16 *fw_lsb,
+  u8 *mac);
 
 #define ECORE_LEADING_HWFN(dev)(&dev->hwfns[0])
 
diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index d7a95fed..1d906b73 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -4297,3 +4297,16 @@ int ecore_device_num_ports(struct ecore_dev *p_dev)
 
return p_dev->num_ports_in_engines * ecore_device_num_engines(p_dev);
 }
+
+void ecore_set_fw_mac_addr(__le16 *fw_msb,
+ __le16 *fw_mid,
+ __le16 *fw_lsb,
+ u8 *mac)
+{
+   ((u8 *)fw_msb)[0] = mac[1];
+   ((u8 *)fw_msb)[1] = mac[0];
+   ((u8 *)fw_mid)[0] = mac[3];
+   ((u8 *)fw_mid)[1] = mac[2];
+   ((u8 *)fw_lsb)[0] = mac[5];
+   ((u8 *)fw_lsb)[1] = mac[4];
+}
diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index 9989ee48..b139c398 100644
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -1012,17 +1012,6 @@ ecore_filter_action(enum ecore_filter_opcode opcode)
return action;
 }
 
-static void ecore_set_fw_mac_addr(__le16 *fw_msb,
- __le16 *fw_mid, __le16 *fw_lsb, u8 *mac)
-{
-   ((u8 *)fw_msb)[0] = mac[1];
-   ((u8 *)fw_msb)[1] = mac[0];
-   ((u8 *)fw_mid)[0] = mac[3];
-   ((u8 *)fw_mid)[1] = mac[2];
-   ((u8 *)fw_lsb)[0] = mac[5];
-   ((u8 *)fw_lsb)[1] = mac[4];
-}
-
 static enum _ecore_status_t
 ecore_filter_ucast_common(struct ecore_hwfn *p_hwfn,
  u16 opaque_fid,
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 06/25] net/qede/base: rename macro

Rename OOO_LB_TC to PKT_LB_TC to give better meaning.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore.h| 2 +-
 drivers/net/qede/base/ecore_hw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 19e9e020..f8307782 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -800,7 +800,7 @@ static OSAL_INLINE u8 ecore_concrete_to_sw_fid(struct 
ecore_dev *p_dev,
 }
 
 #define PURE_LB_TC 8
-#define OOO_LB_TC 9
+#define PKT_LB_TC 9
 
 int ecore_configure_vport_wfq(struct ecore_dev *p_dev, u16 vp_id, u32 rate);
 void ecore_configure_vp_wfq_on_link_change(struct ecore_dev *p_dev,
diff --git a/drivers/net/qede/base/ecore_hw.c b/drivers/net/qede/base/ecore_hw.c
index 7f4db0a0..8abe60a9 100644
--- a/drivers/net/qede/base/ecore_hw.c
+++ b/drivers/net/qede/base/ecore_hw.c
@@ -923,7 +923,7 @@ u16 ecore_get_qm_pq(struct ecore_hwfn *p_hwfn,
case PROTOCOLID_CORE:
if (p_params->core.tc == LB_TC)
pq_id = p_hwfn->qm_info.pure_lb_pq;
-   else if (p_params->core.tc == OOO_LB_TC)
+   else if (p_params->core.tc == PKT_LB_TC)
pq_id = p_hwfn->qm_info.ooo_pq;
else
pq_id = p_hwfn->qm_info.offload_pq;
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 03/25] net/qede/base: add handling of malicious VF

Receive indication that VFs are malicious and pass it to the
caller/clients and stop serving those VF's additional resource requests.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/bcm_osal.h  |   1 +
 drivers/net/qede/base/ecore_iov_api.h |   4 +-
 drivers/net/qede/base/ecore_l2.c  |  26 ++-
 drivers/net/qede/base/ecore_l2_api.h  |   9 +++
 drivers/net/qede/base/ecore_sriov.c   | 123 +-
 drivers/net/qede/base/ecore_sriov.h   |   1 +
 6 files changed, 147 insertions(+), 17 deletions(-)

diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h
index 0b446f2e..7682ea84 100644
--- a/drivers/net/qede/base/bcm_osal.h
+++ b/drivers/net/qede/base/bcm_osal.h
@@ -323,6 +323,7 @@ u32 qede_find_first_zero_bit(unsigned long *, u32);
 #define OSAL_VF_SEND_MSG2PF(dev, done, msg, reply_addr, msg_size, reply_size) 0
 #define OSAL_VF_CQE_COMPLETION(_dev_p, _cqe, _protocol)(0)
 #define OSAL_PF_VF_MSG(hwfn, vfid) 0
+#define OSAL_PF_VF_MALICIOUS(hwfn, vfid) nothing
 #define OSAL_IOV_CHK_UCAST(hwfn, vfid, params) 0
 #define OSAL_IOV_POST_START_VPORT(hwfn, vf, vport_id, opaque_fid) nothing
 #define OSAL_IOV_VF_ACQUIRE(hwfn, vfid) 0
diff --git a/drivers/net/qede/base/ecore_iov_api.h 
b/drivers/net/qede/base/ecore_iov_api.h
index bb8df82f..0b857bb9 100644
--- a/drivers/net/qede/base/ecore_iov_api.h
+++ b/drivers/net/qede/base/ecore_iov_api.h
@@ -52,6 +52,7 @@ enum ecore_iov_pf_to_vf_status {
PFVF_STATUS_NOT_SUPPORTED,
PFVF_STATUS_NO_RESOURCE,
PFVF_STATUS_FORCED,
+   PFVF_STATUS_MALICIOUS,
 };
 
 struct ecore_mcp_link_params;
@@ -301,12 +302,13 @@ bool ecore_iov_is_vf_pending_flr(struct ecore_hwfn 
*p_hwfn,
  * @param p_hwfn
  * @param rel_vf_id - Relative VF ID
  * @param b_enabled_only - consider only enabled VF
+ * @param b_non_malicious - true iff we want to validate vf isn't malicious.
  *
  * @return bool - true for valid VF ID
  */
 bool ecore_iov_is_valid_vfid(struct ecore_hwfn *p_hwfn,
 int rel_vf_id,
-bool b_enabled_only);
+bool b_enabled_only, bool b_non_malicious);
 
 /**
  * @brief Get VF's public info structure
diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index a893cb90..9989ee48 100644
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -36,9 +36,9 @@ ecore_sp_eth_vport_start(struct ecore_hwfn *p_hwfn,
struct vport_start_ramrod_data *p_ramrod = OSAL_NULL;
struct ecore_spq_entry *p_ent = OSAL_NULL;
struct ecore_sp_init_data init_data;
+   u16 rx_mode = 0, tx_err = 0;
u8 abs_vport_id = 0;
enum _ecore_status_t rc = ECORE_NOTIMPL;
-   u16 rx_mode = 0;
 
rc = ecore_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);
if (rc != ECORE_SUCCESS)
@@ -71,6 +71,30 @@ ecore_sp_eth_vport_start(struct ecore_hwfn *p_hwfn,
 
p_ramrod->rx_mode.state = OSAL_CPU_TO_LE16(rx_mode);
 
+   /* Handle requests for strict behavior on transmission errors */
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_ILLEGAL_VLAN_MODE,
+ p_params->b_err_illegal_vlan_mode ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_PACKET_TOO_SMALL,
+ p_params->b_err_small_pkt ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_ANTI_SPOOFING_ERR,
+ p_params->b_err_anti_spoof ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_ILLEGAL_INBAND_TAGS,
+ p_params->b_err_illegal_inband_mode ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_VLAN_INSERTION_W_INBAND_TAG,
+ p_params->b_err_vlan_insert_with_inband ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_MTU_VIOLATION,
+ p_params->b_err_big_pkt ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   SET_FIELD(tx_err, ETH_TX_ERR_VALS_ILLEGAL_CONTROL_FRAME,
+ p_params->b_err_ctrl_frame ?
+ ETH_TX_ERR_ASSERT_MALICIOUS : 0);
+   p_ramrod->tx_err_behav.values = OSAL_CPU_TO_LE16(tx_err);
+
/* TPA related fields */
OSAL_MEMSET(&p_ramrod->tpa_param, 0,
sizeof(struct eth_vport_tpa_param));
diff --git a/drivers/net/qede/base/ecore_l2_api.h 
b/drivers/net/qede/base/ecore_l2_api.h
index c338f5de..c12d97c9 100644
--- a/drivers/net/qede/base/ecore_l2_api.h
+++ b/drivers/net/qede/base/ecore_l2_api.h
@@ -274,6 +274,15 @@ struct ecore_sp_vport_start_params {
bool zero_placement_offset;
bool check_mac;
bool check_ethtype;
+
+   /* Strict behavior on transmission errors */
+   bool b_err_illegal_vlan_mode;
+   bool b_err_illegal_inband_mode;
+   bool b_err_vlan_insert_with_inband;
+

[dpdk-dev] [PATCH 11/25] net/qede: remove unused struct member

Remove b_hw_channel from struct ecore_dev.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore.h|  2 --
 drivers/net/qede/base/ecore_vf.c | 10 --
 drivers/net/qede/qede_main.c |  5 ++---
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index f8307782..71ce24ba 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -711,8 +711,6 @@ struct ecore_dev {
/* SRIOV */
struct ecore_hw_sriov_info  *p_iov_info;
 #define IS_ECORE_SRIOV(p_dev)  (!!(p_dev)->p_iov_info)
-   boolb_hw_channel;
-
unsigned long   tunn_mode;
 
boolb_is_vf;
diff --git a/drivers/net/qede/base/ecore_vf.c b/drivers/net/qede/base/ecore_vf.c
index 4c44ee7a..17ba4d10 100644
--- a/drivers/net/qede/base/ecore_vf.c
+++ b/drivers/net/qede/base/ecore_vf.c
@@ -83,16 +83,6 @@ ecore_send_msg2pf(struct ecore_hwfn *p_hwfn,
/* need to add the END TLV to the message size */
resp_size += sizeof(struct channel_list_end_tlv);
 
-   if (!p_hwfn->p_dev->b_hw_channel) {
-   rc = OSAL_VF_SEND_MSG2PF(p_hwfn->p_dev,
-done,
-p_req,
-p_hwfn->vf_iov_info->pf2vf_reply,
-sizeof(union vfpf_tlvs), resp_size);
-   /* TODO - no prints about message ? */
-   return rc;
-   }
-
/* Send TLVs over HW channel */
OSAL_MEMSET(&trigger, 0, sizeof(struct ustorm_trigger_vf_zone));
trigger.vf_pf_msg_valid = 1;
diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index 40c3e1f2..e836abcf 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -51,10 +51,9 @@ qed_probe(struct ecore_dev *edev, struct rte_pci_device 
*pci_dev,
 
ecore_init_struct(edev);
qdev->protocol = protocol;
-   if (is_vf) {
+   if (is_vf)
edev->b_is_vf = true;
-   edev->b_hw_channel = true; /* @DPDK */
-   }
+
ecore_init_dp(edev, dp_module, dp_level, NULL);
qed_init_pci(edev, pci_dev);
 
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 10/25] net/qede/base: semantic change

Semantic change: No reason to have p_ prefix to non-pointers

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_sriov.c | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/drivers/net/qede/base/ecore_sriov.c 
b/drivers/net/qede/base/ecore_sriov.c
index 0e2b3248..eaad843f 100644
--- a/drivers/net/qede/base/ecore_sriov.c
+++ b/drivers/net/qede/base/ecore_sriov.c
@@ -1987,7 +1987,7 @@ static void ecore_iov_vf_mbx_start_rxq(struct ecore_hwfn 
*p_hwfn,
   struct ecore_ptt *p_ptt,
   struct ecore_vf_info *vf)
 {
-   struct ecore_queue_start_common_params p_params;
+   struct ecore_queue_start_common_params params;
struct ecore_iov_vf_mbx *mbx = &vf->vf_mbx;
u8 status = PFVF_STATUS_NO_RESOURCE;
struct vfpf_start_rxq_tlv *req;
@@ -2000,13 +2000,13 @@ static void ecore_iov_vf_mbx_start_rxq(struct 
ecore_hwfn *p_hwfn,
!ecore_iov_validate_sb(p_hwfn, vf, req->hw_sb))
goto out;
 
-   OSAL_MEMSET(&p_params, 0, sizeof(p_params));
-   p_params.queue_id = (u8)vf->vf_queues[req->rx_qid].fw_rx_qid;
-   p_params.vf_qid = req->rx_qid;
-   p_params.vport_id = vf->vport_id;
-   p_params.stats_id = vf->abs_vf_id + 0x10,
-   p_params.sb = req->hw_sb;
-   p_params.sb_idx = req->sb_index;
+   OSAL_MEMSET(¶ms, 0, sizeof(params));
+   params.queue_id = (u8)vf->vf_queues[req->rx_qid].fw_rx_qid;
+   params.vf_qid = req->rx_qid;
+   params.vport_id = vf->vport_id;
+   params.stats_id = vf->abs_vf_id + 0x10,
+   params.sb = req->hw_sb;
+   params.sb_idx = req->sb_index;
 
/* Legacy VFs have their Producers in a different location, which they
 * calculate on their own and clean the producer prior to this.
@@ -2022,7 +2022,7 @@ static void ecore_iov_vf_mbx_start_rxq(struct ecore_hwfn 
*p_hwfn,
 
rc = ecore_sp_eth_rxq_start_ramrod(p_hwfn, vf->opaque_fid,
   vf->vf_queues[req->rx_qid].fw_cid,
-  &p_params,
+  ¶ms,
   req->bd_max_bytes,
   req->rxq_addr,
   req->cqe_pbl_addr,
@@ -2087,7 +2087,7 @@ static void ecore_iov_vf_mbx_start_txq(struct ecore_hwfn 
*p_hwfn,
   struct ecore_ptt *p_ptt,
   struct ecore_vf_info *vf)
 {
-   struct ecore_queue_start_common_params p_params;
+   struct ecore_queue_start_common_params params;
struct ecore_iov_vf_mbx *mbx = &vf->vf_mbx;
u8 status = PFVF_STATUS_NO_RESOURCE;
union ecore_qm_pq_params pq_params;
@@ -2099,24 +2099,24 @@ static void ecore_iov_vf_mbx_start_txq(struct 
ecore_hwfn *p_hwfn,
pq_params.eth.is_vf = 1;
pq_params.eth.vf_id = vf->relative_vf_id;
 
-   OSAL_MEMSET(&p_params, 0, sizeof(p_params));
+   OSAL_MEMSET(¶ms, 0, sizeof(params));
req = &mbx->req_virt->start_txq;
 
if (!ecore_iov_validate_txq(p_hwfn, vf, req->tx_qid) ||
!ecore_iov_validate_sb(p_hwfn, vf, req->hw_sb))
goto out;
 
-   p_params.queue_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
-   p_params.qzone_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
-   p_params.vport_id = vf->vport_id;
-   p_params.stats_id = vf->abs_vf_id + 0x10,
-   p_params.sb = req->hw_sb;
-   p_params.sb_idx = req->sb_index;
+   params.queue_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
+   params.qzone_id = (u8)vf->vf_queues[req->tx_qid].fw_tx_qid;
+   params.vport_id = vf->vport_id;
+   params.stats_id = vf->abs_vf_id + 0x10,
+   params.sb = req->hw_sb;
+   params.sb_idx = req->sb_index;
 
rc = ecore_sp_eth_txq_start_ramrod(p_hwfn,
   vf->opaque_fid,
   vf->vf_queues[req->tx_qid].fw_cid,
-  &p_params,
+  ¶ms,
   req->pbl_addr,
   req->pbl_size,
   &pq_params);
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 09/25] net/qede/base: improve Tx-switching performance

In order to improve Tx switching performance an additional HSI parameter
called same-as-last-id is introduced. This resource allows FW caching the
txqs packet properties. Driver needs to set same-as-last-id to be equal to
the qzone.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_l2.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/qede/base/ecore_l2.c b/drivers/net/qede/base/ecore_l2.c
index 9cb554c6..22bb43d6 100644
--- a/drivers/net/qede/base/ecore_l2.c
+++ b/drivers/net/qede/base/ecore_l2.c
@@ -877,6 +877,7 @@ ecore_sp_eth_txq_start_ramrod(struct ecore_hwfn *p_hwfn,
p_ramrod->stats_counter_id = p_params->stats_id;
 
p_ramrod->queue_zone_id = OSAL_CPU_TO_LE16(abs_tx_qzone_id);
+   p_ramrod->same_as_last_id = OSAL_CPU_TO_LE16(abs_tx_qzone_id);
 
p_ramrod->pbl_size = OSAL_CPU_TO_LE16(pbl_size);
DMA_REGPAIR_LE(p_ramrod->pbl_base_addr, pbl_addr);
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 12/25] net/qede/base: enhance resource info set printouts

Add the resources names in the ecore_hw_set_resc_info() printouts.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_dev.c | 100 +++---
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 8b7d1da0..f0438089 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -,6 +,40 @@ static u32 ecore_hw_get_dflt_resc_num(struct ecore_hwfn 
*p_hwfn,
return dflt_resc_num;
 }
 
+static const char *ecore_hw_get_resc_name(enum ecore_resources res_id)
+{
+   switch (res_id) {
+   case ECORE_SB:
+   return "SB";
+   case ECORE_L2_QUEUE:
+   return "L2_QUEUE";
+   case ECORE_VPORT:
+   return "VPORT";
+   case ECORE_RSS_ENG:
+   return "RSS_ENG";
+   case ECORE_PQ:
+   return "PQ";
+   case ECORE_RL:
+   return "RL";
+   case ECORE_MAC:
+   return "MAC";
+   case ECORE_VLAN:
+   return "VLAN";
+   case ECORE_RDMA_CNQ_RAM:
+   return "RDMA_CNQ_RAM";
+   case ECORE_ILT:
+   return "ILT";
+   case ECORE_LL2_QUEUE:
+   return "LL2_QUEUE";
+   case ECORE_CMDQS_CQS:
+   return "CMDQS_CQS";
+   case ECORE_RDMA_STATS_QUEUE:
+   return "RDMA_STATS_QUEUE";
+   default:
+   return "UNKNOWN_RESOURCE";
+   }
+}
+
 static enum _ecore_status_t ecore_hw_set_resc_info(struct ecore_hwfn *p_hwfn,
   enum ecore_resources res_id,
   bool drv_resc_alloc)
@@ -2236,8 +2270,9 @@ static enum _ecore_status_t ecore_hw_set_resc_info(struct 
ecore_hwfn *p_hwfn,
 
dflt_resc_num = ecore_hw_get_dflt_resc_num(p_hwfn, res_id);
if (!dflt_resc_num) {
-   DP_ERR(p_hwfn, "Failed to get default amount for resource %d\n",
-  res_id);
+   DP_ERR(p_hwfn,
+  "Failed to get default amount for resource %d [%s]\n",
+   res_id, ecore_hw_get_resc_name(res_id));
return ECORE_INVAL;
}
dflt_resc_start = dflt_resc_num * p_hwfn->enabled_func_idx;
@@ -2263,8 +2298,9 @@ static enum _ecore_status_t ecore_hw_set_resc_info(struct 
ecore_hwfn *p_hwfn,
 &mcp_resp, &mcp_param);
if (rc != ECORE_SUCCESS) {
DP_NOTICE(p_hwfn, true,
- "MFW resp failure for a resc alloc req [res_id %d]\n",
- res_id);
+ "MFW response failure for an allocation request for"
+ " resource %d [%s]\n",
+ res_id, ecore_hw_get_resc_name(res_id));
return rc;
}
 
@@ -2277,11 +2313,11 @@ static enum _ecore_status_t 
ecore_hw_set_resc_info(struct ecore_hwfn *p_hwfn,
mcp_resp != FW_MSG_CODE_RESOURCE_ALLOC_DEPRECATED) {
/* @DPDK */
DP_INFO(p_hwfn,
- "No allocation info for resc %d [mcp_resp 0x%x].",
- res_id, mcp_resp);
-   DP_INFO(p_hwfn,
- "Applying default values [num %d, start %d].\n",
- dflt_resc_num, dflt_resc_start);
+   "Resource %d [%s]: No allocation info was received"
+   " [mcp_resp 0x%x]. Applying default values"
+   " [num %d, start %d].\n",
+   res_id, ecore_hw_get_resc_name(res_id), mcp_resp,
+   dflt_resc_num, dflt_resc_start);
 
*p_resc_num = dflt_resc_num;
*p_resc_start = dflt_resc_start;
@@ -2300,13 +2336,11 @@ static enum _ecore_status_t 
ecore_hw_set_resc_info(struct ecore_hwfn *p_hwfn,
 
if (*p_resc_num != dflt_resc_num || *p_resc_start != dflt_resc_start) {
DP_NOTICE(p_hwfn, false,
- "Resource %d: MFW allocation [num %d, start %d]",
- res_id, *p_resc_num, *p_resc_start);
-   DP_NOTICE(p_hwfn, false,
- "differs from default values [num %d, start %d]%s\n",
- dflt_resc_num,
- dflt_resc_start,
- drv_resc_alloc ? " - applying default values" : "");
+ "Resource %d [%s]: MFW allocation [num %d, start %d]"
+ " differs from default values [num %d, start %d]%s\n",
+ res_id, ecore_hw_get_resc_name(res_id), *p_resc_num,
+ *p_resc_start, dflt_resc_num, dflt_resc_start,
+ drv_resc_alloc ? " - Applying default values" : "");
if (drv_resc_alloc) {
*p_resc_num = dflt_resc

[dpdk-dev] [PATCH 14/25] net/qede/base: add macros for converting pointer

Add macros PTR_LO and PTR_HI (for converting pointer to HI and LOW bits for
passing to FW hsi handles).

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_utils.h | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/qede/base/ecore_utils.h 
b/drivers/net/qede/base/ecore_utils.h
index 616b44c2..034cf1eb 100644
--- a/drivers/net/qede/base/ecore_utils.h
+++ b/drivers/net/qede/base/ecore_utils.h
@@ -10,6 +10,12 @@
 #define __ECORE_UTILS_H__
 
 /* dma_addr_t manip */
+/* Suppress "right shift count >= width of type" warning when that quantity is
+ * 32-bits rquires the >> 16) >> 16)
+ */
+#define PTR_LO(x)  ((u32)(((osal_uintptr_t)(x)) & 0x))
+#define PTR_HI(x)  ((u32)osal_uintptr_t)(x)) >> 16) >> 16))
+
 #define DMA_LO(x)  ((u32)(((dma_addr_t)(x)) & 0x))
 #define DMA_HI(x)  ((u32)(((dma_addr_t)(x)) >> 32))
 
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 13/25] net/qede/base: add new enum member to status codes

Add ECORE_CONN_RESET to enum ecore_status.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_status.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/qede/base/ecore_status.h 
b/drivers/net/qede/base/ecore_status.h
index 6277bc80..c77ec260 100644
--- a/drivers/net/qede/base/ecore_status.h
+++ b/drivers/net/qede/base/ecore_status.h
@@ -10,6 +10,7 @@
 #define __ECORE_STATUS_H__
 
 enum _ecore_status_t {
+   ECORE_CONN_RESET = -13,
ECORE_UNKNOWN_ERROR  = -12,
ECORE_NORESOURCES= -11,
ECORE_NODEV   = -10,
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 16/25] net/qede/base: add check for get nvm info return code

Fail ecore_get_hw_info() in case ecore_hw_get_nvm_info() fails.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_dev.c | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index f29b3cda..0da95c65 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2755,7 +2755,7 @@ ecore_get_hw_info(struct ecore_hwfn *p_hwfn, struct 
ecore_ptt *p_ptt,
/* Since all information is common, only first hwfns should do this */
if (IS_LEAD_HWFN(p_hwfn)) {
rc = ecore_iov_hw_info(p_hwfn);
-   if (rc)
+   if (rc != ECORE_SUCCESS)
return rc;
}
 
@@ -2769,12 +2769,17 @@ ecore_get_hw_info(struct ecore_hwfn *p_hwfn, struct 
ecore_ptt *p_ptt,
ecore_hw_info_port_num(p_hwfn, p_ptt);
 
 #ifndef ASIC_ONLY
-   if (CHIP_REV_IS_ASIC(p_hwfn->p_dev))
+   if (CHIP_REV_IS_ASIC(p_hwfn->p_dev)) {
+#endif
+   rc = ecore_hw_get_nvm_info(p_hwfn, p_ptt);
+   if (rc != ECORE_SUCCESS)
+   return rc;
+#ifndef ASIC_ONLY
+   }
 #endif
-   ecore_hw_get_nvm_info(p_hwfn, p_ptt);
 
rc = ecore_int_igu_read_cam(p_hwfn, p_ptt);
-   if (rc)
+   if (rc != ECORE_SUCCESS)
return rc;
 
 #ifndef ASIC_ONLY
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 15/25] net/qede: add new host ring type option

Add new option called external PBL (page base list) to ecore_chain_alloc
for future use. Mark chain as external if external PBL is provided.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_chain.h   |  9 -
 drivers/net/qede/base/ecore_dev.c | 27 ---
 drivers/net/qede/base/ecore_dev_api.h |  3 ++-
 drivers/net/qede/base/ecore_spq.c | 17 +++--
 drivers/net/qede/qede_if.h| 18 ++
 drivers/net/qede/qede_rxtx.c  |  9 ++---
 6 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/drivers/net/qede/base/ecore_chain.h 
b/drivers/net/qede/base/ecore_chain.h
index 9ad1874f..61e39b56 100644
--- a/drivers/net/qede/base/ecore_chain.h
+++ b/drivers/net/qede/base/ecore_chain.h
@@ -54,6 +54,11 @@ struct ecore_chain_pbl_u32 {
u32 cons_page_idx;
 };
 
+struct ecore_chain_ext_pbl {
+   dma_addr_t p_pbl_phys;
+   void *p_pbl_virt;
+};
+
 struct ecore_chain_pbl {
/* Base address of a pre-allocated buffer for pbl */
dma_addr_t p_phys_table;
@@ -69,6 +74,8 @@ struct ecore_chain_pbl {
struct ecore_chain_pbl_u16 pbl16;
struct ecore_chain_pbl_u32 pbl32;
} u;
+
+   bool external;
 };
 
 struct ecore_chain_u16 {
@@ -570,7 +577,7 @@ ecore_chain_init_params(struct ecore_chain *p_chain, u32 
page_cnt, u8 elem_size,
p_chain->page_cnt = page_cnt;
p_chain->capacity = p_chain->usable_per_page * page_cnt;
p_chain->size = p_chain->elem_per_page * page_cnt;
-
+   p_chain->pbl.external = false;
p_chain->pbl.p_phys_table = 0;
p_chain->pbl.p_virt_table = OSAL_NULL;
p_chain->pbl.pp_virt_addr_tbl = OSAL_NULL;
diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index f0438089..f29b3cda 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -3193,8 +3193,10 @@ static void ecore_chain_free_pbl(struct ecore_dev *p_dev,
}
 
pbl_size = page_cnt * ECORE_CHAIN_PBL_ENTRY_SIZE;
-   OSAL_DMA_FREE_COHERENT(p_dev, p_chain->pbl.p_virt_table,
-  p_chain->pbl.p_phys_table, pbl_size);
+
+   if (!p_chain->pbl.external)
+   OSAL_DMA_FREE_COHERENT(p_dev, p_chain->pbl.p_virt_table,
+  p_chain->pbl.p_phys_table, pbl_size);
  out:
OSAL_VFREE(p_dev, p_chain->pbl.pp_virt_addr_tbl);
 }
@@ -3294,8 +3296,10 @@ ecore_chain_alloc_single(struct ecore_dev *p_dev, struct 
ecore_chain *p_chain)
return ECORE_SUCCESS;
 }
 
-static enum _ecore_status_t ecore_chain_alloc_pbl(struct ecore_dev *p_dev,
- struct ecore_chain *p_chain)
+static enum _ecore_status_t
+ecore_chain_alloc_pbl(struct ecore_dev *p_dev,
+ struct ecore_chain *p_chain,
+ struct ecore_chain_ext_pbl *ext_pbl)
 {
void *p_virt = OSAL_NULL;
u8 *p_pbl_virt = OSAL_NULL;
@@ -3319,7 +3323,15 @@ static enum _ecore_status_t ecore_chain_alloc_pbl(struct 
ecore_dev *p_dev,
 * should be saved to allow its freeing during the error flow.
 */
size = page_cnt * ECORE_CHAIN_PBL_ENTRY_SIZE;
-   p_pbl_virt = OSAL_DMA_ALLOC_COHERENT(p_dev, &p_pbl_phys, size);
+
+   if (ext_pbl == OSAL_NULL) {
+   p_pbl_virt = OSAL_DMA_ALLOC_COHERENT(p_dev, &p_pbl_phys, size);
+   } else {
+   p_pbl_virt = ext_pbl->p_pbl_virt;
+   p_pbl_phys = ext_pbl->p_pbl_phys;
+   p_chain->pbl.external = true;
+   }
+
ecore_chain_init_pbl_mem(p_chain, p_pbl_virt, p_pbl_phys,
 pp_virt_addr_tbl);
if (!p_pbl_virt) {
@@ -3357,7 +3369,8 @@ enum _ecore_status_t ecore_chain_alloc(struct ecore_dev 
*p_dev,
   enum ecore_chain_mode mode,
   enum ecore_chain_cnt_type cnt_type,
   u32 num_elems, osal_size_t elem_size,
-  struct ecore_chain *p_chain)
+  struct ecore_chain *p_chain,
+  struct ecore_chain_ext_pbl *ext_pbl)
 {
u32 page_cnt;
enum _ecore_status_t rc = ECORE_SUCCESS;
@@ -3388,7 +3401,7 @@ enum _ecore_status_t ecore_chain_alloc(struct ecore_dev 
*p_dev,
rc = ecore_chain_alloc_single(p_dev, p_chain);
break;
case ECORE_CHAIN_MODE_PBL:
-   rc = ecore_chain_alloc_pbl(p_dev, p_chain);
+   rc = ecore_chain_alloc_pbl(p_dev, p_chain, ext_pbl);
break;
}
if (rc)
diff --git a/drivers/net/qede/base/ecore_dev_api.h 
b/drivers/net/qede/base/ecore_dev_api.h
index cbddd242..0ec02b5b 100644
--- a/drivers/net/qede/base/ecore_dev_api.h
+++ b/drivers/net/qede/base/ecore_dev_api.h
@@ -370,7 +370,8 @@ ecore_chain_alloc(st

[dpdk-dev] [PATCH 17/25] net/qede/base: retrieve FW crash dump info

As part of device probe, check if management FW crash dump logs are
available. If available, then log an warning message and update the
epoch value too. A new struct ecore_mdump_info is added to populate
dump info including the new "reason" field by reading shared memory
region.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_dev.c | 18 +++---
 drivers/net/qede/base/ecore_dev_api.h |  4 +--
 drivers/net/qede/base/ecore_mcp.c | 66 ++-
 drivers/net/qede/base/ecore_mcp.h | 22 
 drivers/net/qede/base/ecore_mcp_api.h | 33 +++---
 drivers/net/qede/qede_main.c  |  2 +-
 6 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 0da95c65..86b4bffc 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -1761,10 +1761,6 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev 
*p_dev,
return mfw_rc;
}
 
-   ecore_mcp_mdump_get_info(p_hwfn, p_hwfn->p_main_ptt);
-   ecore_mcp_mdump_set_values(p_hwfn, p_hwfn->p_main_ptt,
-  p_params->epoch);
-
/* send DCBX attention request command */
DP_VERBOSE(p_hwfn, ECORE_MSG_DCB,
   "sending phony dcbx set command to trigger DCBx 
attention handling\n");
@@ -2962,6 +2958,7 @@ ecore_hw_prepare_single(struct ecore_hwfn *p_hwfn, void 
OSAL_IOMEM *p_regview,
struct ecore_hw_prepare_params *p_params)
 {
struct ecore_dev *p_dev = p_hwfn->p_dev;
+   struct ecore_mdump_info mdump_info;
enum _ecore_status_t rc = ECORE_SUCCESS;
 
/* Split PCI bars evenly between hwfns */
@@ -3024,6 +3021,19 @@ ecore_hw_prepare_single(struct ecore_hwfn *p_hwfn, void 
OSAL_IOMEM *p_regview,
DP_NOTICE(p_hwfn, false, "Failed to initiate PF FLR\n");
}
 
+   /* Check if mdump logs are present and update the epoch value */
+   if (p_hwfn == ECORE_LEADING_HWFN(p_hwfn->p_dev)) {
+   rc = ecore_mcp_mdump_get_info(p_hwfn, p_hwfn->p_main_ptt,
+ &mdump_info);
+   if (rc == ECORE_SUCCESS && mdump_info.num_of_logs > 0) {
+   DP_NOTICE(p_hwfn, false,
+ "* * * IMPORTANT - HW ERROR register dump 
captured by device * * *\n");
+   }
+
+   ecore_mcp_mdump_set_values(p_hwfn, p_hwfn->p_main_ptt,
+  p_params->epoch);
+   }
+
/* Allocate the init RT array and initialize the init-ops engine */
rc = ecore_init_alloc(p_hwfn);
if (rc) {
diff --git a/drivers/net/qede/base/ecore_dev_api.h 
b/drivers/net/qede/base/ecore_dev_api.h
index 0ec02b5b..0dee68a9 100644
--- a/drivers/net/qede/base/ecore_dev_api.h
+++ b/drivers/net/qede/base/ecore_dev_api.h
@@ -68,8 +68,6 @@ struct ecore_hw_init_params {
bool allow_npar_tx_switch;
/* binary fw data pointer in binary fw file */
const u8 *bin_fw_data;
-   /* the OS Epoch time in seconds */
-   u32 epoch;
 };
 
 /**
@@ -149,6 +147,8 @@ struct ecore_hw_prepare_params {
bool chk_reg_fifo;
/* request the MFW to initiate PF FLR */
bool initiate_pf_flr;
+   /* the OS Epoch time in seconds */
+   u32 epoch;
 };
 
 /**
diff --git a/drivers/net/qede/base/ecore_mcp.c 
b/drivers/net/qede/base/ecore_mcp.c
index a5d707b2..5d40c1ed 100644
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -1098,16 +1098,9 @@ enum _ecore_status_t ecore_mcp_mdump_trigger(struct 
ecore_hwfn *p_hwfn,
 {
u32 mcp_resp;
 
-   return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_TRIGGER,
-  OSAL_NULL, OSAL_NULL, &mcp_resp);
-}
-
-enum _ecore_status_t ecore_mcp_mdump_clear_logs(struct ecore_hwfn *p_hwfn,
-   struct ecore_ptt *p_ptt)
-{
-   u32 mcp_resp;
+   p_hwfn->p_dev->mdump_en = true;
 
-   return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_CLEAR_LOGS,
+   return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_TRIGGER,
   OSAL_NULL, OSAL_NULL, &mcp_resp);
 }
 
@@ -1141,32 +1134,56 @@ ecore_mcp_mdump_get_config(struct ecore_hwfn *p_hwfn, 
struct ecore_ptt *p_ptt,
return rc;
 }
 
-enum _ecore_status_t ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn,
- struct ecore_ptt *p_ptt)
+enum _ecore_status_t
+ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+struct ecore_mdump_info *p_mdump_info)
 {
+   u32 addr, global_offsize, global_addr;
struct mdump_config_stc mdump_config;
enum _ecore_status_t rc;
 
-

[dpdk-dev] [PATCH 19/25] net/qede/base: add support for 2x10G mode

Add support for 2x10G mode

Signed-off-by: Rasesh Mody 
---
 doc/guides/nics/qede.rst  | 2 +-
 drivers/net/qede/base/ecore.h | 1 +
 drivers/net/qede/base/ecore_dev.c | 3 +++
 drivers/net/qede/base/nvm_cfg.h   | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst
index e7332dc6..ae06b1fc 100644
--- a/doc/guides/nics/qede.rst
+++ b/doc/guides/nics/qede.rst
@@ -32,7 +32,7 @@ QEDE Poll Mode Driver
 ==
 
 The QEDE poll mode driver library (**librte_pmd_qede**) implements support
-for **QLogic FastLinQ QL4 25G/40G/100G CNA** family of adapters as well
+for **QLogic FastLinQ QL4 10G/25G/40G/100G CNA** family of adapters as well
 as their virtual functions (VF) in SR-IOV context. It is supported on
 several standard Linux distros like RHEL7.x, SLES12.x and Ubuntu.
 It is compile-tested under FreeBSD OS.
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 71ce24ba..034e885e 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -302,6 +302,7 @@ enum ecore_port_mode {
ECORE_PORT_MODE_DE_2X25G,
ECORE_PORT_MODE_DE_1X25G,
ECORE_PORT_MODE_DE_4X25G,
+   ECORE_PORT_MODE_DE_2X10G,
 };
 
 enum ecore_dev_cap {
diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 86b4bffc..5a29c45b 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2474,6 +2474,9 @@ static enum _ecore_status_t ecore_hw_get_nvm_info(struct 
ecore_hwfn *p_hwfn,
case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G:
p_hwfn->hw_info.port_mode = ECORE_PORT_MODE_DE_2X25G;
break;
+   case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G:
+   p_hwfn->hw_info.port_mode = ECORE_PORT_MODE_DE_2X10G;
+   break;
case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G:
p_hwfn->hw_info.port_mode = ECORE_PORT_MODE_DE_1X25G;
break;
diff --git a/drivers/net/qede/base/nvm_cfg.h b/drivers/net/qede/base/nvm_cfg.h
index 8e9c08a7..4edffaca 100644
--- a/drivers/net/qede/base/nvm_cfg.h
+++ b/drivers/net/qede/base/nvm_cfg.h
@@ -144,6 +144,7 @@ struct nvm_cfg1_glob {
#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G 0xC
#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G 0xD
#define NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G 0xE
+   #define NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G 0xF
#define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_MASK 0x0100
#define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_OFFSET 8
#define NVM_CFG1_GLOB_MPS10_ENFORCE_TX_FIR_CFG_DISABLED 0x0
@@ -578,6 +579,7 @@ struct nvm_cfg1_glob {
#define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_2X50G 0x40
#define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_BB_1X100G \
0x80
+   #define NVM_CFG1_GLOB_MULTI_NETWORK_MODES_CAPABILITY_2X10G 0x100
u32 reserved[41]; /* 0x9C */
 };
 
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 20/25] net/qede: add PCI ids for new chip variant

Add PCI IDs for new asic type (defined as CHIP_NUM_AH_xxx).
It supports 50G, 40G, 25G and 10G speeds.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_dev.c |  7 +-
 drivers/net/qede/qede_ethdev.c| 29 ++--
 drivers/net/qede/qede_ethdev.h| 47 ---
 3 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 5a29c45b..03620d94 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2365,7 +2365,12 @@ static enum _ecore_status_t ecore_hw_get_resc(struct 
ecore_hwfn *p_hwfn,
 #endif
 
for (res_id = 0; res_id < ECORE_MAX_RESC; res_id++) {
-   rc = ecore_hw_set_resc_info(p_hwfn, res_id, drv_resc_alloc);
+   /* @@@TMP for AH:
+* Force the driver's default resource allocation in case there
+* is a diff with the MFW allocation value.
+*/
+   rc = ecore_hw_set_resc_info(p_hwfn, res_id,
+   b_ah || drv_resc_alloc);
if (rc != ECORE_SUCCESS)
return rc;
}
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index b9a325df..a5f87d8d 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -2263,10 +2263,13 @@ static int qedevf_eth_dev_uninit(struct rte_eth_dev 
*eth_dev)
 static struct rte_pci_id pci_id_qedevf_map[] = {
 #define QEDEVF_RTE_PCI_DEVICE(dev) RTE_PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, dev)
{
-   QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_NX2_VF)
+   QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_NX2_VF)
},
{
-   QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_57980S_IOV)
+   QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_57980S_IOV)
+   },
+   {
+   QEDEVF_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_IOV)
},
{.vendor_id = 0,}
 };
@@ -2274,19 +2277,31 @@ static struct rte_pci_id pci_id_qedevf_map[] = {
 static struct rte_pci_id pci_id_qede_map[] = {
 #define QEDE_RTE_PCI_DEVICE(dev) RTE_PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, dev)
{
-   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_NX2_57980E)
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_NX2_57980E)
+   },
+   {
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_NX2_57980S)
+   },
+   {
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_57980S_40)
+   },
+   {
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_57980S_25)
+   },
+   {
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_57980S_100)
},
{
-   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_NX2_57980S)
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_50G)
},
{
-   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_57980S_40)
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_10G)
},
{
-   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_57980S_25)
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_40G)
},
{
-   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_57980S_100)
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_25G)
},
{.vendor_id = 0,}
 };
diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h
index 95e06ef0..19a4ece3 100644
--- a/drivers/net/qede/qede_ethdev.h
+++ b/drivers/net/qede/qede_ethdev.h
@@ -92,24 +92,35 @@
struct ecore_dev *edev = &qdev->edev;   \
 }
 
-/* QLogic 25G/40G/100G vendor/devices ids */
-#define PCI_VENDOR_ID_QLOGIC0x1077
-
-#define CHIP_NUM_57980E 0x1634
-#define CHIP_NUM_57980S 0x1629
-#define CHIP_NUM_VF 0x1630
-#define CHIP_NUM_57980S_40  0x1634
-#define CHIP_NUM_57980S_25  0x1656
-#define CHIP_NUM_57980S_IOV 0x1664
-#define CHIP_NUM_57980S_100 0x1644
-
-#define PCI_DEVICE_ID_NX2_57980ECHIP_NUM_57980E
-#define PCI_DEVICE_ID_NX2_57980SCHIP_NUM_57980S
-#define PCI_DEVICE_ID_NX2_VFCHIP_NUM_VF
-#define PCI_DEVICE_ID_57980S_40 CHIP_NUM_57980S_40
-#define PCI_DEVICE_ID_57980S_25 CHIP_NUM_57980S_25
-#define PCI_DEVICE_ID_57980S_IOVCHIP_NUM_57980S_IOV
-#define PCI_DEVICE_ID_57980S_100CHIP_NUM_57980S_100
+/* QLogic 10G/25G/40G/50G/100G vendor/devices ids */
+#define PCI_VENDOR_ID_QLOGIC   0x1077
+
+#define CHIP_NUM_57980E0x1634
+#define CHIP_NUM_57980S0x1629
+#define CHIP_NUM_VF0x1630
+#define CHIP_NUM_57980S_40 0x1634
+#define CHIP_NUM_57980S_25 0x1656
+#define CHIP_NUM_57980S_IOV0x1664
+#define CHIP_N

[dpdk-dev] [PATCH 21/25] net/qede: add 50G device PCI id

Add 50G device support for 57980 series

Signed-off-by: Rasesh Mody 
---
 config/common_base | 2 +-
 doc/guides/nics/qede.rst   | 4 ++--
 drivers/net/qede/qede_ethdev.c | 3 +++
 drivers/net/qede/qede_ethdev.h | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/common_base b/config/common_base
index 2ffd5572..8822e5fb 100644
--- a/config/common_base
+++ b/config/common_base
@@ -315,7 +315,7 @@ CONFIG_RTE_LIBRTE_PMD_BOND=y
 CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB=n
 CONFIG_RTE_LIBRTE_BOND_DEBUG_ALB_L1=n
 
-# QLogic 10G/25G/40G/100G PMD
+# QLogic 10G/25G/40G/50G/100G PMD
 #
 CONFIG_RTE_LIBRTE_QEDE_PMD=y
 CONFIG_RTE_LIBRTE_QEDE_DEBUG_INIT=n
diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst
index ae06b1fc..854f8bb9 100644
--- a/doc/guides/nics/qede.rst
+++ b/doc/guides/nics/qede.rst
@@ -32,7 +32,7 @@ QEDE Poll Mode Driver
 ==
 
 The QEDE poll mode driver library (**librte_pmd_qede**) implements support
-for **QLogic FastLinQ QL4 10G/25G/40G/100G CNA** family of adapters as well
+for **QLogic FastLinQ QL4 10G/25G/40G/50G/100G CNA** family of adapters as 
well
 as their virtual functions (VF) in SR-IOV context. It is supported on
 several standard Linux distros like RHEL7.x, SLES12.x and Ubuntu.
 It is compile-tested under FreeBSD OS.
@@ -72,7 +72,7 @@ Non-supported Features
 Supported QLogic Adapters
 -
 
-- QLogic FastLinQ QL4 10G/25G/40G/100G CNAs.
+- QLogic FastLinQ QL4 10G/25G/40G/50G/100G CNAs.
 
 Prerequisites
 -
diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index a5f87d8d..7366bc04 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -2292,6 +2292,9 @@ static struct rte_pci_id pci_id_qede_map[] = {
QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_57980S_100)
},
{
+   QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_57980S_50)
+   },
+   {
QEDE_RTE_PCI_DEVICE(PCI_DEVICE_ID_QLOGIC_AH_50G)
},
{
diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h
index 19a4ece3..9701d736 100644
--- a/drivers/net/qede/qede_ethdev.h
+++ b/drivers/net/qede/qede_ethdev.h
@@ -102,6 +102,7 @@
 #define CHIP_NUM_57980S_25 0x1656
 #define CHIP_NUM_57980S_IOV0x1664
 #define CHIP_NUM_57980S_1000x1644
+#define CHIP_NUM_57980S_50 0x1654
 #define CHIP_NUM_AH_50G   0x8070
 #define CHIP_NUM_AH_10G0x8071
 #define CHIP_NUM_AH_40G   0x8072
@@ -115,6 +116,7 @@
 #define PCI_DEVICE_ID_QLOGIC_57980S_25 CHIP_NUM_57980S_25
 #define PCI_DEVICE_ID_QLOGIC_57980S_IOVCHIP_NUM_57980S_IOV
 #define PCI_DEVICE_ID_QLOGIC_57980S_100CHIP_NUM_57980S_100
+#define PCI_DEVICE_ID_QLOGIC_57980S_50 CHIP_NUM_57980S_50
 #define PCI_DEVICE_ID_QLOGIC_AH_50GCHIP_NUM_AH_50G
 #define PCI_DEVICE_ID_QLOGIC_AH_10GCHIP_NUM_AH_10G
 #define PCI_DEVICE_ID_QLOGIC_AH_40GCHIP_NUM_AH_40G
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 18/25] net/qede/base: add support for external PHY

Add support for external PHY BCM8485x.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_mcp.c  |  6 +--
 drivers/net/qede/base/mcp_public.h | 88 --
 2 files changed, 87 insertions(+), 7 deletions(-)

diff --git a/drivers/net/qede/base/ecore_mcp.c 
b/drivers/net/qede/base/ecore_mcp.c
index 5d40c1ed..adcb0f09 100644
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -838,11 +838,9 @@ enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn 
*p_hwfn,
if (b_up)
DP_VERBOSE(p_hwfn, ECORE_MSG_LINK,
   "Configuring Link: Speed 0x%08x, Pause 0x%08x,"
-  " adv_speed 0x%08x, loopback 0x%08x,"
-  " features 0x%08x\n",
+  " adv_speed 0x%08x, loopback 0x%08x\n",
   p_phy_cfg->speed, p_phy_cfg->pause,
-  p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode,
-  p_phy_cfg->feature_config_flags);
+  p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode);
else
DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, "Resetting link\n");
 
diff --git a/drivers/net/qede/base/mcp_public.h 
b/drivers/net/qede/base/mcp_public.h
index 96efc3c8..b8a9ae3a 100644
--- a/drivers/net/qede/base/mcp_public.h
+++ b/drivers/net/qede/base/mcp_public.h
@@ -84,9 +84,32 @@ struct eth_phy_cfg {
 /* Remote Serdes Loopback (RX to TX) */
 #define ETH_LOOPBACK_INT_PHY_FEA_AH_ONLY (9)
 
-   /* features */
-   u32 feature_config_flags;
-#define ETH_EEE_MODE_ADV_LPI   (1 << 0)
+   /* Used to configure the EEE Tx LPI timer, has several modes of
+* operation, according to bits 29:28
+* 2'b00: Timer will be configured by nvram, output will be the value
+*from nvram.
+* 2'b01: Timer will be configured by nvram, output will be in
+*16xmicroseconds.
+* 2'b10: bits 1:0 contain an nvram value which will be used instead
+*of the one located in the nvram. Output will be that value.
+* 2'b11: bits 19:0 contain the idle timer in microseconds; output
+*will be in 16xmicroseconds.
+* Bits 31:30 should be 2'b11 in order for EEE to be enabled.
+*/
+   u32 eee_mode;
+#define EEE_MODE_TIMER_USEC_MASK   (0x000f)
+#define EEE_MODE_TIMER_USEC_OFFSET (0)
+#define EEE_MODE_TIMER_USEC_BALANCED_TIME  (0xa00)
+#define EEE_MODE_TIMER_USEC_AGGRESSIVE_TIME(0x100)
+#define EEE_MODE_TIMER_USEC_LATENCY_TIME   (0x6000)
+/* Set by the driver to request status timer will be in microseconds and and 
not
+ * in EEE policy definition
+ */
+#define EEE_MODE_OUTPUT_TIME   (1 << 28)
+/* Set by the driver to override default nvm timer */
+#define EEE_MODE_OVERRIDE_NVRAM(1 << 29)
+#define EEE_MODE_ENABLE_LPI(1 << 30) /* Set when */
+#define EEE_MODE_ADV_LPI   (1 << 31) /* Set when EEE is enabled */
 };
 
 struct port_mf_cfg {
@@ -447,6 +470,14 @@ struct public_global {
 #define MDUMP_REASON_INTERNAL_ERROR(1 << 0)
 #define MDUMP_REASON_EXTERNAL_TRIGGER  (1 << 1)
 #define MDUMP_REASON_DUMP_AGED (1 << 2)
+   u32 ext_phy_upgrade_fw;
+#define EXT_PHY_FW_UPGRADE_STATUS_MASK (0x)
+#define EXT_PHY_FW_UPGRADE_STATUS_SHIFT(0)
+#define EXT_PHY_FW_UPGRADE_STATUS_IN_PROGRESS  (1)
+#define EXT_PHY_FW_UPGRADE_STATUS_FAILED   (2)
+#define EXT_PHY_FW_UPGRADE_STATUS_SUCCESS  (3)
+#define EXT_PHY_FW_UPGRADE_TYPE_MASK   (0x)
+#define EXT_PHY_FW_UPGRADE_TYPE_SHIFT  (16)
 };
 
 /**/
@@ -597,6 +628,7 @@ struct public_port {
 #define LINK_STATUS_FEC_MODE_NONE  (0 << 27)
 #define LINK_STATUS_FEC_MODE_FIRECODE_CL74 (1 << 27)
 #define LINK_STATUS_FEC_MODE_RS_CL91   (2 << 27)
+#define LINK_STATUS_EXT_PHY_LINK_UP0x4000
 
u32 link_status1;
u32 ext_phy_fw_version;
@@ -718,6 +750,39 @@ struct public_port {
u32 wol_pkt_len;
u32 wol_pkt_details;
struct dcb_dscp_map dcb_dscp_map;
+
+   /* the status of EEE auto-negotiation
+* bits 19:0 the configured tx-lpi entry timer value. Depends on bit 31.
+* bits 23:20 the speeds advertised for EEE.
+* bits 27:24 the speeds the Link partner advertised for EEE.
+* The supported/adv. modes in bits 27:19 originate from the
+* SHMEM_EEE_XXX_ADV definitions (where XXX is replaced by speed).
+* bit 28 when 1'b1 EEE was requested.
+* bit 29 when 1'b1 tx lpi was requested.
+* bit 30 when 1'b1 EEE was negotiated. Tx lpi will be asserted if 30:29
+*are 2'b11.
+* bit 31 - When 1'b0 bits 15:0 contain
+*  NVM_CFG1_PORT_EEE_POWER_SAVING_MODE_XXX define as value.
+

[dpdk-dev] [PATCH 22/25] net/qede/base: add support for new firmware

Add support for 8.14.x.x firmware.

Signed-off-by: Rasesh Mody 
---
 doc/guides/nics/qede.rst  |  8 +--
 drivers/net/qede/base/common_hsi.h|  6 +-
 drivers/net/qede/base/ecore.h |  9 ---
 drivers/net/qede/base/ecore_dcbx.c| 17 +-
 drivers/net/qede/base/ecore_dcbx.h|  6 --
 drivers/net/qede/base/ecore_dev.c | 66 +++--
 drivers/net/qede/base/ecore_gtt_reg_addr.h| 20 +++
 drivers/net/qede/base/ecore_hsi_common.h  | 81 ++
 drivers/net/qede/base/ecore_hsi_debug_tools.h | 26 ++---
 drivers/net/qede/base/ecore_hsi_eth.h | 10 +++-
 drivers/net/qede/base/ecore_hsi_init_tool.h   | 82 ---
 drivers/net/qede/base/ecore_init_fw_funcs.c   | 45 ++-
 drivers/net/qede/base/ecore_init_ops.c|  3 +-
 drivers/net/qede/base/ecore_iov_api.h | 11 
 drivers/net/qede/base/ecore_iro_values.h  |  4 +-
 drivers/net/qede/base/ecore_mcp.c |  5 +-
 drivers/net/qede/base/ecore_sp_commands.c |  4 +-
 drivers/net/qede/base/ecore_spq.c |  3 +
 drivers/net/qede/base/ecore_sriov.c   | 12 
 drivers/net/qede/base/eth_common.h| 34 ---
 drivers/net/qede/base/nvm_cfg.h   | 66 -
 drivers/net/qede/qede_main.c  |  5 +-
 22 files changed, 279 insertions(+), 244 deletions(-)

diff --git a/doc/guides/nics/qede.rst b/doc/guides/nics/qede.rst
index 854f8bb9..89647d63 100644
--- a/doc/guides/nics/qede.rst
+++ b/doc/guides/nics/qede.rst
@@ -77,10 +77,10 @@ Supported QLogic Adapters
 Prerequisites
 -
 
-- Requires firmware version **8.10.x.** and management firmware
-  version **8.10.x or higher**. Firmware may be available
+- Requires firmware version **8.14.x.** and management firmware
+  version **8.14.x or higher**. Firmware may be available
   inbox in certain newer Linux distros under the standard directory
-  ``E.g. /lib/firmware/qed/qed_init_values-8.10.9.0.bin``
+  ``E.g. /lib/firmware/qed/qed_init_values-8.14.6.0.bin``
 
 - If the required firmware files are not available then visit
   `QLogic Driver Download Center `_.
@@ -119,7 +119,7 @@ enabling debugging options may affect system performance.
 - ``CONFIG_RTE_LIBRTE_QEDE_FW`` (default **""**)
 
   Gives absolute path of firmware file.
-  ``Eg: "/lib/firmware/qed/qed_init_values_zipped-8.10.9.0.bin"``
+  ``Eg: "/lib/firmware/qed/qed_init_values_zipped-8.14.6.0.bin"``
   Empty string indicates driver will pick up the firmware file
   from the default location.
 
diff --git a/drivers/net/qede/base/common_hsi.h 
b/drivers/net/qede/base/common_hsi.h
index b431c78d..4083e86d 100644
--- a/drivers/net/qede/base/common_hsi.h
+++ b/drivers/net/qede/base/common_hsi.h
@@ -89,8 +89,8 @@
 
 
 #define FW_MAJOR_VERSION   8
-#define FW_MINOR_VERSION   10
-#define FW_REVISION_VERSION9
+#define FW_MINOR_VERSION   14
+#define FW_REVISION_VERSION6
 #define FW_ENGINEERING_VERSION 0
 
 /***/
@@ -726,8 +726,6 @@ union event_ring_data {
struct malicious_vf_eqe_data malicious_vf /* Malicious VF data */;
struct initial_cleanup_eqe_data vf_init_cleanup
/* VF Initial Cleanup data */;
-/* Host handle for the Async Completions */
-   struct regpair iwarp_handle;
 };
 /* Event Ring Entry */
 struct event_ring_entry {
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 034e885e..b1b0a2ed 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -765,15 +765,6 @@ struct ecore_dev {
 #define NUM_OF_ENG_PFS(dev)(ECORE_IS_BB(dev) ? MAX_NUM_PFS_BB \
  : MAX_NUM_PFS_K2)
 
-#ifndef REAL_ASIC_ONLY
-#define ENABLE_EAGLE_ENG1_WORKAROUND(p_hwfn) ( \
-   (ECORE_IS_BB_A0(p_hwfn->p_dev)) && \
-   (ECORE_PATH_ID(p_hwfn) == 1) && \
-   ((p_hwfn->hw_info.port_mode == ECORE_PORT_MODE_DE_2X40G) || \
-(p_hwfn->hw_info.port_mode == ECORE_PORT_MODE_DE_2X50G) || \
-(p_hwfn->hw_info.port_mode == ECORE_PORT_MODE_DE_2X25G)))
-#endif
-
 /**
  * @brief ecore_concrete_to_sw_fid - get the sw function id from
  *the concrete value.
diff --git a/drivers/net/qede/base/ecore_dcbx.c 
b/drivers/net/qede/base/ecore_dcbx.c
index 8175619a..5932948a 100644
--- a/drivers/net/qede/base/ecore_dcbx.c
+++ b/drivers/net/qede/base/ecore_dcbx.c
@@ -13,6 +13,7 @@
 #include "ecore_cxt.h"
 #include "ecore_gtt_reg_addr.h"
 #include "ecore_iro.h"
+#include "ecore_iov_api.h"
 
 #define ECORE_DCBX_MAX_MIB_READ_TRY(100)
 #define ECORE_ETH_TYPE_DEFAULT (0)
@@ -79,21 +80,6 @@ static bool ecore_dcbx_local(u32 dcbx_cfg_bitmap)
DCBX_CONFIG_VERSION_STATIC) ? true : false;
 }
 
-/* @@@TBD A0 Eagle workaround */
-void ecore_dcbx_eagle_workaround(struct ecor

[dpdk-dev] [PATCH 24/25] net/qede/base: dcbx changes for base driver

This patch includes changes for DCBX like:
 - Return empty parameters for oper-params query when negotiation is not
   complete
 - Use the ieee specific mask value for reading the ethtype value in the
   ieee dcbx mode
 - Endian-ness conversion is not needed for priority<->TC field, as the
   data is already being read/written by ecore in the bigendian way
 - While writing the ets config, base driver incorrectly merges the input
   values with the operational values. The values should be either set
   or unset
 - CEE selection field must be set regardless CEE/IEEE mode
 - Fail the dcbx query for VF interfaces
 - Semantic changes

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore.h  |   3 +
 drivers/net/qede/base/ecore_dcbx.c | 375 ++---
 drivers/net/qede/base/ecore_dcbx_api.h |   1 +
 drivers/net/qede/base/ecore_dev.c  |  24 ++-
 4 files changed, 185 insertions(+), 218 deletions(-)

diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index b1b0a2ed..b41ff4a2 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -373,6 +373,9 @@ struct ecore_hw_info {
u32 port_mode;
u32 hw_mode;
unsigned long device_capabilities;
+
+   /* Default DCBX mode */
+   u8 dcbx_mode;
 };
 
 struct ecore_hw_cid_data {
diff --git a/drivers/net/qede/base/ecore_dcbx.c 
b/drivers/net/qede/base/ecore_dcbx.c
index 5932948a..9fbddec0 100644
--- a/drivers/net/qede/base/ecore_dcbx.c
+++ b/drivers/net/qede/base/ecore_dcbx.c
@@ -28,99 +28,75 @@
 
 static bool ecore_dcbx_app_ethtype(u32 app_info_bitmap)
 {
-   return (ECORE_MFW_GET_FIELD(app_info_bitmap, DCBX_APP_SF) ==
-   DCBX_APP_SF_ETHTYPE) ? true : false;
+   return !!(ECORE_MFW_GET_FIELD(app_info_bitmap, DCBX_APP_SF) ==
+ DCBX_APP_SF_ETHTYPE);
 }
 
-static bool ecore_dcbx_app_port(u32 app_info_bitmap)
-{
-   return (ECORE_MFW_GET_FIELD(app_info_bitmap, DCBX_APP_SF) ==
-   DCBX_APP_SF_PORT) ? true : false;
-}
-
-static bool ecore_dcbx_ieee_app_port(u32 app_info_bitmap, u8 type)
+static bool ecore_dcbx_ieee_app_ethtype(u32 app_info_bitmap)
 {
u8 mfw_val = ECORE_MFW_GET_FIELD(app_info_bitmap, DCBX_APP_SF_IEEE);
 
/* Old MFW */
if (mfw_val == DCBX_APP_SF_IEEE_RESERVED)
-   return ecore_dcbx_app_port(app_info_bitmap);
+   return ecore_dcbx_app_ethtype(app_info_bitmap);
 
-   return (mfw_val == type || mfw_val == DCBX_APP_SF_IEEE_TCP_UDP_PORT) ?
-   true : false;
+   return !!(mfw_val == DCBX_APP_SF_IEEE_ETHTYPE);
 }
 
-static bool ecore_dcbx_default_tlv(u32 app_info_bitmap, u16 proto_id)
+static bool ecore_dcbx_app_port(u32 app_info_bitmap)
 {
-   return (ecore_dcbx_app_ethtype(app_info_bitmap) &&
-   proto_id == ECORE_ETH_TYPE_DEFAULT) ? true : false;
+   return !!(ECORE_MFW_GET_FIELD(app_info_bitmap, DCBX_APP_SF) ==
+ DCBX_APP_SF_PORT);
 }
 
-static bool ecore_dcbx_enabled(u32 dcbx_cfg_bitmap)
+static bool ecore_dcbx_ieee_app_port(u32 app_info_bitmap, u8 type)
 {
-   return (ECORE_MFW_GET_FIELD(dcbx_cfg_bitmap, DCBX_CONFIG_VERSION) ==
-   DCBX_CONFIG_VERSION_DISABLED) ? false : true;
-}
+   u8 mfw_val = ECORE_MFW_GET_FIELD(app_info_bitmap, DCBX_APP_SF_IEEE);
 
-static bool ecore_dcbx_cee(u32 dcbx_cfg_bitmap)
-{
-   return (ECORE_MFW_GET_FIELD(dcbx_cfg_bitmap, DCBX_CONFIG_VERSION) ==
-   DCBX_CONFIG_VERSION_CEE) ? true : false;
-}
+   /* Old MFW */
+   if (mfw_val == DCBX_APP_SF_IEEE_RESERVED)
+   return ecore_dcbx_app_port(app_info_bitmap);
 
-static bool ecore_dcbx_ieee(u32 dcbx_cfg_bitmap)
-{
-   return (ECORE_MFW_GET_FIELD(dcbx_cfg_bitmap, DCBX_CONFIG_VERSION) ==
-   DCBX_CONFIG_VERSION_IEEE) ? true : false;
+   return !!(mfw_val == type || mfw_val == DCBX_APP_SF_IEEE_TCP_UDP_PORT);
 }
 
-static bool ecore_dcbx_local(u32 dcbx_cfg_bitmap)
+static bool ecore_dcbx_default_tlv(u32 app_info_bitmap, u16 proto_id, bool 
ieee)
 {
-   return (ECORE_MFW_GET_FIELD(dcbx_cfg_bitmap, DCBX_CONFIG_VERSION) ==
-   DCBX_CONFIG_VERSION_STATIC) ? true : false;
+   bool ethtype;
+
+   if (ieee)
+   ethtype = ecore_dcbx_ieee_app_ethtype(app_info_bitmap);
+   else
+   ethtype = ecore_dcbx_app_ethtype(app_info_bitmap);
+
+   return !!(ethtype && (proto_id == ECORE_ETH_TYPE_DEFAULT));
 }
 
 static void
 ecore_dcbx_dp_protocol(struct ecore_hwfn *p_hwfn,
   struct ecore_dcbx_results *p_data)
 {
-   struct ecore_hw_info *p_info = &p_hwfn->hw_info;
enum dcbx_protocol_type id;
-   u8 prio, tc, size, update;
-   bool enable;
-   const char *name;   /* @DPDK */
int i;
 
-   size = OSAL_ARRAY_SIZE(ecore_dcbx_app_update);
+   DP_VERBOSE(p_hwfn, ECORE_MSG_DCB, "DCBX negotiated: %d\n",
+  p_data->dcbx_enabled);
 
-   D

[dpdk-dev] [PATCH 23/25] net/qede/base: semantic/formatting changes

This patch consists of semantic/formatting changes. It also includes
comment additions.

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/common_hsi.h   |   5 +-
 drivers/net/qede/base/ecore_dev.c|  53 ---
 drivers/net/qede/base/ecore_hsi_common.h |  14 +-
 drivers/net/qede/base/ecore_hw.c |   4 +-
 drivers/net/qede/base/ecore_init_ops.c   |  23 ++-
 drivers/net/qede/base/ecore_int.c|   6 +-
 drivers/net/qede/base/ecore_mcp.c|   5 +-
 drivers/net/qede/base/ecore_spq.c|   3 +-
 drivers/net/qede/base/ecore_sriov.c  |   8 +-
 drivers/net/qede/base/mcp_public.h   | 262 +++
 10 files changed, 186 insertions(+), 197 deletions(-)

diff --git a/drivers/net/qede/base/common_hsi.h 
b/drivers/net/qede/base/common_hsi.h
index 4083e86d..2f84148e 100644
--- a/drivers/net/qede/base/common_hsi.h
+++ b/drivers/net/qede/base/common_hsi.h
@@ -721,8 +721,7 @@ union event_ring_data {
u8 bytes[8] /* Byte Array */;
struct vf_pf_channel_eqe_data vf_pf_channel /* VF-PF Channel data */;
struct iscsi_eqe_data iscsi_info /* Dedicated fields to iscsi data */;
-   /* Dedicated field for RoCE affiliated asynchronous error */;
-   struct regpair roceHandle;
+   struct regpair roceHandle /* Dedicated field for RDMA data */;
struct malicious_vf_eqe_data malicious_vf /* Malicious VF data */;
struct initial_cleanup_eqe_data vf_init_cleanup
/* VF Initial Cleanup data */;
@@ -766,6 +765,8 @@ enum protocol_type {
MAX_PROTOCOL_TYPE
 };
 
+
+
 /*
  * Ustorm Queue Zone
  */
diff --git a/drivers/net/qede/base/ecore_dev.c 
b/drivers/net/qede/base/ecore_dev.c
index 15db09fc..b7540286 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -70,28 +70,26 @@ static u32 ecore_hw_bar_size(struct ecore_hwfn *p_hwfn, 
enum BAR_ID bar_id)
}
 
val = ecore_rd(p_hwfn, p_hwfn->p_main_ptt, bar_reg);
+   if (val)
+   return 1 << (val + 15);
 
/* The above registers were updated in the past only in CMT mode. Since
 * they were found to be useful MFW started updating them from 8.7.7.0.
 * In older MFW versions they are set to 0 which means disabled.
 */
-   if (!val) {
-   if (p_hwfn->p_dev->num_hwfns > 1) {
-   DP_NOTICE(p_hwfn, false,
- "BAR size not configured. Assuming BAR size");
-   DP_NOTICE(p_hwfn, false,
- "of 256kB for GRC and 512kB for DB\n");
-   return BAR_ID_0 ? 256 * 1024 : 512 * 1024;
-   } else {
-   DP_NOTICE(p_hwfn, false,
- "BAR size not configured. Assuming BAR size");
-   DP_NOTICE(p_hwfn, false,
- "of 512kB for GRC and 512kB for DB\n");
-   return 512 * 1024;
-   }
+   if (p_hwfn->p_dev->num_hwfns > 1) {
+   DP_NOTICE(p_hwfn, false,
+ "BAR size not configured. Assuming BAR size of 256kB"
+ " for GRC and 512kB for DB\n");
+   val = BAR_ID_0 ? 256 * 1024 : 512 * 1024;
+   } else {
+   DP_NOTICE(p_hwfn, false,
+ "BAR size not configured. Assuming BAR size of 512kB"
+ " for GRC and 512kB for DB\n");
+   val = 512 * 1024;
}
 
-   return 1 << (val + 15);
+   return val;
 }
 
 void ecore_init_dp(struct ecore_dev *p_dev,
@@ -1623,7 +1621,8 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev 
*p_dev,
u32 load_code, param;
int i;
 
-   if (p_params->int_mode == ECORE_INT_MODE_MSI && p_dev->num_hwfns > 1) {
+   if ((p_params->int_mode == ECORE_INT_MODE_MSI) &&
+   (p_dev->num_hwfns > 1)) {
DP_NOTICE(p_dev, false,
  "MSI mode is not supported for CMT devices\n");
return ECORE_INVAL;
@@ -2784,11 +2783,14 @@ ecore_get_hw_info(struct ecore_hwfn *p_hwfn, struct 
ecore_ptt *p_ptt,
ecore_mcp_cmd_port_init(p_hwfn, p_ptt);
}
 
-   if (personality != ECORE_PCI_DEFAULT)
+   if (personality != ECORE_PCI_DEFAULT) {
p_hwfn->hw_info.personality = personality;
-   else if (ecore_mcp_is_init(p_hwfn))
-   p_hwfn->hw_info.personality =
-   p_hwfn->mcp_info->func_info.protocol;
+   } else if (ecore_mcp_is_init(p_hwfn)) {
+   enum ecore_pci_personality protocol;
+
+   protocol = p_hwfn->mcp_info->func_info.protocol;
+   p_hwfn->hw_info.personality = protocol;
+   }
 
 #ifndef ASIC_ONLY
/* To overcome ILT lack for emulation, until at least until we'll have
@@ -2937,8 +2939,9 @@ void ecore_prepare_hibernate(struct ecore_dev *p_dev)
 #endif
 
 static en

[dpdk-dev] [PATCH 25/25] net/qede: update PMD version to 2.0.0.1

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/qede_ethdev.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h
index 9701d736..be54f31e 100644
--- a/drivers/net/qede/qede_ethdev.h
+++ b/drivers/net/qede/qede_ethdev.h
@@ -46,8 +46,8 @@
 
 /* Driver versions */
 #define QEDE_PMD_VER_PREFIX"QEDE PMD"
-#define QEDE_PMD_VERSION_MAJOR 1
-#define QEDE_PMD_VERSION_MINOR 2
+#define QEDE_PMD_VERSION_MAJOR 2
+#define QEDE_PMD_VERSION_MINOR 0
 #define QEDE_PMD_VERSION_REVISION   0
 #define QEDE_PMD_VERSION_PATCH 1
 
-- 
2.11.0.rc1

[dpdk-dev] [PATCH 0/3] net: optimize Rx/Tx log message level

These three patches optimized the level of Rx and Tx log
messages. Add a new log control function PMD_RX_FREE_LOG
to control the Rx message which is not printed in packet
receive processing. This function switched by macro 
RTE_LIBRTE__DEBUG_RX_FREE.

Qiming Yang (3):
  net/e1000: optimize Rx/Tx log message level
  net/i40e: optimize Rx/Tx log message level
  net/ixgbe: optimize Rx/Tx log message level

 config/common_base |  1 +
 drivers/net/e1000/e1000_logs.h |  7 +++
 drivers/net/e1000/em_rxtx.c| 10 +-
 drivers/net/e1000/igb_rxtx.c   | 10 +-
 drivers/net/i40e/i40e_logs.h   |  7 +++
 drivers/net/i40e/i40e_rxtx.c   |  2 +-
 drivers/net/ixgbe/ixgbe_logs.h |  7 +++
 drivers/net/ixgbe/ixgbe_rxtx.c | 14 +++---
 8 files changed, 40 insertions(+), 18 deletions(-)

-- 
2.7.4

[dpdk-dev] [PATCH 1/3] net/e1000: optimize Rx/Tx log message level

Signed-off-by: Qiming Yang 
---
 config/common_base |  1 +
 drivers/net/e1000/e1000_logs.h |  7 +++
 drivers/net/e1000/em_rxtx.c| 10 +-
 drivers/net/e1000/igb_rxtx.c   | 10 +-
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/config/common_base b/config/common_base
index 4bff83a..46e9797 100644
--- a/config/common_base
+++ b/config/common_base
@@ -143,6 +143,7 @@ CONFIG_RTE_LIBRTE_EM_PMD=y
 CONFIG_RTE_LIBRTE_IGB_PMD=y
 CONFIG_RTE_LIBRTE_E1000_DEBUG_INIT=n
 CONFIG_RTE_LIBRTE_E1000_DEBUG_RX=n
+CONFIG_RTE_LIBRTE_E1000_DEBUG_RX_FREE=n
 CONFIG_RTE_LIBRTE_E1000_DEBUG_TX=n
 CONFIG_RTE_LIBRTE_E1000_DEBUG_TX_FREE=n
 CONFIG_RTE_LIBRTE_E1000_DEBUG_DRIVER=n
diff --git a/drivers/net/e1000/e1000_logs.h b/drivers/net/e1000/e1000_logs.h
index 81e7bf5..407c245 100644
--- a/drivers/net/e1000/e1000_logs.h
+++ b/drivers/net/e1000/e1000_logs.h
@@ -50,6 +50,13 @@
 #define PMD_RX_LOG(level, fmt, args...) do { } while(0)
 #endif
 
+#ifdef RTE_LIBRTE_E1000_DEBUG_RX_FREE
+#define PMD_RX_FREE_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#else
+#define PMD_RX_FREE_LOG(level, fmt, args...) do { } while (0)
+#endif
+
 #ifdef RTE_LIBRTE_E1000_DEBUG_TX
 #define PMD_TX_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c
index 41f51c0..673af85 100644
--- a/drivers/net/e1000/em_rxtx.c
+++ b/drivers/net/e1000/em_rxtx.c
@@ -721,7 +721,7 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 
nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
if (nmb == NULL) {
-   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u "
   "queue_id=%u",
   (unsigned) rxq->port_id,
   (unsigned) rxq->queue_id);
@@ -806,7 +806,7 @@ eth_em_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 */
nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);
if (nb_hold > rxq->rx_free_thresh) {
-   PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
+   PMD_RX_FREE_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
   "nb_hold=%u nb_rx=%u",
   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,
   (unsigned) rx_id, (unsigned) nb_hold,
@@ -901,7 +901,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct rte_mbuf 
**rx_pkts,
 
nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
if (nmb == NULL) {
-   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u "
   "queue_id=%u", (unsigned) rxq->port_id,
   (unsigned) rxq->queue_id);

rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
@@ -1051,7 +1051,7 @@ eth_em_recv_scattered_pkts(void *rx_queue, struct 
rte_mbuf **rx_pkts,
 */
nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);
if (nb_hold > rxq->rx_free_thresh) {
-   PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
+   PMD_RX_FREE_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
   "nb_hold=%u nb_rx=%u",
   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,
   (unsigned) rx_id, (unsigned) nb_hold,
@@ -1391,7 +1391,7 @@ eth_em_rx_queue_count(struct rte_eth_dev *dev, uint16_t 
rx_queue_id)
uint32_t desc = 0;
 
if (rx_queue_id >= dev->data->nb_rx_queues) {
-   PMD_RX_LOG(DEBUG, "Invalid RX queue_id=%d", rx_queue_id);
+   PMD_RX_LOG(ERR, "Invalid RX queue_id=%d", rx_queue_id);
return 0;
}
 
diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c
index dbd37ac..b8e67c7 100644
--- a/drivers/net/e1000/igb_rxtx.c
+++ b/drivers/net/e1000/igb_rxtx.c
@@ -832,7 +832,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 
nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
if (nmb == NULL) {
-   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u "
   "queue_id=%u", (unsigned) rxq->port_id,
   (unsigned) rxq->queue_id);

rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
@@ -919,7 +919,7 @@ eth_igb_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 */
nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);
if (nb_hold > rxq->rx_free_thresh) {
-   PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%

[dpdk-dev] [PATCH 3/3] net/ixgbe: optimize Rx/Tx log message level

Signed-off-by: Qiming Yang 
---
 drivers/net/ixgbe/ixgbe_logs.h |  7 +++
 drivers/net/ixgbe/ixgbe_rxtx.c | 14 +++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_logs.h b/drivers/net/ixgbe/ixgbe_logs.h
index 53ba42d..68e47fd 100644
--- a/drivers/net/ixgbe/ixgbe_logs.h
+++ b/drivers/net/ixgbe/ixgbe_logs.h
@@ -50,6 +50,13 @@
 #define PMD_RX_LOG(level, fmt, args...) do { } while(0)
 #endif
 
+#ifdef RTE_LIBRTE_IXGBE_DEBUG_RX_FREE
+#define PMD_RX_FREE_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#else
+#define PMD_RX_FREE_LOG(level, fmt, args...) do { } while (0)
+#endif
+
 #ifdef RTE_LIBRTE_IXGBE_DEBUG_TX
 #define PMD_TX_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index b2d9f45..b52c793 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -1560,7 +1560,7 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
if (ixgbe_rx_alloc_bufs(rxq, true) != 0) {
int i, j;
 
-   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u "
   "queue_id=%u", (unsigned) rxq->port_id,
   (unsigned) rxq->queue_id);
 
@@ -1701,7 +1701,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 
nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
if (nmb == NULL) {
-   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed port_id=%u "
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed port_id=%u "
   "queue_id=%u", (unsigned) rxq->port_id,
   (unsigned) rxq->queue_id);

rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
@@ -1799,7 +1799,7 @@ ixgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 */
nb_hold = (uint16_t) (nb_hold + rxq->nb_rx_hold);
if (nb_hold > rxq->rx_free_thresh) {
-   PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
+   PMD_RX_FREE_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
   "nb_hold=%u nb_rx=%u",
   (unsigned) rxq->port_id, (unsigned) rxq->queue_id,
   (unsigned) rx_id, (unsigned) nb_hold,
@@ -1972,7 +1972,7 @@ ixgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf 
**rx_pkts, uint16_t nb_pkts,
if (!bulk_alloc) {
nmb = rte_mbuf_raw_alloc(rxq->mb_pool);
if (nmb == NULL) {
-   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed "
+   PMD_RX_LOG(ERR, "RX mbuf alloc failed "
  "port_id=%u queue_id=%u",
   rxq->port_id, rxq->queue_id);
 
@@ -1989,7 +1989,7 @@ ixgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf 
**rx_pkts, uint16_t nb_pkts,
next_rdt);
nb_hold -= rxq->rx_free_thresh;
} else {
-   PMD_RX_LOG(DEBUG, "RX bulk alloc failed "
+   PMD_RX_FREE_LOG(DEBUG, "RX bulk alloc failed "
  "port_id=%u queue_id=%u",
   rxq->port_id, rxq->queue_id);
 
@@ -2152,7 +2152,7 @@ ixgbe_recv_pkts_lro(void *rx_queue, struct rte_mbuf 
**rx_pkts, uint16_t nb_pkts,
 * hardware point of view...
 */
if (!bulk_alloc && nb_hold > rxq->rx_free_thresh) {
-   PMD_RX_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
+   PMD_RX_FREE_LOG(DEBUG, "port_id=%u queue_id=%u rx_tail=%u "
   "nb_hold=%u nb_rx=%u",
   rxq->port_id, rxq->queue_id, rx_id, nb_hold, nb_rx);
 
@@ -4763,7 +4763,7 @@ ixgbe_setup_loopback_link_82599(struct ixgbe_hw *hw)
if (ixgbe_verify_lesm_fw_enabled_82599(hw)) {
if (hw->mac.ops.acquire_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM) !=
IXGBE_SUCCESS) {
-   PMD_INIT_LOG(ERR, "Could not enable loopback mode");
+   PMD_INIT_LOG(WARNING, "Could not enable loopback mode");
/* ignore error */
return;
}
-- 
2.7.4

[dpdk-dev] [PATCH 2/3] net/i40e: optimize Rx/Tx log message level

Signed-off-by: Qiming Yang 
---
 drivers/net/i40e/i40e_logs.h | 7 +++
 drivers/net/i40e/i40e_rxtx.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_logs.h b/drivers/net/i40e/i40e_logs.h
index e042e24..5c25dbf 100644
--- a/drivers/net/i40e/i40e_logs.h
+++ b/drivers/net/i40e/i40e_logs.h
@@ -50,6 +50,13 @@
 #define PMD_RX_LOG(level, fmt, args...) do { } while(0)
 #endif
 
+#ifdef RTE_LIBRTE_I40E_DEBUG_RX_FREE
+#define PMD_RX_FREE_LOG(level, fmt, args...) \
+   RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
+#else
+#define PMD_RX_FREE_LOG(level, fmt, args...) do { } while (0)
+#endif
+
 #ifdef RTE_LIBRTE_I40E_DEBUG_TX
 #define PMD_TX_LOG(level, fmt, args...) \
RTE_LOG(level, PMD, "%s(): " fmt "\n", __func__, ## args)
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 7ae7d9f..ef25fb1 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -612,7 +612,7 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, 
uint16_t nb_pkts)
if (i40e_rx_alloc_bufs(rxq) != 0) {
uint16_t i, j;
 
-   PMD_RX_LOG(DEBUG, "Rx mbuf alloc failed for "
+   PMD_RX_LOG(ERR, "Rx mbuf alloc failed for "
   "port_id=%u, queue_id=%u",
   rxq->port_id, rxq->queue_id);
rxq->rx_nb_avail = 0;
-- 
2.7.4

[dpdk-dev] [PATCH 0/3] Add MACsec offload support for ixgbe

This patch set adds the MACsec offload support for ixgbe.
The testpmd is also updated to support MACsec cmds.

Tiwei Bie (3):
  lib: add MACsec offload flags
  net/ixgbe: add MACsec offload support
  app/testpmd: add ixgbe MACsec offload support

 app/test-pmd/cmdline.c  | 389 +
 app/test-pmd/macfwd.c   |   2 +
 app/test-pmd/macswap.c  |   2 +
 app/test-pmd/testpmd.h  |   2 +
 app/test-pmd/txonly.c   |   2 +
 drivers/net/ixgbe/ixgbe_ethdev.c| 436 +++-
 drivers/net/ixgbe/ixgbe_ethdev.h|  41 +++
 drivers/net/ixgbe/ixgbe_rxtx.c  |   3 +
 drivers/net/ixgbe/rte_pmd_ixgbe.h   |  98 +++
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map |  11 +
 lib/librte_ether/rte_ethdev.h   |   2 +
 lib/librte_mbuf/rte_mbuf.h  |   5 +
 12 files changed, 986 insertions(+), 7 deletions(-)

-- 
2.7.4

[dpdk-dev] [PATCH 1/3] lib: add MACsec offload flags

These flags will be used in next commits in the ixgbe pmd.

Signed-off-by: Tiwei Bie 
---
 lib/librte_ether/rte_ethdev.h | 2 ++
 lib/librte_mbuf/rte_mbuf.h| 5 +
 2 files changed, 7 insertions(+)

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 9678179..25a33e9 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -857,6 +857,7 @@ struct rte_eth_conf {
 #define DEV_RX_OFFLOAD_TCP_LRO 0x0010
 #define DEV_RX_OFFLOAD_QINQ_STRIP  0x0020
 #define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM 0x0040
+#define DEV_RX_OFFLOAD_MACSEC_STRIP 0x0080
 
 /**
  * TX offload capabilities of a device.
@@ -874,6 +875,7 @@ struct rte_eth_conf {
 #define DEV_TX_OFFLOAD_GRE_TNL_TSO  0x0400/**< Used for tunneling 
packet. */
 #define DEV_TX_OFFLOAD_IPIP_TNL_TSO 0x0800/**< Used for tunneling 
packet. */
 #define DEV_TX_OFFLOAD_GENEVE_TNL_TSO   0x1000/**< Used for tunneling 
packet. */
+#define DEV_TX_OFFLOAD_MACSEC_INSERT0x2000
 
 /**
  * Ethernet device information
diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index ead7c6e..46bb23f 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -182,6 +182,11 @@ extern "C" {
 /* add new TX flags here */
 
 /**
+ * MACsec offload flag.
+ */
+#define PKT_TX_MACSEC(1ULL << 44)
+
+/**
  * Bits 45:48 used for the tunnel type.
  * When doing Tx offload like TSO or checksum, the HW needs to configure the
  * tunnel type into the HW descriptors.
-- 
2.7.4

[dpdk-dev] [PATCH 2/3] net/ixgbe: add MACsec offload support

MACsec (or LinkSec, 802.1AE) is a MAC level encryption/authentication
scheme defined in IEEE 802.1AE that uses symmetric cryptography.
This commit adds the MACsec offload support for ixgbe.

Signed-off-by: Tiwei Bie 
---
 drivers/net/ixgbe/ixgbe_ethdev.c| 436 +++-
 drivers/net/ixgbe/ixgbe_ethdev.h|  41 +++
 drivers/net/ixgbe/ixgbe_rxtx.c  |   3 +
 drivers/net/ixgbe/rte_pmd_ixgbe.h   |  98 +++
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map |  11 +
 5 files changed, 582 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index edc9b22..2684097 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -232,6 +232,7 @@ static int ixgbe_dev_rss_reta_query(struct rte_eth_dev *dev,
 static void ixgbe_dev_link_status_print(struct rte_eth_dev *dev);
 static int ixgbe_dev_lsc_interrupt_setup(struct rte_eth_dev *dev);
 static int ixgbe_dev_rxq_interrupt_setup(struct rte_eth_dev *dev);
+static int ixgbe_dev_macsec_interrupt_setup(struct rte_eth_dev *dev);
 static int ixgbe_dev_interrupt_get_status(struct rte_eth_dev *dev);
 static int ixgbe_dev_interrupt_action(struct rte_eth_dev *dev);
 static void ixgbe_dev_interrupt_handler(struct rte_intr_handle *handle,
@@ -744,6 +745,51 @@ static const struct rte_ixgbe_xstats_name_off 
rte_ixgbe_stats_strings[] = {
 #define IXGBE_NB_HW_STATS (sizeof(rte_ixgbe_stats_strings) / \
   sizeof(rte_ixgbe_stats_strings[0]))
 
+/* MACsec statistics */
+static const struct rte_ixgbe_xstats_name_off rte_ixgbe_macsec_strings[] = {
+   {"out_pkts_untagged", offsetof(struct ixgbe_macsec_stats,
+   out_pkts_untagged)},
+   {"out_pkts_encrypted", offsetof(struct ixgbe_macsec_stats,
+   out_pkts_encrypted)},
+   {"out_pkts_protected", offsetof(struct ixgbe_macsec_stats,
+   out_pkts_protected)},
+   {"out_octets_encrypted", offsetof(struct ixgbe_macsec_stats,
+   out_octets_encrypted)},
+   {"out_octets_protected", offsetof(struct ixgbe_macsec_stats,
+   out_octets_protected)},
+   {"in_pkts_untagged", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_untagged)},
+   {"in_pkts_badtag", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_badtag)},
+   {"in_pkts_nosci", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_nosci)},
+   {"in_pkts_unknownsci", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_unknownsci)},
+   {"in_octets_decrypted", offsetof(struct ixgbe_macsec_stats,
+   in_octets_decrypted)},
+   {"in_octets_validated", offsetof(struct ixgbe_macsec_stats,
+   in_octets_validated)},
+   {"in_pkts_unchecked", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_unchecked)},
+   {"in_pkts_delayed", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_delayed)},
+   {"in_pkts_late", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_late)},
+   {"in_pkts_ok", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_ok)},
+   {"in_pkts_invalid", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_invalid)},
+   {"in_pkts_notvalid", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_notvalid)},
+   {"in_pkts_unusedsa", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_unusedsa)},
+   {"in_pkts_notusingsa", offsetof(struct ixgbe_macsec_stats,
+   in_pkts_notusingsa)},
+};
+
+#define IXGBE_NB_MACSEC_STATS (sizeof(rte_ixgbe_macsec_strings) / \
+  sizeof(rte_ixgbe_macsec_strings[0]))
+
 /* Per-queue statistics */
 static const struct rte_ixgbe_xstats_name_off rte_ixgbe_rxq_strings[] = {
{"mbuf_allocation_errors", offsetof(struct ixgbe_hw_stats, rnbc)},
@@ -2380,6 +2426,8 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
rte_intr_dp_is_en(intr_handle))
ixgbe_dev_rxq_interrupt_setup(dev);
 
+   ixgbe_dev_macsec_interrupt_setup(dev);
+
/* enable uio/vfio intr/eventfd mapping */
rte_intr_enable(intr_handle);
 
@@ -2557,6 +2605,7 @@ ixgbe_dev_close(struct rte_eth_dev *dev)
 static void
 ixgbe_read_stats_registers(struct ixgbe_hw *hw,
   struct ixgbe_hw_stats *hw_stats,
+  struct ixgbe_macsec_stats *macsec_stats,
   uint64_t *total_missed_rx, uint64_t *total_qbrc,
   uint64_t *total_qprc, uint64_t *total_qprdc)
 {
@@ -2726,6 +2775,40 @@ ixgbe_read_stats_registers(struct ixgbe_hw *hw,
/* Flow Director Stats registers */
hw_stats->fdirmatch += IXGBE_READ_REG(hw, IXGBE_FDIRMATCH);
hw_stats->fdirmiss += IXGBE_READ_REG(hw, IXGBE_FDIRMISS);
+
+   /* MACsec Stats registers */
+   macsec_stats->out_pkts_untagged += IXGBE_READ_REG(hw, IXGBE_LSECTXUT);
+   macsec_stats

[dpdk-dev] [PATCH 3/3] app/testpmd: add ixgbe MACsec offload support

add test for set macsec offload
add test for set macsec sc
add test for set macsec sa

Signed-off-by: Tiwei Bie 
---
 app/test-pmd/cmdline.c | 389 +
 app/test-pmd/macfwd.c  |   2 +
 app/test-pmd/macswap.c |   2 +
 app/test-pmd/testpmd.h |   2 +
 app/test-pmd/txonly.c  |   2 +
 5 files changed, 397 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 63b55dc..6d61c88 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -274,6 +274,18 @@ static void cmd_help_long_parsed(void *parsed_result,
 
"set vf mac antispoof (port_id) (vf_id) (on|off).\n"
"Set MAC antispoof for a VF from the PF.\n\n"
+
+   "set macsec offload (port_id) on encrypt (on|off) 
replay-protect (on|off)\n"
+   "Enable MACsec offload.\n\n"
+
+   "set macsec offload (port_id) off\n"
+   "Disable MACsec offload.\n\n"
+
+   "set macsec sc (tx|rx) (port_id) (mac) (pi)\n"
+   "Configure MACsec secure connection (SC).\n\n"
+
+   "set macsec sa (tx|rx) (port_id) (idx) (an) (pn) 
(key)\n"
+   "Configure MACsec secure association (SA).\n\n"
 #endif
 
"vlan set strip (on|off) (port_id)\n"
@@ -11409,6 +11421,379 @@ cmdline_parse_inst_t cmd_set_vf_mac_addr = {
NULL,
},
 };
+
+/* MACsec configuration */
+
+/* Common result structure for MACsec offload enable */
+struct cmd_macsec_offload_on_result {
+   cmdline_fixed_string_t set;
+   cmdline_fixed_string_t macsec;
+   cmdline_fixed_string_t offload;
+   uint8_t port_id;
+   cmdline_fixed_string_t on;
+   cmdline_fixed_string_t encrypt;
+   cmdline_fixed_string_t en_on_off;
+   cmdline_fixed_string_t replay_protect;
+   cmdline_fixed_string_t rp_on_off;
+};
+
+/* Common CLI fields for MACsec offload disable */
+cmdline_parse_token_string_t cmd_macsec_offload_on_set =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+set, "set");
+cmdline_parse_token_string_t cmd_macsec_offload_on_macsec =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+macsec, "macsec");
+cmdline_parse_token_string_t cmd_macsec_offload_on_offload =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+offload, "offload");
+cmdline_parse_token_string_t cmd_macsec_offload_on_port_id =
+   TOKEN_NUM_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+port_id, UINT8);
+cmdline_parse_token_string_t cmd_macsec_offload_on_on =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+on, "on");
+cmdline_parse_token_string_t cmd_macsec_offload_on_encrypt =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+encrypt, "encrypt");
+cmdline_parse_token_string_t cmd_macsec_offload_on_en_on_off =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+en_on_off, "on#off");
+cmdline_parse_token_string_t cmd_macsec_offload_on_replay_protect =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+replay_protect, "replay-protect");
+cmdline_parse_token_string_t cmd_macsec_offload_on_rp_on_off =
+   TOKEN_STRING_INITIALIZER
+   (struct cmd_macsec_offload_on_result,
+rp_on_off, "on#off");
+
+static void
+cmd_set_macsec_offload_on_parsed(
+   void *parsed_result,
+   __attribute__((unused)) struct cmdline *cl,
+   __attribute__((unused)) void *data)
+{
+   struct cmd_macsec_offload_on_result *res = parsed_result;
+   int ret;
+   portid_t port_id = res->port_id;
+   int en = (strcmp(res->en_on_off, "on") == 0) ? 1 : 0;
+   int rp = (strcmp(res->rp_on_off, "on") == 0) ? 1 : 0;
+
+   if (port_id_is_invalid(port_id, ENABLED_WARN))
+   return;
+
+   ports[port_id].tx_ol_flags |= TESTPMD_TX_OFFLOAD_MACSEC;
+   ret = rte_pmd_ixgbe_macsec_enable(port_id, en, rp);
+
+   switch (ret) {
+   case 0:
+   break;
+   case -ENODEV:
+   printf("invalid port_id %d\n", port_id);
+   break;
+   default:
+   printf("programming error: (%s)\n", strerror(-ret));
+   }
+}
+
+cmdline_parse_inst_t cmd_set_macsec_offload_on = {
+   .f = cmd_set_macsec_offload_on_parsed,
+   .data = NULL,
+   .help_str = "set macsec offload port_id on "
+   "encrypt on|off replay-protect on|off",
+   .tokens = {
+   (void *)&cmd_macsec_offload_on_set,
+   (void *)&cmd_macsec_offload_on_macsec,
+   (void *)&c

[dpdk-dev] Intent to upstream Atomic Rules net/ark "Arkville" in DPDK 17.05

2016-12-03 Thread Shepard Siegel

Atomic Rules would like to include our Arkville DPDK PMD net/ark in the
DPDK 17.05 release. We have been watching the recent process of
Solarflare’s net/sfc upstreaming and we decided it would be too aggressive
for us to get in on 17.02. Rather than be the last in queue for 17.02, we
would prefer to be one of the first in the queue for 17.05. This post is
our statement of that intent.

Arkville is a product from Atomic Rules which is a combination of hardware
and software. In the DPDK community, the easy way to describe Arkville is
that it is a line-rate agnostic FPGA-based NIC that does include any
specific MAC. Arkville is unique in that the design process worked backward
from the DPDK API/ABI to allow us to design RTL DPDK-aware data movers.
Arkville’s customers are the small and brave set of users that demand an
FPGA exist between their MAC ports and their host. A link to a slide deck
and product preview shown last month at SC16 is at the end of this post.

Although we’ve done substantial testing; we are just now setting up a
proper DTS environment. Our first course of business is to add two 10 GbE
ports and make Arkville look like a Fortville X710-DA2. This is strange for
us because we started out with four 100 GbE ports, and not much else to
talk to! We are eager to work with merchant 100 GbE ASIC NICs to help bring
DTS into the 100 GbE realm. But 100 GbE aside, as soon as we see our
net/ark PMD playing nice in DTS with a Fortville, and the 17.05 aperture
opens; we will commence the patch submission process.

Thanks all who have helped us get this far so soon. Anyone needing
additional details that aren’t DPDK community wide, please contact me
directly.

Shep for AR Team

Shepard Siegel, CTO

atomicrules.com

Links:

https://dl.dropboxusercontent.com/u/5548901/share/AtomicRules_Arkville_SC16.pdf

https://forums.xilinx.com/t5/Xcell-Daily-Blog/BittWare-s-UltraScale-XUPP3R-board-and-Atomic-Rules-IP-run-Intel/ba-p/734110

[dpdk-dev] [PATCH v2] cryptodev: fix crash on null dereference

crypodev->data->name will be null when
rte_cryptodev_get_dev_id() invoked without a valid
crypto device instance.

Fixes: d11b0f30df88 ("cryptodev: introduce API and framework for crypto 
devices")

Signed-off-by: Jerin Jacob 
Acked-by: Arek Kusztal 
CC: sta...@dpdk.org
---
 lib/librte_cryptodev/rte_cryptodev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_cryptodev/rte_cryptodev.c 
b/lib/librte_cryptodev/rte_cryptodev.c
index 127e8d0..54e95d5 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -225,13 +225,14 @@ rte_cryptodev_create_vdev(const char *name, const char 
*args)
 }
 
 int
-rte_cryptodev_get_dev_id(const char *name) {
+rte_cryptodev_get_dev_id(const char *name)
+{
unsigned i;
 
if (name == NULL)
return -1;
 
-   for (i = 0; i < rte_cryptodev_globals->max_devs; i++)
+   for (i = 0; i < rte_cryptodev_globals->nb_devs; i++)
if ((strcmp(rte_cryptodev_globals->devs[i].data->name, name)
== 0) &&
(rte_cryptodev_globals->devs[i].attached ==
-- 
2.5.5

[dpdk-dev] [PATCH v2 1/2] eal: postpone vdev initialization

Some platform like octeontx may use pci and
vdev based combined device to represent a logical
dpdk functional device.In such case, postponing the
vdev initialization after pci device
initialization will provide the better view of
the pci device resources in the system in
vdev's probe function, and it allows better
functional subsystem registration in vdev probe
function.

As a bonus, This patch fixes a bond device
initialization use case.

example command to reproduce the issue:
./testpmd -c 0x2  --vdev 'eth_bond0,mode=0,
slave=:02:00.0,slave=:03:00.0' --
--port-topology=chained

root cause:
In existing case(vdev initialization and then pci
initialization), creates three Ethernet ports with
following port ids
0 - Bond device
1 - PCI device 0
2 - PCI devive 1

Since testpmd, calls the configure/start on all the ports on
start up,it will translate to following illegal setup sequence

1)bond device configure/start
1.1) pci device0 stop/configure/start
1.2) pci device1 stop/configure/start
2)pci device 0 configure(illegal setup case,
as device in start state)

The fix changes the initialization sequence and
allow initialization in following valid setup order
1) pcie device 0 configure/start
2) pcie device 1 configure/start
3) bond device 2 configure/start
3.1) pcie device 0/stop/configure/start
3.2) pcie device 1/stop/configure/start

Signed-off-by: Jerin Jacob 
---
 lib/librte_eal/bsdapp/eal/eal.c   | 6 +++---
 lib/librte_eal/linuxapp/eal/eal.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 35e3117..2206277 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -577,9 +577,6 @@ rte_eal_init(int argc, char **argv)
rte_config.master_lcore, thread_id, cpuset,
ret == 0 ? "" : "...");
 
-   if (rte_eal_dev_init() < 0)
-   rte_panic("Cannot init pmd devices\n");
-
RTE_LCORE_FOREACH_SLAVE(i) {
 
/*
@@ -616,6 +613,9 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
 
+   if (rte_eal_dev_init() < 0)
+   rte_panic("Cannot init pmd devices\n");
+
rte_eal_mcfg_complete();
 
return fctret;
diff --git a/lib/librte_eal/linuxapp/eal/eal.c 
b/lib/librte_eal/linuxapp/eal/eal.c
index 2075282..16dd5b9 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -841,9 +841,6 @@ rte_eal_init(int argc, char **argv)
rte_config.master_lcore, (int)thread_id, cpuset,
ret == 0 ? "" : "...");
 
-   if (rte_eal_dev_init() < 0)
-   rte_panic("Cannot init pmd devices\n");
-
if (rte_eal_intr_init() < 0)
rte_panic("Cannot init interrupt-handling thread\n");
 
@@ -887,6 +884,9 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
 
+   if (rte_eal_dev_init() < 0)
+   rte_panic("Cannot init pmd devices\n");
+
rte_eal_mcfg_complete();
 
return fctret;
-- 
2.5.5

[dpdk-dev] [PATCH v2 0/2] postpone vdev initialization

v2:
- No changes in eal: postpone vdev initialization
- Added new patch "eal: rename dev init API for consistency" as
suggested by Shreyansh Jain
http://dpdk.org/dev/patchwork/patch/17096/

Jerin Jacob (2):
  eal: postpone vdev initialization
  eal: rename dev init API for consistency

 drivers/net/virtio/virtio_user_ethdev.c |  2 +-
 lib/librte_eal/bsdapp/eal/eal.c |  6 ++---
 lib/librte_eal/bsdapp/eal/rte_eal_version.map   |  2 +-
 lib/librte_eal/common/eal_common_dev.c  | 29 -
 lib/librte_eal/common/eal_common_vdev.c | 29 +
 lib/librte_eal/common/include/rte_dev.h |  4 ++--
 lib/librte_eal/linuxapp/eal/eal.c   |  6 ++---
 lib/librte_eal/linuxapp/eal/rte_eal_version.map |  2 +-
 8 files changed, 40 insertions(+), 40 deletions(-)

-- 
2.5.5

[dpdk-dev] [PATCH v2 2/2] eal: rename dev init API for consistency

rte_eal_dev_init() is a misleading name.
It actually performs the driver->probe for vdev,
which is parallel to rte_eal_pci_probe.

Changed to rte_eal_vdev_probe for consistency and
moved the vdev specific probe to eal_common_vdev.c

Suggested-by: Shreyansh Jain 
Signed-off-by: Jerin Jacob 
---
 drivers/net/virtio/virtio_user_ethdev.c |  2 +-
 lib/librte_eal/bsdapp/eal/eal.c |  4 ++--
 lib/librte_eal/bsdapp/eal/rte_eal_version.map   |  2 +-
 lib/librte_eal/common/eal_common_dev.c  | 29 -
 lib/librte_eal/common/eal_common_vdev.c | 29 +
 lib/librte_eal/common/include/rte_dev.h |  4 ++--
 lib/librte_eal/linuxapp/eal/eal.c   |  4 ++--
 lib/librte_eal/linuxapp/eal/rte_eal_version.map |  2 +-
 8 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/drivers/net/virtio/virtio_user_ethdev.c 
b/drivers/net/virtio/virtio_user_ethdev.c
index 406beea..3b8f111 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -327,7 +327,7 @@ virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)
 }
 
 /* Dev initialization routine. Invoked once for each virtio vdev at
- * EAL init time, see rte_eal_dev_init().
+ * EAL init time, see rte_eal_vdev_probe().
  * Returns 0 on success.
  */
 static int
diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 2206277..62245f3 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -613,8 +613,8 @@ rte_eal_init(int argc, char **argv)
if (rte_eal_pci_probe())
rte_panic("Cannot probe PCI\n");
 
-   if (rte_eal_dev_init() < 0)
-   rte_panic("Cannot init pmd devices\n");
+   if (rte_eal_vdev_probe() < 0)
+   rte_panic("Cannot probe vdev drivers\n");
 
rte_eal_mcfg_complete();
 
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map 
b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index 2f81f7c..f90bde9 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -22,7 +22,7 @@ DPDK_2.0 {
rte_dump_tailq;
rte_eal_alarm_cancel;
rte_eal_alarm_set;
-   rte_eal_dev_init;
+   rte_eal_vdev_probe;
rte_eal_devargs_add;
rte_eal_devargs_dump;
rte_eal_devargs_type_count;
diff --git a/lib/librte_eal/common/eal_common_dev.c 
b/lib/librte_eal/common/eal_common_dev.c
index 4f3b493..6d6868f 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -38,7 +38,6 @@
 #include 
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -76,34 +75,6 @@ void rte_eal_device_remove(struct rte_device *dev)
TAILQ_REMOVE(&dev_device_list, dev, next);
 }
 
-int
-rte_eal_dev_init(void)
-{
-   struct rte_devargs *devargs;
-
-   /*
-* Note that the dev_driver_list is populated here
-* from calls made to rte_eal_driver_register from constructor functions
-* embedded into PMD modules via the RTE_PMD_REGISTER_VDEV macro
-*/
-
-   /* call the init function for each virtual device */
-   TAILQ_FOREACH(devargs, &devargs_list, next) {
-
-   if (devargs->type != RTE_DEVTYPE_VIRTUAL)
-   continue;
-
-   if (rte_eal_vdev_init(devargs->virt.drv_name,
-   devargs->args)) {
-   RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
-   devargs->virt.drv_name);
-   return -1;
-   }
-   }
-
-   return 0;
-}
-
 int rte_eal_dev_attach(const char *name, const char *devargs)
 {
struct rte_pci_addr addr;
diff --git a/lib/librte_eal/common/eal_common_vdev.c 
b/lib/librte_eal/common/eal_common_vdev.c
index 0ff2377..ed6a751 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -37,6 +37,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -114,3 +115,31 @@ rte_eal_vdev_uninit(const char *name)
RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
return -EINVAL;
 }
+
+int
+rte_eal_vdev_probe(void)
+{
+   struct rte_devargs *devargs;
+
+   /*
+* Note that the dev_driver_list is populated here
+* from calls made to rte_eal_driver_register from constructor functions
+* embedded into PMD modules via the RTE_PMD_REGISTER_VDEV macro
+*/
+
+   /* call the init function for each virtual device */
+   TAILQ_FOREACH(devargs, &devargs_list, next) {
+
+   if (devargs->type != RTE_DEVTYPE_VIRTUAL)
+   continue;
+
+   if (rte_eal_vdev_init(devargs->virt.drv_name,
+   devargs->args)) {
+   RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
+

[dpdk-dev] [PATCH 0/5] Interrupt mode for virtio PMD

First of all, interrupt mode here means per-queue Rx interrupt
support.

Historically, virtio PMD can only be binded to igb_uio or
uio_pci_generic, and not for vfio-pci. Besides, quote from
http://dpdk.org/doc/guides-16.11/rel_notes/release_2_1.html:
  "- Per queue RX interrupt events are only allowed in VFIO
 which supports multiple MSI-X vectors.
   - In UIO, the RX interrupt shares the same vector with other
 interrupts. When the RX interrupt and LSC interrupt are both
 enabled, only the former is available.
   - RX interrupt is only implemented for the linuxapp target"

As Linux starts to support vfio noiommu mode since 4.8.0, it's
a good chance to enable per queue RX interrupt for virtio PMD.
This patchset is an attempt to enable this.

Note: this patch set is still under developping, not ready for test.

Signed-off-by: Jianfeng Tan 

Jianfeng Tan (5):
  net/virtio: add Rx descriptor check
  net/virtio: setup Rx fastpath interrupts
  net/virtio: remove Rx queue interrupts when stopping
  net/virtio: add Rx queue intr enable/disable functions
  examples/l3fwd: add parse-ptype option

 drivers/net/virtio/virtio_ethdev.c | 74 +++---
 drivers/net/virtio/virtio_ethdev.h |  3 ++
 drivers/net/virtio/virtio_rxtx.c   |  9 +
 drivers/net/virtio/virtqueue.c | 11 --
 drivers/net/virtio/virtqueue.h | 26 +-
 examples/l3fwd-power/main.c| 60 ++-
 6 files changed, 165 insertions(+), 18 deletions(-)

-- 
2.7.4

[dpdk-dev] [PATCH 2/5] net/virtio: setup Rx fastpath interrupts

In virtio, each rx queue has one exclusive interrupt (corresponding
to irqfd in the qemu/kvm) to get notified when packets are available
in that queue. That is to say, queues cannot share interrupt. So we
have 1:1 mapping between queues and interrupts.

This patch creates eventfds for each Rx queue and configures the info
into kernel.

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c | 42 +++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index 681a86b..886524c 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1474,6 +1474,9 @@ virtio_dev_start(struct rte_eth_dev *dev)
struct virtnet_rx *rxvq;
struct virtnet_tx *txvq __rte_unused;
struct virtio_hw *hw = dev->data->dev_private;
+   struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;
+
+   rte_intr_disable(intr_handle);
 
/* check if lsc interrupt feature is enabled */
if (dev->data->dev_conf.intr_conf.lsc) {
@@ -1482,9 +1485,37 @@ virtio_dev_start(struct rte_eth_dev *dev)
return -ENOTSUP;
}
 
-   if (rte_intr_enable(&dev->pci_dev->intr_handle) < 0) {
-   PMD_DRV_LOG(ERR, "interrupt enable failed");
-   return -EIO;
+   }
+
+   if (dev->data->dev_conf.intr_conf.rxq) {
+   /*
+* 1. uio, igb_uio, vfio (type1): lsc and rxq interrupt share
+* one interrupt.
+* 2. vfio (noiommu): .
+*/
+   uint32_t intr_vector;
+
+   if (!rte_intr_cap_multiple(intr_handle)) {
+   PMD_INIT_LOG(ERR, "Multiple intr vector not supported");
+   return -1;
+   }
+
+   intr_vector = dev->data->nb_rx_queues;
+   if (rte_intr_efd_enable(intr_handle, intr_vector)) {
+   PMD_INIT_LOG(ERR, "Fail to create eventfd");
+   return -1;
+   }
+   }
+
+   if (rte_intr_dp_is_en(intr_handle) && !intr_handle->intr_vec) {
+   intr_handle->intr_vec =
+   rte_zmalloc("intr_vec",
+   dev->data->nb_rx_queues * sizeof(int),
+   0);
+   if (!intr_handle->intr_vec) {
+   PMD_INIT_LOG(ERR, "Failed to allocate %d rx_queues"
+" intr_vec\n", dev->data->nb_rx_queues);
+   return -ENOMEM;
}
}
 
@@ -1520,6 +1551,11 @@ virtio_dev_start(struct rte_eth_dev *dev)
VIRTQUEUE_DUMP(txvq->vq);
}
 
+   if (rte_intr_enable(intr_handle) < 0) {
+   PMD_DRV_LOG(ERR, "interrupt enable failed");
+   return -EIO;
+   }
+
return 0;
 }
 
-- 
2.7.4

[dpdk-dev] [PATCH 1/5] net/virtio: add Rx descriptor check

Under interrupt mode, rx_descriptor_done is used as an indicator
for applications to check if some number of packets are ready to
be received.

This patch enables this by checking used ring's local consumed idx
with shared (with backend) idx.

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c | 1 +
 drivers/net/virtio/virtio_ethdev.h | 3 +++
 drivers/net/virtio/virtio_rxtx.c   | 9 +
 3 files changed, 13 insertions(+)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index 079fd6c..681a86b 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -737,6 +737,7 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
.link_update = virtio_dev_link_update,
.rx_queue_setup  = virtio_dev_rx_queue_setup,
.rx_queue_release= virtio_dev_queue_release,
+   .rx_descriptor_done  = virtio_dev_rx_queue_done,
.tx_queue_setup  = virtio_dev_tx_queue_setup,
.tx_queue_release= virtio_dev_queue_release,
/* collect stats per queue */
diff --git a/drivers/net/virtio/virtio_ethdev.h 
b/drivers/net/virtio/virtio_ethdev.h
index 27d9a19..4ab81c6 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -78,6 +78,9 @@ void virtio_dev_cq_start(struct rte_eth_dev *dev);
 /*
  * RX/TX function prototypes
  */
+
+int virtio_dev_rx_queue_done(void *rxq, uint16_t offset);
+
 int  virtio_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
uint16_t nb_rx_desc, unsigned int socket_id,
const struct rte_eth_rxconf *rx_conf,
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
index 22d97a4..aeea0db 100644
--- a/drivers/net/virtio/virtio_rxtx.c
+++ b/drivers/net/virtio/virtio_rxtx.c
@@ -72,6 +72,15 @@
 #define VIRTIO_SIMPLE_FLAGS ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
ETH_TXQ_FLAGS_NOOFFLOADS)
 
+int
+virtio_dev_rx_queue_done(void *rxq, uint16_t offset)
+{
+   struct virtnet_rx *rxvq = rxq;
+   struct virtqueue *vq = rxvq->vq;
+
+   return (VIRTQUEUE_NUSED(vq) >= offset);
+}
+
 static void
 vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx)
 {
-- 
2.7.4

[dpdk-dev] [PATCH 3/5] net/virtio: remove Rx queue interrupts when stopping

This patch disables Rx queue interrupts, cleans the datapath event
and queue/vector map when stopping the device.

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index 886524c..cc5750e 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1484,7 +1484,6 @@ virtio_dev_start(struct rte_eth_dev *dev)
PMD_DRV_LOG(ERR, "link status not supported by host");
return -ENOTSUP;
}
-
}
 
if (dev->data->dev_conf.intr_conf.rxq) {
@@ -1611,11 +1610,17 @@ static void
 virtio_dev_stop(struct rte_eth_dev *dev)
 {
struct rte_eth_link link;
+   struct rte_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf;
+   struct rte_intr_handle *intr_handle = &dev->pci_dev->intr_handle;
 
PMD_INIT_LOG(DEBUG, "stop");
 
-   if (dev->data->dev_conf.intr_conf.lsc)
-   rte_intr_disable(&dev->pci_dev->intr_handle);
+   if (intr_conf->lsc || intr_conf->rxq) {
+   rte_intr_disable(intr_handle);
+   rte_intr_efd_disable(intr_handle);
+   rte_free(intr_handle->intr_vec);
+   intr_handle->intr_vec = NULL;
+   }
 
memset(&link, 0, sizeof(link));
virtio_dev_atomic_write_link_status(dev, &link);
-- 
2.7.4

[dpdk-dev] [PATCH 4/5] net/virtio: add Rx queue intr enable/disable functions

This patch implements interrupt enable/disable functions for each
Rx queue. And we rely on flags of avail queue as the hint for virtio
device to interrupt virtio driver or not.

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c | 22 ++
 drivers/net/virtio/virtqueue.c | 11 ---
 drivers/net/virtio/virtqueue.h | 26 +-
 3 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index cc5750e..d7db698 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -715,6 +715,26 @@ virtio_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
return 0;
 }
 
+static int
+virtio_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+   struct virtnet_rx *rxvq = dev->data->rx_queues[queue_id];
+   struct virtqueue *vq = rxvq->vq;
+
+   virtqueue_enable_intr(vq);
+   return 0;
+}
+
+static int
+virtio_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
+{
+   struct virtnet_rx *rxvq = dev->data->rx_queues[queue_id];
+   struct virtqueue *vq = rxvq->vq;
+
+   virtqueue_disable_intr(vq);
+   return 0;
+}
+
 /*
  * dev_ops for virtio, bare necessities for basic operation
  */
@@ -736,6 +756,8 @@ static const struct eth_dev_ops virtio_eth_dev_ops = {
.xstats_reset= virtio_dev_stats_reset,
.link_update = virtio_dev_link_update,
.rx_queue_setup  = virtio_dev_rx_queue_setup,
+   .rx_queue_intr_enable= virtio_dev_rx_queue_intr_enable,
+   .rx_queue_intr_disable   = virtio_dev_rx_queue_intr_disable,
.rx_queue_release= virtio_dev_queue_release,
.rx_descriptor_done  = virtio_dev_rx_queue_done,
.tx_queue_setup  = virtio_dev_tx_queue_setup,
diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index 7f60e3e..9ad77b8 100644
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -38,17 +38,6 @@
 #include "virtio_logs.h"
 #include "virtio_pci.h"
 
-void
-virtqueue_disable_intr(struct virtqueue *vq)
-{
-   /*
-* Set VRING_AVAIL_F_NO_INTERRUPT to hint host
-* not to interrupt when it consumes packets
-* Note: this is only considered a hint to the host
-*/
-   vq->vq_ring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
-}
-
 /*
  * Two types of mbuf to be cleaned:
  * 1) mbuf that has been consumed by backend but not used by virtio.
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index f0bb089..b9b6e58 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -274,7 +274,31 @@ vring_desc_init(struct vring_desc *dp, uint16_t n)
 /**
  * Tell the backend not to interrupt us.
  */
-void virtqueue_disable_intr(struct virtqueue *vq);
+static inline void
+virtqueue_disable_intr(struct virtqueue *vq)
+{
+   /*
+* Set VRING_AVAIL_F_NO_INTERRUPT to hint host
+* not to interrupt when it consumes packets
+* Note: this is only considered a hint to the host
+*/
+   vq->vq_ring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
+}
+
+/**
+ * Tell the backend to interrupt us.
+ */
+static inline void
+virtqueue_enable_intr(struct virtqueue *vq)
+{
+   /*
+* Unset VRING_AVAIL_F_NO_INTERRUPT to hint host
+* to interrupt when it consumes packets
+* Note: this is only considered a hint to the host
+*/
+   vq->vq_ring.avail->flags &= (~VRING_AVAIL_F_NO_INTERRUPT);
+}
+
 /**
  *  Dump virtqueue internal structures, for debug purpose only.
  */
-- 
2.7.4

[dpdk-dev] [PATCH 5/5] examples/l3fwd: add parse-ptype option

To support those devices that do not provide packet type info when
receiving packets, add a new option, --parse-ptype, to analyze
packet type in the Rx callback.

Signed-off-by: Jianfeng Tan 
---
 examples/l3fwd-power/main.c | 60 -
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index b65d683..46c37bf 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -164,6 +164,8 @@ static uint32_t enabled_port_mask = 0;
 static int promiscuous_on = 0;
 /* NUMA is enabled by default. */
 static int numa_on = 1;
+static int parse_ptype; /**< Parse packet type using rx callback, and */
+   /**< disabled by default */
 
 enum freq_scale_hint_t
 {
@@ -607,6 +609,48 @@ get_ipv4_dst_port(struct ipv4_hdr *ipv4_hdr, uint8_t 
portid,
 #endif
 
 static inline void
+parse_ptype_one(struct rte_mbuf *m)
+{
+   struct ether_hdr *eth_hdr;
+   uint32_t packet_type = RTE_PTYPE_UNKNOWN;
+   uint16_t ether_type;
+
+   eth_hdr = rte_pktmbuf_mtod(m, struct ether_hdr *);
+   ether_type = eth_hdr->ether_type;
+   if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv4))
+   packet_type |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
+   else if (ether_type == rte_cpu_to_be_16(ETHER_TYPE_IPv6))
+   packet_type |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
+
+   m->packet_type = packet_type;
+}
+
+static uint16_t
+cb_parse_ptype(uint8_t port __rte_unused, uint16_t queue __rte_unused,
+  struct rte_mbuf *pkts[], uint16_t nb_pkts,
+  uint16_t max_pkts __rte_unused,
+  void *user_param __rte_unused)
+{
+   unsigned i;
+
+   for (i = 0; i < nb_pkts; ++i)
+   parse_ptype_one(pkts[i]);
+
+   return nb_pkts;
+}
+
+static int
+add_cb_parse_ptype(uint8_t portid, uint16_t queueid)
+{
+   printf("Port %d: softly parse packet type info\n", portid);
+   if (rte_eth_add_rx_callback(portid, queueid, cb_parse_ptype, NULL))
+   return 0;
+
+   printf("Failed to add rx callback: port=%d\n", portid);
+   return -1;
+}
+
+static inline void
 l3fwd_simple_forward(struct rte_mbuf *m, uint8_t portid,
struct lcore_conf *qconf)
 {
@@ -1108,7 +1152,8 @@ print_usage(const char *prgname)
"  --config (port,queue,lcore): rx queues configuration\n"
"  --no-numa: optional, disable numa awareness\n"
"  --enable-jumbo: enable jumbo frame"
-   " which max packet len is PKTLEN in decimal (64-9600)\n",
+   " which max packet len is PKTLEN in decimal (64-9600)\n"
+   "  --parse-ptype: parse packet type by software\n",
prgname);
 }
 
@@ -1202,6 +1247,8 @@ parse_config(const char *q_arg)
return 0;
 }
 
+#define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
+
 /* Parse the argument given in the command line of the application */
 static int
 parse_args(int argc, char **argv)
@@ -1214,6 +1261,7 @@ parse_args(int argc, char **argv)
{"config", 1, 0, 0},
{"no-numa", 0, 0, 0},
{"enable-jumbo", 0, 0, 0},
+   {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, 0},
{NULL, 0, 0, 0}
};
 
@@ -1284,6 +1332,13 @@ parse_args(int argc, char **argv)
(unsigned int)port_conf.rxmode.max_rx_pkt_len);
}
 
+   if (!strncmp(lgopts[option_index].name,
+CMD_LINE_OPT_PARSE_PTYPE,
+sizeof(CMD_LINE_OPT_PARSE_PTYPE))) {
+   printf("soft parse-ptype is enabled\n");
+   parse_ptype = 1;
+   }
+
break;
 
default:
@@ -1716,6 +1771,9 @@ main(int argc, char **argv)
rte_exit(EXIT_FAILURE,
"rte_eth_rx_queue_setup: err=%d, "
"port=%d\n", ret, portid);
+
+   if (parse_ptype && add_cb_parse_ptype(portid, queueid))
+   rte_exit(EXIT_FAILURE, "Fail to add ptype 
cb\n");
}
}
 
-- 
2.7.4

[dpdk-dev] [PATCH] Add crypto PMD optimized for ARMv8

2016-12-03 Thread zbigniew.bodek

From: Zbigniew Bodek 

Introduce crypto poll mode driver using ARMv8
cryptographic extensions. This PMD is optimized
to provide performance boost for chained
crypto operations processing, such as:
* encryption + HMAC generation
* decryption + HMAC validation.
In particular, cipher only or hash only
operations are not provided. 
Performance gain can be observed in tests
against OpenSSL PMD which also uses ARM
crypto extensions for packets processing.

Exemplary crypto performance tests comparison:

cipher_hash. cipher algo: AES_CBC
auth algo: SHA1_HMAC cipher key size=16.
burst_size: 64 ops

ARMv8 PMD improvement over OpenSSL PMD
(Optimized for ARMv8 cipher only and hash
only cases):

Buffer
Size(B)   OPS(M)  Throughput(Gbps)
64729 %   742 %
128   577 %   592 %
256   483 %   476 %
512   336 %   351 %
768   300 %   286 %
1024  263 %   250 %
1280  225 %   229 %
1536  214 %   213 %
1792  186 %   203 %
2048  200 %   193 %

The driver currently supports AES-128-CBC
in combination with: SHA256 MAC, SHA256 HMAC
and SHA1 HMAC.

CPU compatibility with this virtual device
is detected in run-time and virtual crypto
device will not be created if CPU doesn't
provide AES, SHA1, SHA2 and NEON.

The functionality and performance of this
code can be tested using generic test application
with the following commands:
* cryptodev_sw_armv8_autotest
* cryptodev_sw_armv8_perftest
New test vectors and cases have been added
to the general pool. In particular SHA256 MAC
and SHA1 HMAC for short cases were introduced.
This is because low-level ARM assembly code
is using different code paths for long and
short data sets, so in order to test the
mentioned driver correctly, two different
data sets need to be provided.

The assembly code requires some style
improvements to avoid using >80 character lines.
This issue will be addressed in v2 patch.
Further performance improvements are planned
in the following patch revisions.

Zbigniew Bodek (3):
  mk: fix build of assembly files for ARM64
  crypto/armv8: add PMD optimized for ARMv8 processors
  app/test: add ARMv8 crypto tests and test vectors

 MAINTAINERS|6 +
 app/test/test_cryptodev.c  |   63 +
 app/test/test_cryptodev_aes_test_vectors.h |  211 ++-
 app/test/test_cryptodev_blockcipher.c  |4 +
 app/test/test_cryptodev_blockcipher.h  |1 +
 app/test/test_cryptodev_perf.c |  508 ++
 config/common_base |6 +
 config/defconfig_arm64-armv8a-linuxapp-gcc |2 +
 doc/guides/cryptodevs/armv8.rst|   82 +
 doc/guides/cryptodevs/index.rst|1 +
 doc/guides/rel_notes/release_17_02.rst |5 +
 drivers/crypto/Makefile|3 +
 drivers/crypto/armv8/Makefile  |   84 +
 drivers/crypto/armv8/asm/aes128cbc_sha1_hmac.S | 1678 ++
 drivers/crypto/armv8/asm/aes128cbc_sha256.S| 1518 
 drivers/crypto/armv8/asm/aes128cbc_sha256_hmac.S   | 1854 
 drivers/crypto/armv8/asm/aes_core.S|  151 ++
 drivers/crypto/armv8/asm/include/rte_armv8_defs.h  |   78 +
 drivers/crypto/armv8/asm/sha1_core.S   |  515 ++
 drivers/crypto/armv8/asm/sha1_hmac_aes128cbc_dec.S | 1598 +
 drivers/crypto/armv8/asm/sha256_aes128cbc_dec.S| 1619 +
 drivers/crypto/armv8/asm/sha256_core.S |  519 ++
 .../crypto/armv8/asm/sha256_hmac_aes128cbc_dec.S   | 1791 +++
 drivers/crypto/armv8/genassym.c|   55 +
 drivers/crypto/armv8/rte_armv8_pmd.c   |  905 ++
 drivers/crypto/armv8/rte_armv8_pmd_ops.c   |  390 
 drivers/crypto/armv8/rte_armv8_pmd_private.h   |  210 +++
 drivers/crypto/armv8/rte_armv8_pmd_version.map |3 +
 lib/librte_cryptodev/rte_cryptodev.h   |3 +
 mk/arch/arm64/rte.vars.mk  |1 -
 mk/rte.app.mk  |3 +
 mk/toolchain/gcc/rte.vars.mk   |6 +-
 32 files changed, 13862 insertions(+), 11 deletions(-)
 create mode 100644 doc/guides/cryptodevs/armv8.rst
 create mode 100644 drivers/crypto/armv8/Makefile
 create mode 100644 drivers/crypto/armv8/asm/aes128cbc_sha1_hmac.S
 create mode 100644 drivers/crypto/armv8/asm/aes128cbc_sha256.S
 create mode 100644 drivers/crypto/armv8/asm/aes128cbc_sha256_hmac.S
 create mode 100644 drivers/crypto/armv8/asm/aes_core.S
 create mode 100644 drivers/crypto/armv8/asm/include/rte_armv8_defs.h
 create mode 100644 drivers/crypto/armv8/asm/sha1_core.S
 create mode 100644 drivers/crypto/armv8/asm/sha1_hmac_aes128cbc_dec.S
 create mode 100644 drivers/crypto/armv8/asm/sha256_aes128cbc_dec.S
 create mode 100644 drivers/crypto/armv8/asm/sh

[dpdk-dev] [PATCH 3/3] app/test: add ARMv8 crypto tests and test vectors

2016-12-03 Thread zbigniew.bodek

From: Zbigniew Bodek 

Introduce unit tests for ARMv8 crypto PMD.
Add test vectors for short cases such as 160 bytes.
These test cases are ARMv8 specific since the code provides
different processing paths for different input data sizes.
Add test vectors for cipher + SHA256 MAC generation.

User can validate correctness of algorithms' implementation using:
* cryptodev_sw_armv8_autotest
For performance test one can use:
* cryptodev_sw_armv8_perftest

Signed-off-by: Zbigniew Bodek 
---
 app/test/test_cryptodev.c  |  63 
 app/test/test_cryptodev_aes_test_vectors.h | 211 +++-
 app/test/test_cryptodev_blockcipher.c  |   4 +
 app/test/test_cryptodev_blockcipher.h  |   1 +
 app/test/test_cryptodev_perf.c | 508 +
 5 files changed, 779 insertions(+), 8 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 872f8b4..a0540d6 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -348,6 +348,27 @@ struct crypto_unittest_params {
}
}
 
+   /* Create 2 ARMv8 devices if required */
+   if (gbl_cryptodev_type == RTE_CRYPTODEV_ARMV8_PMD) {
+#ifndef RTE_LIBRTE_PMD_ARMV8_CRYPTO
+   RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO must be"
+   " enabled in config file to run this testsuite.\n");
+   return TEST_FAILED;
+#endif
+   nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_ARMV8_PMD);
+   if (nb_devs < 2) {
+   for (i = nb_devs; i < 2; i++) {
+   ret = rte_eal_vdev_init(
+   RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),
+   NULL);
+
+   TEST_ASSERT(ret == 0, "Failed to create "
+   "instance %u of pmd : %s", i,
+   RTE_STR(CRYPTODEV_NAME_ARMV8_PMD));
+   }
+   }
+   }
+
 #ifndef RTE_LIBRTE_PMD_QAT
if (gbl_cryptodev_type == RTE_CRYPTODEV_QAT_SYM_PMD) {
RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_QAT must be enabled "
@@ -1545,6 +1566,22 @@ struct crypto_unittest_params {
return TEST_SUCCESS;
 }
 
+static int
+test_AES_chain_armv8_all(void)
+{
+   struct crypto_testsuite_params *ts_params = &testsuite_params;
+   int status;
+
+   status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+   ts_params->op_mpool, ts_params->valid_devs[0],
+   RTE_CRYPTODEV_ARMV8_PMD,
+   BLKCIPHER_AES_CHAIN_TYPE);
+
+   TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+   return TEST_SUCCESS;
+}
+
 /* * SNOW 3G Tests * */
 static int
 create_wireless_algo_hash_session(uint8_t dev_id,
@@ -6504,6 +6541,23 @@ struct test_crypto_vector {
}
 };
 
+static struct unit_test_suite cryptodev_armv8_testsuite  = {
+   .suite_name = "Crypto Device ARMv8 Unit Test Suite",
+   .setup = testsuite_setup,
+   .teardown = testsuite_teardown,
+   .unit_test_cases = {
+   TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_armv8_all),
+
+   /** Negative tests */
+   TEST_CASE_ST(ut_setup, ut_teardown,
+   auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+   TEST_CASE_ST(ut_setup, ut_teardown,
+   auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+   TEST_CASES_END() /**< NULL terminate unit test array */
+   }
+};
+
 static int
 test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
 {
@@ -6567,6 +6621,14 @@ struct test_crypto_vector {
return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
 }
 
+static int
+test_cryptodev_armv8(void)
+{
+   gbl_cryptodev_type = RTE_CRYPTODEV_ARMV8_PMD;
+
+   return unit_test_suite_runner(&cryptodev_armv8_testsuite);
+}
+
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
@@ -6575,3 +6637,4 @@ struct test_crypto_vector {
 REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);
 REGISTER_TEST_COMMAND(cryptodev_sw_zuc_autotest, test_cryptodev_sw_zuc);
+REGISTER_TEST_COMMAND(cryptodev_sw_armv8_autotest, test_cryptodev_armv8);
diff --git a/app/test/test_cryptodev_aes_test_vectors.h 
b/app/test/test_cryptodev_aes_test_vectors.h
index 1c68f93..470c2d9 100644
--- a/app/test/test_cryptodev_aes_test_vectors.h
+++ b/app/test/test_cryptodev_aes_test_vectors.h
@@ -825,6 +825,136 @@
}
 };
 
+/** AES-128-CBC SHA256 MAC test vector */
+static const struct blockcipher_test_data aes_test_data_12 = {
+   .crypto_algo = RTE_CRYPT

[dpdk-dev] [PATCH 1/3] mk: fix build of assembly files for ARM64

2016-12-03 Thread zbigniew.bodek

From: Zbigniew Bodek 

Avoid using incorrect assembler (nasm) and unsupported flags
when building for ARM64.

Signed-off-by: Zbigniew Bodek 
---
 mk/arch/arm64/rte.vars.mk| 1 -
 mk/toolchain/gcc/rte.vars.mk | 6 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk
index c168426..3b1178a 100644
--- a/mk/arch/arm64/rte.vars.mk
+++ b/mk/arch/arm64/rte.vars.mk
@@ -53,7 +53,6 @@ CROSS ?=
 
 CPU_CFLAGS  ?=
 CPU_LDFLAGS ?=
-CPU_ASFLAGS ?= -felf
 
 export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
 
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
index ff70f3d..94f6412 100644
--- a/mk/toolchain/gcc/rte.vars.mk
+++ b/mk/toolchain/gcc/rte.vars.mk
@@ -41,9 +41,11 @@
 CC= $(CROSS)gcc
 KERNELCC  = $(CROSS)gcc
 CPP   = $(CROSS)cpp
-# for now, we don't use as but nasm.
-# AS  = $(CROSS)as
+ifeq ($(CONFIG_RTE_ARCH_X86),y)
 AS= nasm
+else
+AS= $(CROSS)as
+endif
 AR= $(CROSS)ar
 LD= $(CROSS)ld
 OBJCOPY   = $(CROSS)objcopy
-- 
1.9.1

[dpdk-dev] [PATCH 01/29] net/ixgbe/base: fix check for PHY reset

The previously generic PHY reset check is not sufficient
for the PHY type = ixgbe_phy_x550em_ext_t.
This patch fixes it.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_phy.c | 29 -
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c 
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 43c55d7..1d9fb3e 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -528,11 +528,30 @@ s32 ixgbe_reset_phy_generic(struct ixgbe_hw *hw)
 */
for (i = 0; i < 30; i++) {
msec_delay(100);
-   hw->phy.ops.read_reg(hw, IXGBE_MDIO_PHY_XS_CONTROL,
-IXGBE_MDIO_PHY_XS_DEV_TYPE, &ctrl);
-   if (!(ctrl & IXGBE_MDIO_PHY_XS_RESET)) {
-   usec_delay(2);
-   break;
+   if (hw->phy.type == ixgbe_phy_x550em_ext_t) {
+   status = hw->phy.ops.read_reg(hw,
+ IXGBE_MDIO_TX_VENDOR_ALARMS_3,
+ IXGBE_MDIO_PMA_PMD_DEV_TYPE,
+ &ctrl);
+   if (status != IXGBE_SUCCESS)
+   return status;
+
+   if (ctrl & IXGBE_MDIO_TX_VENDOR_ALARMS_3_RST_MASK) {
+   usec_delay(2);
+   break;
+   }
+   } else {
+   status = hw->phy.ops.read_reg(hw,
+IXGBE_MDIO_PHY_XS_CONTROL,
+IXGBE_MDIO_PHY_XS_DEV_TYPE,
+&ctrl);
+   if (status != IXGBE_SUCCESS)
+   return status;
+
+   if (!(ctrl & IXGBE_MDIO_PHY_XS_RESET)) {
+   usec_delay(2);
+   break;
+   }
}
}
 
-- 
2.7.4

[dpdk-dev] [PATCH 03/29] net/ixgbe/base: use fast MDIO for non-10G MDIO devices

Devices that cannot go 10G can safely select a faster MDIO speed than
those devices that can possibly connect at 10G. So select the higher
speed for those devices.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index acb8140..c1fac1a 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2549,8 +2549,6 @@ STATIC void ixgbe_set_mdio_speed(struct ixgbe_hw *hw)
case IXGBE_DEV_ID_X550EM_X_10G_T:
case IXGBE_DEV_ID_X550EM_A_SGMII:
case IXGBE_DEV_ID_X550EM_A_SGMII_L:
-   case IXGBE_DEV_ID_X550EM_A_1G_T:
-   case IXGBE_DEV_ID_X550EM_A_1G_T_L:
case IXGBE_DEV_ID_X550EM_A_10G_T:
case IXGBE_DEV_ID_X550EM_A_SFP:
case IXGBE_DEV_ID_X550EM_A_QSFP:
@@ -2559,6 +2557,13 @@ STATIC void ixgbe_set_mdio_speed(struct ixgbe_hw *hw)
hlreg0 &= ~IXGBE_HLREG0_MDCSPD;
IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
break;
+   case IXGBE_DEV_ID_X550EM_A_1G_T:
+   case IXGBE_DEV_ID_X550EM_A_1G_T_L:
+   /* Select fast MDIO clock speed for these devices */
+   hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
+   hlreg0 |= IXGBE_HLREG0_MDCSPD;
+   IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0);
+   break;
default:
break;
}
-- 
2.7.4

[dpdk-dev] [PATCH 02/29] net/ixgbe/base: fix condition to clear RAR entry

Specifically the RAR entry for the SAN MAC address is being
cleared when the VMDq pool bits are cleared. In order to prevent
this we need to add an extra check to protect the SAN MAC from
being cleared.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c 
b/drivers/net/ixgbe/base/ixgbe_common.c
index cca19ef..b2cc6fb 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3764,7 +3764,8 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 
rar, u32 vmdq)
}
 
/* was that the last pool using this rar? */
-   if (mpsar_lo == 0 && mpsar_hi == 0 && rar != 0)
+   if (mpsar_lo == 0 && mpsar_hi == 0 &&
+   rar != 0 && rar != hw->mac.san_mac_rar_index)
hw->mac.ops.clear_rar(hw, rar);
 done:
return IXGBE_SUCCESS;
-- 
2.7.4

[dpdk-dev] [PATCH 04/29] net/ixgbe/base: fix PHY identification

previous method to identify the CS4223/CS4227 is incorrect and
unreliable. This patch provide a new register to differentiate
between these PHY SKUs.

Fixes: fc0559bdb5e3 ("net/ixgbe/base: add link MAC setup for X550a SFP+")

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_phy.h  | 5 +++--
 drivers/net/ixgbe/base/ixgbe_x550.c | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h 
b/drivers/net/ixgbe/base/ixgbe_phy.h
index da14abc..816de36 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -92,8 +92,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #define IXGBE_CS4227_GLOBAL_ID_MSB 1
 #define IXGBE_CS4227_SCRATCH   2
 #define IXGBE_CS4227_GLOBAL_ID_VALUE   0x03E5
-#define IXGBE_CS4223_PHY_ID0x7003  /* Quad port */
-#define IXGBE_CS4227_PHY_ID0x3003  /* Dual port */
+#define IXGBE_CS4227_EFUSE_PDF_SKU 0x19F
+#define IXGBE_CS4223_SKU_ID0x0010  /* Quad port */
+#define IXGBE_CS4227_SKU_ID0x0014  /* Dual port */
 #define IXGBE_CS4227_RESET_PENDING 0x1357
 #define IXGBE_CS4227_RESET_COMPLETE0x5AA5
 #define IXGBE_CS4227_RETRIES   15
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index c1fac1a..f5143f9 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2927,8 +2927,8 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
return IXGBE_ERR_PHY_ADDR_INVALID;
}
 
-   /* Get external PHY device id */
-   ret_val = hw->phy.ops.read_reg(hw, IXGBE_CS4227_GLOBAL_ID_MSB,
+   /* Get external PHY SKU id */
+   ret_val = hw->phy.ops.read_reg(hw, IXGBE_CS4227_EFUSE_PDF_SKU,
IXGBE_MDIO_ZERO_DEV_TYPE, ®_phy_ext);
 
if (ret_val != IXGBE_SUCCESS)
@@ -2937,7 +2937,7 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
/* When configuring quad port CS4223, the MAC instance is part
 * of the slice offset.
 */
-   if (reg_phy_ext == IXGBE_CS4223_PHY_ID)
+   if (reg_phy_ext == IXGBE_CS4223_SKU_ID)
slice_offset = (hw->bus.lan_id +
(hw->bus.instance_id << 1)) << 12;
else
-- 
2.7.4

[dpdk-dev] [PATCH 07/29] net/ixgbe/base: add support to store LED link active

This patch adds support to get the LED link active via the LEDCTL
register. If the LEDCTL register does not have LED link active
(LED mode field = 0x0100) set then default LED link active returned.
LED link active is used for adapter identify/blink support.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_common.c | 45 +++
 drivers/net/ixgbe/base/ixgbe_common.h |  1 +
 drivers/net/ixgbe/base/ixgbe_type.h   |  2 ++
 3 files changed, 48 insertions(+)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c 
b/drivers/net/ixgbe/base/ixgbe_common.c
index a6016dc..89b4b5f 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -113,6 +113,7 @@ s32 ixgbe_init_ops_generic(struct ixgbe_hw *hw)
mac->ops.led_off = ixgbe_led_off_generic;
mac->ops.blink_led_start = ixgbe_blink_led_start_generic;
mac->ops.blink_led_stop = ixgbe_blink_led_stop_generic;
+   mac->ops.init_led_link_act = ixgbe_init_led_link_act_generic;
 
/* RAR, Multicast, VLAN */
mac->ops.set_rar = ixgbe_set_rar_generic;
@@ -497,6 +498,9 @@ s32 ixgbe_init_hw_generic(struct ixgbe_hw *hw)
status = hw->mac.ops.start_hw(hw);
}
 
+   /* Initialize the LED link active for LED blink support */
+   hw->mac.ops.init_led_link_act(hw);
+
return status;
 }
 
@@ -1136,6 +1140,47 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw)
 }
 
 /**
+ *  ixgbe_init_led_link_act_generic - Store the LED index link/activity.
+ *  @hw: pointer to hardware structure
+ *
+ *  Store the index for the link active LED. This will be used to support
+ *  blinking the LED.
+ **/
+s32 ixgbe_init_led_link_act_generic(struct ixgbe_hw *hw)
+{
+   struct ixgbe_mac_info *mac = &hw->mac;
+   u32 led_reg, led_mode;
+   u16 i;
+
+   led_reg = IXGBE_READ_REG(hw, IXGBE_LEDCTL);
+
+   /* Get LED link active from the LEDCTL register */
+   for (i = 0; i < 4; i++) {
+   led_mode = led_reg >> IXGBE_LED_MODE_SHIFT(i);
+
+   if ((led_mode & IXGBE_LED_MODE_MASK_BASE) ==
+IXGBE_LED_LINK_ACTIVE) {
+   mac->led_link_act = i;
+   return IXGBE_SUCCESS;
+   }
+   }
+
+   /*
+* If LEDCTL register does not have the LED link active set, then use
+* known MAC defaults.
+*/
+   switch (hw->mac.type) {
+   case ixgbe_mac_X550EM_a:
+   case ixgbe_mac_X550EM_x:
+   mac->led_link_act = 1;
+   break;
+   default:
+   mac->led_link_act = 2;
+   }
+   return IXGBE_SUCCESS;
+}
+
+/**
  *  ixgbe_led_on_generic - Turns on the software controllable LEDs.
  *  @hw: pointer to hardware structure
  *  @index: led number to turn on
diff --git a/drivers/net/ixgbe/base/ixgbe_common.h 
b/drivers/net/ixgbe/base/ixgbe_common.h
index ae28206..93e80ea 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.h
+++ b/drivers/net/ixgbe/base/ixgbe_common.h
@@ -72,6 +72,7 @@ s32 ixgbe_stop_adapter_generic(struct ixgbe_hw *hw);
 
 s32 ixgbe_led_on_generic(struct ixgbe_hw *hw, u32 index);
 s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);
+s32 ixgbe_init_led_link_act_generic(struct ixgbe_hw *hw);
 
 s32 ixgbe_init_eeprom_params_generic(struct ixgbe_hw *hw);
 s32 ixgbe_write_eeprom_generic(struct ixgbe_hw *hw, u16 offset, u16 data);
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index 5b2506a..b90ae6d 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3886,6 +3886,7 @@ struct ixgbe_mac_operations {
s32 (*led_off)(struct ixgbe_hw *, u32);
s32 (*blink_led_start)(struct ixgbe_hw *, u32);
s32 (*blink_led_stop)(struct ixgbe_hw *, u32);
+   s32 (*init_led_link_act)(struct ixgbe_hw *);
 
/* RAR, Multicast, VLAN */
s32 (*set_rar)(struct ixgbe_hw *, u32, u8 *, u32, u32);
@@ -4029,6 +4030,7 @@ struct ixgbe_mac_info {
struct ixgbe_dmac_config dmac_config;
bool set_lben;
u32  max_link_up_time;
+   u8   led_link_act;
 };
 
 struct ixgbe_phy_info {
-- 
2.7.4

[dpdk-dev] [PATCH 05/29] net/ixgbe/base: clean up X557 link status check

This patch cleans up the code and clarifies the comment around
the X557 PHY link status check in ixgbe_check_link_t_x550em( ).

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index f5143f9..69aa9d5 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -4660,7 +4660,7 @@ s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, 
ixgbe_link_speed *speed,
  bool *link_up, bool link_up_wait_to_complete)
 {
u32 status;
-   u16 autoneg_status;
+   u16 i, autoneg_status = 0;
 
if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper)
return IXGBE_ERR_CONFIG;
@@ -4673,21 +4673,18 @@ s32 ixgbe_check_link_t_X550em(struct ixgbe_hw *hw, 
ixgbe_link_speed *speed,
return status;
 
/* MAC link is up, so check external PHY link.
-* Read this twice back to back to indicate current status.
+* X557 PHY. Link status is latching low, and can only be used to detect
+* link drop, and not the current status of the link without performing
+* back-to-back reads.
 */
-   status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- &autoneg_status);
-
-   if (status != IXGBE_SUCCESS)
-   return status;
-
-   status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- &autoneg_status);
+   for (i = 0; i < 2; i++) {
+   status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_STATUS,
+ IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
+ &autoneg_status);
 
-   if (status != IXGBE_SUCCESS)
-   return status;
+   if (status != IXGBE_SUCCESS)
+   return status;
+   }
 
/* If external PHY link is not up, then indicate link not up */
if (!(autoneg_status & IXGBE_MDIO_AUTO_NEG_LINK_STATUS))
-- 
2.7.4

[dpdk-dev] [PATCH 06/29] net/ixgbe/base: add driver version to firmware

This patch sends the driver version string to firmware through
the host interface command on x550 devices.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_api.c|  7 ++--
 drivers/net/ixgbe/base/ixgbe_api.h|  2 +-
 drivers/net/ixgbe/base/ixgbe_common.c |  4 ++-
 drivers/net/ixgbe/base/ixgbe_common.h |  2 +-
 drivers/net/ixgbe/base/ixgbe_type.h   | 14 +++-
 drivers/net/ixgbe/base/ixgbe_x550.c   | 63 +++
 drivers/net/ixgbe/base/ixgbe_x550.h   |  2 ++
 7 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_api.c 
b/drivers/net/ixgbe/base/ixgbe_api.c
index 094ee52..0ddafcb 100644
--- a/drivers/net/ixgbe/base/ixgbe_api.c
+++ b/drivers/net/ixgbe/base/ixgbe_api.c
@@ -1147,12 +1147,15 @@ s32 ixgbe_setup_fc(struct ixgbe_hw *hw)
  * @min: driver minor number to be sent to firmware
  * @build: driver build number to be sent to firmware
  * @ver: driver version number to be sent to firmware
+ * @len: length of driver_ver string
+ * @driver_ver: driver string
  **/
 s32 ixgbe_set_fw_drv_ver(struct ixgbe_hw *hw, u8 maj, u8 min, u8 build,
-u8 ver)
+u8 ver, u16 len, char *driver_ver)
 {
return ixgbe_call_func(hw, hw->mac.ops.set_fw_drv_ver, (hw, maj, min,
-  build, ver), IXGBE_NOT_IMPLEMENTED);
+  build, ver, len, driver_ver),
+  IXGBE_NOT_IMPLEMENTED);
 }
 
 
diff --git a/drivers/net/ixgbe/base/ixgbe_api.h 
b/drivers/net/ixgbe/base/ixgbe_api.h
index 24c4ae8..af85d4e 100644
--- a/drivers/net/ixgbe/base/ixgbe_api.h
+++ b/drivers/net/ixgbe/base/ixgbe_api.h
@@ -133,7 +133,7 @@ s32 ixgbe_set_vlvf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
 s32 ixgbe_fc_enable(struct ixgbe_hw *hw);
 s32 ixgbe_setup_fc(struct ixgbe_hw *hw);
 s32 ixgbe_set_fw_drv_ver(struct ixgbe_hw *hw, u8 maj, u8 min, u8 build,
-u8 ver);
+u8 ver, u16 len, char *driver_ver);
 s32 ixgbe_get_thermal_sensor_data(struct ixgbe_hw *hw);
 s32 ixgbe_init_thermal_sensor_thresh(struct ixgbe_hw *hw);
 void ixgbe_set_mta(struct ixgbe_hw *hw, u8 *mc_addr);
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c 
b/drivers/net/ixgbe/base/ixgbe_common.c
index b2cc6fb..a6016dc 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4596,13 +4596,15 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, 
u32 *buffer,
  *  semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.
  **/
 s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
-u8 build, u8 sub)
+u8 build, u8 sub, u16 len,
+const char *driver_ver)
 {
struct ixgbe_hic_drv_info fw_cmd;
int i;
s32 ret_val = IXGBE_SUCCESS;
 
DEBUGFUNC("ixgbe_set_fw_drv_ver_generic");
+   UNREFERENCED_2PARAMETER(len, driver_ver);
 
fw_cmd.hdr.cmd = FW_CEM_CMD_DRIVER_INFO;
fw_cmd.hdr.buf_len = FW_CEM_CMD_DRIVER_INFO_LEN;
diff --git a/drivers/net/ixgbe/base/ixgbe_common.h 
b/drivers/net/ixgbe/base/ixgbe_common.h
index 66dd565..ae28206 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.h
+++ b/drivers/net/ixgbe/base/ixgbe_common.h
@@ -155,7 +155,7 @@ void ixgbe_set_rxpba_generic(struct ixgbe_hw *hw, int 
num_pb, u32 headroom,
 int strategy);
 void ixgbe_enable_relaxed_ordering_gen2(struct ixgbe_hw *hw);
 s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
-u8 build, u8 ver);
+u8 build, u8 ver, u16 len, const char *str);
 u8 ixgbe_calculate_checksum(u8 *buffer, u32 length);
 s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
 u32 length, u32 timeout, bool return_data);
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index 4982e03..5b2506a 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3037,6 +3037,7 @@ enum ixgbe_fdir_pballoc_type {
 #define FW_CEM_UNUSED_VER  0x0
 #define FW_CEM_MAX_RETRIES 3
 #define FW_CEM_RESP_STATUS_SUCCESS 0x1
+#define FW_CEM_DRIVER_VERSION_SIZE 39 /* +9 would send 48 bytes to fw */
 #define FW_READ_SHADOW_RAM_CMD 0x31
 #define FW_READ_SHADOW_RAM_LEN 0x6
 #define FW_WRITE_SHADOW_RAM_CMD0x33
@@ -3111,6 +3112,16 @@ struct ixgbe_hic_drv_info {
u16 pad2; /* end spacing to ensure length is mult. of dword2 */
 };
 
+struct ixgbe_hic_drv_info2 {
+   struct ixgbe_hic_hdr hdr;
+   u8 port_num;
+   u8 ver_sub;
+   u8 ver_build;
+   u8 ver_min;
+   u8 ver_maj;
+   char driver_string[FW_CEM_DRIVER_VERSION_SIZE];
+};
+
 /* These need to be dword aligned */
 struct ixgbe_hic_read_shadow_ram {
union ixgbe_hi

[dpdk-dev] [PATCH 11/29] net/ixgbe/base: fix getting phy type

This patch fixes ixgbe_get_supported_physical_layer_X550em to
correctly return physical layer as IXGBE_PHYSICAL_LAYER_1000BASE_T
for some devices.

Fixes: 76d5b807ff74 ("ixgbe/base: new X557 phy")
Fixes: d2e72774e58c ("ixgbe/base: support X550")

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index a338a79..d5dffdf 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -3797,6 +3797,8 @@ u32 ixgbe_get_supported_physical_layer_X550em(struct 
ixgbe_hw *hw)
if (ext_ability & IXGBE_MDIO_PHY_1000BASET_ABILITY)
physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
break;
+   case ixgbe_phy_m88:
+   physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
default:
break;
}
-- 
2.7.4

[dpdk-dev] [PATCH 08/29] net/ixgbe/base: cleanup logic in X540 checksum calculation

The variable checksum_last_word is used only for a bounds check.
So remove this variable and use IXGBE_EEPROM_CHECKSUM directly.
IXGBE_EEPROM_CHECKSUM value is included in the for loop, but then
it is checked and excluded. Remove the variable checksum_last_word
from the loop so no check is needed.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x540.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x540.c 
b/drivers/net/ixgbe/base/ixgbe_x540.c
index 6e778bc..49bf154 100644
--- a/drivers/net/ixgbe/base/ixgbe_x540.c
+++ b/drivers/net/ixgbe/base/ixgbe_x540.c
@@ -491,7 +491,6 @@ s32 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
u16 length = 0;
u16 pointer = 0;
u16 word = 0;
-   u16 checksum_last_word = IXGBE_EEPROM_CHECKSUM;
u16 ptr_start = IXGBE_PCIE_ANALOG_PTR;
 
/* Do not use hw->eeprom.ops.read because we do not want to take
@@ -501,14 +500,15 @@ s32 ixgbe_calc_eeprom_checksum_X540(struct ixgbe_hw *hw)
 
DEBUGFUNC("ixgbe_calc_eeprom_checksum_X540");
 
-   /* Include 0x0-0x3F in the checksum */
-   for (i = 0; i <= checksum_last_word; i++) {
+   /* Include 0x0 up to IXGBE_EEPROM_CHECKSUM; do not include the
+* checksum itself
+*/
+   for (i = 0; i < IXGBE_EEPROM_CHECKSUM; i++) {
if (ixgbe_read_eerd_generic(hw, i, &word)) {
DEBUGOUT("EEPROM read failed\n");
return IXGBE_ERR_EEPROM;
}
-   if (i != IXGBE_EEPROM_CHECKSUM)
-   checksum += word;
+   checksum += word;
}
 
/* Include all data from pointers 0x3, 0x6-0xE.  This excludes the
-- 
2.7.4

[dpdk-dev] [PATCH 09/29] net/ixgbe/base: enable LASI interrupts only for X552 devices

Enable the LASI interrupts on X552 devices to receive notifications of the
link configurations of the external PHY and correspondingly support the
configuration of the internal iXFI link, since iXFI does not support
auto-negotiation. This is not required for X553 devices having KR support,
which performs auto-negotiations and which is used as the internal link to
the external PHY. Hence adding a check here to avoid enabling LASI
interrupts for X553 devices. For X553 devices we get link
notifications through LSC interrupts in the MAC. That should suffice to
handle link notifications. The default value of "Link connect/disconnect
mask"  (IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN) in auto-neg transmit vendor
interrupt mask 2 (7.D401) is 0. Hence added a check that disables code in
ixgbe_x550.c/ixgbe_enable_lasi_ext_t_x550em() that sets this bit and hence
retains the default value for this bit, for X553 devices.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 31 ++-
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 28c7ce3..fecc8e6 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2026,19 +2026,32 @@ STATIC s32 ixgbe_enable_lasi_ext_t_x550em(struct 
ixgbe_hw *hw)
status = ixgbe_get_lasi_ext_t_x550em(hw, &lsc);
 
/* Enable link status change alarm */
-   status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE, ®);
 
-   if (status != IXGBE_SUCCESS)
-   return status;
+   /* Enable the LASI interrupts on X552 devices to receive notifications
+* of the link configurations of the external PHY and correspondingly
+* support the configuration of the internal iXFI link, since iXFI does
+* not support auto-negotiation. This is not required for X553 devices
+* having KR support, which performs auto-negotiations and which is used
+* as the internal link to the external PHY. Hence adding a check here
+* to avoid enabling LASI interrupts for X553 devices.
+*/
+   if (hw->mac.type != ixgbe_mac_X550EM_a) {
+   status = hw->phy.ops.read_reg(hw,
+   IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
+   IXGBE_MDIO_AUTO_NEG_DEV_TYPE, ®);
+
+   if (status != IXGBE_SUCCESS)
+   return status;
 
-   reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
+   reg |= IXGBE_MDIO_PMA_TX_VEN_LASI_INT_EN;
 
-   status = hw->phy.ops.write_reg(hw, IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
-  IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
+   status = hw->phy.ops.write_reg(hw,
+   IXGBE_MDIO_PMA_TX_VEN_LASI_INT_MASK,
+   IXGBE_MDIO_AUTO_NEG_DEV_TYPE, reg);
 
-   if (status != IXGBE_SUCCESS)
-   return status;
+   if (status != IXGBE_SUCCESS)
+   return status;
+   }
 
/* Enable high temperature failure and global fault alarms */
status = hw->phy.ops.read_reg(hw, IXGBE_MDIO_GLOBAL_INT_MASK,
-- 
2.7.4

[dpdk-dev] [PATCH 10/29] net/ixgbe/base: add X552 MAC check for iXFI flows

The MAC register NW_MNG_IF_SEL fields have been redefined for X553.
These changes impact the iXFI driver code flow. Since iXFI is only
supported in X552, this patch adds X552 MAC check for iXFI flows.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_type.h |  4 ++--
 drivers/net/ixgbe/base/ixgbe_x550.c | 13 ++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index b90ae6d..adc5fb3 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -4271,8 +4271,8 @@ struct ixgbe_hw {
 #define IXGBE_NW_MNG_IF_SEL_PHY_SPEED_1G   (1u << 19)
 #define IXGBE_NW_MNG_IF_SEL_PHY_SPEED_2_5G (1u << 20)
 #define IXGBE_NW_MNG_IF_SEL_PHY_SPEED_10G  (1u << 21)
-#define IXGBE_NW_MNG_IF_SEL_ENABLE_10_100M (1 << 23)
-#define IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE (1 << 24)
+#define IXGBE_NW_MNG_IF_SEL_SGMII_ENABLE   (1u << 25)
+#define IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE (1 << 24) /* X552 reg field only */
 #define IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT 3
 #define IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD   \
(0x1F << IXGBE_NW_MNG_IF_SEL_MDIO_PHY_ADD_SHIFT)
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index fecc8e6..a338a79 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -3053,6 +3053,10 @@ STATIC s32 ixgbe_setup_ixfi_x550em(struct ixgbe_hw *hw, 
ixgbe_link_speed *speed)
s32 status;
u32 reg_val;
 
+   /* iXFI is only supported with X552 */
+   if (mac->type != ixgbe_mac_X550EM_x)
+   return IXGBE_ERR_LINK_SETUP;
+
/* Disable AN and force speed to 10G Serial. */
status = mac->ops.read_iosf_sb_reg(hw,
IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
@@ -3149,7 +3153,8 @@ s32 ixgbe_setup_internal_phy_t_x550em(struct ixgbe_hw *hw)
if (hw->mac.ops.get_media_type(hw) != ixgbe_media_type_copper)
return IXGBE_ERR_CONFIG;
 
-   if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+   if (hw->mac.type == ixgbe_mac_X550EM_x &&
+   !(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
/* If link is down, there is no setup necessary so return  */
status = ixgbe_ext_phy_t_x550em_get_link(hw, &link_up);
if (status != IXGBE_SUCCESS)
@@ -4651,8 +4656,10 @@ s32 ixgbe_setup_mac_link_t_X550em(struct ixgbe_hw *hw,
else
force_speed = IXGBE_LINK_SPEED_1GB_FULL;
 
-   /* If internal link mode is XFI, then setup XFI internal link. */
-   if (!(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
+   /* If X552 and internal link mode is XFI, then setup XFI internal link.
+*/
+   if (hw->mac.type == ixgbe_mac_X550EM_x &&
+   !(hw->phy.nw_mng_if_sel & IXGBE_NW_MNG_IF_SEL_INT_PHY_MODE)) {
status = ixgbe_setup_ixfi_x550em(hw, &force_speed);
 
if (status != IXGBE_SUCCESS)
-- 
2.7.4

[dpdk-dev] [PATCH 13/29] net/ixgbe/base: cleanup dead EEE code

Remove some specific code for enabling/disabling
EEE. Those were added previously and now are
in "removed" status.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 61 ++---
 1 file changed, 10 insertions(+), 51 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 5cf9e40..97fbf88 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -62,7 +62,7 @@ s32 ixgbe_init_ops_X550(struct ixgbe_hw *hw)
mac->ops.dmac_config = ixgbe_dmac_config_X550;
mac->ops.dmac_config_tcs = ixgbe_dmac_config_tcs_X550;
mac->ops.dmac_update_tcs = ixgbe_dmac_update_tcs_X550;
-   mac->ops.setup_eee = ixgbe_setup_eee_X550;
+   mac->ops.setup_eee = NULL;
mac->ops.set_source_address_pruning =
ixgbe_set_source_address_pruning_X550;
mac->ops.set_ethertype_anti_spoofing =
@@ -603,15 +603,6 @@ s32 ixgbe_init_ops_X550EM(struct ixgbe_hw *hw)
else
mac->ops.setup_fc = ixgbe_setup_fc_X550em;
 
-   switch (hw->device_id) {
-   case IXGBE_DEV_ID_X550EM_X_KR:
-   case IXGBE_DEV_ID_X550EM_A_KR:
-   case IXGBE_DEV_ID_X550EM_A_KR_L:
-   break;
-   default:
-   mac->ops.setup_eee = NULL;
-   }
-
/* PHY */
phy->ops.init = ixgbe_init_phy_ops_X550em;
phy->ops.identify = ixgbe_identify_phy_x550em;
@@ -679,6 +670,15 @@ s32 ixgbe_init_ops_X550EM_a(struct ixgbe_hw *hw)
mac->ops.setup_fc = ixgbe_setup_fc_sgmii_x550em_a;
}
 
+   switch (hw->device_id) {
+   case IXGBE_DEV_ID_X550EM_A_KR:
+   case IXGBE_DEV_ID_X550EM_A_KR_L:
+   mac->ops.setup_eee = ixgbe_setup_eee_X550;
+   break;
+   default:
+   mac->ops.setup_eee = NULL;
+   }
+
return ret_val;
 }
 
@@ -883,28 +883,10 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
  */
 STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
 {
-   u16 autoneg_eee_reg;
u32 link_reg;
s32 status;
 
-   if (hw->mac.type == ixgbe_mac_X550) {
-   /* Advertise EEE capability */
-   hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
-IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-&autoneg_eee_reg);
-
-   autoneg_eee_reg |= (IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
-   IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
-   IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
-
-   hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- autoneg_eee_reg);
-   return IXGBE_SUCCESS;
-   }
-
switch (hw->device_id) {
-   case IXGBE_DEV_ID_X550EM_X_KR:
case IXGBE_DEV_ID_X550EM_A_KR:
case IXGBE_DEV_ID_X550EM_A_KR_L:
status = hw->mac.ops.read_iosf_sb_reg(hw,
@@ -938,26 +920,9 @@ STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
  */
 STATIC s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
 {
-   u16 autoneg_eee_reg;
u32 link_reg;
s32 status;
 
-   if (hw->mac.type == ixgbe_mac_X550) {
-   /* Disable advertised EEE capability */
-   hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
-IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-&autoneg_eee_reg);
-
-   autoneg_eee_reg &= ~(IXGBE_AUTO_NEG_10GBASE_EEE_ADVT |
-IXGBE_AUTO_NEG_1000BASE_EEE_ADVT |
-IXGBE_AUTO_NEG_100BASE_EEE_ADVT);
-
-   hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_EEE_ADVT,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- autoneg_eee_reg);
-   return IXGBE_SUCCESS;
-   }
-
switch (hw->device_id) {
case IXGBE_DEV_ID_X550EM_X_KR:
case IXGBE_DEV_ID_X550EM_A_KR:
@@ -1009,12 +974,6 @@ s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool 
enable_eee)
if (enable_eee) {
eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
 
-   /* Not supported on first revision of X550EM_x. */
-   if ((hw->mac.type == ixgbe_mac_X550EM_x) &&
-   !(IXGBE_FUSES0_REV_MASK &
- IXGBE_READ_REG(hw, IXGBE_FUSES0_GROUP(0
-   return IXGBE_SUCCESS;
-
status = ixgbe_enable_eee_x550(hw);
if (status)
return status;
-- 
2.7.4

[dpdk-dev] [PATCH 12/29] net/ixgbe/base: fix SGMII link setup for M88 PHYs

This patch fixes ixgbe_setup_sgmii_m88 to set lane speed to autoneg
instead of 1G to prevent problems with link between PHYs

Fixes: d4b4c6845487 ("net/ixgbe/base: add X550em_a FW ALEF support")

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index d5dffdf..5cf9e40 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -1778,7 +1778,7 @@ STATIC s32 ixgbe_setup_sgmii_m88(struct ixgbe_hw *hw, 
ixgbe_link_speed speed,
return rc;
 
flx_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_MASK;
-   flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_1G;
+   flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SPEED_AN;
flx_val &= ~IXGBE_KRM_PMD_FLX_MASK_ST20_AN_EN;
flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_SGMII_EN;
flx_val |= IXGBE_KRM_PMD_FLX_MASK_ST20_AN37_EN;
-- 
2.7.4

[dpdk-dev] [PATCH 14/29] net/ixgbe/base: update setup PHY link to unset all speeds

This patch updates ixgbe_setup_phy_link_generic to set/unset
auto-negotiation for all speeds. This ensures that unsupported
speeds are unset. This is necessary since the PHY NVM may
advertise unsupported speeds.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_phy.c | 130 +++--
 1 file changed, 51 insertions(+), 79 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c 
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 1d9fb3e..54e45b2 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -787,91 +787,63 @@ s32 ixgbe_setup_phy_link_generic(struct ixgbe_hw *hw)
 
ixgbe_get_copper_link_capabilities_generic(hw, &speed, &autoneg);
 
-   if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
-   /* Set or unset auto-negotiation 10G advertisement */
-   hw->phy.ops.read_reg(hw, IXGBE_MII_10GBASE_T_AUTONEG_CTRL_REG,
-IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-&autoneg_reg);
-
-   autoneg_reg &= ~IXGBE_MII_10GBASE_T_ADVERTISE;
-   if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL)
-   autoneg_reg |= IXGBE_MII_10GBASE_T_ADVERTISE;
-
-   hw->phy.ops.write_reg(hw, IXGBE_MII_10GBASE_T_AUTONEG_CTRL_REG,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- autoneg_reg);
-   }
-
-   if (hw->mac.type == ixgbe_mac_X550) {
-   if (speed & IXGBE_LINK_SPEED_5GB_FULL) {
-   /* Set or unset auto-negotiation 5G advertisement */
-   hw->phy.ops.read_reg(hw,
-   IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-   IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-   &autoneg_reg);
-
-   autoneg_reg &= ~IXGBE_MII_5GBASE_T_ADVERTISE;
-   if (hw->phy.autoneg_advertised &
-IXGBE_LINK_SPEED_5GB_FULL)
-   autoneg_reg |= IXGBE_MII_5GBASE_T_ADVERTISE;
-
-   hw->phy.ops.write_reg(hw,
-   IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-   IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-   autoneg_reg);
-   }
+   /* Set or unset auto-negotiation 10G advertisement */
+   hw->phy.ops.read_reg(hw, IXGBE_MII_10GBASE_T_AUTONEG_CTRL_REG,
+IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
+&autoneg_reg);
 
-   if (speed & IXGBE_LINK_SPEED_2_5GB_FULL) {
-   /* Set or unset auto-negotiation 2.5G advertisement */
-   hw->phy.ops.read_reg(hw,
-   IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-   IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-   &autoneg_reg);
-
-   autoneg_reg &= ~IXGBE_MII_2_5GBASE_T_ADVERTISE;
-   if (hw->phy.autoneg_advertised &
-   IXGBE_LINK_SPEED_2_5GB_FULL)
-   autoneg_reg |= IXGBE_MII_2_5GBASE_T_ADVERTISE;
-
-   hw->phy.ops.write_reg(hw,
-   IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-   IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-   autoneg_reg);
-   }
-   }
+   autoneg_reg &= ~IXGBE_MII_10GBASE_T_ADVERTISE;
+   if ((hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_10GB_FULL) &&
+   (speed & IXGBE_LINK_SPEED_10GB_FULL))
+   autoneg_reg |= IXGBE_MII_10GBASE_T_ADVERTISE;
 
-   if (speed & IXGBE_LINK_SPEED_1GB_FULL) {
-   /* Set or unset auto-negotiation 1G advertisement */
-   hw->phy.ops.read_reg(hw,
-IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
-IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
-&autoneg_reg);
+   hw->phy.ops.write_reg(hw, IXGBE_MII_10GBASE_T_AUTONEG_CTRL_REG,
+ IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
+ autoneg_reg);
 
-   autoneg_reg &= ~IXGBE_MII_1GBASE_T_ADVERTISE;
-   if (hw->phy.autoneg_advertised & IXGBE_LINK_SPEED_1GB_FULL)
-   autoneg_reg |= IXGBE_MII_1GBASE_T_ADVERTISE;
+   hw->phy.ops.read_reg(hw, IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
+IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
+&autoneg_reg);
 
-   hw->phy.ops.write_reg(hw,
- IXGBE_MII_AUTONEG_VENDOR_PROVISION_1_REG,
- IXGBE_MDIO_AUTO_NEG_DEV_TYPE,
- autoneg_reg);
+   if (hw->mac.type == ixgbe_mac_X550) {
+

[dpdk-dev] [PATCH 15/29] net/ixgbe/base: support FW commands to control some PHYs

Implement support for new firmware commands to be used to access
and control some PHYs.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_common.h |   4 +-
 drivers/net/ixgbe/base/ixgbe_osdep.h  |   3 +-
 drivers/net/ixgbe/base/ixgbe_type.h   |  70 ++-
 drivers/net/ixgbe/base/ixgbe_x550.c   | 230 +-
 4 files changed, 300 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.h 
b/drivers/net/ixgbe/base/ixgbe_common.h
index 93e80ea..903f34d 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.h
+++ b/drivers/net/ixgbe/base/ixgbe_common.h
@@ -161,7 +161,9 @@ u8 ixgbe_calculate_checksum(u8 *buffer, u32 length);
 s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer,
 u32 length, u32 timeout, bool return_data);
 s32 ixgbe_hic_unlocked(struct ixgbe_hw *, u32 *buffer, u32 length, u32 
timeout);
-
+s32 ixgbe_shutdown_fw_phy(struct ixgbe_hw *);
+s32 ixgbe_fw_phy_activity(struct ixgbe_hw *, u16 activity,
+ u32 (*data)[FW_PHY_ACT_DATA_COUNT]);
 void ixgbe_clear_tx_pending(struct ixgbe_hw *hw);
 
 extern s32 ixgbe_reset_pipeline_82599(struct ixgbe_hw *hw);
diff --git a/drivers/net/ixgbe/base/ixgbe_osdep.h 
b/drivers/net/ixgbe/base/ixgbe_osdep.h
index 77f0af5..b0977b6 100644
--- a/drivers/net/ixgbe/base/ixgbe_osdep.h
+++ b/drivers/net/ixgbe/base/ixgbe_osdep.h
@@ -95,8 +95,9 @@ enum {
 #define STATIC static
 #define IXGBE_NTOHL(_i)rte_be_to_cpu_32(_i)
 #define IXGBE_NTOHS(_i)rte_be_to_cpu_16(_i)
+#define IXGBE_CPU_TO_LE16(_i)  rte_cpu_to_le_16(_i)
 #define IXGBE_CPU_TO_LE32(_i)  rte_cpu_to_le_32(_i)
-#define IXGBE_LE32_TO_CPU(_i) rte_le_to_cpu_32(_i)
+#define IXGBE_LE32_TO_CPU(_i)  rte_le_to_cpu_32(_i)
 #define IXGBE_LE32_TO_CPUS(_i) rte_le_to_cpu_32(_i)
 #define IXGBE_CPU_TO_BE16(_i)  rte_cpu_to_be_16(_i)
 #define IXGBE_CPU_TO_BE32(_i)  rte_cpu_to_be_32(_i)
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index adc5fb3..c7100b0 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3063,6 +3063,59 @@ enum ixgbe_fdir_pballoc_type {
 #define FW_INT_PHY_REQ_LEN 10
 #define FW_INT_PHY_REQ_READ0
 #define FW_INT_PHY_REQ_WRITE   1
+#define FW_PHY_ACT_REQ_CMD 5
+#define FW_PHY_ACT_DATA_COUNT  4
+#define FW_PHY_ACT_REQ_LEN (4 + 4 * FW_PHY_ACT_DATA_COUNT)
+#define FW_PHY_ACT_INIT_PHY1
+#define FW_PHY_ACT_SETUP_LINK  2
+#define FW_PHY_ACT_LINK_SPEED_10   (1u << 0)
+#define FW_PHY_ACT_LINK_SPEED_100  (1u << 1)
+#define FW_PHY_ACT_LINK_SPEED_1G   (1u << 2)
+#define FW_PHY_ACT_LINK_SPEED_2_5G (1u << 3)
+#define FW_PHY_ACT_LINK_SPEED_5G   (1u << 4)
+#define FW_PHY_ACT_LINK_SPEED_10G  (1u << 5)
+#define FW_PHY_ACT_LINK_SPEED_20G  (1u << 6)
+#define FW_PHY_ACT_LINK_SPEED_25G  (1u << 7)
+#define FW_PHY_ACT_LINK_SPEED_40G  (1u << 8)
+#define FW_PHY_ACT_LINK_SPEED_50G  (1u << 9)
+#define FW_PHY_ACT_LINK_SPEED_100G (1u << 10)
+#define FW_PHY_ACT_SETUP_LINK_PAUSE_SHIFT 16
+#define FW_PHY_ACT_SETUP_LINK_PAUSE_MASK (3u << \
+ FW_PHY_ACT_SETUP_LINK_PAUSE_SHIFT)
+#define FW_PHY_ACT_SETUP_LINK_PAUSE_NONE 0u
+#define FW_PHY_ACT_SETUP_LINK_PAUSE_TX 1u
+#define FW_PHY_ACT_SETUP_LINK_PAUSE_RX 2u
+#define FW_PHY_ACT_SETUP_LINK_PAUSE_RXTX 3u
+#define FW_PHY_ACT_SETUP_LINK_LP   (1u << 18)
+#define FW_PHY_ACT_SETUP_LINK_HP   (1u << 19)
+#define FW_PHY_ACT_SETUP_LINK_EEE  (1u << 20)
+#define FW_PHY_ACT_SETUP_LINK_AN   (1u << 22)
+#define FW_PHY_ACT_SETUP_LINK_RSP_DOWN (1u << 0)
+#define FW_PHY_ACT_GET_LINK_INFO   3
+#define FW_PHY_ACT_GET_LINK_INFO_EEE   (1u << 19)
+#define FW_PHY_ACT_GET_LINK_INFO_FC_TX (1u << 20)
+#define FW_PHY_ACT_GET_LINK_INFO_FC_RX (1u << 21)
+#define FW_PHY_ACT_GET_LINK_INFO_POWER (1u << 22)
+#define FW_PHY_ACT_GET_LINK_INFO_AN_COMPLETE   (1u << 24)
+#define FW_PHY_ACT_GET_LINK_INFO_TEMP  (1u << 25)
+#define FW_PHY_ACT_GET_LINK_INFO_LP_FC_TX  (1u << 28)
+#define FW_PHY_ACT_GET_LINK_INFO_LP_FC_RX  (1u << 29)
+#define FW_PHY_ACT_FORCE_LINK_DOWN 4
+#define FW_PHY_ACT_FORCE_LINK_DOWN_OFF (1u << 0)
+#define FW_PHY_ACT_PHY_SW_RESET5
+#define FW_PHY_ACT_PHY_HW_RESET6
+#define FW_PHY_ACT_GET_PHY_INFO7
+#define FW_PHY_ACT_UD_20x1002
+#define FW_PHY_ACT_UD_2_10G_KR_EEE (1u << 6)
+#define FW_PHY_ACT_UD_2_10G_KX4_EEE(1u << 5)
+#define FW_PHY_ACT_UD_2_1G_KX_EEE  (1u << 4)
+#define FW_PHY_ACT_UD_2_10G_T_EEE  (1u << 3)
+#define FW_PHY_ACT_UD_2_1G_T_EEE   (1u << 2)
+#define FW_PHY_ACT_UD_2_100M_TX_EEE(1u << 1)
+#define FW_PHY_ACT_RETRIES 50
+#define FW_PHY_INFO_SPEED_MASK 0xFFFu
+#define FW_PHY_INFO_ID_HI_MASK 0xu
+#define FW_PHY_INFO_ID_LO_MASK 0xu
 
 /* Host Interface Comma

[dpdk-dev] [PATCH 17/29] net/ixgbe/base: support busy SGMII register reads

This patch is needed for base driver support because the NW_MNG_IF_SEL
register fields are used to determine SGMII link for busy SGMII register
reads.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index c7ccd81..0011f21 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2444,6 +2444,9 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
 
DEBUGFUNC("ixgbe_init_phy_ops_X550em");
 
+   hw->mac.ops.set_lan_id(hw);
+   ixgbe_read_mng_if_sel_x550em(hw);
+
if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber) {
phy->phy_semaphore_mask = IXGBE_GSSR_SHARED_I2C_SM;
ixgbe_setup_mux_ctl(hw);
@@ -2483,7 +2486,8 @@ s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw)
 
/* Identify the PHY or SFP module */
ret_val = phy->ops.identify(hw);
-   if (ret_val == IXGBE_ERR_SFP_NOT_SUPPORTED)
+   if (ret_val == IXGBE_ERR_SFP_NOT_SUPPORTED ||
+   ret_val == IXGBE_ERR_PHY_ADDR_INVALID)
return ret_val;
 
/* Setup function pointers based on detected hardware */
-- 
2.7.4

[dpdk-dev] [PATCH 18/29] net/ixgbe/base: include new speeds in VFLINK interpretation

This patch moves some of the extended speeds that come with X552
(5G, 2.5G, 10M) into the link check functions.
 It also now returns speed_unknown for speeds that are not known
how to interpret.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/Makefile   |   1 +
 drivers/net/ixgbe/base/ixgbe_hv_vf.c | 240 +++
 drivers/net/ixgbe/base/ixgbe_hv_vf.h |  41 ++
 drivers/net/ixgbe/base/ixgbe_osdep.h |   1 +
 drivers/net/ixgbe/base/ixgbe_vf.c|  16 +++
 drivers/net/ixgbe/base/ixgbe_vf.h|   3 +
 6 files changed, 302 insertions(+)
 create mode 100644 drivers/net/ixgbe/base/ixgbe_hv_vf.c
 create mode 100644 drivers/net/ixgbe/base/ixgbe_hv_vf.h

diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
index 94ddc7b..a3e6a52 100644
--- a/drivers/net/ixgbe/Makefile
+++ b/drivers/net/ixgbe/Makefile
@@ -100,6 +100,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x550.c
 SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_phy.c
 SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_api.c
 SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf.c
+SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_hv_vf.c
 SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb.c
 SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82599.c
 SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82598.c
diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c 
b/drivers/net/ixgbe/base/ixgbe_hv_vf.c
new file mode 100644
index 000..6e3449e
--- /dev/null
+++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.c
@@ -0,0 +1,240 @@
+/***
+
+Copyright (c) 2001-2015, Intel Corporation
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+ 3. Neither the name of the Intel Corporation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+***/
+
+#include "ixgbe_vf.h"
+#include "ixgbe_hv_vf.h"
+
+/**
+ * Hyper-V variant - just a stub.
+ */
+static s32 ixgbevf_hv_update_mc_addr_list_vf(struct ixgbe_hw *hw, u8 
*mc_addr_list,
+u32 mc_addr_count, ixgbe_mc_addr_itr next,
+bool clear)
+{
+   UNREFERENCED_5PARAMETER(hw, mc_addr_list, mc_addr_count, next, clear);
+
+   return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+}
+
+/**
+ * Hyper-V variant - just a stub.
+ */
+static s32 ixgbevf_hv_update_xcast_mode(struct ixgbe_hw *hw, int xcast_mode)
+{
+   UNREFERENCED_2PARAMETER(hw, xcast_mode);
+
+   return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+}
+
+/**
+ * Hyper-V variant - just a stub.
+ */
+static s32 ixgbevf_hv_set_vfta_vf(struct ixgbe_hw *hw, u32 vlan, u32 vind,
+ bool vlan_on, bool vlvf_bypass)
+{
+   UNREFERENCED_5PARAMETER(hw, vlan, vind, vlan_on, vlvf_bypass);
+
+   return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+}
+
+static s32 ixgbevf_hv_set_uc_addr_vf(struct ixgbe_hw *hw, u32 index, u8 *addr)
+{
+   UNREFERENCED_3PARAMETER(hw, index, addr);
+
+   return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+}
+
+/**
+ * Hyper-V variant - just a stub.
+ */
+static s32 ixgbevf_hv_reset_hw_vf(struct ixgbe_hw *hw) 
+{
+   UNREFERENCED_PARAMETER(hw);
+
+   return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+}
+
+/**
+ * Hyper-V variant - just a stub.
+ */
+static s32 ixgbevf_hv_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 
vlan, u32 vind)
+{
+   UNREFERENCED_5PARAMETER(hw, index, addr, vlan, vind);
+
+   return IXGBE_ERR_FEATURE_NOT_SUPPORTED;
+}  
+
+/**
+ * Hyper-V variant; there is no mailbox communication.
+ */
+static s32 ixgbevf_hv_check_mac_link_vf(struct ixgbe_hw *hw,
+

[dpdk-dev] [PATCH 16/29] net/ixgbe/base: use FW commands to control some PHYs

Use the new firmware interface to access and control some PHYs.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_phy.c  |   4 -
 drivers/net/ixgbe/base/ixgbe_phy.h  |  67 --
 drivers/net/ixgbe/base/ixgbe_type.h |   2 +-
 drivers/net/ixgbe/base/ixgbe_x550.c | 412 ++--
 4 files changed, 68 insertions(+), 417 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c 
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 54e45b2..8901fc1 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -475,10 +475,6 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)
case X557_PHY_ID2:
phy_type = ixgbe_phy_x550em_ext_t;
break;
-   case IXGBE_M88E1500_E_PHY_ID:
-   case IXGBE_M88E1543_E_PHY_ID:
-   phy_type = ixgbe_phy_m88;
-   break;
default:
phy_type = ixgbe_phy_unknown;
break;
diff --git a/drivers/net/ixgbe/base/ixgbe_phy.h 
b/drivers/net/ixgbe/base/ixgbe_phy.h
index 816de36..820d471 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.h
+++ b/drivers/net/ixgbe/base/ixgbe_phy.h
@@ -155,73 +155,6 @@ POSSIBILITY OF SUCH DAMAGE.
 /* SFP+ SFF-8472 Compliance */
 #define IXGBE_SFF_SFF_8472_UNSUP   0x00
 
-/* More phy definitions */
-#define IXGBE_M88E1500_COPPER_CTRL 0   /* Page 0 reg */
-#define IXGBE_M88E1500_COPPER_CTRL_RESET   (1u << 15)
-#define IXGBE_M88E1500_COPPER_CTRL_AN_EN   (1u << 12)
-#define IXGBE_M88E1500_COPPER_CTRL_POWER_DOWN  (1u << 11)
-#define IXGBE_M88E1500_COPPER_CTRL_RESTART_AN  (1u << 9)
-#define IXGBE_M88E1500_COPPER_CTRL_FULL_DUPLEX (1u << 8)
-#define IXGBE_M88E1500_COPPER_CTRL_SPEED_MSB   (1u << 6)
-#define IXGBE_M88E1500_COPPER_STATUS   1   /* Page 0 reg */
-#define IXGBE_M88E1500_COPPER_STATUS_AN_DONE   (1u << 5)
-#define IXGBE_M88E1500_COPPER_AN   4   /* Page 0 reg */
-#define IXGBE_M88E1500_COPPER_AN_AS_PAUSE  (1u << 11)
-#define IXGBE_M88E1500_COPPER_AN_PAUSE (1u << 10)
-#define IXGBE_M88E1500_COPPER_AN_T4(1u << 9)
-#define IXGBE_M88E1500_COPPER_AN_100TX_FD  (1u << 8)
-#define IXGBE_M88E1500_COPPER_AN_100TX_HD  (1u << 7)
-#define IXGBE_M88E1500_COPPER_AN_10TX_FD   (1u << 6)
-#define IXGBE_M88E1500_COPPER_AN_10TX_HD   (1u << 5)
-#define IXGBE_M88E1500_COPPER_AN_LP_ABILITY5   /* Page 0 reg */
-#define IXGBE_M88E1500_COPPER_AN_LP_AS_PAUSE   (1u << 11)
-#define IXGBE_M88E1500_COPPER_AN_LP_PAUSE  (1u << 10)
-#define IXGBE_M88E1500_1000T_CTRL  9   /* Page 0 reg */
-/* 1=Configure PHY as Master 0=Configure PHY as Slave */
-#define IXGBE_M88E1500_1000T_CTRL_MS_VALUE (1u << 11)
-#define IXGBE_M88E1500_1000T_CTRL_1G_FD(1u << 9)
-/* 1=Master/Slave manual config value 0=Automatic Master/Slave config */
-#define IXGBE_M88E1500_1000T_CTRL_MS_ENABLE(1u << 12)
-#define IXGBE_M88E1500_1000T_CTRL_FULL_DUPLEX  (1u << 9)
-#define IXGBE_M88E1500_1000T_CTRL_HALF_DUPLEX  (1u << 8)
-#define IXGBE_M88E1500_1000T_STATUS10  /* Page 0 reg */
-#define IXGBE_M88E1500_AUTO_COPPER_SGMII   0x2
-#define IXGBE_M88E1500_AUTO_COPPER_BASEX   0x3
-#define IXGBE_M88E1500_STATUS_LINK (1u << 2) /* Interface Link Bit 
*/
-#define IXGBE_M88E1500_MAC_CTRL_1  16  /* Page 0 reg */
-#define IXGBE_M88E1500_MAC_CTRL_1_MODE_MASK0x0380 /* Mode Select */
-#define IXGBE_M88E1500_MAC_CTRL_1_DWN_SHIFT12
-#define IXGBE_M88E1500_MAC_CTRL_1_DWN_4X   3u
-#define IXGBE_M88E1500_MAC_CTRL_1_ED_SHIFT 8
-#define IXGBE_M88E1500_MAC_CTRL_1_ED_TM3u
-#define IXGBE_M88E1500_MAC_CTRL_1_MDIX_SHIFT   5
-#define IXGBE_M88E1500_MAC_CTRL_1_MDIX_AUTO3u
-#define IXGBE_M88E1500_MAC_CTRL_1_POWER_DOWN   (1u << 2)
-#define IXGBE_M88E1500_PHY_SPEC_STATUS 17  /* Page 0 reg */
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_SHIFT 14
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_MASK  3u
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_100u
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_100   1u
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_SPEED_1000  2u
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_DUPLEX  (1u << 13)
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_RESOLVED(1u << 11)
-#define IXGBE_M88E1500_PHY_SPEC_STATUS_LINK(1u << 10)
-#define IXGBE_M88E1500_PAGE_ADDR   22  /* All pages reg */
-#define IXGBE_M88E1500_FIBER_CTRL  0   /* Page 1 reg */
-#define IXGBE_M88E1500_FIBER_CTRL_RESET(1u << 15)
-#define IXGBE_M88E1500_FIBER_CTRL_SPEED_LSB(1u << 13)
-#define IXGBE_M88E1500_FIBER_CTRL_AN_EN(1u << 12)
-#define IXGBE_M88E1500_FIBER_CTRL_POWER_DOWN   (1u << 11)
-#define IXGBE_M88E1500_FIBER_CTRL_DUPLEX_FULL  (1u << 8)
-#define IXGBE_M88E1500_FIBER_CTRL_SPEED_MSB(1u << 6)
-#define IXGBE_M88E1500_MAC_SPEC_CTRL   16  /* P

[dpdk-dev] [PATCH 21/29] net/ixgbe/base: remove unneeded MAC check

ixgbe_read_i2c_combined_generic_int() is only used by devices >= X550.
Set the initial value accordingly and remove the MAC check.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_phy.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c 
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 8901fc1..209e9d0 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -113,7 +113,7 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw 
*hw, u8 addr, u16 reg,
u16 *val, bool lock)
 {
u32 swfw_mask = hw->phy.phy_semaphore_mask;
-   int max_retry = 10;
+   int max_retry = 3;
int retry = 0;
u8 csum_byte;
u8 high_bits;
@@ -121,8 +121,6 @@ s32 ixgbe_read_i2c_combined_generic_int(struct ixgbe_hw 
*hw, u8 addr, u16 reg,
u8 reg_high;
u8 csum;
 
-   if (hw->mac.type >= ixgbe_mac_X550)
-   max_retry = 3;
reg_high = ((reg >> 7) & 0xFE) | 1; /* Indicate read combined */
csum = ixgbe_ones_comp_byte_add(reg_high, reg & 0xFF);
csum = ~csum;
-- 
2.7.4

[dpdk-dev] [PATCH 22/29] net/ixgbe/base: remove unused PHY ID

The first PHY ID for X550 was only used on original HW and
never released. So remove these unused PHY ID.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_phy.c  | 1 -
 drivers/net/ixgbe/base/ixgbe_type.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_phy.c 
b/drivers/net/ixgbe/base/ixgbe_phy.c
index 209e9d0..5ad4dfe 100644
--- a/drivers/net/ixgbe/base/ixgbe_phy.c
+++ b/drivers/net/ixgbe/base/ixgbe_phy.c
@@ -457,7 +457,6 @@ enum ixgbe_phy_type ixgbe_get_phy_type_from_id(u32 phy_id)
case TN1010_PHY_ID:
phy_type = ixgbe_phy_tn;
break;
-   case X550_PHY_ID1:
case X550_PHY_ID2:
case X550_PHY_ID3:
case X540_PHY_ID:
diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index 9851d84..9ec17a9 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -1647,7 +1647,6 @@ struct ixgbe_dmac_config {
 #define TN1010_PHY_ID  0x00A19410
 #define TNX_FW_REV 0xB
 #define X540_PHY_ID0x01540200
-#define X550_PHY_ID1   0x01540220
 #define X550_PHY_ID2   0x01540223
 #define X550_PHY_ID3   0x01540221
 #define X557_PHY_ID0x01540240
-- 
2.7.4

[dpdk-dev] [PATCH 20/29] net/ixgbe/base: add physical layer options for FW PHY type

The "FW" PHY type now supports speeds 10M, 100M, and 1G. Previously,
only the 1G speed was reported in the
ixgbe_get_supported_physical_layer_X550em() function for this PHY type.
This patch is to add the 10M and 100M options.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_type.h | 1 +
 drivers/net/ixgbe/base/ixgbe_x550.c | 8 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index 6ab466b..9851d84 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3426,6 +3426,7 @@ typedef u32 ixgbe_physical_layer;
 #define IXGBE_PHYSICAL_LAYER_10GBASE_XAUI  0x1000
 #define IXGBE_PHYSICAL_LAYER_SFP_ACTIVE_DA 0x2000
 #define IXGBE_PHYSICAL_LAYER_1000BASE_SX   0x4000
+#define IXGBE_PHYSICAL_LAYER_10BASE_T  0x8000
 
 /* Flow Control Data Sheet defined values
  * Calculation and defines taken from 802.1bb Annex O
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 0011f21..f1f1fbe 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -3784,7 +3784,13 @@ u32 ixgbe_get_supported_physical_layer_X550em(struct 
ixgbe_hw *hw)
physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
break;
case ixgbe_phy_fw:
-   physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_T;
+   if (hw->phy.speeds_supported & IXGBE_LINK_SPEED_1GB_FULL)
+   physical_layer |= IXGBE_PHYSICAL_LAYER_1000BASE_T;
+   if (hw->phy.speeds_supported & IXGBE_LINK_SPEED_100_FULL)
+   physical_layer |= IXGBE_PHYSICAL_LAYER_100BASE_TX;
+   if (hw->phy.speeds_supported & IXGBE_LINK_SPEED_10_FULL)
+   physical_layer |= IXGBE_PHYSICAL_LAYER_10BASE_T;
+   break;
default:
break;
}
-- 
2.7.4

[dpdk-dev] [PATCH 19/29] net/ixgbe/base: check only X550 devices support 5G

Since only X550 devices have support for 5G, so it should be checked
for that speed on such devices.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
 drivers/net/ixgbe/base/ixgbe_hv_vf.c  | 2 +-
 drivers/net/ixgbe/base/ixgbe_vf.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_common.c 
b/drivers/net/ixgbe/base/ixgbe_common.c
index 89b4b5f..18bb18c 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -4230,7 +4230,7 @@ s32 ixgbe_check_mac_link_generic(struct ixgbe_hw *hw, 
ixgbe_link_speed *speed,
break;
case IXGBE_LINKS_SPEED_100_82599:
*speed = IXGBE_LINK_SPEED_100_FULL;
-   if (hw->mac.type >= ixgbe_mac_X550) {
+   if (hw->mac.type == ixgbe_mac_X550) {
if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
*speed = IXGBE_LINK_SPEED_5GB_FULL;
}
diff --git a/drivers/net/ixgbe/base/ixgbe_hv_vf.c 
b/drivers/net/ixgbe/base/ixgbe_hv_vf.c
index 6e3449e..c4e11cc 100644
--- a/drivers/net/ixgbe/base/ixgbe_hv_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_hv_vf.c
@@ -147,7 +147,7 @@ static s32 ixgbevf_hv_check_mac_link_vf(struct ixgbe_hw *hw,
break;
case IXGBE_LINKS_SPEED_100_82599:
*speed = IXGBE_LINK_SPEED_100_FULL;
-   if (hw->mac.type >= ixgbe_mac_X550) {
+   if (hw->mac.type == ixgbe_mac_X550) {
if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
*speed = IXGBE_LINK_SPEED_5GB_FULL;
}
diff --git a/drivers/net/ixgbe/base/ixgbe_vf.c 
b/drivers/net/ixgbe/base/ixgbe_vf.c
index 66486ea..8775ee5 100644
--- a/drivers/net/ixgbe/base/ixgbe_vf.c
+++ b/drivers/net/ixgbe/base/ixgbe_vf.c
@@ -623,7 +623,7 @@ s32 ixgbe_check_mac_link_vf(struct ixgbe_hw *hw, 
ixgbe_link_speed *speed,
break;
case IXGBE_LINKS_SPEED_100_82599:
*speed = IXGBE_LINK_SPEED_100_FULL;
-   if (hw->mac.type >= ixgbe_mac_X550) {
+   if (hw->mac.type == ixgbe_mac_X550) {
if (links_reg & IXGBE_LINKS_SPEED_NON_STD)
*speed = IXGBE_LINK_SPEED_5GB_FULL;
}
-- 
2.7.4

[dpdk-dev] [PATCH 23/29] net/ixgbe/base: update FW PHY flow control

This patch removes the flow control conversion from rx and tx to pause and
asymmetric pause, as that is handled by the call to ixgbe_negotiate_fc.
Performing the conversion prior to calling ixgbe_negotiate_fc results in
an incorrect fc mode if RX only pause is selected when the link partner is
advertising TX.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 16 +---
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index f1f1fbe..49b59e7 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -4199,7 +4199,6 @@ void ixgbe_fc_autoneg_sgmii_x550em_a(struct ixgbe_hw *hw)
u32 info[FW_PHY_ACT_DATA_COUNT] = { 0 };
ixgbe_link_speed speed;
bool link_up;
-   u32 fc;
 
/* AN should have completed when the cable was plugged in.
 * Look for reasons to bail out.  Bail out if:
@@ -4227,21 +4226,8 @@ void ixgbe_fc_autoneg_sgmii_x550em_a(struct ixgbe_hw *hw)
goto out;
}
 
-   /* Get the advertized flow control and modify it to indicate
-* pause and asymmetric pause instead of rx and tx
-*/
-   fc = info[0];
-   if (fc & FW_PHY_ACT_GET_LINK_INFO_FC_RX)
-   fc ^= FW_PHY_ACT_GET_LINK_INFO_FC_TX;
-
-   /* Modify link partner's flow control to indicate pause and
-* asymmetric pause instead of rx and tx
-*/
-   if (fc & FW_PHY_ACT_GET_LINK_INFO_LP_FC_RX)
-   fc ^= FW_PHY_ACT_GET_LINK_INFO_LP_FC_TX;
-
/* Negotiate the flow control */
-   status = ixgbe_negotiate_fc(hw, fc, fc,
+   status = ixgbe_negotiate_fc(hw, info[0], info[0],
FW_PHY_ACT_GET_LINK_INFO_FC_RX,
FW_PHY_ACT_GET_LINK_INFO_FC_TX,
FW_PHY_ACT_GET_LINK_INFO_LP_FC_RX,
-- 
2.7.4

[dpdk-dev] [PATCH 25/29] net/ixgbe/base: fix incorrect IXGBE LSWFW register

This register was incorrect when compared to the data sheet.
Even though the Linux kernel and DPDK polling mode driver doesn't
currently use this register, it is better to fix it upstream.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_type.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index f1761a3..49b71c5 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -153,7 +153,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define IXGBE_DEV_ID_X550EM_X_VF   0x15A8
 #define IXGBE_DEV_ID_X550EM_X_VF_HV0x15A9
 
-#define IXGBE_CAT(r, m) IXGBE_##r##m
+#define IXGBE_CAT(r,m) IXGBE_##r##m
 
 #define IXGBE_BY_MAC(_hw, r) ((_hw)->mvals[IXGBE_CAT(r, _IDX)])
 
@@ -1045,7 +1045,7 @@ struct ixgbe_dmac_config {
 #define IXGBE_FTFT 0x09400 /* 0x9400-0x97FC */
 #define IXGBE_METF(_i) (0x05190 + ((_i) * 4)) /* 4 of these (0-3) */
 #define IXGBE_MDEF_EXT(_i) (0x05160 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_LSWFW0x15014
+#define IXGBE_LSWFW0x15F14
 #define IXGBE_BMCIP(_i)(0x05050 + ((_i) * 4)) /* 0x5050-0x505C 
*/
 #define IXGBE_BMCIPVAL 0x05060
 #define IXGBE_BMCIP_IPADDR_TYPE0x0001
-- 
2.7.4

[dpdk-dev] [PATCH 27/29] net/ixgbe/base: add write flush required by Inphi

This patch updates Inphi configuration to flush the register write with
a reg read. Inphi is configured in ixgbe_setup_mac_link_sfp_x550a.
The Inphy setup flow has been updated to read configuration reg, write
only linear/non-linear, and then read (write flush).

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 4a98530..a57ba74 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -2834,12 +2834,26 @@ s32 ixgbe_setup_mac_link_sfp_x550a(struct ixgbe_hw *hw,
 
/* Configure CS4227/CS4223 LINE side to proper mode. */
reg_slice = IXGBE_CS4227_LINE_SPARE24_LSB + slice_offset;
+
+   ret_val = hw->phy.ops.read_reg(hw, reg_slice,
+   IXGBE_MDIO_ZERO_DEV_TYPE, ®_phy_ext);
+
+   if (ret_val != IXGBE_SUCCESS)
+   return ret_val;
+
+   reg_phy_ext &= ~((IXGBE_CS4227_EDC_MODE_CX1 << 1) |
+(IXGBE_CS4227_EDC_MODE_SR << 1));
+
if (setup_linear)
reg_phy_ext = (IXGBE_CS4227_EDC_MODE_CX1 << 1) | 0x1;
else
reg_phy_ext = (IXGBE_CS4227_EDC_MODE_SR << 1) | 0x1;
ret_val = hw->phy.ops.write_reg(hw, reg_slice,
 IXGBE_MDIO_ZERO_DEV_TYPE, reg_phy_ext);
+
+   /* Flush previous write with a read */
+   ret_val = hw->phy.ops.read_reg(hw, reg_slice,
+   IXGBE_MDIO_ZERO_DEV_TYPE, ®_phy_ext);
}
return ret_val;
 }
-- 
2.7.4

[dpdk-dev] [PATCH 24/29] net/ixgbe/base: add EEE support for DNL-controlled PHYs

This patch adds EEE support for DNL-controlled PHYs. Because DNL
does not indicate EEE capability or status, this patch simply
assumes that it is supported. As soon as there is a DNL-supported
PHY that does not support EEE, there will be defects in this area
because the driver will not report the EEE status correctly.
This also deletes some now-unused definitions from an earlier
Marvell PHY implementation and combines a device ID check into a
switch statement.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_type.h |  8 
 drivers/net/ixgbe/base/ixgbe_x550.c | 15 +++
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_type.h 
b/drivers/net/ixgbe/base/ixgbe_type.h
index 9ec17a9..f1761a3 100644
--- a/drivers/net/ixgbe/base/ixgbe_type.h
+++ b/drivers/net/ixgbe/base/ixgbe_type.h
@@ -3720,14 +3720,6 @@ enum ixgbe_fc_mode {
ixgbe_fc_default
 };
 
-/* Master/slave control */
-enum ixgbe_ms_type {
-   ixgbe_ms_hw_default = 0,
-   ixgbe_ms_force_master,
-   ixgbe_ms_force_slave,
-   ixgbe_ms_auto
-};
-
 /* Smart Speed Settings */
 #define IXGBE_SMARTSPEED_MAX_RETRIES   3
 enum ixgbe_smart_speed {
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 49b59e7..2aaed6b 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -896,19 +896,18 @@ s32 ixgbe_init_ops_X550EM_a(struct ixgbe_hw *hw)
break;
}
 
-   if ((hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T) ||
-   (hw->device_id == IXGBE_DEV_ID_X550EM_A_1G_T_L)) {
+   switch (hw->device_id) {
+   case IXGBE_DEV_ID_X550EM_A_1G_T:
+   case IXGBE_DEV_ID_X550EM_A_1G_T_L:
mac->ops.fc_autoneg = ixgbe_fc_autoneg_sgmii_x550em_a;
mac->ops.setup_fc = ixgbe_fc_autoneg_fw;
-   }
-
-   switch (hw->device_id) {
-   case IXGBE_DEV_ID_X550EM_A_KR:
-   case IXGBE_DEV_ID_X550EM_A_KR_L:
mac->ops.setup_eee = ixgbe_setup_eee_fw;
+   hw->phy.eee_speeds_supported = IXGBE_LINK_SPEED_100_FULL |
+  IXGBE_LINK_SPEED_1GB_FULL;
+   hw->phy.eee_speeds_advertised = hw->phy.eee_speeds_supported;
break;
default:
-   mac->ops.setup_eee = NULL;
+   break;
}
 
return ret_val;
-- 
2.7.4

[dpdk-dev] [PATCH 28/29] net/ixgbe/base: report physical layer for SGMII PHY type

For the PHY type SGMII, we need to report the physical layer
so the OS can display the correct link connection.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index a57ba74..782ca91 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -3693,6 +3693,9 @@ u32 ixgbe_get_supported_physical_layer_X550em(struct 
ixgbe_hw *hw)
if (hw->phy.speeds_supported & IXGBE_LINK_SPEED_10_FULL)
physical_layer |= IXGBE_PHYSICAL_LAYER_10BASE_T;
break;
+   case ixgbe_phy_sgmii:
+   physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_KX;
+   break;
default:
break;
}
-- 
2.7.4

[dpdk-dev] [PATCH 26/29] net/ixgbe/base: remove unused old EEE code

remove unused old EEE code.

Signed-off-by: Wei Dai 
---
 drivers/net/ixgbe/base/ixgbe_x550.c | 113 +---
 drivers/net/ixgbe/base/ixgbe_x550.h |   2 -
 2 files changed, 1 insertion(+), 114 deletions(-)

diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c 
b/drivers/net/ixgbe/base/ixgbe_x550.c
index 2aaed6b..4a98530 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.c
+++ b/drivers/net/ixgbe/base/ixgbe_x550.c
@@ -942,6 +942,7 @@ s32 ixgbe_init_ops_X550EM_x(struct ixgbe_hw *hw)
  ixgbe_write_i2c_combined_generic_unlocked;
link->addr = IXGBE_CS4227;
 
+
return ret_val;
 }
 
@@ -1109,118 +1110,6 @@ s32 ixgbe_init_eeprom_params_X550(struct ixgbe_hw *hw)
 }
 
 /**
- * ixgbe_enable_eee_x550 - Enable EEE support
- * @hw: pointer to hardware structure
- */
-STATIC s32 ixgbe_enable_eee_x550(struct ixgbe_hw *hw)
-{
-   u32 link_reg;
-   s32 status;
-
-   switch (hw->device_id) {
-   case IXGBE_DEV_ID_X550EM_A_KR:
-   case IXGBE_DEV_ID_X550EM_A_KR_L:
-   status = hw->mac.ops.read_iosf_sb_reg(hw,
-   IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-   IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
-   if (status != IXGBE_SUCCESS)
-   return status;
-
-   link_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |
-   IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX;
-
-   /* Don't advertise FEC capability when EEE enabled. */
-   link_reg &= ~IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;
-
-   status = hw->mac.ops.write_iosf_sb_reg(hw,
-   IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-   IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
-   if (status != IXGBE_SUCCESS)
-   return status;
-   break;
-   default:
-   break;
-   }
-
-   return IXGBE_SUCCESS;
-}
-
-/**
- * ixgbe_disable_eee_x550 - Disable EEE support
- * @hw: pointer to hardware structure
- */
-STATIC s32 ixgbe_disable_eee_x550(struct ixgbe_hw *hw)
-{
-   u32 link_reg;
-   s32 status;
-
-   switch (hw->device_id) {
-   case IXGBE_DEV_ID_X550EM_X_KR:
-   case IXGBE_DEV_ID_X550EM_A_KR:
-   case IXGBE_DEV_ID_X550EM_A_KR_L:
-   status = hw->mac.ops.read_iosf_sb_reg(hw,
-   IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-   IXGBE_SB_IOSF_TARGET_KR_PHY, &link_reg);
-   if (status != IXGBE_SUCCESS)
-   return status;
-
-   link_reg &= ~(IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KR |
- IXGBE_KRM_LINK_CTRL_1_TETH_EEE_CAP_KX);
-
-   /* Advertise FEC capability when EEE is disabled. */
-   link_reg |= IXGBE_KRM_LINK_CTRL_1_TETH_AN_CAP_FEC;
-
-   status = hw->mac.ops.write_iosf_sb_reg(hw,
-   IXGBE_KRM_LINK_CTRL_1(hw->bus.lan_id),
-   IXGBE_SB_IOSF_TARGET_KR_PHY, link_reg);
-   if (status != IXGBE_SUCCESS)
-   return status;
-   break;
-   default:
-   break;
-   }
-
-   return IXGBE_SUCCESS;
-}
-
-/**
- *  ixgbe_setup_eee_X550 - Enable/disable EEE support
- *  @hw: pointer to the HW structure
- *  @enable_eee: boolean flag to enable EEE
- *
- *  Enable/disable EEE based on enable_eee flag.
- *  Auto-negotiation must be started after BASE-T EEE bits in PHY register 7.3C
- *  are modified.
- *
- **/
-s32 ixgbe_setup_eee_X550(struct ixgbe_hw *hw, bool enable_eee)
-{
-   s32 status;
-   u32 eeer;
-
-   DEBUGFUNC("ixgbe_setup_eee_X550");
-
-   eeer = IXGBE_READ_REG(hw, IXGBE_EEER);
-   /* Enable or disable EEE per flag */
-   if (enable_eee) {
-   eeer |= (IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
-
-   status = ixgbe_enable_eee_x550(hw);
-   if (status)
-   return status;
-   } else {
-   eeer &= ~(IXGBE_EEER_TX_LPI_EN | IXGBE_EEER_RX_LPI_EN);
-
-   status = ixgbe_disable_eee_x550(hw);
-   if (status)
-   return status;
-   }
-   IXGBE_WRITE_REG(hw, IXGBE_EEER, eeer);
-
-   return IXGBE_SUCCESS;
-}
-
-/**
  * ixgbe_set_source_address_pruning_X550 - Enable/Disbale source address 
pruning
  * @hw: pointer to hardware structure
  * @enable: enable or disable source address pruning
diff --git a/drivers/net/ixgbe/base/ixgbe_x550.h 
b/drivers/net/ixgbe/base/ixgbe_x550.h
index 2d1876b..30ca5df 100644
--- a/drivers/net/ixgbe/base/ixgbe_x550.h
+++ b/drivers/net/ixgbe/base/ixgbe_x550.h
@@ -57,8 +57,6 @@ s32 ixgbe_read_ee_hostif_X550(struct ixgbe_hw *hw, u16 offset,
 u16*data);
 s32 ixgbe_write_ee_hostif_da

[dpdk-dev] [PATCH 29/29] net/ixgbe/base: update version of basical codes in README