From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE76DC43334 for ; Wed, 6 Jul 2022 15:36:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234402AbiGFPgP (ORCPT ); Wed, 6 Jul 2022 11:36:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234340AbiGFPfe (ORCPT ); Wed, 6 Jul 2022 11:35:34 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48CDDBB6; Wed, 6 Jul 2022 08:33:23 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C7CD8B81D8E; Wed, 6 Jul 2022 15:33:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B217C341CB; Wed, 6 Jul 2022 15:33:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657121600; bh=3Ebo41DSRWuzz7t4znUhen4wmpTzViKj875cur3+ojk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e5SQJj5AGzzi+nzH+pw3bIpuK+r5WNFCOarjk35ejlIIxDjdkMYZJfQ4620XGpkNs 2XkHVnrWwsdNgkXOviH2v/MJwIOlmCMVKYD6BalyfVWtAJlQEDfO83TblR2gMbkcNr eZ31nAx0oEiPXo6f2ARbTMi3OGMTQQopRFgyGBARCUpyrqTuwGkaK43+KP+yH5PFVO fmwtv1DkuOK269PXYIqtnTa+dN3m2h7ftlApxyT7XvoURLc1kVibCznZnRm5FeisQ9 alNmcV43W6hDMEUOAEoL3OSs9OxFFqDsm+EeAu6Wvo6i118cBe9X5rDU2/UVxU+h/K XMddXPo7P76mw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephan Gerhold , "Michael S . Tsirkin" , Sasha Levin , jasowang@redhat.com, virtualization@lists.linux-foundation.org Subject: [PATCH AUTOSEL 5.4 2/9] virtio_mmio: Restore guest page size on resume Date: Wed, 6 Jul 2022 11:33:08 -0400 Message-Id: <20220706153316.1598554-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220706153316.1598554-1-sashal@kernel.org> References: <20220706153316.1598554-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephan Gerhold [ Upstream commit e0c2ce8217955537dd5434baeba061f209797119 ] Virtio devices might lose their state when the VMM is restarted after a suspend to disk (hibernation) cycle. This means that the guest page size register must be restored for the virtio_mmio legacy interface, since otherwise the virtio queues are not functional. This is particularly problematic for QEMU that currently still defaults to using the legacy interface for virtio_mmio. Write the guest page size register again in virtio_mmio_restore() to make legacy virtio_mmio devices work correctly after hibernation. Signed-off-by: Stephan Gerhold Message-Id: <20220621110621.3638025-3-stephan.gerhold@kernkonzept.com> Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/virtio/virtio_mmio.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 2a2d817caeff..e781e5e9215f 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -527,6 +527,9 @@ static int virtio_mmio_restore(struct device *dev) { struct virtio_mmio_device *vm_dev = dev_get_drvdata(dev); + if (vm_dev->version == 1) + writel(PAGE_SIZE, vm_dev->base + VIRTIO_MMIO_GUEST_PAGE_SIZE); + return virtio_device_restore(&vm_dev->vdev); } -- 2.35.1