Patchwork [v8,02/11] pci: clean up pci command register io/memory bit initialization

login
register
mail settings
Submitter Isaku Yamahata
Date Nov. 15, 2010, 7:30 a.m.
Message ID <ccb5112f3f13fb13143e1a316234bcc823f931db.1289805831.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/71192/
State New
Headers show

Comments

Isaku Yamahata - Nov. 15, 2010, 7:30 a.m.
This patch fixes the initialization of io/memory bit of command register.
Those bits for type 1 device is RW.
Those bits for type 0 device is
  RO = 0 if it has no io/memory BAR
  RW if it has io/memory BAR

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
---
 hw/pci.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/pci.c b/hw/pci.c
index b70a568..2fc8ab1 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -548,10 +548,14 @@  static void pci_init_wmask(PCIDevice *dev)
     /*
      * bit 0: PCI_COMMAND_IO
      *        type 0: if IO BAR is used, RW
-     *        type 1: RW
+     *                This is handled by pci_register_bar()
+     *        type 1: RW:
+     *                This is fixed by pci_init_wmask_bridge()
      * bit 1: PCI_COMMAND_MEMORY
      *        type 0: if IO BAR is used, RW
+     *                This is handled by pci_register_bar()
      *        type 1: RW
+     *                This is fixed by pci_init_wmask_bridge()
      * bit 2: PCI_COMMAND_MASTER
      *        type 0: RW if bus master
      *        type 1: RW
@@ -586,8 +590,7 @@  static void pci_init_wmask(PCIDevice *dev)
      * bit 11-15: reserved
      */
     pci_set_word(dev->wmask + PCI_COMMAND,
-                 PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |
-                 PCI_COMMAND_PARITY | PCI_COMMAND_SERR |
+                 PCI_COMMAND_MASTER | PCI_COMMAND_PARITY | PCI_COMMAND_SERR |
                  PCI_COMMAND_INTX_DISABLE);
 
     memset(dev->wmask + PCI_CONFIG_HEADER_SIZE, 0xff,
@@ -596,6 +599,9 @@  static void pci_init_wmask(PCIDevice *dev)
 
 static void pci_init_wmask_bridge(PCIDevice *d)
 {
+    pci_word_test_and_set_mask(d->wmask + PCI_COMMAND,
+                               PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
+
     /* PCI_PRIMARY_BUS, PCI_SECONDARY_BUS, PCI_SUBORDINATE_BUS and
        PCI_SEC_LETENCY_TIMER */
     memset(d->wmask + PCI_PRIMARY_BUS, 0xff, 4);
@@ -833,6 +839,14 @@  void pci_register_bar(PCIDevice *pci_dev, int region_num,
     if (region_num == PCI_ROM_SLOT) {
         /* ROM enable bit is writeable */
         wmask |= PCI_ROM_ADDRESS_ENABLE;
+    } else {
+        if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
+            pci_word_test_and_set_mask(pci_dev->wmask + PCI_COMMAND,
+                                       PCI_COMMAND_IO);
+        } else {
+            pci_word_test_and_set_mask(pci_dev->wmask + PCI_COMMAND,
+                                       PCI_COMMAND_MEMORY);
+        }
     }
     pci_set_long(pci_dev->config + addr, type);
     if (!(r->type & PCI_BASE_ADDRESS_SPACE_IO) &&