github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 04:33:55 +00:00
Code Issues Projects Releases Wiki Activity

hv: fix wrong VF BDF

Browse Source 
The vf_bdf is not initialized when invoking pci_pdev_read_cfg function.

Tracked-On: #4433

Signed-off-by: Yuan Liu <yuan1.liu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yuan Liu 2020-03-03 17:54:29 +08:00 committed by wenlingz
parent 7b429fe483
commit 08ed45f4b4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/dm/vpci/vsriov.c
View File

@ -150,6 +150,7 @@ static void enable_vf(struct pci_vdev *pf_vdev)
union pci_bdf vf_bdf; union pci_bdf vf_bdf;
uint16_t idx; uint16_t idx;
uint16_t sub_vid = 0U; uint16_t sub_vid = 0U;
uint16_t num_vfs, stride, fst_off;
/* Confirm that the physical VF_ENABLE register has been set successfully */ /* Confirm that the physical VF_ENABLE register has been set successfully */
ASSERT(is_vf_enabled(pf_vdev), "VF_ENABLE was not set successfully on the hardware"); ASSERT(is_vf_enabled(pf_vdev), "VF_ENABLE was not set successfully on the hardware");
@ -182,14 +183,15 @@ static void enable_vf(struct pci_vdev *pf_vdev)
* To check if all enabled VFs are ready, just check the first VF already exists, * To check if all enabled VFs are ready, just check the first VF already exists,
* do not need to check all. * do not need to check all.
*/ */
fst_off = read_sriov_reg(pf_vdev, PCIR_SRIOV_FST_VF_OFF);
stride = read_sriov_reg(pf_vdev, PCIR_SRIOV_VF_STRIDE);
vf_bdf.fields.bus = get_vf_bus(pf_vdev, fst_off, stride, 0U);
vf_bdf.fields.devfun = get_vf_devfun(pf_vdev, fst_off, stride, 0U);
sub_vid = (uint16_t) pci_pdev_read_cfg(vf_bdf, PCIV_SUB_VENDOR_ID, 2U); sub_vid = (uint16_t) pci_pdev_read_cfg(vf_bdf, PCIV_SUB_VENDOR_ID, 2U);
if ((sub_vid != 0xFFFFU) && (sub_vid != 0U)) { if ((sub_vid != 0xFFFFU) && (sub_vid != 0U)) {
uint16_t num_vfs, stride, fst_off;
struct pci_vdev *vf_vdev; struct pci_vdev *vf_vdev;
num_vfs = read_sriov_reg(pf_vdev, PCIR_SRIOV_NUMVFS); num_vfs = read_sriov_reg(pf_vdev, PCIR_SRIOV_NUMVFS);
fst_off = read_sriov_reg(pf_vdev, PCIR_SRIOV_FST_VF_OFF);
stride = read_sriov_reg(pf_vdev, PCIR_SRIOV_VF_STRIDE);
for (idx = 0U; idx < num_vfs; idx++) { for (idx = 0U; idx < num_vfs; idx++) {
vf_bdf.fields.bus = get_vf_bus(pf_vdev, fst_off, stride, idx); vf_bdf.fields.bus = get_vf_bus(pf_vdev, fst_off, stride, idx);
vf_bdf.fields.devfun = get_vf_devfun(pf_vdev, fst_off, stride, idx); vf_bdf.fields.devfun = get_vf_devfun(pf_vdev, fst_off, stride, idx);