From 6fe4c366af6240671c071f63a25a9cf0f9cc230d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 17 Nov 2022 14:59:38 +0000 Subject: [PATCH] ANDROID: virtio_balloon: Do not clear VIRTIO_F_ACCESS_PLATFORM This essentially reverts commit e41b1355508debe45fda33 "virtio_balloon: disable VIOMMU support". Although the virtio_balloon driver does not translate through a VIOMMU (or bounce buffer) the pages that it sends to the device, it *does* need to perform these translations on the virtio rings themselves. This fixes virtio_balloon initialisation inside a PKVM/ARM64 protected virtual machine. Bug: 240239989 Change-Id: I2a84eec870fd638223b231e5c4d1c27216dc40a2 Signed-off-by: Keir Fraser Signed-off-by: Quentin Perret --- drivers/virtio/virtio_balloon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 18a6d8d78fe7..eb27c82bf0dc 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -1108,7 +1108,6 @@ static int virtballoon_validate(struct virtio_device *vdev) else if (!virtio_has_feature(vdev, VIRTIO_BALLOON_F_PAGE_POISON)) __virtio_clear_bit(vdev, VIRTIO_BALLOON_F_REPORTING); - __virtio_clear_bit(vdev, VIRTIO_F_ACCESS_PLATFORM); return 0; }