github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-09 03:58:34 +00:00
Code Issues Projects Releases Wiki Activity

HV: this patch fixes bar address non-zero checking for 64-bit bars

Browse Source 
For 64-bit bars, previously the code will do bar size calculation only if the
lower 32-bit bar address is nonzero, changed to do bar size calculation when the whole
64-bit bar address is nonzero.

Tracked-On: #2534
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Reviewed-by: Eddie Dong <eddie.dong@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen 2019-02-08 15:21:08 -08:00 committed by Eddie Dong
parent b43f5cba57
commit 1454dd371d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hypervisor/hw/pci.c
View File

@ -247,6 +247,7 @@ static uint8_t pci_pdev_read_bar(union pci_bdf bdf, uint8_t idx, struct pci_bar
base = 0UL; base = 0UL;
size = 0UL; size = 0UL;
type = pci_pdev_read_bar_type(bdf, idx); type = pci_pdev_read_bar_type(bdf, idx);
bar_hi = 0U;
if (type != PCIBAR_NONE) { if (type != PCIBAR_NONE) {
if (type == PCIBAR_IO_SPACE) { if (type == PCIBAR_IO_SPACE) {
@ -260,14 +261,13 @@ static uint8_t pci_pdev_read_bar(union pci_bdf bdf, uint8_t idx, struct pci_bar
/* Get the base address */ /* Get the base address */
base = (uint64_t)bar_lo & bar_base_mask; base = (uint64_t)bar_lo & bar_base_mask;
if (base != 0UL) { if (type == PCIBAR_MEM64) {
if (type == PCIBAR_MEM64) { bar_hi = pci_pdev_read_cfg(bdf, pci_bar_offset(idx + 1U), 4U);
bar_hi = pci_pdev_read_cfg(bdf, pci_bar_offset(idx + 1U), 4U); base |= ((uint64_t)bar_hi << 32U);
base |= ((uint64_t)bar_hi << 32U); }
}
if (base != 0UL) {
/* Sizing the BAR */ /* Sizing the BAR */
size = 0UL;
if ((type == PCIBAR_MEM64) && (idx < (PCI_BAR_COUNT - 1U))) { if ((type == PCIBAR_MEM64) && (idx < (PCI_BAR_COUNT - 1U))) {
pci_pdev_write_cfg(bdf, pci_bar_offset(idx + 1U), 4U, ~0U); pci_pdev_write_cfg(bdf, pci_bar_offset(idx + 1U), 4U, ~0U);
size = (uint64_t)pci_pdev_read_cfg(bdf, pci_bar_offset(idx + 1U), 4U); size = (uint64_t)pci_pdev_read_cfg(bdf, pci_bar_offset(idx + 1U), 4U);