github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-17 17:01:52 +00:00
Code Issues Projects Releases Wiki Activity

HV: rename pci_pdev_array to pci_pdevs

Browse Source 
hv: pci: rename pci_pdev_array to pci_pdevs to make it clearer

Tracked-On: #4857
Signed-off-by: Wang Qian <qian1.wang@intel.com>
Reviewed-by: Li Fei <Fei1.Li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Qian Wang 2020-06-04 16:53:24 +08:00 committed by wenlingz
parent 780c87d9da
commit f58bf1f03f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/hw/pci.c
View File

@ -46,7 +46,7 @@
static spinlock_t pci_device_lock; static spinlock_t pci_device_lock;
static uint32_t num_pci_pdev; static uint32_t num_pci_pdev;
static struct pci_pdev pci_pdev_array[CONFIG_MAX_PCI_DEV_NUM]; static struct pci_pdev pci_pdevs[CONFIG_MAX_PCI_DEV_NUM];
static uint64_t pci_mmcfg_base = DEFAULT_PCI_MMCFG_BASE; static uint64_t pci_mmcfg_base = DEFAULT_PCI_MMCFG_BASE;
#ifdef CONFIG_ACPI_PARSE_ENABLED #ifdef CONFIG_ACPI_PARSE_ENABLED
@ -259,12 +259,12 @@ void pdev_restore_bar(const struct pci_pdev *pdev)
} }
/* @brief: Find the DRHD index corresponding to a PCI device /* @brief: Find the DRHD index corresponding to a PCI device
* Runs through the pci_pdev_array and returns the value in drhd_idx * Runs through the pci_pdevs and returns the value in drhd_idx
* member from pdev structure that matches matches B:D.F * member from pdev structure that matches matches B:D.F
* *
* @pbdf[in] B:D.F of a PCI device * @pbdf[in] B:D.F of a PCI device
* *
* @return if there is a matching pbdf in pci_pdev_array, pdev->drhd_idx, else INVALID_DRHD_INDEX * @return if there is a matching pbdf in pci_pdevs, pdev->drhd_idx, else INVALID_DRHD_INDEX
*/ */
uint32_t pci_lookup_drhd_for_pbdf(uint16_t pbdf) uint32_t pci_lookup_drhd_for_pbdf(uint16_t pbdf)
@ -273,8 +273,8 @@ uint32_t pci_lookup_drhd_for_pbdf(uint16_t pbdf)
uint32_t index; uint32_t index;
for (index = 0U; index < num_pci_pdev; index++) { for (index = 0U; index < num_pci_pdev; index++) {
if (pci_pdev_array[index].bdf.value == pbdf) { if (pci_pdevs[index].bdf.value == pbdf) {
drhd_index = pci_pdev_array[index].drhd_index; drhd_index = pci_pdevs[index].drhd_index;
break; break;
} }
} }
@ -561,7 +561,7 @@ static void init_all_dev_config(void)
struct pci_pdev *pdev = NULL; struct pci_pdev *pdev = NULL;
for (idx = 0U; idx < num_pci_pdev; idx++) { for (idx = 0U; idx < num_pci_pdev; idx++) {
pdev = &pci_pdev_array[idx]; pdev = &pci_pdevs[idx];
if (is_bridge(pdev)) { if (is_bridge(pdev)) {
config_pci_bridge(pdev); config_pci_bridge(pdev);
@ -751,7 +751,7 @@ struct pci_pdev *init_pdev(uint16_t pbdf, uint32_t drhd_index)
hdr_layout = (hdr_type & PCIM_HDRTYPE); hdr_layout = (hdr_type & PCIM_HDRTYPE);
if ((hdr_layout == PCIM_HDRTYPE_NORMAL) || (hdr_layout == PCIM_HDRTYPE_BRIDGE)) { if ((hdr_layout == PCIM_HDRTYPE_NORMAL) || (hdr_layout == PCIM_HDRTYPE_BRIDGE)) {
pdev = &pci_pdev_array[num_pci_pdev]; pdev = &pci_pdevs[num_pci_pdev];
pdev->bdf.value = pbdf; pdev->bdf.value = pbdf;
pdev->hdr_type = hdr_type; pdev->hdr_type = hdr_type;
pdev->base_class = (uint8_t)pci_pdev_read_cfg(bdf, PCIR_CLASS, 1U); pdev->base_class = (uint8_t)pci_pdev_read_cfg(bdf, PCIR_CLASS, 1U);

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

@ -338,12 +338,12 @@ void enable_disable_pci_intx(union pci_bdf bdf, bool enable);
void init_pci_pdev_list(void); void init_pci_pdev_list(void);
/* @brief: Find the DRHD index corresponding to a PCI device /* @brief: Find the DRHD index corresponding to a PCI device
* Runs through the pci_pdev_array and returns the value in drhd_idx * Runs through the pci_pdevs and returns the value in drhd_idx
* member from pdev strucutre that matches matches B:D.F * member from pdev strucutre that matches matches B:D.F
* *
* @pbdf[in] B:D.F of a PCI device * @pbdf[in] B:D.F of a PCI device
* *
* @return if there is a matching pbdf in pci_pdev_array, pdev->drhd_idx, else -1U * @return if there is a matching pbdf in pci_pdevs, pdev->drhd_idx, else -1U
*/ */
uint32_t pci_lookup_drhd_for_pbdf(uint16_t pbdf); uint32_t pci_lookup_drhd_for_pbdf(uint16_t pbdf);