fixes for the virtio block device

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

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 01ce86a..31e09ad 100644 (file)
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -24,23 +24,62 @@
 
 #ifdef __V3VEE__
 
-#include <palacios/vm_dev.h>
+
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_rbtree.h>
 
 #include <devices/pci_types.h>
 
 
-typedef enum {PCI_BAR_IO, PCI_BAR_MEM32, PCI_BAR_MEM64_LOW, PCI_BAR_MEM64_HIGH, PCI_BAR_NONE} pci_bar_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;
 
-struct v3_bar_reg {
-    int updated;
+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;
+
+struct v3_pci_bar {
     pci_bar_type_t type;
-    int num_resources;
-    int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+    
+    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];
 
@@ -50,39 +89,57 @@ struct pci_device {
        } __attribute__((packed));
     } __attribute__((packed));
 
+    struct v3_pci_bar bar[6];
 
-
-    struct v3_bar_reg 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_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled);
-    int (*ext_rom_update)(struct pci_dev *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 ext_rom_update_flag;
+    int bar_update_flag;
 
     void * priv_data;
 };
 
 
+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,
-                      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),
-                      int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
-                      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