integrated new configuration system

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

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 62060c5..1da7102 100644 (file)
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -30,15 +30,18 @@
 
 #include <devices/pci_types.h>
 
+struct vm_device;
+
 
 typedef enum { PCI_BAR_IO, 
-              PCI_BAR_MEM16, 
+              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_device_type_t;
+typedef enum {PCI_STD_DEVICE, PCI_TO_PCI_BRIDGE, PCI_CARDBUS, PCI_MULTIFUNCTION, PCI_PASSTHROUGH} pci_device_type_t;
 
 
 
@@ -63,10 +66,17 @@ 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;
@@ -75,11 +85,18 @@ struct v3_pci_bar {
 };
 
 
-#define PCI_IO_BASE(bar_val) (bar_val & 0xfffffffc)
-#define PCI_MEM32_BASE(bar_val) (bar_val & 0xfffffff0)
+#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];
 
@@ -105,12 +122,14 @@ struct pci_device {
 
     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 (*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_update)(struct pci_device * pci_dev, uint_t reg_num, int length);
+    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 (*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;
@@ -120,11 +139,13 @@ 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, uint_t intr_line), 
+                         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);
 
 
 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,
@@ -134,10 +155,21 @@ v3_pci_register_device(struct vm_device * pci,
                       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),
-                      struct vm_device * dev);
+                      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