* and the University of New Mexico. You can find out more at
* http://www.v3vee.org
*
+ * Copyright (c) 2009, Jack Lange <jarusl@cs.northwestern.edu>
* Copyright (c) 2009, Lei Xia <lxia@northwestern.edu>
* Copyright (c) 2009, Chang Seok Bae <jhuell@gmail.com>
- * Copyright (c) 2009, Jack Lange <jarusl@cs.northwestern.edu>
* Copyright (c) 2009, The V3VEE Project <http://www.v3vee.org>
* All rights reserved.
*
- * Author: Lei Xia <lxia@northwestern.edu>
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ * Lei Xia <lxia@northwestern.edu>
* Chang Seok Bae <jhuell@gmail.com>
- * Jack Lange <jarusl@cs.northwestern.edu>
*
* This is free software. You are permitted to use,
* redistribute, and modify it as specified in the file "V3VEE_LICENSE".
#include <palacios/vmm_io.h>
#include <palacios/vmm_intr.h>
#include <palacios/vmm_rbtree.h>
+#include <palacios/vmm_dev_mgr.h>
#include <devices/pci.h>
#include <devices/pci_types.h>
-#ifndef DEBUG_PCI
+#include <palacios/vm_guest.h>
+
+
+
+#ifndef CONFIG_DEBUG_PCI
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
#define CONFIG_ADDR_PORT 0x0cf8
#define CONFIG_DATA_PORT 0x0cfc
+#define PCI_DEV_IO_PORT_BASE 0xc000
#define PCI_BUS_COUNT 1
// Bitmap of the allocated device numbers
uint8_t dev_map[MAX_BUS_DEVICES / 8];
+
+
+ int (*raise_pci_irq)(struct pci_device * pci_dev, void * dev_data);
+ int (*lower_pci_irq)(struct pci_device * pci_dev, void * dev_data);
+ void * irq_dev_data;
};
// Configuration address register
struct pci_addr_reg addr_reg;
+ // Base IO Port which PCI devices will register with...
+ uint16_t dev_io_base;
+
// Attached Busses
struct pci_bus bus_list[PCI_BUS_COUNT];
};
-#ifdef DEBUG_PCI
+#ifdef CONFIG_DEBUG_PCI
static void pci_dump_state(struct pci_internal * pci_state) {
struct rb_node * node = v3_rb_first(&(pci_state->bus_list[0].devices));
int i, j;
for (i = 0; i < sizeof(bus->dev_map); i++) {
+ PrintDebug("i=%d\n", i);
if (bus->dev_map[i] != 0xff) {
// availability
for (j = 0; j < 8; j++) {
+ PrintDebug("\tj=%d\n", j);
if (!(bus->dev_map[i] & (0x1 << j))) {
return ((i * 8) + j);
}
-static int addr_port_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
- struct pci_internal * pci_state = (struct pci_internal *)dev->private_data;
+static int addr_port_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+ struct pci_internal * pci_state = priv_data;
int reg_offset = port & 0x3;
uint8_t * reg_addr = ((uint8_t *)&(pci_state->addr_reg.val)) + reg_offset;
}
-static int addr_port_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
- struct pci_internal * pci_state = (struct pci_internal *)dev->private_data;
+static int addr_port_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+ struct pci_internal * pci_state = priv_data;
int reg_offset = port & 0x3;
uint8_t * reg_addr = ((uint8_t *)&(pci_state->addr_reg.val)) + reg_offset;
}
-static int data_port_read(ushort_t port, void * dst, uint_t length, struct vm_device * vmdev) {
- struct pci_internal * pci_state = (struct pci_internal *)(vmdev->private_data);
+static int data_port_read(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
+ struct pci_internal * pci_state = priv_data;
struct pci_device * pci_dev = NULL;
uint_t reg_num = (pci_state->addr_reg.reg_num << 2) + (port & 0x3);
int i;
return length;
}
+ if (pci_dev->type == PCI_PASSTHROUGH) {
+ if (pci_dev->config_read(reg_num, dst, length, pci_dev->priv_data) == -1) {
+ PrintError("Failed to handle configuration update for passthrough pci_device\n");
+ return -1;
+ }
+
+ return 0;
+ }
+
for (i = 0; i < length; i++) {
*(uint8_t *)((uint8_t *)dst + i) = pci_dev->config_space[reg_num + i];
}
}
}
-
-static int bar_update(struct pci_device * pci, int bar_num, uint32_t new_val) {
+static int bar_update(struct guest_info * info, struct pci_device * pci, int bar_num, uint32_t new_val) {
struct v3_pci_bar * bar = &(pci->bar[bar_num]);
- PrintDebug("Updating BAR Register (Dev=%s) (bar=%d) (old_val=%x) (new_val=%x)\n",
+ PrintDebug("Updating BAR Register (Dev=%s) (bar=%d) (old_val=0x%x) (new_val=0x%x)\n",
pci->name, bar_num, bar->val, new_val);
switch (bar->type) {
case PCI_BAR_IO: {
int i = 0;
- PrintDebug("\tRehooking %d IO ports from base %x to %x\n",
- bar->num_ports, PCI_IO_BASE(bar->val), PCI_IO_BASE(new_val));
+ PrintDebug("\tRehooking %d IO ports from base 0x%x to 0x%x for %d ports\n",
+ bar->num_ports, PCI_IO_BASE(bar->val), PCI_IO_BASE(new_val),
+ bar->num_ports);
// only do this if pci device is enabled....
+ if (!(pci->config_header.status & 0x1)) {
+ PrintError("PCI Device IO space not enabled\n");
+ }
+
for (i = 0; i < bar->num_ports; i++) {
- v3_dev_unhook_io(pci->vm_dev, PCI_IO_BASE(bar->val) + i);
+ PrintDebug("Rehooking PCI IO port (old port=%u) (new port=%u)\n",
+ PCI_IO_BASE(bar->val) + i, PCI_IO_BASE(new_val) + i);
+
+ v3_unhook_io_port(info->vm_info, PCI_IO_BASE(bar->val) + i);
+
+ if (v3_hook_io_port(info->vm_info, PCI_IO_BASE(new_val) + i,
+ bar->io_read, bar->io_write,
+ bar->private_data) == -1) {
+
+ PrintError("Could not hook PCI IO port (old port=%u) (new port=%u)\n",
+ PCI_IO_BASE(bar->val) + i, PCI_IO_BASE(new_val) + i);
+ v3_print_io_map(info->vm_info);
+ return -1;
+ }
+ }
+
+ bar->val = new_val;
- v3_dev_hook_io(pci->vm_dev, PCI_IO_BASE(new_val) + i,
- bar->io_read, bar->io_write);
+ break;
+ }
+ case PCI_BAR_MEM32: {
+ v3_unhook_mem(info->vm_info, V3_MEM_CORE_ANY, (addr_t)(bar->val));
+
+ if (bar->mem_read) {
+ v3_hook_full_mem(info->vm_info, V3_MEM_CORE_ANY, PCI_MEM32_BASE(new_val),
+ PCI_MEM32_BASE(new_val) + (bar->num_pages * PAGE_SIZE_4KB),
+ bar->mem_read, bar->mem_write, pci->priv_data);
+ } else {
+ PrintError("Write hooks not supported for PCI\n");
+ return -1;
}
bar->val = new_val;
}
-static int data_port_write(ushort_t port, void * src, uint_t length, struct vm_device * vmdev) {
- struct pci_internal * pci_state = (struct pci_internal *)vmdev->private_data;
+static int data_port_write(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
+ struct pci_internal * pci_state = priv_data;
struct pci_device * pci_dev = NULL;
uint_t reg_num = (pci_state->addr_reg.reg_num << 2) + (port & 0x3);
int i;
return length;
}
- PrintDebug("Writing PCI Data register. bus = %d, dev = %d, reg = %d (%x) addr_reg = %x (val=%x, len=%d)\n",
+ PrintDebug("Writing PCI Data register. bus = %d, dev = %d, fn = %d, reg = %d (0x%x) addr_reg = 0x%x (val=0x%x, len=%d)\n",
pci_state->addr_reg.bus_num,
pci_state->addr_reg.dev_num,
+ pci_state->addr_reg.fn_num,
reg_num, reg_num,
pci_state->addr_reg.val,
*(uint32_t *)src, length);
return -1;
}
+ if (pci_dev->type == PCI_PASSTHROUGH) {
+ if (pci_dev->config_write(reg_num, src, length, pci_dev->priv_data) == -1) {
+ PrintError("Failed to handle configuration update for passthrough pci_device\n");
+ return -1;
+ }
+
+ return 0;
+ }
+
for (i = 0; i < length; i++) {
uint_t cur_reg = reg_num + i;
} else if ((cur_reg >= 0x30) && (cur_reg < 0x34)) {
// Extension ROM update
- pci_dev->ext_rom_update_flag = 1;
+ pci_dev->exp_rom_update_flag = 1;
} else if (cur_reg == 0x04) {
// COMMAND update
uint8_t command = *((uint8_t *)src + i);
// BIST update
pci_dev->config_header.BIST = 0x00;
}
+ } else {
+ PrintError("PCI Write to read only register %d\n", cur_reg);
}
}
if (pci_dev->config_update) {
- pci_dev->config_update(pci_dev, reg_num, length);
+ pci_dev->config_update(reg_num, src, length, pci_dev->priv_data);
}
// Scan for BAR updated
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;
- // check special flags....
- // bar_update
- if (bar_update(pci_dev, i, *(uint32_t *)(pci_dev->config_space + bar_offset)) == -1) {
- PrintError("PCI Device %s: Bar update Error Bar=%d\n", pci_dev->name, i);
- return -1;
+ if (pci_dev->bar[i].type == PCI_BAR_PASSTHROUGH) {
+ if (pci_dev->bar[i].bar_write(i, (uint32_t *)(pci_dev->config_space + bar_offset), pci_dev->bar[i].private_data) == -1) {
+ PrintError("Error in passthrough bar write operation\n");
+ return -1;
+ }
+ } else {
+
+ *(uint32_t *)(pci_dev->config_space + bar_offset) &= pci_dev->bar[i].mask;
+ // check special flags....
+
+ // bar_update
+ if (bar_update(core, pci_dev, i, *(uint32_t *)(pci_dev->config_space + bar_offset)) == -1) {
+ PrintError("PCI Device %s: Bar update Error Bar=%d\n", pci_dev->name, i);
+ return -1;
+ }
}
pci_dev->bar[i].updated = 0;
pci_dev->bar_update_flag = 0;
}
- if ((pci_dev->ext_rom_update_flag) && (pci_dev->ext_rom_update)) {
- pci_dev->ext_rom_update(pci_dev);
- pci_dev->ext_rom_update_flag = 0;
+ if ((pci_dev->exp_rom_update_flag) && (pci_dev->exp_rom_update)) {
+ pci_dev->exp_rom_update(pci_dev, &(pci_dev->config_header.expansion_rom_address), pci_dev->priv_data);
+ pci_dev->exp_rom_update_flag = 0;
}
-static int pci_reset_device(struct vm_device * dev) {
- PrintDebug("pci: reset device\n");
- return 0;
-}
-static int pci_start_device(struct vm_device * dev) {
- PrintDebug("pci: start device\n");
- return 0;
+static void init_pci_busses(struct pci_internal * pci_state) {
+ int i;
+
+ for (i = 0; i < PCI_BUS_COUNT; i++) {
+ pci_state->bus_list[i].bus_num = i;
+ pci_state->bus_list[i].devices.rb_node = NULL;
+ memset(pci_state->bus_list[i].dev_map, 0, sizeof(pci_state->bus_list[i].dev_map));
+ }
}
-static int pci_stop_device(struct vm_device * dev) {
- PrintDebug("pci: stop device\n");
- return 0;
-}
+static int pci_free(struct pci_internal * pci_state) {
+ int i;
+ // cleanup devices
+ for (i = 0; i < PCI_BUS_COUNT; i++) {
+ struct pci_bus * bus = &(pci_state->bus_list[i]);
+ struct rb_node * node = v3_rb_first(&(bus->devices));
+ struct pci_device * dev = NULL;
+
+ while (node) {
+ dev = rb_entry(node, struct pci_device, dev_tree_node);
+ node = v3_rb_next(node);
+
+ v3_rb_erase(&(dev->dev_tree_node), &(bus->devices));
+ V3_Free(dev);
+ }
-static int pci_deinit_device(struct vm_device * dev) {
- int i = 0;
-
- for (i = 0; i < 4; i++){
- v3_dev_unhook_io(dev, CONFIG_ADDR_PORT + i);
- v3_dev_unhook_io(dev, CONFIG_DATA_PORT + i);
}
+ V3_Free(pci_state);
return 0;
}
+static struct v3_device_ops dev_ops = {
+ .free = (int (*)(void *))pci_free,
-static void init_pci_busses(struct pci_internal * pci_state) {
- int i;
+};
- for (i = 0; i < PCI_BUS_COUNT; i++) {
- pci_state->bus_list[i].bus_num = i;
- pci_state->bus_list[i].devices.rb_node = NULL;
- memset(pci_state->bus_list[i].dev_map, 0, sizeof(pci_state->bus_list[i].dev_map));
- }
-}
-static int pci_init_device(struct vm_device * dev) {
- struct pci_internal * pci_state = (struct pci_internal *)dev->private_data;;
+static int pci_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
+ struct pci_internal * pci_state = V3_Malloc(sizeof(struct pci_internal));
int i = 0;
+ char * dev_id = v3_cfg_val(cfg, "ID");
+ int ret = 0;
+
+ PrintDebug("PCI internal at %p\n",(void *)pci_state);
+
+ struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, pci_state);
- PrintDebug("pci: init_device\n");
+ if (dev == NULL) {
+ PrintError("Could not attach device %s\n", dev_id);
+ V3_Free(pci_state);
+ return -1;
+ }
- // JRL: Fix this....
- // dev->vm->pci = dev; //should be in vmm_config.c
pci_state->addr_reg.val = 0;
+ pci_state->dev_io_base = PCI_DEV_IO_PORT_BASE;
init_pci_busses(pci_state);
PrintDebug("Sizeof config header=%d\n", (int)sizeof(struct pci_config_header));
for (i = 0; i < 4; i++) {
- v3_dev_hook_io(dev, CONFIG_ADDR_PORT + i, &addr_port_read, &addr_port_write);
- v3_dev_hook_io(dev, CONFIG_DATA_PORT + i, &data_port_read, &data_port_write);
+ ret |= v3_dev_hook_io(dev, CONFIG_ADDR_PORT + i, &addr_port_read, &addr_port_write);
+ ret |= v3_dev_hook_io(dev, CONFIG_DATA_PORT + i, &data_port_read, &data_port_write);
+ }
+
+ if (ret != 0) {
+ PrintError("Error hooking PCI IO ports\n");
+ v3_remove_device(dev);
+ return -1;
}
return 0;
}
-static struct vm_device_ops dev_ops = {
- .init = pci_init_device,
- .deinit = pci_deinit_device,
- .reset = pci_reset_device,
- .start = pci_start_device,
- .stop = pci_stop_device,
-};
-
-
-struct vm_device * v3_create_pci() {
- struct pci_internal * pci_state = V3_Malloc(sizeof(struct pci_internal));
-
- PrintDebug("PCI internal at %p\n",(void *)pci_state);
-
- struct vm_device * device = v3_create_device("PCI", &dev_ops, pci_state);
-
- return device;
-}
-
+device_register("PCI", pci_init)
-static inline int init_bars(struct pci_device * pci_dev) {
+static inline int init_bars(struct v3_vm_info * vm, struct pci_device * pci_dev) {
int i = 0;
for (i = 0; i < 6; i++) {
int j = 0;
pci_dev->bar[i].mask = (~((pci_dev->bar[i].num_ports) - 1)) | 0x01;
- pci_dev->bar[i].val = pci_dev->bar[i].default_base_port & pci_dev->bar[i].mask;
+ if (pci_dev->bar[i].default_base_port != 0xffff) {
+ pci_dev->bar[i].val = pci_dev->bar[i].default_base_port & pci_dev->bar[i].mask;
+ } else {
+ pci_dev->bar[i].val = 0;
+ }
+
pci_dev->bar[i].val |= 0x00000001;
for (j = 0; j < pci_dev->bar[i].num_ports; j++) {
// hook IO
- if (v3_dev_hook_io(pci_dev->vm_dev, pci_dev->bar[i].default_base_port + j,
- pci_dev->bar[i].io_read, pci_dev->bar[i].io_write) == -1) {
- PrintError("Could not hook default io port %x\n", pci_dev->bar[i].default_base_port + j);
- return -1;
+ if (pci_dev->bar[i].default_base_port != 0xffff) {
+ if (v3_hook_io_port(vm, pci_dev->bar[i].default_base_port + j,
+ pci_dev->bar[i].io_read, pci_dev->bar[i].io_write,
+ pci_dev->bar[i].private_data) == -1) {
+ PrintError("Could not hook default io port %x\n", pci_dev->bar[i].default_base_port + j);
+ return -1;
+ }
}
}
pci_dev->bar[i].mask = ~((pci_dev->bar[i].num_pages << 12) - 1);
pci_dev->bar[i].mask |= 0xf; // preserve the configuration flags
- pci_dev->bar[i].val = pci_dev->bar[i].default_base_addr & pci_dev->bar[i].mask;
+ if (pci_dev->bar[i].default_base_addr != 0xffffffff) {
+ pci_dev->bar[i].val = pci_dev->bar[i].default_base_addr & pci_dev->bar[i].mask;
+ } else {
+ pci_dev->bar[i].val = 0;
+ }
// hook memory
if (pci_dev->bar[i].mem_read) {
// full hook
- v3_hook_full_mem(pci_dev->vm_dev->vm, pci_dev->bar[i].default_base_addr,
+ v3_hook_full_mem(vm, V3_MEM_CORE_ANY, pci_dev->bar[i].default_base_addr,
pci_dev->bar[i].default_base_addr + (pci_dev->bar[i].num_pages * PAGE_SIZE_4KB),
- pci_dev->bar[i].mem_read, pci_dev->bar[i].mem_write, pci_dev->vm_dev);
+ pci_dev->bar[i].mem_read, pci_dev->bar[i].mem_write, pci_dev->priv_data);
} else if (pci_dev->bar[i].mem_write) {
// write hook
PrintError("Write hooks not supported for PCI devices\n");
*(uint32_t *)(pci_dev->config_space + bar_offset) = pci_dev->bar[i].val;
- } else if (pci_dev->bar[i].type == PCI_BAR_MEM16) {
+ } else if (pci_dev->bar[i].type == PCI_BAR_MEM24) {
PrintError("16 Bit memory ranges not supported (reg: %d)\n", i);
return -1;
} else if (pci_dev->bar[i].type == PCI_BAR_NONE) {
pci_dev->bar[i].val = 0x00000000;
pci_dev->bar[i].mask = 0x00000000; // This ensures that all updates will be dropped
*(uint32_t *)(pci_dev->config_space + bar_offset) = pci_dev->bar[i].val;
+ } else if (pci_dev->bar[i].type == PCI_BAR_PASSTHROUGH) {
+
+ // Call the bar init function to get the local cached value
+ pci_dev->bar[i].bar_init(i, &(pci_dev->bar[i].val), pci_dev->bar[i].private_data);
+
} else {
PrintError("Invalid BAR type for bar #%d\n", i);
return -1;
}
+int v3_pci_set_irq_bridge(struct vm_device * pci_bus, int bus_num,
+ int (*raise_pci_irq)(struct pci_device * pci_dev, void * dev_data),
+ int (*lower_pci_irq)(struct pci_device * pci_dev, void * dev_data),
+ void * priv_data) {
+ struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
+
+
+ pci_state->bus_list[bus_num].raise_pci_irq = raise_pci_irq;
+ pci_state->bus_list[bus_num].lower_pci_irq = lower_pci_irq;
+ pci_state->bus_list[bus_num].irq_dev_data = priv_data;
+
+ return 0;
+}
+
+int v3_pci_raise_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev) {
+ struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
+ struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
+
+ return bus->raise_pci_irq(dev, bus->irq_dev_data);
+}
+
+int v3_pci_lower_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev) {
+ struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
+ struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
+
+ return bus->lower_pci_irq(dev, bus->irq_dev_data);
+}
+
// if dev_num == -1, auto assign
struct pci_device * v3_pci_register_device(struct vm_device * pci,
pci_device_type_t dev_type,
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 (*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) {
+ 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 (*exp_rom_update)(struct pci_device * pci_dev, uint32_t * src, void * priv_data),
+ void * priv_data) {
struct pci_internal * pci_state = (struct pci_internal *)pci->private_data;
struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
return NULL;
}
- if (dev_num == -1) {
+ if (dev_num == PCI_AUTO_DEV_NUM) {
+ PrintDebug("Searching for free device number\n");
if ((dev_num = get_free_dev_num(bus)) == -1) {
PrintError("No more available PCI slots on bus %d\n", bus->bus_num);
return NULL;
}
}
+ PrintDebug("Checking for PCI Device\n");
+
if (get_device(bus, dev_num, fn_num) != NULL) {
PrintError("PCI Device already registered at slot %d on bus %d\n",
dev_num, bus->bus_num);
memset(pci_dev, 0, sizeof(struct pci_device));
+
+ pci_dev->type = dev_type;
- switch (dev_type) {
+ switch (pci_dev->type) {
case PCI_STD_DEVICE:
pci_dev->config_header.header_type = 0x00;
break;
return NULL;
}
+
+
pci_dev->bus_num = bus_num;
pci_dev->dev_num = dev_num;
pci_dev->fn_num = fn_num;
strncpy(pci_dev->name, name, sizeof(pci_dev->name));
- pci_dev->vm_dev = dev;
+ pci_dev->priv_data = priv_data;
// register update callbacks
pci_dev->config_update = config_update;
pci_dev->cmd_update = cmd_update;
- pci_dev->ext_rom_update = ext_rom_update;
+ pci_dev->exp_rom_update = exp_rom_update;
//copy bars
for (i = 0; i < 6; i ++) {
pci_dev->bar[i].type = bars[i].type;
+ pci_dev->bar[i].private_data = bars[i].private_data;
if (pci_dev->bar[i].type == PCI_BAR_IO) {
pci_dev->bar[i].num_ports = bars[i].num_ports;
- pci_dev->bar[i].default_base_port = bars[i].default_base_port;
+
+ // This is a horrible HACK becaues the BIOS is supposed to set the PCI base ports
+ // And if the BIOS doesn't, Linux just happily overlaps device port assignments
+ if (bars[i].default_base_port != (uint16_t)-1) {
+ pci_dev->bar[i].default_base_port = bars[i].default_base_port;
+ } else {
+ pci_dev->bar[i].default_base_port = pci_state->dev_io_base;
+ pci_state->dev_io_base += ( 0x100 * ((bars[i].num_ports / 0x100) + 1) );
+ }
+
pci_dev->bar[i].io_read = bars[i].io_read;
pci_dev->bar[i].io_write = bars[i].io_write;
- } else {
+ } else if (pci_dev->bar[i].type == PCI_BAR_MEM32) {
pci_dev->bar[i].num_pages = bars[i].num_pages;
pci_dev->bar[i].default_base_addr = bars[i].default_base_addr;
pci_dev->bar[i].mem_read = bars[i].mem_read;
pci_dev->bar[i].mem_write = bars[i].mem_write;
+ } else if (pci_dev->bar[i].type == PCI_BAR_PASSTHROUGH) {
+ pci_dev->bar[i].bar_init = bars[i].bar_init;
+ pci_dev->bar[i].bar_write = bars[i].bar_write;
+ } else {
+ pci_dev->bar[i].num_pages = 0;
+ pci_dev->bar[i].default_base_addr = 0;
+ pci_dev->bar[i].mem_read = NULL;
+ pci_dev->bar[i].mem_write = NULL;
}
}
- if (init_bars(pci_dev) == -1) {
+ if (init_bars(pci->vm, pci_dev) == -1) {
PrintError("could not initialize bar registers\n");
return NULL;
}
// add the device
add_device_to_bus(bus, pci_dev);
-#ifdef DEBUG_PCI
+#ifdef CONFIG_DEBUG_PCI
pci_dump_state(pci_state);
#endif
+// if dev_num == -1, auto assign
+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) {
+
+ struct pci_internal * pci_state = (struct pci_internal *)pci->private_data;
+ struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
+ struct pci_device * pci_dev = NULL;
+
+ if (dev_num > MAX_BUS_DEVICES) {
+ PrintError("Requested Invalid device number (%d)\n", dev_num);
+ return NULL;
+ }
+
+ if (dev_num == PCI_AUTO_DEV_NUM) {
+ PrintDebug("Searching for free device number\n");
+ if ((dev_num = get_free_dev_num(bus)) == -1) {
+ PrintError("No more available PCI slots on bus %d\n", bus->bus_num);
+ return NULL;
+ }
+ }
+
+ PrintDebug("Checking for PCI Device\n");
+
+ if (get_device(bus, dev_num, fn_num) != NULL) {
+ PrintError("PCI Device already registered at slot %d on bus %d\n",
+ dev_num, bus->bus_num);
+ return NULL;
+ }
+
+
+ pci_dev = (struct pci_device *)V3_Malloc(sizeof(struct pci_device));
+
+ if (pci_dev == NULL) {
+ PrintError("Could not allocate pci device\n");
+ return NULL;
+ }
+
+ memset(pci_dev, 0, sizeof(struct pci_device));
+
+ pci_dev->bus_num = bus_num;
+ pci_dev->dev_num = dev_num;
+ pci_dev->fn_num = fn_num;
+
+ strncpy(pci_dev->name, name, sizeof(pci_dev->name));
+ pci_dev->priv_data = private_data;
+
+ // register update callbacks
+ pci_dev->config_write = config_write;
+ pci_dev->config_read = config_read;
+
+ // add the device
+ add_device_to_bus(bus, pci_dev);
+
+#ifdef CONFIG_DEBUG_PCI
+ pci_dump_state(pci_state);
+#endif
+
+ return pci_dev;
+}