[PATCH pre-squash 05/14] fixup! virtio_pci: modern driver
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2015-01-21 15:00:19
Subsystem:
the rest, virtio core · Maintainers:
Linus Torvalds, "Michael S. Tsirkin", Jason Wang
virtio_pci_modern: fix up vendor capability Gerd Hoffmann noticed that we implemented capability layout from an old draft. Unfortunately the code was copied to host as well, so we didn't notice. Luckily we caught this in time. This fixes commit "virtio_pci: modern driver" and should be smashed with it. Reported-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/virtio/virtio_pci_modern.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index e2f41c9..a3d8101 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c@@ -26,13 +26,13 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, u32 start, u32 size, size_t *len) { - u8 type_and_bar, bar; + u8 bar; u32 offset, length; void __iomem *p; pci_read_config_byte(dev, off + offsetof(struct virtio_pci_cap, - type_and_bar), - &type_and_bar); + bar), + &bar); pci_read_config_dword(dev, off + offsetof(struct virtio_pci_cap, offset), &offset); pci_read_config_dword(dev, off + offsetof(struct virtio_pci_cap, length),
@@ -76,9 +76,6 @@ static void __iomem *map_capability(struct pci_dev *dev, int off, if (len) *len = length; - bar = (type_and_bar >> VIRTIO_PCI_CAP_BAR_SHIFT) & - VIRTIO_PCI_CAP_BAR_MASK; - if (minlen + offset < minlen || minlen + offset > pci_resource_len(dev, bar)) { dev_err(&dev->dev,
@@ -438,15 +435,13 @@ static inline int virtio_pci_find_capability(struct pci_dev *dev, u8 cfg_type, for (pos = pci_find_capability(dev, PCI_CAP_ID_VNDR); pos > 0; pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_VNDR)) { - u8 type_and_bar, type, bar; + u8 type, bar; pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap, - type_and_bar), - &type_and_bar); - - type = (type_and_bar >> VIRTIO_PCI_CAP_TYPE_SHIFT) & - VIRTIO_PCI_CAP_TYPE_MASK; - bar = (type_and_bar >> VIRTIO_PCI_CAP_BAR_SHIFT) & - VIRTIO_PCI_CAP_BAR_MASK; + cfg_type), + &type); + pci_read_config_byte(dev, pos + offsetof(struct virtio_pci_cap, + bar), + &bar); /* Ignore structures with reserved BAR values */ if (bar > 0x5)
--
MST