From: Vincent Whitchurch Date: Wed, 16 Jan 2019 16:32:51 +0000 (+0100) Subject: vop: Fix handling of >32 feature bits X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8216e7e367043182fe121b6dec5e7dbe9d3231cd;p=openwrt%2Fstaging%2Fblogic.git vop: Fix handling of >32 feature bits This is needed, for example, for VIRTIO_F_IOMMU_PLATFORM. Signed-off-by: Vincent Whitchurch Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/mic/vop/vop_main.c b/drivers/misc/mic/vop/vop_main.c index 1a9b410f4190..47a096ddc6fe 100644 --- a/drivers/misc/mic/vop/vop_main.c +++ b/drivers/misc/mic/vop/vop_main.c @@ -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; }