On Sun, 24 Jan 2021 16:35:41 +0100
Heiner Kallweit <hkallweit1@xxxxxxxxx> wrote:
> The pci user accessors return negative errno's on error.
>
> Fixes: f572a960a15e ("vfio/pci: Intel IGD host and LCP bridge config space access")
> Signed-off-by: Heiner Kallweit <hkallweit1@xxxxxxxxx>
> ---
> drivers/vfio/pci/vfio_pci_igd.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Applied to vfio next branch for v5.12 w/ Connie's R-b. I did drop the
fixes tag since pcibios_err_to_errno() has always handled -errno
correctly to avoid the unnecessary churn. Thanks,
Alex
>
> diff --git a/drivers/vfio/pci/vfio_pci_igd.c b/drivers/vfio/pci/vfio_pci_igd.c
> index 53d97f459..e66dfb017 100644
> --- a/drivers/vfio/pci/vfio_pci_igd.c
> +++ b/drivers/vfio/pci/vfio_pci_igd.c
> @@ -127,7 +127,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,
>
> ret = pci_user_read_config_byte(pdev, pos, &val);
> if (ret)
> - return pcibios_err_to_errno(ret);
> + return ret;
>
> if (copy_to_user(buf + count - size, &val, 1))
> return -EFAULT;
> @@ -141,7 +141,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,
>
> ret = pci_user_read_config_word(pdev, pos, &val);
> if (ret)
> - return pcibios_err_to_errno(ret);
> + return ret;
>
> val = cpu_to_le16(val);
> if (copy_to_user(buf + count - size, &val, 2))
> @@ -156,7 +156,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,
>
> ret = pci_user_read_config_dword(pdev, pos, &val);
> if (ret)
> - return pcibios_err_to_errno(ret);
> + return ret;
>
> val = cpu_to_le32(val);
> if (copy_to_user(buf + count - size, &val, 4))
> @@ -171,7 +171,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,
>
> ret = pci_user_read_config_word(pdev, pos, &val);
> if (ret)
> - return pcibios_err_to_errno(ret);
> + return ret;
>
> val = cpu_to_le16(val);
> if (copy_to_user(buf + count - size, &val, 2))
> @@ -186,7 +186,7 @@ static size_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,
>
> ret = pci_user_read_config_byte(pdev, pos, &val);
> if (ret)
> - return pcibios_err_to_errno(ret);
> + return ret;
>
> if (copy_to_user(buf + count - size, &val, 1))
> return -EFAULT;
