From nobody Mon Feb 9 00:19:49 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1676565716; cv=none; d=zohomail.com; s=zohoarc; b=VOdaqkBCe9wOuRDGifiu37jmzaKC9rnLTU42HQLPsl/f3cv+khGivxB2V7DBIMTWbtMoF3YqQECzIJ/gnqxglsGDY4Y5upPDbyitZNxt/jGldOdIEU4au0W0mktaMVjXU4qZ/oR1a0iNURLS5CkTHNY1wVFp3ndr/s/vc9qlMMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676565716; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EoMLEEBeALy5RqHQol1x3kgq/xhZyhIr706Dydz1mcg=; b=dDDAhgaGIvFrL+duA2bCnPMHzJ1chmjau+gCyvnOd5T1FFwe/wBQbfQcbcN1R9L9by37DXqf7VK2iBwWkOBaxMqyGqCHQKG+Jdd6qzD0pOvlSX7YYHSGyQB5U0r8T2QTYQn+twRiTA9gYyUlyvVfYDQGyX+ac4ZsHQ4Kxkpyhr8= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1676565716031511.8255778939339; Thu, 16 Feb 2023 08:41:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pShKK-0004TB-NH; Thu, 16 Feb 2023 11:41:44 -0500 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 1pShKJ-0004LT-2r for qemu-devel@nongnu.org; Thu, 16 Feb 2023 11:41:43 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pShKG-0000W1-DW for qemu-devel@nongnu.org; Thu, 16 Feb 2023 11:41:42 -0500 Received: by mail-pl1-x62f.google.com with SMTP id o8so2580925pls.11 for ; Thu, 16 Feb 2023 08:41:39 -0800 (PST) Received: from kerodi.Dlink ([49.206.14.226]) by smtp.gmail.com with ESMTPSA id q20-20020a638c54000000b004fbd10af99asm1385243pgn.60.2023.02.16.08.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 08:41:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; 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=EoMLEEBeALy5RqHQol1x3kgq/xhZyhIr706Dydz1mcg=; b=ANBJwgPCNC6PbcfccAbxrHtxoSvqLoi80pDNv0YL5fb+C5flauy9u1vHjc0dEM9Njx SS7B5onBKUc3NmdznYAc3oNOwPQ0E1GdIeOWuJAySZcBRK3MtypMz3VwdvYCWtMCPWtx dr35tCYP8pVxVQfCqSOXlX2XhC89uiSwvxbaAtRJF6jEpNA8HyEHzT9nZHyMwucAustD 6BNK7S+7rGeHUqgAprP/00olah4g+Foey+wSC+SRCmkCOlcKjiLz1I5/AyGn3j3GqCVQ bscMjDYs1gphBi+kykJwaJ75c5jLpRfFuNIR3HT6eKZ/75AIgVm4+EFWLwMvddMGQ9Bd bSRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EoMLEEBeALy5RqHQol1x3kgq/xhZyhIr706Dydz1mcg=; b=gMxFlFRwlC/QHflMOJdVSWod7iiVdjSXBbiXLmE3GDYVJEOpKoG8E2hDMyVDrFjMVP pqEZZPj9MEvy7bP5SJba/DjgPSMIdCUjhaLDh3S6VK/6yIEkwJfpE7AMb+FolxdVWZWj 3w4QJTPHTHZANfUAQ2ybQHOsGmE4N6Bqp9E19t5Z6Emdqe12/b/1BirL5TBH/vHsONdq IDGQ6QJ4n0JBrY8e9Yg//zIz3lByW5FLi7HElg11ac/fHqjFsT+HrOiyfp/mDlAuCbej R08rrrbJrPOKpRoDiCzQyKlO/ZsQm8ZQsPVYq3KAgOFL+OGRbUDVsTEDsK/Jzyb3ukmc oaXg== X-Gm-Message-State: AO0yUKWOrLRsMrFQfShGO+S+F8BcFVAzLuk9HdL1tXbnqUACPbTc4JqW 8A+myKfenbzQl7emObLlwHVmfg== X-Google-Smtp-Source: AK7set96TadgyeuAadPBG/2PYEBLzHT4t3cBwnGEfL1yCFmuloVcH+zhipQOI161SxzEFOzLl+8x+A== X-Received: by 2002:a17:90b:1a88:b0:234:b964:5707 with SMTP id ng8-20020a17090b1a8800b00234b9645707mr821815pjb.16.1676565698843; Thu, 16 Feb 2023 08:41:38 -0800 (PST) From: Sunil V L To: Palmer Dabbelt , Alistair Francis , Bin Meng Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Andrew Jones , Anup Patel , Atish Kumar Patra , Daniel Henrique Barboza , Sunil V L Subject: [PATCH V3 2/8] hw/riscv/virt: Add a switch to disable ACPI Date: Thu, 16 Feb 2023 22:11:19 +0530 Message-Id: <20230216164125.1945633-3-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230216164125.1945633-1-sunilvl@ventanamicro.com> References: <20230216164125.1945633-1-sunilvl@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::62f; envelope-from=sunilvl@ventanamicro.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 @ventanamicro.com) X-ZM-MESSAGEID: 1676565717802100003 Content-Type: text/plain; charset="utf-8" ACPI will be enabled by default. Add a switch to turn off for testing and debug purposes. Signed-off-by: Sunil V L Reviewed-by: Andrew Jones --- hw/riscv/virt.c | 29 +++++++++++++++++++++++++++++ include/hw/riscv/virt.h | 2 ++ 2 files changed, 31 insertions(+) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 1621278eb8..8df37cf3d6 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -50,6 +50,7 @@ #include "hw/pci-host/gpex.h" #include "hw/display/ramfb.h" #include "hw/acpi/aml-build.h" +#include "qapi/qapi-visit-common.h" =20 /* * The virt machine physical address space used by some of the devices @@ -1518,6 +1519,7 @@ static void virt_machine_instance_init(Object *obj) =20 s->oem_id =3D g_strndup(ACPI_BUILD_APPNAME6, 6); s->oem_table_id =3D g_strndup(ACPI_BUILD_APPNAME8, 8); + s->acpi =3D ON_OFF_AUTO_AUTO; } =20 static char *virt_get_aia_guests(Object *obj, Error **errp) @@ -1592,6 +1594,28 @@ static void virt_set_aclint(Object *obj, bool value,= Error **errp) s->have_aclint =3D value; } =20 +bool virt_is_acpi_enabled(RISCVVirtState *s) +{ + return s->acpi !=3D ON_OFF_AUTO_OFF; +} + +static void virt_get_acpi(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + RISCVVirtState *s =3D RISCV_VIRT_MACHINE(obj); + OnOffAuto acpi =3D s->acpi; + + visit_type_OnOffAuto(v, name, &acpi, errp); +} + +static void virt_set_acpi(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + RISCVVirtState *s =3D RISCV_VIRT_MACHINE(obj); + + visit_type_OnOffAuto(v, name, &s->acpi, errp); +} + static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *mach= ine, DeviceState *dev) { @@ -1663,6 +1687,11 @@ static void virt_machine_class_init(ObjectClass *oc,= void *data) sprintf(str, "Set number of guest MMIO pages for AIA IMSIC. Valid valu= e " "should be between 0 and %d.", VIRT_IRQCHIP_MAX_GUESTS); object_class_property_set_description(oc, "aia-guests", str); + object_class_property_add(oc, "acpi", "OnOffAuto", + virt_get_acpi, virt_set_acpi, + NULL, NULL); + object_class_property_set_description(oc, "acpi", + "Enable ACPI"); } =20 static const TypeInfo virt_machine_typeinfo =3D { diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 6c7885bf89..62efebaa32 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -58,6 +58,7 @@ struct RISCVVirtState { int aia_guests; char *oem_id; char *oem_table_id; + OnOffAuto acpi; }; =20 enum { @@ -123,4 +124,5 @@ enum { #define FDT_APLIC_INT_MAP_WIDTH (FDT_PCI_ADDR_CELLS + FDT_PCI_INT_CELLS + \ 1 + FDT_APLIC_INT_CELLS) =20 +bool virt_is_acpi_enabled(RISCVVirtState *s); #endif --=20 2.34.1