OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv: vPCI: vPCI device should use its virtual configure space to access its BAR 

vPCI device should use its virtual configure space to access its BAR after vPCI
device initialized.
This patch also remove corner case "vPCI device will use its 64 bits BAR high idx
to access its BAR base address".

Tracked-On: #3475
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2019-09-10 22:06:02 +08:00 committed by ACRN System Integration
parent 6ebc22210b
commit ca51cc9d8a
1 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hypervisor/dm/vpci/pci_pt.c
View File

@ -36,36 +36,19 @@
/** /**
* @brief get bar's full base address in 64-bit * @brief get bar's full base address in 64-bit
* @pre idx < nr_bars * @pre (pci_get_bar_type(bars[idx].reg.value) == PCIBAR_MEM64) ? ((idx + 1U) < nr_bars) : (idx < nr_bars)
* For 64-bit MMIO bar, its lower 32-bits base address and upper 32-bits base are combined * For 64-bit MMIO bar, its lower 32-bits base address and upper 32-bits base are combined
* into one 64-bit base address * into one 64-bit base address
*/ */
static uint64_t pci_bar_2_bar_base(const struct pci_bar *pbars, uint32_t nr_bars, uint32_t idx) static uint64_t pci_bar_2_bar_base(const struct pci_bar *bars, uint32_t nr_bars, uint32_t idx)
{ {
uint64_t base = 0UL; uint64_t base = 0UL;
uint64_t tmp; uint64_t tmp;
const struct pci_bar *bar; const struct pci_bar *bar;
enum pci_bar_type type;
bar = &pbars[idx]; bar = &bars[idx];
type = pci_get_bar_type(bar->reg.value);
if (bar->is_64bit_high) {
ASSERT(idx > 0U, "idx for upper 32-bit of the 64-bit bar should be greater than 0!");
if (idx > 0U) {
const struct pci_bar *prev_bar = &pbars[idx - 1U];
/* Upper 32-bit of 64-bit bar (does not have flags portion) */
base = (uint64_t)(bar->reg.value);
base <<= 32U;
/* Lower 32-bit of a 64-bit bar (BITS 31-4 = base address, 16-byte aligned) */
tmp = (uint64_t)(prev_bar->reg.bits.mem.base);
tmp <<= 4U;
base |= tmp;
}
} else {
enum pci_bar_type type = pci_get_bar_type(bar->reg.value);
switch (type) { switch (type) {
case PCIBAR_IO_SPACE: case PCIBAR_IO_SPACE:
/* IO bar, BITS 31-2 = base address, 4-byte aligned */ /* IO bar, BITS 31-2 = base address, 4-byte aligned */
@ -79,9 +62,8 @@ static uint64_t pci_bar_2_bar_base(const struct pci_bar *pbars, uint32_t nr_bars
break; break;
case PCIBAR_MEM64: case PCIBAR_MEM64:
ASSERT((idx + 1U) < nr_bars, "idx for upper 32-bit of the 64-bit bar is out of range!");
if ((idx + 1U) < nr_bars) { if ((idx + 1U) < nr_bars) {
const struct pci_bar *next_bar = &pbars[idx + 1U]; const struct pci_bar *next_bar = &bars[idx + 1U];
/* Upper 32-bit of 64-bit bar */ /* Upper 32-bit of 64-bit bar */
base = (uint64_t)(next_bar->reg.value); base = (uint64_t)(next_bar->reg.value);
@ -99,7 +81,6 @@ static uint64_t pci_bar_2_bar_base(const struct pci_bar *pbars, uint32_t nr_bars
/* Nothing to do */ /* Nothing to do */
break; break;
} }
}
return base; return base;
} }
@ -151,11 +132,7 @@ static void vdev_pt_remap_msix_table_vbar(struct pci_vdev *vdev)
uint64_t pbar_base = vbar->base_hpa; /* pbar (hpa) */ uint64_t pbar_base = vbar->base_hpa; /* pbar (hpa) */
msix->mmio_hpa = pbar_base; msix->mmio_hpa = pbar_base;
if (is_prelaunched_vm(vdev->vpci->vm)) {
msix->mmio_gpa = get_vbar_base(vdev, msix->table_bar); msix->mmio_gpa = get_vbar_base(vdev, msix->table_bar);
} else {
msix->mmio_gpa = sos_vm_hpa2gpa(pbar_base);
}
msix->mmio_size = vbar->size; msix->mmio_size = vbar->size;
} }