From: Andrew Jones <drjones@redhat.com>
To: kvm@vger.kernel.org
Cc: alex.williamson@redhat.com, eric.auger@redhat.com
Subject: [PATCH] vfio/pci: Fix version2 RC endpoint PCIe capability size
Date: Fri, 11 Aug 2017 12:03:35 +0200 [thread overview]
Message-ID: <20170811100335.22716-1-drjones@redhat.com> (raw)
Fix a typo which resulted in returning the same value for the length
of version 2 root complex integrated endpoints as other version 2
devices, even though RC's don't have a link.
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
The issue was only found by review, so I've only compile-tested the fix.
Actually, TBH, I don't know anything about PCI or RC config space, so I'm
just assuming link-size-v2 == link-size-v1 and that link-size-v1 is 8,
since the code was using 0xc == PCI_CAP_EXP_ENDPOINT_SIZEOF_V1 - 8 for it.
drivers/vfio/pci/vfio_pci_config.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index 5628fe114347..afe29cd88f1f 100644
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -1244,15 +1244,15 @@ static int vfio_cap_len(struct vfio_pci_device *vdev, u8 cap, u8 pos)
}
/* length based on version and type */
- if ((pcie_caps_reg(pdev) & PCI_EXP_FLAGS_VERS) == 1) {
- if (pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_END)
- return 0xc; /* "All Devices" only, no link */
- return PCI_CAP_EXP_ENDPOINT_SIZEOF_V1;
- } else {
- if (pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_END)
- return 0x2c; /* No link */
- return PCI_CAP_EXP_ENDPOINT_SIZEOF_V2;
- }
+ if ((pcie_caps_reg(pdev) & PCI_EXP_FLAGS_VERS) == 1)
+ ret = PCI_CAP_EXP_ENDPOINT_SIZEOF_V1;
+ else
+ ret = PCI_CAP_EXP_ENDPOINT_SIZEOF_V2;
+
+ if (pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_END)
+ ret -= 8; /* "All Devices" only, no link */
+
+ return ret;
case PCI_CAP_ID_HT:
ret = pci_read_config_byte(pdev, pos + 3, &byte);
if (ret)
--
2.13.4
next reply other threads:[~2017-08-11 10:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-11 10:03 Andrew Jones [this message]
2017-08-11 14:13 ` [PATCH] vfio/pci: Fix version2 RC endpoint PCIe capability size Alex Williamson
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=20170811100335.22716-1-drjones@redhat.com \
--to=drjones@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.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