Merge branch 'devel' of /home/palacios/palacios into devel

[palacios.git] / palacios / include / devices / pci.h

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 5f58120..090ac62 100644 (file)
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -22,6 +22,8 @@
 #ifndef __DEVICES_PCI_H__
 #define __DEVICES_PCI_H__
 
+#ifdef __V3VEE__
+
 #include <palacios/vm_dev.h>
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_rbtree.h>
@@ -29,18 +31,28 @@
 #include <devices/pci_types.h>
 
 
-#define V3_PCI_BAR_MEM         0x00
-#define V3_PCI_BAR_IO          0x01
-#define V3_PCI_BAR_MEM_PREFETCH        0x08
+typedef enum {PCI_BAR_IO, PCI_BAR_MEM32, PCI_BAR_MEM64_LOW, PCI_BAR_MEM64_HIGH, PCI_BAR_NONE} pci_bar_type_t;
 
+struct v3_bar_reg {
+    int updated;
+    pci_bar_type_t type;
+    int num_resources;
+    int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+};
 
 struct pci_device {
     union {
-       struct pci_config_header header;
-       uint8_t header_space[64];
+       uint8_t config_space[256];
+
+       struct {
+           struct pci_config_header config_header;
+           uint8_t config_data[192];
+       } __attribute__((packed));
     } __attribute__((packed));
 
-    uint8_t config_space[192];
+
+
+    struct v3_bar_reg bar[6];
 
     uint_t bus_num;
     struct rb_node dev_tree_node;
@@ -50,9 +62,14 @@ struct pci_device {
 
     struct vm_device * vm_dev;  //the corresponding virtual device
 
-    int (*config_read)(struct pci_device * pci_dev, uint_t reg_num, void * dst, int len);
-    int (*config_write)(struct pci_device * pci_dev, uint_t reg_num, void * src, int len);
-    int (*bar_update)(struct pci_device * pci_dev, uint_t bar_reg, uint32_t val);
+    int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length);
+
+    int (*cmd_update)(struct pci_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled);
+    int (*ext_rom_update)(struct pci_dev *pci_dev);
+
+
+    int ext_rom_update_flag;
+    int bar_update_flag;
 
     void * priv_data;
 };
@@ -66,11 +83,12 @@ v3_pci_register_device(struct vm_device * pci,
                       uint_t bus_num,
                       const char * name,
                       int dev_num,
-                      int (*config_read)(struct pci_device * pci_dev, uint_t reg_num, void * dst, int len),
-                      int (*config_write)(struct pci_device * pci_dev, uint_t reg_num, void * src, int len),
-                      int (*bar_update)(struct pci_device * pci_dev, uint_t bar_reg, uint32_t val),
+                      int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
+                      int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
                       void * private_data);
 
 
 #endif
 
+#endif
+