X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpci.c;h=602f47c34d6b3197a06174adc182710e0c2b36e4;hb=70d3ac1e7be22e42fbf8f778367e9bf6d32e5b7f;hp=964cd4804fc0aabf6fb3880fa4349a594f3626cd;hpb=59b6853965a3cd4b17d0466c3650feed594cd89e;p=palacios.git diff --git a/palacios/src/devices/pci.c b/palacios/src/devices/pci.c index 964cd48..602f47c 100644 --- a/palacios/src/devices/pci.c +++ b/palacios/src/devices/pci.c @@ -154,9 +154,9 @@ struct pci_device * __add_device_to_bus(struct pci_bus * bus, struct pci_device parent = *p; tmp_dev = rb_entry(parent, struct pci_device, dev_tree_node); - if (dev->dev_num < tmp_dev->dev_num) { + if (dev->devfn < tmp_dev->devfn) { p = &(*p)->rb_left; - } else if (dev->dev_num > tmp_dev->dev_num) { + } else if (dev->devfn > tmp_dev->devfn) { p = &(*p)->rb_right; } else { return tmp_dev; @@ -186,16 +186,17 @@ struct pci_device * add_device_to_bus(struct pci_bus * bus, struct pci_device * } -static struct pci_device * get_device(struct pci_bus * bus, int dev_num) { +static struct pci_device * get_device(struct pci_bus * bus, uint8_t dev_num, uint8_t fn_num) { struct rb_node * n = bus->devices.rb_node; struct pci_device * dev = NULL; + uint8_t devfn = ((dev_num & 0x1f) << 3) | (fn_num & 0x7); while (n) { dev = rb_entry(n, struct pci_device, dev_tree_node); - if (dev_num < dev->dev_num) { + if (devfn < dev->devfn) { n = n->rb_left; - } else if (dev_num > dev->dev_num) { + } else if (devfn > dev->devfn) { n = n->rb_right; } else { return dev; @@ -301,7 +302,7 @@ static int data_port_read(ushort_t port, void * dst, uint_t length, struct vm_de reg_num, reg_num, pci_state->addr_reg.val); - pci_dev = get_device(&(pci_state->bus_list[0]), pci_state->addr_reg.dev_num); + pci_dev = get_device(&(pci_state->bus_list[0]), pci_state->addr_reg.dev_num, pci_state->addr_reg.fn_num); if (pci_dev == NULL) { for (i = 0; i < length; i++) { @@ -340,6 +341,24 @@ static inline int is_cfg_reg_writable(uchar_t header_type, int reg_num) { return 1; } + } else if (header_type == 0x80) { + switch (reg_num) { + case 0x00: + case 0x01: + case 0x02: + case 0x03: + case 0x08: + case 0x09: + case 0x0a: + case 0x0b: + case 0x0e: + case 0x3d: + return 0; + + default: + return 1; + + } } else { // PCI to PCI Bridge = 0x01 // CardBus Bridge = 0x02 @@ -355,16 +374,18 @@ static inline int is_cfg_reg_writable(uchar_t header_type, int reg_num) { static int bar_update(struct pci_device * pci, int bar_num, uint32_t new_val) { struct v3_pci_bar * bar = &(pci->bar[bar_num]); - PrintError("Updating BAR Register (Dev=%s) (bar=%d) (val=%x)\n", - pci->name, bar_num, new_val); + PrintDebug("Updating BAR Register (Dev=%s) (bar=%d) (old_val=%x) (new_val=%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)); // only do this if pci device is enabled.... for (i = 0; i < bar->num_ports; i++) { - PrintDebug("Rehooking IO Port %x\n", PCI_IO_BASE(bar->val) + i); v3_dev_unhook_io(pci->vm_dev, PCI_IO_BASE(bar->val) + i); @@ -377,9 +398,8 @@ static int bar_update(struct pci_device * pci, int bar_num, uint32_t new_val) { break; } case PCI_BAR_NONE: { - PrintError("Reprogramming an unsupported BAR register (Dev=%s) (bar=%d) (val=%x)\n", + PrintDebug("Reprogramming an unsupported BAR register (Dev=%s) (bar=%d) (val=%x)\n", pci->name, bar_num, new_val); - bar->val = new_val; break; } default: @@ -410,7 +430,7 @@ static int data_port_write(ushort_t port, void * src, uint_t length, struct vm_d *(uint32_t *)src, length); - pci_dev = get_device(&(pci_state->bus_list[0]), pci_state->addr_reg.dev_num); + pci_dev = get_device(&(pci_state->bus_list[0]), pci_state->addr_reg.dev_num, pci_state->addr_reg.fn_num); if (pci_dev == NULL) { PrintError("Writing configuration space for non-present device (dev_num=%d)\n", @@ -421,27 +441,39 @@ static int data_port_write(ushort_t port, void * src, uint_t length, struct vm_d for (i = 0; i < length; i++) { uint_t cur_reg = reg_num + i; + int writable = is_cfg_reg_writable(pci_dev->config_header.header_type, cur_reg); - if (is_cfg_reg_writable(pci_dev->config_header.header_type, cur_reg)) { + if (writable == -1) { + PrintError("Invalid PCI configuration space\n"); + return -1; + } + + if (writable) { pci_dev->config_space[cur_reg] = *(uint8_t *)((uint8_t *)src + i); if ((cur_reg >= 0x10) && (cur_reg < 0x28)) { - // BAR Reg - int bar_reg = (cur_reg & ~0x3) - 0x10; + // BAR Register Update + int bar_reg = ((cur_reg & ~0x3) - 0x10) / 4; pci_dev->bar_update_flag = 1; pci_dev->bar[bar_reg].updated = 1; - PrintDebug("Updating BAR register\n"); + // PrintDebug("Updating BAR register %d\n", bar_reg); } else if ((cur_reg >= 0x30) && (cur_reg < 0x34)) { + // Extension ROM update + pci_dev->ext_rom_update_flag = 1; } else if (cur_reg == 0x04) { // COMMAND update uint8_t command = *((uint8_t *)src + i); + PrintError("command update for %s old=%x new=%x\n", + pci_dev->name, + pci_dev->config_space[cur_reg],command); + pci_dev->config_space[cur_reg] = command; - + if (pci_dev->cmd_update) { pci_dev->cmd_update(pci_dev, (command & 0x01), (command & 0x02)); } @@ -464,6 +496,7 @@ static int data_port_write(ushort_t port, void * src, uint_t length, struct vm_d 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) { @@ -520,36 +553,6 @@ static int pci_deinit_device(struct vm_device * dev) { - -static int init_i440fx(struct vm_device * dev) { - struct pci_device * pci_dev = NULL; - struct v3_pci_bar bars[6]; - int i; - - for (i = 0; i < 6; i++) { - bars[i].type = PCI_BAR_NONE; - } - - pci_dev = v3_pci_register_device(dev, PCI_STD_DEVICE, 0, "i440FX", 0, bars, - NULL, NULL, NULL, NULL); - - if (!pci_dev) { - return -1; - } - - pci_dev->config_header.vendor_id = 0x8086; - pci_dev->config_header.device_id = 0x1237; - pci_dev->config_header.revision = 0x0002; - pci_dev->config_header.subclass = 0x00; // SubClass: host2pci - pci_dev->config_header.class = 0x06; // Class: PCI bridge - - pci_dev->bus_num = 0; - return 0; -} - - - - static void init_pci_busses(struct pci_internal * pci_state) { int i; @@ -563,7 +566,7 @@ static void init_pci_busses(struct pci_internal * pci_state) { static int pci_init_device(struct vm_device * dev) { - struct pci_internal * pci_state = (struct pci_internal *)dev->private_data;; + struct pci_internal * pci_state = (struct pci_internal *)dev->private_data; int i = 0; PrintDebug("pci: init_device\n"); @@ -574,11 +577,6 @@ static int pci_init_device(struct vm_device * dev) { pci_state->addr_reg.val = 0; init_pci_busses(pci_state); - - if (init_i440fx(dev) == -1) { - PrintError("Could not intialize i440fx\n"); - return -1; - } PrintDebug("Sizeof config header=%d\n", (int)sizeof(struct pci_config_header)); @@ -670,6 +668,7 @@ static inline int init_bars(struct pci_device * pci_dev) { 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 { PrintError("Invalid BAR type for bar #%d\n", i); @@ -684,14 +683,15 @@ static inline int init_bars(struct pci_device * pci_dev) { // if dev_num == -1, auto assign 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 (*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) { + struct vm_device * dev) { struct pci_internal * pci_state = (struct pci_internal *)pci->private_data; struct pci_bus * bus = &(pci_state->bus_list[bus_num]); @@ -710,7 +710,7 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci, } } - if (get_device(bus, dev_num) != NULL) { + 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; @@ -720,16 +720,20 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci, 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)); - + switch (dev_type) { case PCI_STD_DEVICE: pci_dev->config_header.header_type = 0x00; break; + case PCI_MULTIFUNCTION: + pci_dev->config_header.header_type = 0x80; + break; default: PrintError("Unhandled PCI Device Type: %d\n", dev_type); return NULL; @@ -737,20 +741,19 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci, 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 = pci; + pci_dev->vm_dev = dev; // 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->priv_data = private_data; - //copy bars - for (i = 0; i < 6; i ++){ + for (i = 0; i < 6; i ++) { pci_dev->bar[i].type = bars[i].type; if (pci_dev->bar[i].type == PCI_BAR_IO) {