Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8216e7e3 authored by Vincent Whitchurch's avatar Vincent Whitchurch Committed by Greg Kroah-Hartman
Browse files

vop: Fix handling of >32 feature bits 



This is needed, for example, for VIRTIO_F_IOMMU_PLATFORM.

Signed-off-by: default avatarVincent Whitchurch <vincent.whitchurch@axis.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 417406f2

drivers/misc/mic/vop/vop_main.c

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ _vop_total_desc_size(struct mic_device_desc __iomem *desc) 
static u64 vop_get_features(struct virtio_device *vdev)

{

	unsigned int i, bits;

	u32 features = 0;

	u64 features = 0;

	struct mic_device_desc __iomem *desc = to_vopvdev(vdev)->desc;

	u8 __iomem *in_features = _vop_vq_features(desc);

	int feature_len = ioread8(&desc->feature_len);
@@ -125,7 +125,7 @@ static u64 vop_get_features(struct virtio_device *vdev) 
	bits = min_t(unsigned, feature_len, sizeof(vdev->features)) * 8;

	for (i = 0; i < bits; i++)

		if (ioread8(&in_features[i / 8]) & (BIT(i % 8)))

			features |= BIT(i);

			features |= BIT_ULL(i);



	return features;

}