github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-29 00:37:15 +00:00
Code Issues Projects Releases Wiki Activity

hv: vpci: revert the temporary workaround of handling I/O port CF9

Browse Source 
Revert the temporary workaround of calling allow_guest_pio_access() to
reset the I/O bitmap for CF9.

For CONFIG_ADDR register, only intercept I/O port CF8 to achieve these:

- In SOS, I/O bitmap for port CF9 is not set.
- In UOS or in partition mode, I/O requests to CF9/CFA/CFB won't be handled
  by pci_cfgaddr_io_read/write() any more.

Tracked-On: #1815
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
This commit is contained in:
Zide Chen 2018-11-13 15:05:58 -08:00 committed by lijinxia
parent fe9a340ea9
commit 5d013ed2ba
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hypervisor/dm/vpci/vpci.c
View File

@ -105,7 +105,7 @@ void vpci_init(struct acrn_vm *vm)
struct vm_io_range pci_cfgaddr_range = { struct vm_io_range pci_cfgaddr_range = {
.flags = IO_ATTR_RW, .flags = IO_ATTR_RW,
.base = PCI_CONFIG_ADDR, .base = PCI_CONFIG_ADDR,
.len = 4U .len = 1U
}; };
struct vm_io_range pci_cfgdata_range = { struct vm_io_range pci_cfgdata_range = {
@ -123,18 +123,17 @@ void vpci_init(struct acrn_vm *vm)
#endif #endif
if ((vpci->ops->init != NULL) && (vpci->ops->init(vm) == 0)) { if ((vpci->ops->init != NULL) && (vpci->ops->init(vm) == 0)) {
/*
* SOS: intercep port CF8 only.
* UOS or partition mode: register handler for CF8 only and I/O requests to CF9/CFA/CFB are
* not handled by vpci.
*/
register_io_emulation_handler(vm, PCI_CFGADDR_PIO_IDX, &pci_cfgaddr_range, register_io_emulation_handler(vm, PCI_CFGADDR_PIO_IDX, &pci_cfgaddr_range,
pci_cfgaddr_io_read, pci_cfgaddr_io_write); pci_cfgaddr_io_read, pci_cfgaddr_io_write);
/* Intercept and handle I/O ports CFC -- CFF */
register_io_emulation_handler(vm, PCI_CFGDATA_PIO_IDX, &pci_cfgdata_range, register_io_emulation_handler(vm, PCI_CFGDATA_PIO_IDX, &pci_cfgdata_range,
pci_cfgdata_io_read, pci_cfgdata_io_write); pci_cfgdata_io_read, pci_cfgdata_io_write);
/* This is a tmp solution to avoid sos reboot failure, it need pass-thru IO port CF9 for Reset Control
* register.
*/
if (is_vm0(vm)) {
allow_guest_pio_access(vm, (uint16_t)0xCF9U, 1U);
}
} }
} }