Commit b44a06bd authored by Ramesh Thomas's avatar Ramesh Thomas Committed by Alex Williamson
Browse files

vfio/pci: Remove #ifdef iowrite64 and #ifdef ioread64 



Remove the #ifdef iowrite64 and #ifdef ioread64 checks around calls to
64 bit IO access. Since default implementations have been enabled, the
checks are not required.

Signed-off-by: default avatarRamesh Thomas <ramesh.thomas@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20241210131938.303500-3-ramesh.thomas@intel.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 2b938e3d

drivers/vfio/pci/vfio_pci_rdwr.c

+0 −12
Original line number Diff line number Diff line
@@ -62,9 +62,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_iowrite##size); 
VFIO_IOWRITE(8)

VFIO_IOWRITE(16)

VFIO_IOWRITE(32)

#ifdef iowrite64

VFIO_IOWRITE(64)

#endif



#define VFIO_IOREAD(size) \

int vfio_pci_core_ioread##size(struct vfio_pci_core_device *vdev,	\
@@ -90,9 +88,7 @@ EXPORT_SYMBOL_GPL(vfio_pci_core_ioread##size); 
VFIO_IOREAD(8)

VFIO_IOREAD(16)

VFIO_IOREAD(32)

#ifdef ioread64

VFIO_IOREAD(64)

#endif



#define VFIO_IORDWR(size)						\

static int vfio_pci_iordwr##size(struct vfio_pci_core_device *vdev,\
@@ -128,9 +124,7 @@ static int vfio_pci_iordwr##size(struct vfio_pci_core_device *vdev,\ 
VFIO_IORDWR(8)

VFIO_IORDWR(16)

VFIO_IORDWR(32)

#if defined(ioread64) && defined(iowrite64)

VFIO_IORDWR(64)

#endif



/*

 * Read or write from an __iomem region (MMIO or I/O port) with an excluded
@@ -156,7 +150,6 @@ ssize_t vfio_pci_core_do_io_rw(struct vfio_pci_core_device *vdev, bool test_mem, 
		else

			fillable = 0;



#if defined(ioread64) && defined(iowrite64)

		if (fillable >= 8 && !(off % 8)) {

			ret = vfio_pci_iordwr64(vdev, iswrite, test_mem,

						io, buf, off, &filled);
@@ -164,7 +157,6 @@ ssize_t vfio_pci_core_do_io_rw(struct vfio_pci_core_device *vdev, bool test_mem, 
				return ret;



		} else

#endif

		if (fillable >= 4 && !(off % 4)) {

			ret = vfio_pci_iordwr32(vdev, iswrite, test_mem,

						io, buf, off, &filled);
@@ -382,12 +374,10 @@ static void vfio_pci_ioeventfd_do_write(struct vfio_pci_ioeventfd *ioeventfd, 
		vfio_pci_core_iowrite32(ioeventfd->vdev, test_mem,

					ioeventfd->data, ioeventfd->addr);

		break;

#ifdef iowrite64

	case 8:

		vfio_pci_core_iowrite64(ioeventfd->vdev, test_mem,

					ioeventfd->data, ioeventfd->addr);

		break;

#endif

	}

}
@@ -441,10 +431,8 @@ int vfio_pci_ioeventfd(struct vfio_pci_core_device *vdev, loff_t offset, 
	      pos >= vdev->msix_offset + vdev->msix_size))

		return -EINVAL;



#ifndef iowrite64

	if (count == 8)

		return -EINVAL;

#endif



	ret = vfio_pci_core_setup_barmap(vdev, bar);

	if (ret)