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

HV: add uint32_t nr_bars to struct struct pci_pdev to track # of bars

Browse Source 
nr_bars in struct pci_pdev is used to store the actual # of bars (
6 for normal pci device and 2 for pci bridge), nr_bars will be used in subsequent
patches

Use uint32_t for bar related variables (bar index, etc) to unify the bar
related code (no casting between uint32_t and uint8_t)

Tracked-On: #3241
Signed-off-by: dongshen <dongsheng.x.zhang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
dongshen 2019-06-24 12:01:08 -07:00 committed by wenlingz
parent 95d10d8921
commit 208b1d3664
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hypervisor/hw/pci.c
View File

@ -187,21 +187,21 @@ void init_pci_pdev_list(void)
} }
} }
static uint8_t pci_pdev_get_num_bars(uint8_t hdr_type) static uint32_t pci_pdev_get_nr_bars(uint8_t hdr_type)
{ {
uint8_t num_bars = (uint8_t)0U; uint32_t nr_bars = 0U;
switch (hdr_type & PCIM_HDRTYPE) { switch (hdr_type & PCIM_HDRTYPE) {
case PCIM_HDRTYPE_NORMAL: case PCIM_HDRTYPE_NORMAL:
num_bars = (uint8_t)6U; nr_bars = 6U;
break; break;
case PCIM_HDRTYPE_BRIDGE: case PCIM_HDRTYPE_BRIDGE:
num_bars = (uint8_t)2U; nr_bars = 2U;
break; break;
case PCIM_HDRTYPE_CARDBUS: case PCIM_HDRTYPE_CARDBUS:
num_bars = (uint8_t)1U; nr_bars = 1U;
break; break;
default: default:
@ -209,7 +209,7 @@ static uint8_t pci_pdev_get_num_bars(uint8_t hdr_type)
break; break;
} }
return num_bars; return nr_bars;
} }
/* Get the base address of the raw bar value (val) */ /* Get the base address of the raw bar value (val) */
@ -238,7 +238,7 @@ static inline uint32_t pci_pdev_get_bar_base(uint32_t bar_val)
/* /*
* @pre bar != NULL * @pre bar != NULL
*/ */
static uint32_t pci_pdev_read_bar(union pci_bdf bdf, uint8_t idx, struct pci_bar *bar) static uint32_t pci_pdev_read_bar(union pci_bdf bdf, uint32_t idx, struct pci_bar *bar)
{ {
uint64_t base, size; uint64_t base, size;
enum pci_bar_type type; enum pci_bar_type type;
@ -296,9 +296,9 @@ static uint32_t pci_pdev_read_bar(union pci_bdf bdf, uint8_t idx, struct pci_bar
/* /*
* @pre nr_bars <= PCI_BAR_COUNT * @pre nr_bars <= PCI_BAR_COUNT
*/ */
static void pci_pdev_read_bars(union pci_bdf bdf, uint8_t nr_bars, struct pci_bar *bar) static void pci_pdev_read_bars(union pci_bdf bdf, uint32_t nr_bars, struct pci_bar *bar)
{ {
uint8_t idx = 0U; uint32_t idx = 0U;
uint32_t bar_step; uint32_t bar_step;
while (idx < nr_bars) { while (idx < nr_bars) {
@ -404,15 +404,14 @@ static void pci_read_cap(struct pci_pdev *pdev, uint8_t hdr_type)
static void fill_pdev(uint16_t pbdf, struct pci_pdev *pdev) static void fill_pdev(uint16_t pbdf, struct pci_pdev *pdev)
{ {
uint8_t hdr_type; uint8_t hdr_type;
uint8_t nr_bars;
pdev->bdf.value = pbdf; pdev->bdf.value = pbdf;
hdr_type = (uint8_t)pci_pdev_read_cfg(pdev->bdf, PCIR_HDRTYPE, 1U); hdr_type = (uint8_t)pci_pdev_read_cfg(pdev->bdf, PCIR_HDRTYPE, 1U);
nr_bars = pci_pdev_get_num_bars(hdr_type); pdev->nr_bars = pci_pdev_get_nr_bars(hdr_type);
pci_pdev_read_bars(pdev->bdf, nr_bars, &pdev->bar[0]); pci_pdev_read_bars(pdev->bdf, pdev->nr_bars, &pdev->bar[0]);
if ((pci_pdev_read_cfg(pdev->bdf, PCIR_STATUS, 2U) & PCIM_STATUS_CAPPRESENT) != 0U) { if ((pci_pdev_read_cfg(pdev->bdf, PCIR_STATUS, 2U) & PCIM_STATUS_CAPPRESENT) != 0U) {
pci_read_cap(pdev, hdr_type); pci_read_cap(pdev, hdr_type);

1
hypervisor/include/hw/pci.h
View File

@ -207,6 +207,7 @@ struct pci_msix_cap {
struct pci_pdev { struct pci_pdev {
/* The bar info of the physical PCI device. */ /* The bar info of the physical PCI device. */
uint32_t nr_bars; /* 6 for normal device, 2 for bridge, 1 for cardbus */
struct pci_bar bar[PCI_BAR_COUNT]; struct pci_bar bar[PCI_BAR_COUNT];
/* The bus/device/function triple of the physical PCI device. */ /* The bus/device/function triple of the physical PCI device. */