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

hv: pci: Hide PCI bridge 00:1c.0 from SOS

Browse Source 
It is found that SOS will reset the PCI devices under PCI
bridge 00:1c.0 when 00:1c.0 is exposed to SOS. If a PCI
device under 00:1c.0 is passed through to pre-launched VM,
it will be reset by SOS at startup hence the passthrough
will not work properly. This patch provides a workaround
by hiding PCI bridge 00:1c.0 from SOS in this case.

Tracked-On: #5346
Signed-off-by: Jian Jun Chen <jian.jun.chen@intel.com>
This commit is contained in:
Jian Jun Chen 2020-09-23 04:37:29 +00:00 committed by wenlingz
parent 569e05ef74
commit 80f905f217
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hypervisor/arch/x86/configs/pci_dev.c
View File

@ -8,6 +8,7 @@
#include <pci.h>
#include <pci_dev.h>
#include <vpci.h>
#include <logmsg.h>
/*
* @pre pdev != NULL;
@ -38,6 +39,56 @@ static bool is_allocated_to_prelaunched_vm(struct pci_pdev *pdev)
return found;
}
static bool is_pbus_allocated_to_prelaunched_vm(uint8_t bus)
{
bool found = false;
uint16_t vmid;
uint32_t pci_idx;
struct acrn_vm_config *vm_config;
struct acrn_vm_pci_dev_config *dev_config;
for (vmid = 0U; (vmid < CONFIG_MAX_VM_NUM) && !found; vmid++) {
vm_config = get_vm_config(vmid);
if (vm_config->load_order == PRE_LAUNCHED_VM) {
for (pci_idx = 0U; pci_idx < vm_config->pci_dev_num; pci_idx++) {
dev_config = &vm_config->pci_devs[pci_idx];
if ((dev_config->emu_type == PCI_DEV_TYPE_PTDEV) &&
(dev_config->pbdf.bits.b == bus)) {
found = true;
break;
}
}
}
}
return found;
}
static bool need_hide_from_sos(struct pci_pdev *pdev)
{
const union pci_bdf bdf = {.bits.b = 0U, .bits.d = 0x1cU, .bits.f = 0U};
uint8_t hdr_type, hdr_layout, sec_busno;
uint32_t vid, pid;
bool ret = false;
if (bdf_is_equal(bdf, pdev->bdf)) {
vid = pci_pdev_read_cfg(pdev->bdf, PCIR_VENDOR, 2U);
pid = pci_pdev_read_cfg(pdev->bdf, PCIR_DEVICE, 2U);
hdr_type = (uint8_t)pci_pdev_read_cfg(pdev->bdf, PCIR_HDRTYPE, 1U);
hdr_layout = (hdr_type & PCIM_HDRTYPE);
if ((vid == 0x8086) && (pid == 0xa0bc) && (hdr_layout == PCIM_HDRTYPE_BRIDGE)) {
sec_busno = (uint8_t)pci_pdev_read_cfg(pdev->bdf, PCIR_SECBUS_1, 1U);
ret = is_pbus_allocated_to_prelaunched_vm(sec_busno);
if (ret) {
pr_acrnlog("%s: [%x:%x.%x] is hidden from SOS",
__func__, bdf.bits.b, bdf.bits.d, bdf.bits.f);
}
}
}
return ret;
}
/*
* @brief Initialize a acrn_vm_pci_dev_config structure
@ -56,7 +107,7 @@ struct acrn_vm_pci_dev_config *init_one_dev_config(struct pci_pdev *pdev)
struct acrn_vm_config *vm_config;
struct acrn_vm_pci_dev_config *dev_config = NULL;
if (!is_allocated_to_prelaunched_vm(pdev)) {
if (!is_allocated_to_prelaunched_vm(pdev) && !need_hide_from_sos(pdev)) {
for (vmid = 0U; vmid < CONFIG_MAX_VM_NUM; vmid++) {
vm_config = get_vm_config(vmid);
if (vm_config->load_order != SOS_VM) {