From patchwork Tue Aug 15 07:06:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xiaoyun" X-Patchwork-Id: 27607 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 31CFC9143; Tue, 15 Aug 2017 09:07:14 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 727CF9141; Tue, 15 Aug 2017 09:07:12 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Aug 2017 00:07:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.41,376,1498546800"; d="scan'208"; a="1162693633" Received: from dpdk-lixiaoyun.sh.intel.com ([10.67.111.119]) by orsmga001.jf.intel.com with ESMTP; 15 Aug 2017 00:07:08 -0700 From: Xiaoyun Li To: beilei.xing@intel.com Cc: jingjing.wu@intel.com, dev@dpdk.org, Xiaoyun Li , stable@dpdk.org Date: Tue, 15 Aug 2017 15:06:29 +0800 Message-Id: <1502780789-17352-1-git-send-email-xiaoyun.li@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502768028-187875-1-git-send-email-xiaoyun.li@intel.com> References: <1502768028-187875-1-git-send-email-xiaoyun.li@intel.com> Subject: [dpdk-dev] [PATCH v2] net/i40e: fix PF notify issue when VF is not up X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch stops PF from sending message to VF when VF's admin queue isn't enabled, namely VF isn't up and modifies VF state to active when VF reset is completed. Fixes: 4861cde46116 ("i40e: new poll mode driver") Cc: stable@dpdk.org Signed-off-by: Xiaoyun Li --- v2: * Modify the abbreviation to be clearer. * Move variables' declaration up to the begin of function. drivers/net/i40e/i40e_pf.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c index 100f8dc..2c3c835 100644 --- a/drivers/net/i40e/i40e_pf.c +++ b/drivers/net/i40e/i40e_pf.c @@ -167,6 +167,9 @@ i40e_pf_host_vf_reset(struct i40e_pf_vf *vf, bool do_hw_reset) PMD_DRV_LOG(ERR, "VF reset timeout"); return -ETIMEDOUT; } + + vf->state = I40E_VF_ACTIVE; + /* This is not first time to do reset, do cleanup job first */ if (vf->vsi) { /* Disable queues */ @@ -1193,6 +1196,9 @@ void i40e_notify_vf_link_status(struct rte_eth_dev *dev, struct i40e_pf_vf *vf) { struct virtchnl_pf_event event; + uint32_t tval, rval; + uint16_t vf_id; + struct i40e_hw *hw; event.event = VIRTCHNL_EVENT_LINK_CHANGE; event.event_data.link_event.link_status = @@ -1224,8 +1230,18 @@ i40e_notify_vf_link_status(struct rte_eth_dev *dev, struct i40e_pf_vf *vf) break; } - i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_EVENT, - I40E_SUCCESS, (uint8_t *)&event, sizeof(event)); + hw = I40E_PF_TO_HW(vf->pf); + vf_id = vf->vf_idx; + + tval = I40E_READ_REG(hw, I40E_VF_ATQLEN(vf_id)); + rval = I40E_READ_REG(hw, I40E_VF_ARQLEN(vf_id)); + + if (tval & I40E_VF_ATQLEN_ATQLEN_MASK || + tval & I40E_VF_ATQLEN_ATQENABLE_MASK || + rval & I40E_VF_ARQLEN_ARQLEN_MASK || + rval & I40E_VF_ARQLEN_ARQENABLE_MASK) + i40e_pf_host_send_msg_to_vf(vf, VIRTCHNL_OP_EVENT, + I40E_SUCCESS, (uint8_t *)&event, sizeof(event)); } void