[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/9] pci: pci_default_cap_write_config ignores wm
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH v2 1/9] pci: pci_default_cap_write_config ignores wmask |
Date: |
Fri, 12 Nov 2010 10:46:10 -0700 |
User-agent: |
StGIT/0.14.3 |
Make use of wmask, just like the rest of config space.
Signed-off-by: Alex Williamson <address@hidden>
---
hw/pci.c | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 92aaa85..4bc5882 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1175,13 +1175,15 @@ uint32_t pci_default_read_config(PCIDevice *d,
return pci_read_config(d, address, len);
}
-static void pci_write_config(PCIDevice *pci_dev,
- uint32_t address, uint32_t val, int len)
+static void pci_write_config_with_mask(PCIDevice *d, uint32_t addr,
+ uint32_t val, int l)
{
int i;
- for (i = 0; i < len; i++) {
- pci_dev->config[address + i] = val & 0xff;
- val >>= 8;
+ uint32_t config_size = pci_config_size(d);
+
+ for (i = 0; i < l && addr + i < config_size; val >>= 8, ++i) {
+ uint8_t wmask = d->wmask[addr + i];
+ d->config[addr + i] = (d->config[addr + i] & ~wmask) | (val & wmask);
}
}
@@ -1202,23 +1204,19 @@ uint32_t pci_default_cap_read_config(PCIDevice *pci_dev,
void pci_default_cap_write_config(PCIDevice *pci_dev,
uint32_t address, uint32_t val, int len)
{
- pci_write_config(pci_dev, address, val, len);
+ pci_write_config_with_mask(pci_dev, address, val, len);
}
void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
{
- int i, was_irq_disabled = pci_irq_disabled(d);
- uint32_t config_size = pci_config_size(d);
+ int was_irq_disabled = pci_irq_disabled(d);
if (pci_access_cap_config(d, addr, l)) {
d->cap.config_write(d, addr, val, l);
return;
}
- for (i = 0; i < l && addr + i < config_size; val >>= 8, ++i) {
- uint8_t wmask = d->wmask[addr + i];
- d->config[addr + i] = (d->config[addr + i] & ~wmask) | (val & wmask);
- }
+ pci_write_config_with_mask(d, addr, val, l);
#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
if (kvm_enabled() && kvm_irqchip_in_kernel() &&
- [Qemu-devel] [PATCH v2 0/9] PCI capability and device assignment improvements, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 1/9] pci: pci_default_cap_write_config ignores wmask,
Alex Williamson <=
- [Qemu-devel] [PATCH v2 2/9] pci: Remove pci_enable_capability_support(), Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 3/9] device-assignment: Use PCI capabilities support, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 4/9] pci: Replace used bitmap with capability byte map, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 5/9] pci: Remove cap.length, cap.start, cap.supported, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 6/9] device-assignment: Move PCI capabilities to match physical hardware, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 7/9] pci: Pass ID for capability read/write handlers, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 8/9] pci: Remove capability read/write config handlers, Alex Williamson, 2010/11/12
- [Qemu-devel] [PATCH v2 9/9] pci: Store capability offsets in PCIDevice, Alex Williamson, 2010/11/12