gwj / at91sam9263 · Commits

Commit bf367b54092014edd36a64195697ea3959fba5cf

Authored by ths
1 parent c6cda17a

Match values with the ones documented in the PIIX4 datasheet. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3377 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 1 deletions
hw/acpi.c
  View file @bf367b5
@@ -400,7 +400,7 @@ static void pm_io_space_update(PIIX4PMState *s) @@ -400,7 +400,7 @@ static void pm_io_space_update(PIIX4PMState *s)
400 400
401 if (s->dev.config[0x80] & 1) { 401 if (s->dev.config[0x80] & 1) {
402 pm_io_base = le32_to_cpu(*(uint32_t *)(s->dev.config + 0x40)); 402 pm_io_base = le32_to_cpu(*(uint32_t *)(s->dev.config + 0x40));
403 - pm_io_base &= 0xfffe; 403 + pm_io_base &= 0xffc0;
404 404
405 /* XXX: need to improve memory and ioport allocation */ 405 /* XXX: need to improve memory and ioport allocation */
406 #if defined(DEBUG) 406 #if defined(DEBUG)
@@ -474,6 +474,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base) @@ -474,6 +474,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base)
474 pci_conf[0x01] = 0x80; 474 pci_conf[0x01] = 0x80;
475 pci_conf[0x02] = 0x13; 475 pci_conf[0x02] = 0x13;
476 pci_conf[0x03] = 0x71; 476 pci_conf[0x03] = 0x71;
  477 + pci_conf[0x06] = 0x80;
  478 + pci_conf[0x07] = 0x02;
477 pci_conf[0x08] = 0x00; // revision number 479 pci_conf[0x08] = 0x00; // revision number
478 pci_conf[0x09] = 0x00; 480 pci_conf[0x09] = 0x00;
479 pci_conf[0x0a] = 0x80; // other bridge device 481 pci_conf[0x0a] = 0x80; // other bridge device