X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fpci.h;h=1da7102d8e8ad609e6489faeab75a3dd63606bd0;hp=79718a719afaf8a9af931d211d5e560200819d2d;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=bc98195a63d8cb1d109eeaa72f57f468c6c9581e

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 79718a7..1da7102 100644
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -24,16 +24,31 @@
 
 #ifdef __V3VEE__
 
-#include <palacios/vm_dev.h>
+
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_rbtree.h>
 
 #include <devices/pci_types.h>
 
+struct vm_device;
+
+
+typedef enum { PCI_BAR_IO, 
+	       PCI_BAR_MEM24, 
+	       PCI_BAR_MEM32, 
+	       PCI_BAR_MEM64_LOW, 
+	       PCI_BAR_MEM64_HIGH, 
+	       PCI_BAR_PASSTHROUGH,
+	       PCI_BAR_NONE } pci_bar_type_t;
+
+typedef enum {PCI_STD_DEVICE, PCI_TO_PCI_BRIDGE, PCI_CARDBUS, PCI_MULTIFUNCTION, PCI_PASSTHROUGH} pci_device_type_t;
 
-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;
+
+// For the rest of the subclass codes see:
+// http://www.acm.uiuc.edu/sigops/roll_your_own/7.c.1.html
+
+#define PCI_AUTO_DEV_NUM (-1)
 
 struct pci_device;
 
@@ -51,17 +66,37 @@ struct v3_pci_bar {
 	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);
+	    int (*io_read)(ushort_t port, void * dst, uint_t length, void * private_data);
+	    int (*io_write)(ushort_t port, void * src, uint_t length, void * private_data);
+	};
+	
+	struct {
+	    int (*bar_init)(int bar_num, uint32_t * dst,void * private_data);
+	    int (*bar_write)(int bar_num, uint32_t * src, void * private_data);
 	};
     };
+    
+    void * private_data;
 
     // Internal PCI data
+    uint32_t val;
     int updated;
     uint32_t mask;
 };
 
+
+#define PCI_IO_MASK 0xfffffffc
+#define PCI_MEM_MASK 0xfffffff0
+#define PCI_MEM24_MASK 0x000ffff0
+
+#define PCI_IO_BASE(bar_val) (bar_val & PCI_IO_MASK)
+#define PCI_MEM32_BASE(bar_val) (bar_val & PCI_MEM_MASK)
+#define PCI_MEM24_BASE(bar_val) (bar_val & PCI_MEM24_MASK)
+
 struct pci_device {
+
+    pci_device_type_t type;
+
     union {
 	uint8_t config_space[256];
 
@@ -71,22 +106,29 @@ struct pci_device {
 	} __attribute__((packed));
     } __attribute__((packed));
 
-
-
     struct v3_pci_bar bar[6];
 
-    uint_t bus_num;
     struct rb_node dev_tree_node;
 
-    int dev_num;
+    uint_t bus_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)(uint_t reg_num, void * src, uint_t length, void * priv_data);
 
-    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 (*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 (*config_write)(uint_t reg_num, void * src, uint_t length, void * private_data);
+    int (*config_read)(uint_t reg_num, void * dst, uint_t length, void * private_data);
 
 
     int ext_rom_update_flag;
@@ -96,20 +138,38 @@ struct pci_device {
 };
 
 
+int v3_pci_set_irq_bridge(struct vm_device * pci_bus, int bus_num,
+			  int (*raise_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev), 
+			  int (*lower_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev), 
+			  struct vm_device * bridge_dev);
+
 
-struct vm_device * v3_create_pci();
+int v3_pci_raise_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev);
+int v3_pci_lower_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev);
 
 struct pci_device * 
 v3_pci_register_device(struct vm_device * pci,
 		       pci_device_type_t dev_type, 
-		       uint_t bus_num,
-		       const char * name,
+		       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),
+		       int (*config_update)(uint_t reg_num, void * src, uint_t 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),
-		       void * private_data);
+		       void * priv_data);
+
+
+struct pci_device * 
+v3_pci_register_passthrough_device(struct vm_device * pci,
+				   int bus_num,
+				   int dev_num,
+				   int fn_num,
+				   const char * name,
+				   int (*config_write)(uint_t reg_num, void * src, uint_t length, void * private_data),
+				   int (*config_read)(uint_t reg_num, void * dst, uint_t length, void * private_data),
+				   void * private_data);
 
 
 #endif