Commit 4b454a82 authored by Eli Cohen's avatar Eli Cohen Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Fix wrong use of bit numbers 



VIRTIO_F_VERSION_1 is a bit number. Use BIT_ULL() with mask
conditionals.

Also, in mlx5_vdpa_is_little_endian() use BIT_ULL for consistency with
the rest of the code.

Fixes: 1a86b377 ("vdpa/mlx5: Add VDPA driver for supported mlx5 devices")
Signed-off-by: default avatarEli Cohen <elic@nvidia.com>
Link: https://lore.kernel.org/r/20210408091047.4269-5-elic@nvidia.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
parent b2ae0a2d

drivers/vdpa/mlx5/net/mlx5_vnet.c

+2 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ static int create_virtqueue(struct mlx5_vdpa_net *ndev, struct mlx5_vdpa_virtque 
	MLX5_SET(virtio_q, vq_ctx, event_qpn_or_msix, mvq->fwqp.mqp.qpn);

	MLX5_SET(virtio_q, vq_ctx, queue_size, mvq->num_ent);

	MLX5_SET(virtio_q, vq_ctx, virtio_version_1_0,

		 !!(ndev->mvdev.actual_features & VIRTIO_F_VERSION_1));

		 !!(ndev->mvdev.actual_features & BIT_ULL(VIRTIO_F_VERSION_1)));

	MLX5_SET64(virtio_q, vq_ctx, desc_addr, mvq->desc_addr);

	MLX5_SET64(virtio_q, vq_ctx, used_addr, mvq->device_addr);

	MLX5_SET64(virtio_q, vq_ctx, available_addr, mvq->driver_addr);
@@ -1554,7 +1554,7 @@ static void clear_virtqueues(struct mlx5_vdpa_net *ndev) 
static inline bool mlx5_vdpa_is_little_endian(struct mlx5_vdpa_dev *mvdev)

{

	return virtio_legacy_is_little_endian() ||

		(mvdev->actual_features & (1ULL << VIRTIO_F_VERSION_1));

		(mvdev->actual_features & BIT_ULL(VIRTIO_F_VERSION_1));

}



static __virtio16 cpu_to_mlx5vdpa16(struct mlx5_vdpa_dev *mvdev, u16 val)