X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fpci.h;h=66841a808f9fac89e3bd4f2efde68d948b4c8ebb;hb=a0e1d8274aef54adcf50dce0b3843489f2a3cd21;hp=42bdabb03c2c04e0c26f5f197599bb7faa25d25a;hpb=11bbd0b954aa7ee9fe8007e6207e876074c79f44;p=palacios.git

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 42bdabb..66841a8 100644
--- 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,33 +31,78 @@
 #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_MEM16, PCI_BAR_MEM32, PCI_BAR_MEM64_LOW, PCI_BAR_MEM64_HIGH, PCI_BAR_NONE} pci_bar_type_t;
+
+typedef enum {PCI_STD_DEVICE, PCI_TO_PCI_BRIDGE, PCI_CARDBUS, PCI_MULTIFUNCTION} pci_device_type_t;
+
+struct pci_device;
+
+struct v3_pci_bar {
+    pci_bar_type_t type;
+    
+    union {
+	struct {
+	    int num_pages;
+	    addr_t default_base_addr;
+	    int (*mem_read)(addr_t guest_addr, void * dst, uint_t length, void * private_data);
+	    int (*mem_write)(addr_t guest_addr, void * src, uint_t length, void * private_data);
+	};
+
+	struct {
+	    int num_ports;
+	    uint16_t default_base_port;
+	    int (*io_read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev);
+	    int (*io_write)(ushort_t port, void * src, uint_t length, struct vm_device * dev);
+	};
+    };
+
+    // Internal PCI data
+    uint32_t val;
+    int updated;
+    uint32_t mask;
+};
+
 
+#define PCI_IO_BASE(bar_val) (bar_val & 0xfffffffc)
+#define PCI_MEM32_BASE(bar_val) (bar_val & 0xfffffff0)
 
 struct pci_device {
+
     union {
+	uint8_t config_space[256];
+
 	struct {
 	    struct pci_config_header config_header;
 	    uint8_t config_data[192];
 	} __attribute__((packed));
-
-	uint8_t config_space[256];
     } __attribute__((packed));
 
+    struct v3_pci_bar bar[6];
 
+    struct rb_node dev_tree_node;
 
     uint_t bus_num;
-    struct rb_node dev_tree_node;
 
-    int dev_num;
+    union {
+	uint8_t devfn;
+	struct {
+	    uint8_t fn_num       : 3;
+	    uint8_t dev_num      : 5;
+	} __attribute__((packed));
+    } __attribute__((packed));
+
     char name[64];
 
     struct vm_device * vm_dev;  //the corresponding virtual device
 
     int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length);
 
+    int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled);
+    int (*ext_rom_update)(struct pci_device *pci_dev);
+
+    int ext_rom_update_flag;
+    int bar_update_flag;
+
     void * priv_data;
 };
 
@@ -65,12 +112,19 @@ struct vm_device * v3_create_pci();
 
 struct pci_device * 
 v3_pci_register_device(struct vm_device * pci,
-		       uint_t bus_num,
-		       const char * name,
+		       pci_device_type_t dev_type, 
+		       int bus_num,
 		       int dev_num,
+		       int fn_num,
+		       const char * name,
+		       struct v3_pci_bar * bars,
 		       int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
-		       void * private_data);
+		       int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled),
+		       int (*ext_rom_update)(struct pci_device *pci_dev),
+		       struct vm_device * dev);
+
 
+#endif
 
 #endif