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;;
+ struct pci_internal * pci_state = (struct pci_internal *)vmdev->private_data;
struct pci_device * pci_dev = NULL;
uint_t reg_num = pci_state->addr_reg.reg_num + (port & 0x3);
int i;
for (i = 0; i < length; i++) {
- if (is_cfg_reg_writable(pci_dev->config_header.header_type, reg_num)) {
- pci_dev->config_space[reg_num + i] = *((uint8_t *)src + i);
+ uint_t cur_reg = reg_num + i;
+
+ if (is_cfg_reg_writable(pci_dev->config_header.header_type, cur_reg)) {
+ pci_dev->config_space[cur_reg] = *((uint8_t *)src + i);
+
+ if ((cur_reg >= 0x10) && (cur_reg < 0x28)) {
+ // BAR Reg
+ int bar_reg = (cur_reg & ~0x3) - 0x10;
+
+ if (pci_dev->bar[bar_reg].bar_update) {
+ pci_dev->bar_update_flag = 1;
+ pci_dev->bar[bar_reg].updated = 1;
+ }
+ } else if ((cur_reg >= 0x30) && (cur_reg < 0x34)) {
+ pci_dev->ext_rom_updated = 1;
+ } 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
+ }
}
}
if (pci_dev->config_update) {
pci_dev->config_update(pci_dev, reg_num, length);
}
-
+
+ // Scan for BAR updated
+ if (pci_dev->bar_update_flag) {
+ for (i = 0; i < 6; 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_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;
+ }
+
+
return length;
}
static int init_i440fx(struct vm_device * dev) {
struct pci_device * pci_dev = v3_pci_register_device(dev, 0, "i440FX", 0,
- NULL, NULL);
+ NULL, NULL, NULL);
if (!pci_dev) {
return -1;
PrintError("Could not intialize i440fx\n");
return -1;
}
+
+ PrintDebug("Sizeof config header=%d\n", 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);
+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
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) {
struct pci_internal * pci_state = (struct pci_internal *)pci->private_data;
strncpy(pci_dev->name, name, sizeof(pci_dev->name));
pci_dev->vm_dev = pci;
+ // register update callbacks
pci_dev->config_update = config_update;
+ pci_dev->bar_update = bar_update;
pci_dev->priv_data = private_data;
//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;