From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
virtualization@lists.linux-foundation.org,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH pre-squash 05/14] fixup! virtio_pci: modern driver
Date: Wed, 21 Jan 2015 17:00:19 +0200 [thread overview]
Message-ID: <1421852375-22604-6-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1421852375-22604-1-git-send-email-mst@redhat.com>
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
next prev parent reply other threads:[~2015-01-21 15:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-21 15:00 [PATCH pre-squash 00/14] virtio 1.0: virtio-pci fixup Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 01/14] virtio_pci: move probe/remove code to common Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 02/14] virtio-pci: define layout for virtio 1.0 Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 03/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 04/14] virtio_pci: modern driver Michael S. Tsirkin
2015-01-21 15:00 ` Michael S. Tsirkin [this message]
2015-01-21 15:00 ` [PATCH pre-squash 06/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 07/14] virtio_pci: macros for PCI layout offsets Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 08/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 09/14] virtio_pci_modern: reduce number of mappings Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 10/14] virtio_pci_modern: support devices with no config Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 11/14] virtio_pci: add an option to disable legacy driver Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 12/14] virtio_pci: add module param to force legacy mode Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 13/14] fixup! " Michael S. Tsirkin
2015-01-21 15:00 ` [PATCH pre-squash 14/14] virtio_pci_modern: drop an unused function Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1421852375-22604-6-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome