From patchwork Tue Apr 4 12:49:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xing, Beilei" X-Patchwork-Id: 125772 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CC1DE428CD; Tue, 4 Apr 2023 15:12:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A83A640EF0; Tue, 4 Apr 2023 15:12:06 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id B94ED40A7E for ; Tue, 4 Apr 2023 15:12:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680613925; x=1712149925; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QBoApNdkaS97+1pLqDMN953A+JgmdYY2AgOcUasnKfo=; b=cZLVNm648yc1BTxiHlXfU2som5ZQIchGVbmuJhrzyT650H5/aPwgguGe SMynbr7OMt4OgNSSEhCSOYE5lBk2J61SqAynr3Ysaj8xNAsXT7dlzBCWv tkfsH/jZQfVgR6+pa8FP06DrE9e/GPfxDZ77jwW9bevfBXask/xLf2ih+ bkYewh/L+LieXy2A0zUwCiD6I9CLZrk/5bMEPcbAdMyp87lBJgTepiUIn AopOTMNWQUJbR9Jw4dZ2tz8FgFKBIkqFl5zewJ4KBmQ7HQ2tZXBD1SsoA 1sVlw99MlrO39F4QvBQhIyvUhDEUVkfgMPcyj1mUUK0Ed3jSam8BbLZlh Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10670"; a="326193873" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="326193873" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2023 06:12:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10670"; a="663588864" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="663588864" Received: from dpdk-beileix-3.sh.intel.com ([10.67.110.253]) by orsmga006.jf.intel.com with ESMTP; 04 Apr 2023 06:12:03 -0700 From: beilei.xing@intel.com To: jingjing.wu@intel.com Cc: dev@dpdk.org, Beilei Xing Subject: [PATCH v2] net/idpf: add VF support Date: Tue, 4 Apr 2023 12:49:37 +0000 Message-Id: <20230404124937.72970-1-beilei.xing@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20230321065601.80171-1-beilei.xing@intel.com> References: <20230321065601.80171-1-beilei.xing@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Beilei Xing Support VF whose device id is 0x145c. Signed-off-by: Beilei Xing --- v2 change: - Rebase code based on new patchset: https://patches.dpdk.org/project/dpdk/cover/20230404124112.71703-1-beilei.xing@intel.com/ drivers/net/idpf/idpf_ethdev.c | 89 ++++++++++++++++++++++++++++++---- drivers/net/idpf/idpf_ethdev.h | 2 + 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 18c152b598..b4364bbb08 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -1078,6 +1078,7 @@ idpf_handle_virtchnl_msg(struct idpf_adapter_ext *adapter_ex) switch (mbx_op) { case idpf_mbq_opc_send_msg_to_peer_pf: + case idpf_mbq_opc_send_msg_to_peer_drv: if (vc_op == VIRTCHNL2_OP_EVENT) { if (ctlq_msg.data_len < sizeof(struct virtchnl2_event)) { PMD_DRV_LOG(ERR, "Error event"); @@ -1128,6 +1129,23 @@ idpf_dev_alarm_handler(void *param) rte_eal_alarm_set(IDPF_ALARM_INTERVAL, idpf_dev_alarm_handler, adapter); } +static int +idpf_hw_vf_reset_check(struct idpf_hw *hw) +{ + uint32_t reg; + int i; + + for (i = 0; i < IDPF_RESET_WAIT_CNT; i++) { + reg = IDPF_READ_REG(hw, VFGEN_RSTAT); + if (reg != 0xFFFFFFFF && (reg & VFGEN_RSTAT_VFR_STATE_M)) + return 0; + rte_delay_ms(1000); + } + + PMD_INIT_LOG(ERR, "VF reset timeout"); + return -EBUSY; +} + static struct idpf_ctlq_create_info idpf_ctlq_info[IDPF_CTLQ_NUM] = { { .type = IDPF_CTLQ_TYPE_MAILBOX_TX, @@ -1201,6 +1219,41 @@ static struct virtchnl2_get_capabilities req_caps = { .other_caps = VIRTCHNL2_CAP_WB_ON_ITR }; +struct idpf_ctlq_create_info vf_ctlq_info[IDPF_CTLQ_NUM] = { + { + .type = IDPF_CTLQ_TYPE_MAILBOX_TX, + .id = IDPF_CTLQ_ID, + .len = IDPF_CTLQ_LEN, + .buf_size = IDPF_DFLT_MBX_BUF_SIZE, + .reg = { + .head = VF_ATQH, + .tail = VF_ATQT, + .len = VF_ATQLEN, + .bah = VF_ATQBAH, + .bal = VF_ATQBAL, + .len_mask = VF_ATQLEN_ATQLEN_M, + .len_ena_mask = VF_ATQLEN_ATQENABLE_M, + .head_mask = VF_ATQH_ATQH_M, + } + }, + { + .type = IDPF_CTLQ_TYPE_MAILBOX_RX, + .id = IDPF_CTLQ_ID, + .len = IDPF_CTLQ_LEN, + .buf_size = IDPF_DFLT_MBX_BUF_SIZE, + .reg = { + .head = VF_ARQH, + .tail = VF_ARQT, + .len = VF_ARQLEN, + .bah = VF_ARQBAH, + .bal = VF_ARQBAL, + .len_mask = VF_ARQLEN_ARQLEN_M, + .len_ena_mask = VF_ARQLEN_ARQENABLE_M, + .head_mask = VF_ARQH_ARQH_M, + } + } +}; + static int idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adapter) { @@ -1217,17 +1270,32 @@ idpf_adapter_ext_init(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *a strncpy(adapter->name, pci_dev->device.name, PCI_PRI_STR_SIZE); - idpf_hw_pf_reset(hw); - ret = idpf_hw_pf_reset_check(hw); - if (ret != 0) { - PMD_INIT_LOG(ERR, "PF is still resetting"); - goto err_reset_check; - } + if (hw->device_id == IDPF_DEV_ID_PF) { + idpf_hw_pf_reset(hw); + ret = idpf_hw_pf_reset_check(hw); + if (ret != 0) { + PMD_INIT_LOG(ERR, "PF is still resetting"); + goto err_reset_check; + } + + ret = idpf_hw_mbx_init(hw, idpf_ctlq_info); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Failed to init mailbox"); + goto err_reset_check; + } + } else if (hw->device_id == IDPF_DEV_ID_VF) { + ret = idpf_hw_vf_reset_check(hw); + if (ret != 0) { + PMD_INIT_LOG(ERR, "VF is still resetting"); + goto err_reset_check; + } + + ret = idpf_hw_mbx_init(hw, vf_ctlq_info); + if (ret != 0) { + PMD_INIT_LOG(ERR, "Failed to init mailbox"); + goto err_reset_check; + } - ret = idpf_hw_mbx_init(hw, idpf_ctlq_info); - if (ret != 0) { - PMD_INIT_LOG(ERR, "Failed to init mailbox"); - goto err_reset_check; } rte_memcpy(&base->caps, &req_caps, sizeof(struct virtchnl2_get_capabilities)); @@ -1369,6 +1437,7 @@ idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params) static const struct rte_pci_id pci_id_idpf_map[] = { { RTE_PCI_DEVICE(IDPF_INTEL_VENDOR_ID, IDPF_DEV_ID_PF) }, + { RTE_PCI_DEVICE(IDPF_INTEL_VENDOR_ID, IDPF_DEV_ID_SRIOV) }, { .vendor_id = 0, /* sentinel */ }, }; diff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h index 3c2c932438..030f1470e2 100644 --- a/drivers/net/idpf/idpf_ethdev.h +++ b/drivers/net/idpf/idpf_ethdev.h @@ -20,6 +20,8 @@ #include #include +#define IDPF_DEV_ID_SRIOV 0x145c + #define IDPF_MAX_VPORT_NUM 8 #define IDPF_INVALID_VPORT_IDX 0xffff