HV: emulate dummy multi-function dev in Service VM
For a pdev which allocated to prelaunched VM or owned by HV, we need to check whether it is a multifuction dev at function 0. If yes we have to emulate a dummy function dev in Service VM, otherwise the sub-function devices will be lost in guest OS pci probe process. Tracked-On: #8492 Reviewed-by: Junjie Mao <junjie.mao@intel.com> Signed-off-by: Qiang Zhang <qiang4.zhang@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
parent
bf653d277b
commit
a4a73b5aac
|
@ -315,6 +315,7 @@ VP_DM_C_SRCS += dm/vpci/vpci.c
|
||||||
VP_DM_C_SRCS += dm/vpci/vhostbridge.c
|
VP_DM_C_SRCS += dm/vpci/vhostbridge.c
|
||||||
VP_DM_C_SRCS += dm/vpci/vroot_port.c
|
VP_DM_C_SRCS += dm/vpci/vroot_port.c
|
||||||
VP_DM_C_SRCS += dm/vpci/vpci_bridge.c
|
VP_DM_C_SRCS += dm/vpci/vpci_bridge.c
|
||||||
|
VP_DM_C_SRCS += dm/vpci/vpci_mf_dev.c
|
||||||
VP_DM_C_SRCS += dm/vpci/ivshmem.c
|
VP_DM_C_SRCS += dm/vpci/ivshmem.c
|
||||||
VP_DM_C_SRCS += dm/vpci/pci_pt.c
|
VP_DM_C_SRCS += dm/vpci/pci_pt.c
|
||||||
VP_DM_C_SRCS += dm/vpci/vmsi.c
|
VP_DM_C_SRCS += dm/vpci/vmsi.c
|
||||||
|
|
|
@ -75,6 +75,16 @@ struct acrn_vm_pci_dev_config *init_one_dev_config(struct pci_pdev *pdev)
|
||||||
} else {
|
} else {
|
||||||
dev_config->emu_type = PCI_DEV_TYPE_PTDEV;
|
dev_config->emu_type = PCI_DEV_TYPE_PTDEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((is_allocated_to_hv || is_allocated_to_prelaunched_vm)
|
||||||
|
&& (dev_config == NULL)
|
||||||
|
&& is_pci_cfg_multifunction(pdev->hdr_type)
|
||||||
|
&& (pdev->bdf.bits.f == 0U))
|
||||||
|
{
|
||||||
|
dev_config = &service_vm_config->pci_devs[service_vm_config->pci_dev_num];
|
||||||
|
dev_config->emu_type = PCI_DEV_TYPE_DUMMY_MF_EMUL;
|
||||||
|
dev_config->vdev_ops = &vpci_mf_dev_ops;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dev_config != NULL) {
|
if (dev_config != NULL) {
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2018-2022 Intel Corporation.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <asm/guest/vm.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <logmsg.h>
|
||||||
|
#include <pci.h>
|
||||||
|
#include "vpci_priv.h"
|
||||||
|
|
||||||
|
/* config space of dummy multifunction device */
|
||||||
|
#define PCI_DUMMY_DEVICE_VENDOR 0x1D94U
|
||||||
|
#define PCI_DUMMY_DEVICE_ID 0x145AU
|
||||||
|
#define DUMMY_MF_REV 0x1U
|
||||||
|
#define DUMMY_MF_CLASS 0x0U
|
||||||
|
|
||||||
|
static void init_vpci_mf_dev(struct pci_vdev *vdev)
|
||||||
|
{
|
||||||
|
pci_vdev_write_vcfg(vdev, PCIR_VENDOR, 2U, PCI_DUMMY_DEVICE_VENDOR);
|
||||||
|
pci_vdev_write_vcfg(vdev, PCIR_DEVICE, 2U, PCI_DUMMY_DEVICE_ID);
|
||||||
|
pci_vdev_write_vcfg(vdev, PCIR_REVID, 1U, DUMMY_MF_REV);
|
||||||
|
pci_vdev_write_vcfg(vdev, PCIR_CLASS, 1U, DUMMY_MF_CLASS);
|
||||||
|
pci_vdev_write_vcfg(vdev, PCIR_HDRTYPE, 1U, PCIM_HDRTYPE_NORMAL | PCIM_MFDEV);
|
||||||
|
|
||||||
|
vdev->parent_user = NULL;
|
||||||
|
vdev->user = vdev;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void deinit_vpci_mf_dev(struct pci_vdev *vdev)
|
||||||
|
{
|
||||||
|
vdev->parent_user = NULL;
|
||||||
|
vdev->user = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int32_t read_vpci_mf_dev(struct pci_vdev *vdev, uint32_t offset,
|
||||||
|
uint32_t bytes, uint32_t *val)
|
||||||
|
{
|
||||||
|
*val = pci_vdev_read_vcfg(vdev, offset, bytes);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int32_t write_vpci_mf_dev(__unused struct pci_vdev *vdev, __unused uint32_t offset,
|
||||||
|
__unused uint32_t bytes, __unused uint32_t val)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
const struct pci_vdev_ops vpci_mf_dev_ops = {
|
||||||
|
.init_vdev = init_vpci_mf_dev,
|
||||||
|
.deinit_vdev = deinit_vpci_mf_dev,
|
||||||
|
.write_vdev_cfg = write_vpci_mf_dev,
|
||||||
|
.read_vdev_cfg = read_vpci_mf_dev,
|
||||||
|
};
|
|
@ -29,9 +29,11 @@
|
||||||
#define SERVICE_VM_IDLE "idle=halt "
|
#define SERVICE_VM_IDLE "idle=halt "
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define PCI_DEV_TYPE_NONE 0U
|
||||||
#define PCI_DEV_TYPE_PTDEV (1U << 0U)
|
#define PCI_DEV_TYPE_PTDEV (1U << 0U)
|
||||||
#define PCI_DEV_TYPE_HVEMUL (1U << 1U)
|
#define PCI_DEV_TYPE_HVEMUL (1U << 1U)
|
||||||
#define PCI_DEV_TYPE_SERVICE_VM_EMUL (1U << 2U)
|
#define PCI_DEV_TYPE_SERVICE_VM_EMUL (1U << 2U)
|
||||||
|
#define PCI_DEV_TYPE_DUMMY_MF_EMUL (1U << 3U)
|
||||||
|
|
||||||
#define MAX_MMIO_DEV_NUM 2U
|
#define MAX_MMIO_DEV_NUM 2U
|
||||||
|
|
||||||
|
|
|
@ -184,6 +184,7 @@ struct acrn_vm;
|
||||||
|
|
||||||
extern const struct pci_vdev_ops vhostbridge_ops;
|
extern const struct pci_vdev_ops vhostbridge_ops;
|
||||||
extern const struct pci_vdev_ops vpci_bridge_ops;
|
extern const struct pci_vdev_ops vpci_bridge_ops;
|
||||||
|
extern const struct pci_vdev_ops vpci_mf_dev_ops;
|
||||||
int32_t init_vpci(struct acrn_vm *vm);
|
int32_t init_vpci(struct acrn_vm *vm);
|
||||||
void deinit_vpci(struct acrn_vm *vm);
|
void deinit_vpci(struct acrn_vm *vm);
|
||||||
struct pci_vdev *pci_find_vdev(struct acrn_vpci *vpci, union pci_bdf vbdf);
|
struct pci_vdev *pci_find_vdev(struct acrn_vpci *vpci, union pci_bdf vbdf);
|
||||||
|
|
Loading…
Reference in New Issue