Add handle of write to command register

[palacios.git] / palacios / src / devices / pci.c

diff --git a/palacios/src/devices/pci.c b/palacios/src/devices/pci.c
index 42077e9..8170e6e 100644 (file)
--- a/palacios/src/devices/pci.c
+++ b/palacios/src/devices/pci.c
@@ -370,8 +370,16 @@ static int data_port_write(ushort_t port, void * src, uint_t length, struct vm_d
                }
            } else if ((cur_reg >= 0x30) && (cur_reg < 0x34)) {
                pci_dev->ext_rom_updated = 1;
-           } else if ((cur_reg == 0x04) || (cur_reg == 0x05)) {
-               // COMMAND update
+           } else if (cur_reg == 0x04) {
+             // COMMAND update      
+             uint8_t command = *((uint8_t *)src + i);
+
+             pci_dev->config_space[cur_reg] = command;       
+
+             if (pci_dev->cmd_update) {
+               pci_dev->cmd_update(pci_dev, (command & 0x01), (command & 0x02));
+             }
+             
            } else if (cur_reg == 0x0f) {
                // BIST update
            }
@@ -385,10 +393,16 @@ static int data_port_write(ushort_t port, void * src, uint_t length, struct vm_d
     // Scan for BAR updated
     if (pci_dev->bar_update_flag) {
        for (i = 0; i < 6; i++) {
-           if ((pci_dev->bar[i].updated) && (pci_dev->bar[i].bar_update)) {
-               pci_dev->bar[i].bar_update(pci_dev, i);
+           if (pci_dev->bar[i].updated) {
+               int bar_offset = 0x10 + 4 * i;
+
+               *(uint32_t *)pci_dev->config_space + bar_offset) &= pci_dev->bar[i].mask;
+
+               if (pci_dev->bar[i].bar_update) {
+                   pci_dev->bar[i].bar_update(pci_dev, i);
+               }
+               pci_dev->bar[i].updated = 0;
            }
-           pci_dev->bar[i].updated = 0;
        }
        pci_dev->bar_update_flag = 0;
     }
@@ -521,6 +535,37 @@ struct vm_device * v3_create_pci() {
 
 
 
+static inline int init_bars(struct pci_device * pci_dev) {
+    int i = 0;
+
+    for (i = 0; i < 6; i++) {
+       int bar_offset = 0x10 + 4 * i;
+
+       if (pci_dev->bar[i].type == PCI_BAR_IO) {
+           *(uint32_t *)(pci_dev->config_space + bar_offset) = 0x00000001;
+       } else if (pci_dev->bar[i].type == PCI_BAR_MEM32) {
+           pci_dev->bar[i].mask = (pci_dev->bar[i].num_pages << 12) - 1;
+           pci_dev->bar[i].mask |= 0xf; // preserve the configuration flags
+            
+           *(uint32_t *)(pci_dev->config_space + bar_offset) = 0x00000008;
+           
+           if (pci_dev->bar[i].mem_hook) {
+               // clear the prefetchable flag...
+               *(uint8_t *)(pci_dev->config_space + bar_offset) &= ~0x00000008;
+           }
+       } else if (pci_dev->bar[i].type == PCI_BAR_MEM16) {
+           PrintError("16 Bit memory ranges not supported (reg: %d)\n", i);
+       } else if (pci_dev->bar[i].type == PCI_BAR_NONE) {
+           *(uint32_t *)(pci_dev->config_space + bar_offset) = 0x00000000;
+       } else {
+           PrintError("Invalid BAR type for bar #%d\n", i);
+           return -1;
+       }
+           
+
+    }
+}
+
 
 
 // if dev_num == -1, auto assign 
@@ -530,7 +575,7 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci,
                                           int dev_num,
                                           struct v3_pci_bar * bars,
                                           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 (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled),
                                           int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
                                           void * private_data) {
 
@@ -582,12 +627,16 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci,
     
     //copy bars
     for (i = 0; i < 6; i ++){
-      pci_dev->bar[i].updated = bars[i].updated;
       pci_dev->bar[i].type = bars[i].type;
       pci_dev->bar[i].num_resources = bars[i].num_resources;
       pci_dev->bar[i].bar_update = bars[i].bar_update;
     }
 
+    if (init_bars(pci_dev) == -1) {
+       PrintError("could not initialize bar registers\n");
+       return NULL;
+    }
+
     pci_dev->cmd_update = cmd_update;
     pci_dev->ext_rom_update = ext_rom_update;