[kvm-unit-tests,05/11] x86: mov pci.h to asm

Commit Message

Andrew Jones Jan. 15, 2016, 4:10 p.m. UTC

Also move pci_config_read into pci.h from pci.c.

Signed-off-by: Andrew Jones <[e-mail]>
---
 lib/x86/{ => asm}/pci.h |  8 ++++++++
 lib/x86/pci.c           | 10 +---------
 x86/vmexit.c            |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/x86/{ => asm}/pci.h (65%)

Patch

diff --git a/lib/x86/pci.h b/lib/x86/asm/pci.h
similarity index 65%
rename from lib/x86/pci.h
rename to lib/x86/asm/pci.h
index 046e68f9a65b6..8ad93a87966c6 100644
--- a/lib/x86/pci.h
+++ b/lib/x86/asm/pci.h
@@ -2,6 +2,7 @@ 
 #define PCI_H
 
 #include "libcflat.h"
+#include "asm/io.h"
 
 typedef uint16_t pcidevaddr_t;
 enum {
@@ -12,4 +13,11 @@  unsigned long pci_bar_addr(pcidevaddr_t dev, int bar_num);
 bool pci_bar_is_memory(pcidevaddr_t dev, int bar_num);
 bool pci_bar_is_valid(pcidevaddr_t dev, int bar_num);
 
+static inline uint32_t pci_config_read(pcidevaddr_t dev, uint8_t reg)
+{
+    uint32_t index = reg | (dev << 8) | (0x1 << 31);
+    outl(index, 0xCF8);
+    return inl(0xCFC);
+}
+
 #endif
diff --git a/lib/x86/pci.c b/lib/x86/pci.c
index 991345ce77858..7002d80836a4c 100644
--- a/lib/x86/pci.c
+++ b/lib/x86/pci.c
@@ -1,13 +1,5 @@ 
 #include <linux/pci_regs.h>
-#include "pci.h"
-#include "asm/io.h"
-
-static uint32_t pci_config_read(pcidevaddr_t dev, uint8_t reg)
-{
-    uint32_t index = reg | (dev << 8) | (0x1 << 31); 
-    outl(index, 0xCF8);
-    return inl(0xCFC);
-}
+#include "asm/pci.h"
 
 /* Scan bus look for a specific device. Only bus 0 scanned for now. */
 pcidevaddr_t pci_find_dev(uint16_t vendor_id, uint16_t device_id)
diff --git a/x86/vmexit.c b/x86/vmexit.c
index 1d74a89567adc..61243a9d63c9a 100644
--- a/x86/vmexit.c
+++ b/x86/vmexit.c
@@ -4,7 +4,7 @@ 
 #include "atomic.h"
 #include "x86/vm.h"
 #include "x86/desc.h"
-#include "x86/pci.h"
+#include "asm/pci.h"
 #include "x86/acpi.h"
 #include "asm/io.h"