Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3731794iog; Tue, 21 Jun 2022 05:00:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vbS+Gd4wgJ5RDlGf9IaHdmwnfj+r9MX4sSeojLd7c8MbUf9PeDAKsge24SAVW3OWE2RPvV X-Received: by 2002:a05:6a00:4406:b0:51c:244f:85d8 with SMTP id br6-20020a056a00440600b0051c244f85d8mr29521180pfb.36.1655812817459; Tue, 21 Jun 2022 05:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655812817; cv=none; d=google.com; s=arc-20160816; b=yKFeSKYcOD1t+V7Galwc9aKDi8G5Nj6oh6wmMBBJQjyLUUnFxihnbri3EVn/lf/ii2 O/eLsLmWOOotZqcvxk7AcKXa509kiFsHfVW9yq7oQ9IgAjGYXr4lQFON+H62BzwqZNhR ZYgF6ytU+3lEJBPsJW2oc+sxlxDCFn49LoQAXrdWrZ/XD6+KDeGlY4tRUotd9b3XzI48 v4zUyICwJjY6am7pAjoif1OHEmhRqzzXZXYIAuoItxeLfChZWGicLrxgI2rX60hR72RZ PHX+y/WPZPz92KwxlsywzzN8LSxuLiFp1wVqbSawX1N8PwbtHOXT4sByJUudi3ODojnV apGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=D6GD7v0OxoQRiN+PLWPk/I3LPeDqLQnzXNY1W/TtwTQ=; b=RLWH3YgcsV3/G21OsG77AVcY8J1y29ehO4N1N1u+kiZqHk/T+/Dun1F/ViT2TIYDRm 4v4zA5PmwdEy46W4UHYnKGNOVAG+FSrZpLg9hrVRKpqcdaZiTwRxj45N1AeRM/eaqQEw v7liaXfIMHX8d/EJPqpV8op1fCpzMrqkkd5LQ1ux3aHujlpfMhPw77Ofh7q1NzItP09k kBcKI9/n9DIm4Rfr6BFX7hQ37kMnjfV83I9CvUr7IuF+SpIaEfAoNwD6ciYhaTAKEI4d iWNiAbl7wgIqyqd0KwZbfWB6NhnBGo2AoUcv1o3tm9CtbjVHAM/li8m6TIs/wxQvQsk8 f+7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernkonzept.com header.s=mx1 header.b=gZPlPh4b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernkonzept.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y184-20020a638ac1000000b0040c9f7f2987si2619916pgd.135.2022.06.21.05.00.04; Tue, 21 Jun 2022 05:00:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kernkonzept.com header.s=mx1 header.b=gZPlPh4b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernkonzept.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349925AbiFULmp (ORCPT + 99 others); Tue, 21 Jun 2022 07:42:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349870AbiFULmj (ORCPT ); Tue, 21 Jun 2022 07:42:39 -0400 X-Greylist: delayed 1936 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 21 Jun 2022 04:42:36 PDT Received: from mx.kernkonzept.com (serv1.kernkonzept.com [IPv6:2a01:4f8:1c1c:b490::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF98DBE19 for ; Tue, 21 Jun 2022 04:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kernkonzept.com; s=mx1; h=Content-Transfer-Encoding:MIME-Version:Message-Id :Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=D6GD7v0OxoQRiN+PLWPk/I3LPeDqLQnzXNY1W/TtwTQ=; b=gZPlPh4bRTWAWM9vsyz7KyFwPl ZU9yrDlz4CFhbD36JLeX5/a659POUAmFVCZe+piXKe6F6j0nsYxdX1Mc2UEUX7XNq6YmTBdaVGRua /HgJPpEdArS0HD92yeO0ZYehtWRJxTuZuvqn+YlMQMT133b6PMIat7tVzdXw7ifof9YyxyKPp12K8 9F7ZAaX/t2aU7m7rTDPXHS7iCPaNODfQlsj8RYYuhSKFH/P0IfNPSbf1Ch4t7/5WCq2IapIZs38zL yeozHzaIZIpqEJ3tbIK0uR+AAXn2DUpEEAdGVPtrv1568qARjisNNEPtbfT7KbzHRLOImRXJmjOuL 6ea98NTA==; Received: from [10.22.3.24] (helo=kernkonzept.com) by mx.kernkonzept.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2) id 1o3blo-005hKr-Fd; Tue, 21 Jun 2022 13:10:08 +0200 From: Stephan Gerhold To: "Michael S. Tsirkin" , Jason Wang Cc: virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Stephan Gerhold Subject: [PATCH 0/2] virtio_mmio: Fix suspend to disk (hibernation) Date: Tue, 21 Jun 2022 13:06:19 +0200 Message-Id: <20220621110621.3638025-1-stephan.gerhold@kernkonzept.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At the moment suspend to disk (hibernation) works correctly when using virtio_pci, but not when using virtio_mmio. This is because virtio_mmio does not call the freeze/restore callbacks provided by most virtio drivers. Fix this by adding the missing PM calls to virtio_mmio and restore the guest page size for the legacy version of virtio_mmio. Stephan Gerhold (2): virtio_mmio: Add missing PM calls to freeze/restore virtio_mmio: Restore guest page size on resume drivers/virtio/virtio_mmio.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -- 2.30.2