Patchwork [20/25] pci: factor out config update logic.

login
register
mail settings
Submitter Isaku Yamahata
Date Oct. 2, 2009, 8:16 p.m.
Message ID <1254514577-11896-21-git-send-email-yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/34899/
State Superseded
Headers show

Comments

Isaku Yamahata - Oct. 2, 2009, 8:16 p.m.
Updating BAR in pci bar is specific to header type 00.
So split out the logic to common to header type 01 which
will be used later.

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

Patch

diff --git a/hw/pci.c b/hw/pci.c
index 2054902..ed9b785 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -659,16 +659,24 @@  uint32_t pci_default_read_config(PCIDevice *d,
     return pcie_config_get(d, address, len);
 }
 
-void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
+static void pci_default_write_config_common(PCIDevice *d,
+                                            uint32_t addr, uint32_t val, int l)
 {
     int i;
     uint32_t config_size = pcie_config_size(d);
-    uint8_t *orig = pci_write_config_init(d, addr, l);
 
+    assert(l == 1 || l == 2 || l == 4);
     for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) {
         uint8_t wmask = d->wmask[addr];
         d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask);
     }
+}
+
+void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
+{
+    uint8_t *orig = pci_write_config_init(d, addr, l);
+
+    pci_default_write_config_common(d, addr, val, l);
 
     if (pci_config_changed(orig, d->config, addr, l,
                            PCI_BASE_ADDRESS_0, PCI_BASE_ADDRESS_5 + 4) ||