From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E15F3ED12D for ; Wed, 15 Apr 2026 17:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776274850; cv=none; b=QQjEfQw8PR/+cP/ETtuuexNBCZIwRL/whU34kiaRIM859ExJyuTO3H4YzrGO7AcL0qOSAjntPY3stog+FWxxdO9n0wMlftVm43zx5ZfUtbhqwROkG+aLgoOV0N60xwpf6lFNgFDKO8+uRc7NAkEy5+jvFEyyqkWEVOWjJNQZ8ro= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776274850; c=relaxed/simple; bh=wM41XmBBS8TtNKAIUom+SJe3wlh1BXsYctp8oV5NbHA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BDuuHVibsms9Bn1U0IEs1cMOS/UXT4gFzD5hHan7a36ZwhmphUw5c95xONiHDziAj7BkucUYsLqkHtQ2voVzrijTJQul2GHLFQLYyk/LdxYtquyAIxslwAbWaTl9pv+J/yOaLKUO+5zlbYRVbstxYZYGwZRu7kpam9Yb2q5U62U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=od9UVH/u; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="od9UVH/u" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-358e3cc5e7eso3865133a91.0 for ; Wed, 15 Apr 2026 10:40:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776274848; x=1776879648; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wM7k7U3YOg606LvkeNC0T6FE9JAmhA/+H8CjM9x4H8o=; b=od9UVH/u0tzvwoMpDkE3tvJS3e73cpHxAE0ItMRt3fp0oKOmebj3CHITtgJZYQqB9x V8HB5R5bMnSuwNoITPZrklk1vEj78L2aob8qz1edUPxQDc8JbDj8jjcINz1B7RjGhVpM hegYZZz9afVSXEcBdtgYKAK9XT3+6Gxbsp+LIv/gWY9ursiCyABdF9b0XITcZUdz2d9K VVc1SRWQw9aP8yXq0QAuuT7hYyhv3Wmc6gYCXBx3LKTQa4W30Wf084xvhI+B+xwz0myS ty6BELgWqcyLjnvtP4fp/mcRMWWWgULtItzQp1/ZCUhkiGvI8aCrUv8qAQb+FaPAlFF6 m3ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776274848; x=1776879648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wM7k7U3YOg606LvkeNC0T6FE9JAmhA/+H8CjM9x4H8o=; b=ZQulUog5VbefA6S0n7BUPRTkbHsI+GyT1NBFfY2e/QzFgQ1AA1/rFWhsAeHEMnTnS/ Wfn6iJ67VhA0q0+6buhmFGjaL4TWI0MnCgCnZmUlzdZv25TvIgc063EitxhJj9y+gY58 mIBAuhNEe8YSftMcFQPrMm4wl+NmAzs41z5Shvc7sEb+XC/2UabyN5jAcTkQJTfbPdc9 2MhzlnItRMCR+JHdvoiOXxeN2zdTMG12anJBX8ViLIsbYfrJXhEPr3zy4Tjnb5pGYO7Z f2pqyz7lCSJaVTlVjjWE7GxYKprmLfykGH5MB49Xsr90pu0OLjpk9XzNVvGW63P3Fm1A 8qhQ== X-Forwarded-Encrypted: i=1; AFNElJ/jOoSZy3oEN9C8WXAgFC6pQ2TvizN+mfodtcqHKyGyJPWZLFOCttzG5/yqwRfI2kvVAhSbt3cyVCr5MTo=@vger.kernel.org X-Gm-Message-State: AOJu0Yzt4uepNFwFCOduacu8OxIjF+F//AETf91TcqdkhOH+FkmW2Wum Z1/tLFR5mevjEFh5JkOhWo7oLy6LUm10ysIIIzpL/qRYh9Xb8EAxFVe29sYvYp6m X-Gm-Gg: AeBDiev4DvH+oVw2J2hrnFdcdJ5MsrEVmsdRBbTl8Bn3mByK1bAAcPVqJ17WXtGpR31 +z4rsZc6Fvo0S8DBlELIn1o/GyooypVFOylZJ29CUIs0RmycrcAhnLkr8+4JhXhxGEj1QVVVnjX wkcBW1Gll1fUwvXOHoQvjypdlx/UysK1UEPMfWIeWws8ewEy96QduC7ifh71RD0SDuQHQSUr0u5 nbnlf1Cu2IlCmS8GLVmkfzUOcUmgq0wlDvJoIA3iBM0iWPsSnV7NhJUPmHIwkc3zC69DBlipf+0 AWqhY027bp1EoIbjEMvpSn0rCcPnJEYTLhOVHesZ4zfiM4i59o51V3fc0I4pgutpAd3Msfrbr/j P7N4HF1gscYgCAgayMhQ2ghjbrVYOwMUXY4gVNGTqU2cd37k29Flt46Pk5IVdxfujNRObGGQCZ8 OP2Vq7Y/Q2yV2eJ5dPAPhQOXcwVjLG4sBhDijtAdl/f6qmOdDBYCuAANdz89ZxBNTJdtJ9GD7vD s4fBR/3xVx1gxJUlqNotjDKbY6Kp/woEXlwLA== X-Received: by 2002:a17:90a:d407:b0:35e:594a:5b75 with SMTP id 98e67ed59e1d1-35e594a62e8mr14176643a91.25.1776274848384; Wed, 15 Apr 2026 10:40:48 -0700 (PDT) Received: from baver-zenith.localdomain ([124.49.88.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35fd1fe9b50sm2891026a91.3.2026.04.15.10.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 10:40:48 -0700 (PDT) From: Sungho Bae To: mst@redhat.com, jasowang@redhat.com Cc: xuanzhuo@linux.alibaba.com, eperezma@redhat.com, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Sungho Bae Subject: [RFC PATCH v1 4/4] virtio-mmio: wire up noirq system sleep PM callbacks Date: Thu, 16 Apr 2026 02:38:33 +0900 Message-Id: <20260415173833.6319-5-baver.bae@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260415173833.6319-1-baver.bae@gmail.com> References: <20260415173833.6319-1-baver.bae@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sungho Bae Implement the transport side of noirq system-sleep PM for virtio-mmio: - vm_reset_vqs(): iterate all virtqueues, call virtqueue_reinit_vring() to reset the vring state in place, then reprogram the MMIO queue registers (QUEUE_SEL, QUEUE_NUM, descriptor/avail/used addresses, QUEUE_READY) so the device can use the same rings immediately after restore. No memory is allocated or freed. - virtio_mmio_freeze_noirq() / virtio_mmio_restore_noirq(): thin wrappers that forward to the virtio core noirq helpers. The restore_noirq path also writes GUEST_PAGE_SIZE for legacy (v1) devices, matching the existing restore callback. - Wire vm_reset_vqs into virtio_mmio_config_ops and register the noirq callbacks via SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(). With this in place, a virtio-mmio driver can implement freeze_noirq / restore_noirq to participate in the noirq PM phase, enabling use cases such as virtio-clock or virtio-regulator that must be operational before other devices are restored. Signed-off-by: Sungho Bae --- drivers/virtio/virtio_mmio.c | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 595c2274fbb5..7bf193ba4173 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -336,6 +336,65 @@ static void vm_del_vqs(struct virtio_device *vdev) free_irq(platform_get_irq(vm_dev->pdev, 0), vm_dev); } +static int vm_reset_vqs(struct virtio_device *vdev) +{ + struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); + struct virtqueue *vq; + + virtio_device_for_each_vq(vdev, vq) { + unsigned int num = virtqueue_get_vring_size(vq); + + virtqueue_reinit_vring(vq); + + writel(vq->index, vm_dev->base + VIRTIO_MMIO_QUEUE_SEL); + writel(num, vm_dev->base + VIRTIO_MMIO_QUEUE_NUM); + + if (vm_dev->version == 1) { + u64 q_pfn = virtqueue_get_desc_addr(vq) >> PAGE_SHIFT; + + /* + * virtio-mmio v1 uses a 32bit QUEUE PFN. If we have + * something that doesn't fit in 32bit, fail the setup + * rather than pretending to be successful. + */ + if (q_pfn >> 32) { + dev_err(&vdev->dev, + "platform bug: legacy virtio-mmio must not be used with RAM above 0x%llxGB\n", + 0x1ULL << (32 + PAGE_SHIFT - 30)); + return -E2BIG; + } + + writel(PAGE_SIZE, + vm_dev->base + VIRTIO_MMIO_QUEUE_ALIGN); + writel(q_pfn, vm_dev->base + VIRTIO_MMIO_QUEUE_PFN); + } else { + u64 addr; + + addr = virtqueue_get_desc_addr(vq); + writel((u32)addr, + vm_dev->base + VIRTIO_MMIO_QUEUE_DESC_LOW); + writel((u32)(addr >> 32), + vm_dev->base + VIRTIO_MMIO_QUEUE_DESC_HIGH); + + addr = virtqueue_get_avail_addr(vq); + writel((u32)addr, + vm_dev->base + VIRTIO_MMIO_QUEUE_AVAIL_LOW); + writel((u32)(addr >> 32), + vm_dev->base + VIRTIO_MMIO_QUEUE_AVAIL_HIGH); + + addr = virtqueue_get_used_addr(vq); + writel((u32)addr, + vm_dev->base + VIRTIO_MMIO_QUEUE_USED_LOW); + writel((u32)(addr >> 32), + vm_dev->base + VIRTIO_MMIO_QUEUE_USED_HIGH); + + writel(1, vm_dev->base + VIRTIO_MMIO_QUEUE_READY); + } + } + + return 0; +} + static void vm_synchronize_cbs(struct virtio_device *vdev) { struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); @@ -528,6 +587,7 @@ static const struct virtio_config_ops virtio_mmio_config_ops = { .reset = vm_reset, .find_vqs = vm_find_vqs, .del_vqs = vm_del_vqs, + .reset_vqs = vm_reset_vqs, .get_features = vm_get_features, .finalize_features = vm_finalize_features, .bus_name = vm_bus_name, @@ -553,8 +613,27 @@ static int virtio_mmio_restore(struct device *dev) return virtio_device_restore(&vm_dev->vdev); } +static int virtio_mmio_freeze_noirq(struct device *dev) +{ + struct virtio_mmio_device *vm_dev = dev_get_drvdata(dev); + + return virtio_device_freeze_noirq(&vm_dev->vdev); +} + +static int virtio_mmio_restore_noirq(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_noirq(&vm_dev->vdev); +} + static const struct dev_pm_ops virtio_mmio_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(virtio_mmio_freeze, virtio_mmio_restore) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(virtio_mmio_freeze_noirq, + virtio_mmio_restore_noirq) }; #endif -- 2.34.1