hv: refine pci_read_cap and pci_read_ext_cap

yliu80 · wenlingz · commit 734ad6ce308f · 2020-03-05T10:15:15.000+08:00
The pci_read_cap and pci_read_ext_cap are used to enumerate PCI legacy capability and extended capability. Change the name pci_read_cap to pci_enumerate_cap Change the name pci_read_ext_cap to pci_enumerate_ext_cap Tracked-On: #4433 Signed-off-by: Yuan Liu <yuan1.liu@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
diff --git a/hypervisor/hw/pci.c b/hypervisor/hw/pci.c
@@ -521,7 +521,7 @@ static inline uint32_t pci_pdev_get_nr_bars(uint8_t hdr_type)
 /**
  * @pre pdev != NULL
  */
-static void pci_read_ext_cap(struct pci_pdev *pdev) {
+static void pci_enumerate_ext_cap(struct pci_pdev *pdev) {
 
 	uint32_t hdr, pos;
 
@@ -546,7 +546,7 @@ static void pci_read_ext_cap(struct pci_pdev *pdev) {
 /*
  * @pre pdev != NULL
  */
-static void pci_read_cap(struct pci_pdev *pdev)
+static void pci_enumerate_cap(struct pci_pdev *pdev)
 {
 	uint8_t pos, cap;
 	uint32_t msgctrl;
@@ -601,7 +601,7 @@ static void pci_read_cap(struct pci_pdev *pdev)
 	}
 
 	if (is_pcie) {
-		pci_read_ext_cap(pdev);
+		pci_enumerate_ext_cap(pdev);
 	}
 }
 
@@ -637,7 +637,7 @@ struct pci_pdev *init_pdev(uint16_t pbdf, uint32_t drhd_index)
 			}
 
 			if ((pci_pdev_read_cfg(bdf, PCIR_STATUS, 2U) & PCIM_STATUS_CAPPRESENT) != 0U) {
-				pci_read_cap(pdev);
+				pci_enumerate_cap(pdev);
 			}
 
 			pdev->drhd_index = drhd_index;

Original file line number	Diff line number	Diff line change
`@@ -521,7 +521,7 @@ static inline uint32_t pci_pdev_get_nr_bars(uint8_t hdr_type)`
`521`	`521`	`/**`
`522`	`522`	`* @pre pdev != NULL`
`523`	`523`	`*/`
`524`		`-static void pci_read_ext_cap(struct pci_pdev *pdev) {`
	`524`	`+static void pci_enumerate_ext_cap(struct pci_pdev *pdev) {`
`525`	`525`
`526`	`526`	`uint32_t hdr, pos;`
`527`	`527`
`@@ -546,7 +546,7 @@ static void pci_read_ext_cap(struct pci_pdev *pdev) {`
`546`	`546`	`/*`
`547`	`547`	`* @pre pdev != NULL`
`548`	`548`	`*/`
`549`		`-static void pci_read_cap(struct pci_pdev *pdev)`
	`549`	`+static void pci_enumerate_cap(struct pci_pdev *pdev)`
`550`	`550`	`{`
`551`	`551`	`uint8_t pos, cap;`
`552`	`552`	`uint32_t msgctrl;`
`@@ -601,7 +601,7 @@ static void pci_read_cap(struct pci_pdev *pdev)`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`if (is_pcie) {`
`604`		`- pci_read_ext_cap(pdev);`
	`604`	`+ pci_enumerate_ext_cap(pdev);`
`605`	`605`	`}`
`606`	`606`	`}`
`607`	`607`
`@@ -637,7 +637,7 @@ struct pci_pdev *init_pdev(uint16_t pbdf, uint32_t drhd_index)`
`637`	`637`	`}`
`638`	`638`
`639`	`639`	`if ((pci_pdev_read_cfg(bdf, PCIR_STATUS, 2U) & PCIM_STATUS_CAPPRESENT) != 0U) {`
`640`		`- pci_read_cap(pdev);`
	`640`	`+ pci_enumerate_cap(pdev);`
`641`	`641`	`}`
`642`	`642`
`643`	`643`	`pdev->drhd_index = drhd_index;`