X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fhinic%2Fbase%2Fhinic_pmd_hwif.c;h=26fa1e27d49840bedc84eb4166cd19e1e5c16766;hb=1028e5bc36b4dd4ae51580eb3e45410b6c82e153;hp=0fced5bc4e1f407a376d03625dcc3b8c14e17afd;hpb=62d2083dd78edf628dc03b46ced95e3c4a4b3c4b;p=dpdk.git diff --git a/drivers/net/hinic/base/hinic_pmd_hwif.c b/drivers/net/hinic/base/hinic_pmd_hwif.c index 0fced5bc4e..26fa1e27d4 100644 --- a/drivers/net/hinic/base/hinic_pmd_hwif.c +++ b/drivers/net/hinic/base/hinic_pmd_hwif.c @@ -99,7 +99,7 @@ void hinic_set_pf_status(struct hinic_hwif *hwif, enum hinic_pf_status status) u32 addr = HINIC_CSR_FUNC_ATTR5_ADDR; if (hwif->attr.func_type == TYPE_VF) { - PMD_DRV_LOG(ERR, "VF doesn't support set attr5"); + PMD_DRV_LOG(INFO, "VF doesn't support to set attr5"); return; } @@ -280,7 +280,7 @@ void hinic_set_msix_state(void *hwdev, u16 msix_idx, enum hinic_msix_state flag) /* vfio-pci does not mmap msi-x vector table to user space, * we can not access the space when kernel driver is vfio-pci */ - if (hw->pcidev_hdl->kdrv == RTE_KDRV_VFIO) + if (hw->pcidev_hdl->kdrv == RTE_PCI_KDRV_VFIO) return; mask_bits = readl(hwif->intr_regs_base + offset); @@ -321,7 +321,7 @@ int wait_until_doorbell_flush_states(struct hinic_hwif *hwif, rte_delay_ms(1); } while (time_before(jiffies, end)); - return -EFAULT; + return -ETIMEDOUT; } static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif) @@ -343,7 +343,7 @@ static int wait_until_doorbell_and_outbound_enabled(struct hinic_hwif *hwif) rte_delay_ms(1); } while (time_before(jiffies, end)); - return -EFAULT; + return -ETIMEDOUT; } u16 hinic_global_func_id(void *hwdev) @@ -450,8 +450,8 @@ static void hinic_parse_hwif_attr(struct hinic_hwdev *hwdev) struct hinic_hwif *hwif = hwdev->hwif; PMD_DRV_LOG(INFO, "Device %s hwif attribute:", hwdev->pcidev_hdl->name); - PMD_DRV_LOG(INFO, "func_idx:%u, p2p_idx:%u, pciintf_idx:%u, " - "vf_in_pf:%u, ppf_idx:%u, global_vf_id:%u, func_type:%u", + PMD_DRV_LOG(INFO, "func_idx: %u, p2p_idx: %u, pciintf_idx: %u, " + "vf_in_pf: %u, ppf_idx: %u, global_vf_id: %u, func_type: %u", hwif->attr.func_global_idx, hwif->attr.port_to_port_idx, hwif->attr.pci_intf_idx, hwif->attr.vf_in_pf, hwif->attr.ppf_idx,