From nobody Wed Oct 23 00:39:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1727172263; cv=none; d=zohomail.com; s=zohoarc; b=R1p45Q0rbDfyhisgEbsoWCztqBkSL6RvR/6M7YAl5EyhJiORD8H5xa1EPHN+foOHqE11ntx6f4VB9FDQLfzOrTKmbwffe/xojXfNrf9mwWJP5laIXnn4cd0ZMxv/0muLHGG7nVXr9VjNYG82DF/v6fNv95WZv+sU0gCxh9jLy0w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727172263; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YZBWguW1/yxKfTN4VFQnwjD6U0kQnYjphKMOOnuruhE=; b=klCbeG28fsNNovdkN/5IeXfaDpDkP1yD28t4QyYXliGe/Efj9LV9UIimqc342z2QNgQRoAnLD/Tg9ic9f5xwQBV2PW5sUriJpQu31CEowX9aIciEt2mOc55sy7PBsNAkcik6p+uHsqXeD0y9/QXnsvb989Funo0smHqWrLeo0Xk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727172263625716.3907328744613; Tue, 24 Sep 2024 03:04:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1st2Og-0002VZ-JD; Tue, 24 Sep 2024 06:03:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1st2Oa-0002Db-TK for qemu-devel@nongnu.org; Tue, 24 Sep 2024 06:03:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1st2OX-000311-VI for qemu-devel@nongnu.org; Tue, 24 Sep 2024 06:03:47 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-227-JpgQ47lWMRKJvxxVLZpcQA-1; Tue, 24 Sep 2024 06:03:43 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A621219B9AA9; Tue, 24 Sep 2024 10:03:42 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.22.16.106]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A37C71956052; Tue, 24 Sep 2024 10:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727172224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YZBWguW1/yxKfTN4VFQnwjD6U0kQnYjphKMOOnuruhE=; b=U9uuu4xqROfNMT4+EqSpxG82DOSp0rx/QbJs7NuHTmJYWqgihqJZER0GKqubHZ1SbAK2og 6PBMIBoHvBwJ1qxXSbsVc1TR6zKmk8GOZ2rI4dJPAq53dgmfs5JBp1s9ij7KrDeffAbcOJ 6yfIzYL/fs/BBihSZIwgF6qgUd1HDCg= X-MC-Unique: JpgQ47lWMRKJvxxVLZpcQA-1 From: David Hildenbrand To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Paolo Bonzini , David Hildenbrand , Juraj Marcin Subject: [PULL 3/6] reset: Add RESET_TYPE_WAKEUP Date: Tue, 24 Sep 2024 12:03:26 +0200 Message-ID: <20240924100329.248738-4-david@redhat.com> In-Reply-To: <20240924100329.248738-1-david@redhat.com> References: <20240924100329.248738-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1727172264732116600 Content-Type: text/plain; charset="utf-8" From: Juraj Marcin Some devices need to distinguish cold start reset from waking up from a suspended state. This patch adds new value to the enum, and updates the i386 wakeup method to use this new reset type. Message-ID: <20240904103722.946194-3-jmarcin@redhat.com> Reviewed-by: David Hildenbrand Signed-off-by: Juraj Marcin Signed-off-by: David Hildenbrand --- docs/devel/reset.rst | 12 +++++++++++- hw/i386/pc.c | 2 +- include/hw/resettable.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/devel/reset.rst b/docs/devel/reset.rst index ed41e09f16..74c7c0171a 100644 --- a/docs/devel/reset.rst +++ b/docs/devel/reset.rst @@ -44,6 +44,17 @@ The Resettable interface handles reset types with an enu= m ``ResetType``: value on each cold reset, such as RNG seed information, and which they must not reinitialize on a snapshot-load reset. =20 +``RESET_TYPE_WAKEUP`` + If the machine supports waking up from a suspended state and needs to re= set + its devices during wake-up (from the ``MachineClass::wakeup()`` method),= this + reset type should be used for such a request. Devices can utilize this r= eset + type to differentiate the reset requested during machine wake-up from ot= her + reset requests. For example, RAM content must not be lost during wake-up= , and + memory devices like virtio-mem that provide additional RAM must not reset + such state during wake-ups, but might do so during cold resets. However,= this + reset type should not be used for wake-up detection, as not every machine + type issues a device reset request during wake-up. + ``RESET_TYPE_S390_CPU_NORMAL`` This is only used for S390 CPU objects; it clears interrupts, stops processing, and clears the TLB, but does not touch register contents. @@ -53,7 +64,6 @@ The Resettable interface handles reset types with an enum= ``ResetType``: ``RESET_TYPE_S390_CPU_NORMAL`` does and also clears the PSW, prefix, FPC, timer and control registers. It does not touch gprs, fprs or acrs. =20 - Devices which implement reset methods must treat any unknown ``ResetType`` as equivalent to ``RESET_TYPE_COLD``; this will reduce the amount of existing code we need to change if we add more types in future. diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 79a626a3eb..80a65d965f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1732,7 +1732,7 @@ static void pc_machine_reset(MachineState *machine, R= esetType type) static void pc_machine_wakeup(MachineState *machine) { cpu_synchronize_all_states(); - pc_machine_reset(machine, RESET_TYPE_COLD); + pc_machine_reset(machine, RESET_TYPE_WAKEUP); cpu_synchronize_all_post_reset(); } =20 diff --git a/include/hw/resettable.h b/include/hw/resettable.h index 94f6f22e3c..fd862f1e9f 100644 --- a/include/hw/resettable.h +++ b/include/hw/resettable.h @@ -29,6 +29,7 @@ typedef struct ResettableState ResettableState; * Types of reset. * * + Cold: reset resulting from a power cycle of the object. + * + Wakeup: reset resulting from a wake-up from a suspended state. * * TODO: Support has to be added to handle more types. In particular, * ResettableState structure needs to be expanded. @@ -36,6 +37,7 @@ typedef struct ResettableState ResettableState; typedef enum ResetType { RESET_TYPE_COLD, RESET_TYPE_SNAPSHOT_LOAD, + RESET_TYPE_WAKEUP, RESET_TYPE_S390_CPU_INITIAL, RESET_TYPE_S390_CPU_NORMAL, } ResetType; --=20 2.46.1