@@ -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 */ },
};
@@ -20,6 +20,8 @@
#include <base/idpf_prototype.h>
#include <base/virtchnl2.h>
+#define IDPF_DEV_ID_SRIOV 0x145c
+
#define IDPF_MAX_VPORT_NUM 8
#define IDPF_INVALID_VPORT_IDX 0xffff