Alex,
Does it look good to you?
On Mon, Dec 08, 2014 at 09:22:18AM +0800, Wei Yang wrote:
>Current vfio-pci just supports normal pci device, so vfio_pci_probe() will
>return if the pci device is not a normal device. While current code makes a
>mistake. PCI_HEADER_TYPE is the offset in configuration space of the device
>type, but we use this value to mask the type value.
>
>This patch adds a function to check whether the pci device is a normal type
>and use it in vfio_pci_probe().
>
>Signed-off-by: Wei Yang <weiyang@xxxxxxxxxxxxxxxxxx>
>---
> drivers/vfio/pci/vfio_pci.c | 4 +---
> include/linux/pci.h | 11 +++++++++++
> 2 files changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
>index 9558da3..f82bf62 100644
>--- a/drivers/vfio/pci/vfio_pci.c
>+++ b/drivers/vfio/pci/vfio_pci.c
>@@ -839,13 +839,11 @@ static const struct vfio_device_ops vfio_pci_ops = {
>
> static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> {
>- u8 type;
> struct vfio_pci_device *vdev;
> struct iommu_group *group;
> int ret;
>
>- pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type);
>- if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL)
>+ if (!pci_is_normal(pdev))
> return -EINVAL;
>
> group = iommu_group_get(&pdev->dev);
>diff --git a/include/linux/pci.h b/include/linux/pci.h
>index 48d1f98..2027f66 100644
>--- a/include/linux/pci.h
>+++ b/include/linux/pci.h
>@@ -519,6 +519,17 @@ static inline bool pci_is_bridge(struct pci_dev *dev)
> dev->hdr_type == PCI_HEADER_TYPE_CARDBUS;
> }
>
>+/**
>+ * pci_is_normal - check if the PCI device is a normal device
>+ * @dev: PCI device
>+ *
>+ * Return true if the PCI device is a normal device
>+ */
>+static inline bool pci_is_normal(struct pci_dev *dev)
>+{
>+ return dev->hdr_type == PCI_HEADER_TYPE_NORMAL;
>+}
>+
> static inline struct pci_dev *pci_upstream_bridge(struct pci_dev *dev)
> {
> dev = pci_physfn(dev);
>--
>1.7.9.5
--
Richard Yang
Help you, Help me
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
