search for: abba04d

...if (ioread8(&in_features[i / 8]) & (BIT_ULL(i % 8))) features |= BIT_ULL(i); + /* MIC is not in virtio 1.0, disable it for now. */ + features &= ~BIT_ULL(VIRTIO_F_VERSION_1); return features; } diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index abba04d..08536f0 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -704,7 +704,8 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) out_free: kfree(features); kfree(ccw); - return rc; + /* TODO: enable virtio 1.0 */ + return rc & ~BIT_ULL(VIRTIO_F_VER...

...if (ioread8(&in_features[i / 8]) & (BIT_ULL(i % 8))) features |= BIT_ULL(i); + /* MIC is not in virtio 1.0, disable it for now. */ + features &= ~BIT_ULL(VIRTIO_F_VERSION_1); return features; } diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index abba04d..08536f0 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -704,7 +704,8 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) out_free: kfree(features); kfree(ccw); - return rc; + /* TODO: enable virtio 1.0 */ + return rc & ~BIT_ULL(VIRTIO_F_VER...

...anged, 8 insertions(+), 2 deletions(-) Why do you disable ccw but not pci? (Doesn't pci need any changes transport-side?) And you missed the old s390 virtio transport in drivers/s390/kvm/kvm_virtio.c :) > diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c > index abba04d..08536f0 100644 > --- a/drivers/s390/kvm/virtio_ccw.c > +++ b/drivers/s390/kvm/virtio_ccw.c > @@ -704,7 +704,8 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) > out_free: > kfree(features); > kfree(ccw); > - return rc; > + /* TODO: enable virtio 1.0 */...

...-side?) No because the register is 32 bit wide there. > And you missed the old s390 virtio transport in > drivers/s390/kvm/kvm_virtio.c :) Good catch. I can fix that for v5, but see below. > > diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c > > index abba04d..08536f0 100644 > > --- a/drivers/s390/kvm/virtio_ccw.c > > +++ b/drivers/s390/kvm/virtio_ccw.c > > @@ -704,7 +704,8 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) > > out_free: > > kfree(features); > > kfree(ccw); > > - return rc; &...

...-side?) No because the register is 32 bit wide there. > And you missed the old s390 virtio transport in > drivers/s390/kvm/kvm_virtio.c :) Good catch. I can fix that for v5, but see below. > > diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c > > index abba04d..08536f0 100644 > > --- a/drivers/s390/kvm/virtio_ccw.c > > +++ b/drivers/s390/kvm/virtio_ccw.c > > @@ -704,7 +704,8 @@ static u64 virtio_ccw_get_features(struct virtio_device *vdev) > > out_free: > > kfree(features); > > kfree(ccw); > > - return rc; &...

...ev->features)) * 8; for (i = 0; i < bits; i++) { - if (vdev->features & (1 << i)) + if (vdev->features & (1ULL << i)) out_features[i / 8] |= (1 << (i % 8)); } } diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index 1dbee95..abba04d 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -660,11 +660,12 @@ static void virtio_ccw_reset(struct virtio_device *vdev) kfree(ccw); } -static u32 virtio_ccw_get_features(struct virtio_device *vdev) +static u64 virtio_ccw_get_features(struct virtio_device *...

...ev->features)) * 8; for (i = 0; i < bits; i++) { - if (vdev->features & (1 << i)) + if (vdev->features & (1ULL << i)) out_features[i / 8] |= (1 << (i % 8)); } } diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index 1dbee95..abba04d 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -660,11 +660,12 @@ static void virtio_ccw_reset(struct virtio_device *vdev) kfree(ccw); } -static u32 virtio_ccw_get_features(struct virtio_device *vdev) +static u64 virtio_ccw_get_features(struct virtio_device *...

...ev->features)) * 8; for (i = 0; i < bits; i++) { - if (vdev->features & (1 << i)) + if (vdev->features & (1ULL << i)) out_features[i / 8] |= (1 << (i % 8)); } } diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index 1dbee95..abba04d 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -660,11 +660,12 @@ static void virtio_ccw_reset(struct virtio_device *vdev) kfree(ccw); } -static u32 virtio_ccw_get_features(struct virtio_device *vdev) +static u64 virtio_ccw_get_features(struct virtio_device *...

...ev->features)) * 8; for (i = 0; i < bits; i++) { - if (vdev->features & (1 << i)) + if (vdev->features & (1ULL << i)) out_features[i / 8] |= (1 << (i % 8)); } } diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c index 1dbee95..abba04d 100644 --- a/drivers/s390/kvm/virtio_ccw.c +++ b/drivers/s390/kvm/virtio_ccw.c @@ -660,11 +660,12 @@ static void virtio_ccw_reset(struct virtio_device *vdev) kfree(ccw); } -static u32 virtio_ccw_get_features(struct virtio_device *vdev) +static u64 virtio_ccw_get_features(struct virtio_device *...

...; i < bits; i++) { > - if (vdev->features & (1 << i)) > + if (vdev->features & (1ULL << i)) > out_features[i / 8] |= (1 << (i % 8)); > } > } > diff --git a/drivers/s390/kvm/virtio_ccw.c b/drivers/s390/kvm/virtio_ccw.c > index 1dbee95..abba04d 100644 > --- a/drivers/s390/kvm/virtio_ccw.c > +++ b/drivers/s390/kvm/virtio_ccw.c > @@ -660,11 +660,12 @@ static void virtio_ccw_reset(struct virtio_device *vdev) > kfree(ccw); > } > > -static u32 virtio_ccw_get_features(struct virtio_device *vdev) > +static u64 virtio_...