From nobody Sat May 4 21:25:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1675028133; cv=none; d=zohomail.com; s=zohoarc; b=P/+VRXG8glS05N8J54JYGCs4BhRwfd3r0TexKqQ2xXcKMAWlMdwySlKhb/zptFgR91HgA/661hVla/rjDRo8P40nL56N7zWS6CwBCHNYwFCY6wm95TuvOrz/gw5i9FTDFf5OOS8fGk36DVFEY2zNsCOWGgtafp3g9Al/t/DW2ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675028133; 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=JadtpMa7DrfVYGf0i2ahJZaP7MUyVL38zp2RXdr9vK0=; b=cZ2/uMKZcbFp7qoo5nr47A+85HNbiODLb2zmqyXeyJ0Lz8dRv9f12PRpKRAy0SK5aJ74UbPUrKvvYumT2SqrrK96b8BRcR0R05H1nvj4sX5PpDjSEq7ov+VQ95Rof2D/3eRQFiUrDMdBIJtkf3rOSlts/mjC93BcXTYsgs8CMZ4= 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+importer2=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 1675028133990229.69979317226625; Sun, 29 Jan 2023 13:35:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMFJw-0002Pv-Lf; Sun, 29 Jan 2023 16:34:40 -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 1pMFJu-0002Og-L5 for qemu-devel@nongnu.org; Sun, 29 Jan 2023 16:34:38 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMFJt-0001Ls-1e for qemu-devel@nongnu.org; Sun, 29 Jan 2023 16:34:38 -0500 Received: by mail-ed1-x52a.google.com with SMTP id fi26so9246440edb.7 for ; Sun, 29 Jan 2023 13:34:36 -0800 (PST) Received: from localhost.localdomain ([46.183.103.17]) by smtp.gmail.com with ESMTPSA id d1-20020aa7d681000000b0049be07c9ff5sm5831220edr.4.2023.01.29.13.34.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 13:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=JadtpMa7DrfVYGf0i2ahJZaP7MUyVL38zp2RXdr9vK0=; b=P+1gPNOlpaSzSsVYz5ligiEIkoMxrbb3smmEElmfd9u4FddwHbns66bE2H3bXqYhWl dHHmR035QC3XfKi1Cgc9/oRgyg2DcGj+Qs2mySTXoSaczFLnJESkqUIGUuPgedKe63xk iMTcd33W8/EFDRIIIFVE4LVYEUcO3b4sf/P/l/V42LRy4C//E2mWfeuj2/7F6oOMOa96 6/hDpWR140ONFpzWYbZPiKA8hJnjGjYqQlL30EUe+Fgz9jr+Hcc27pYxyd+sm2cYzrgH WsmNDUevkrd7+keGrO749LUl/AIzHWLkc7hxfzpLG5xgpCeaVQUKDTt9tttKL68FqgZf 6XoQ== 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=JadtpMa7DrfVYGf0i2ahJZaP7MUyVL38zp2RXdr9vK0=; b=KJcUC1sSvXFtRLVUiofX8uxOTYZ/z1Dc0gB6vqhhBNra30pLMpAp0Rhq6FvsTuzvqS PiiJiJxQdZrCA3phAOwYYUOMKst1aVeJlPw7oWtQky5L/uWJsNoNHwl5cUJpiMV716XE EWwAieuOkMKMB/kMsm4CKUisOZMpy7Fp5HTk/RDehMsXo2RKVRBikah3qND8PH6gpSPQ utaOaNxshi6JJHm7MEL1qeiURMMJOubfuWoLQGoCE2eb6h0U24C9LC4yeHWfkShFolpV m11mCTd248gD1O5h1vVUxN19PcoswpWNX3NUUyVkfP6NcQxRCHv+ZjIvZwR2T0SETCyE RgUQ== X-Gm-Message-State: AFqh2kqXjvR+r/Z9WkGSWWJJeHQ+p5xrxE8+dLhzr8StCbz7Aj62McS6 cUV4KhINWl0B1V2QCKMe1ZO7sVSUC3c= X-Google-Smtp-Source: AMrXdXtroKdAEVh48bNrSqJvkcUTbsPnCMI4pkgBbs8b6Zc13poLH0Dms2i9tc4lqv9DTGR2pG/LHw== X-Received: by 2002:a05:6402:43c4:b0:49e:8425:6033 with SMTP id p4-20020a05640243c400b0049e84256033mr41567703edc.28.1675028074639; Sun, 29 Jan 2023 13:34:34 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Huacai Chen , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH 1/3] hw/isa/vt82c686: Fix SCI routing Date: Sun, 29 Jan 2023 22:34:16 +0100 Message-Id: <20230129213418.87978-2-shentey@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230129213418.87978-1-shentey@gmail.com> References: <20230129213418.87978-1-shentey@gmail.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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=shentey@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1675028136054100004 Content-Type: text/plain; charset="utf-8" According to the PCI specification, the hardware is not supposed to use PCI_INTERRUPT_PIN for interrupt routing. Use the dedicated ACPI Interrupt Select register for SCI routing instead. Signed-off-by: Bernhard Beschow --- hw/isa/vt82c686.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 3f9bd0c04d..2189be6f20 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -46,6 +46,8 @@ struct ViaPMState { ACPIREGS ar; APMState apm; PMSMBus smb; + + qemu_irq irq; }; =20 static void pm_io_space_update(ViaPMState *s) @@ -148,18 +150,7 @@ static void pm_update_sci(ViaPMState *s) ACPI_BITMASK_POWER_BUTTON_ENABLE | ACPI_BITMASK_GLOBAL_LOCK_ENABLE | ACPI_BITMASK_TIMER_ENABLE)) !=3D 0); - if (pci_get_byte(s->dev.config + PCI_INTERRUPT_PIN)) { - /* - * FIXME: - * Fix device model that realizes this PM device and remove - * this work around. - * The device model should wire SCI and setup - * PCI_INTERRUPT_PIN properly. - * If PIN# =3D 0(interrupt pin isn't used), don't raise SCI as - * work around. - */ - pci_set_irq(&s->dev, sci_level); - } + qemu_set_irq(s->irq, sci_level); /* schedule a timer interruption if needed */ acpi_pm_tmr_update(&s->ar, (s->ar.pm1.evt.en & ACPI_BITMASK_TIMER_ENAB= LE) && !(pmsts & ACPI_BITMASK_TIMER_STATUS)); @@ -213,6 +204,13 @@ static void via_pm_realize(PCIDevice *dev, Error **err= p) acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2, false); } =20 +static void via_pm_init(Object *obj) +{ + ViaPMState *s =3D VIA_PM(obj); + + qdev_init_gpio_out(DEVICE(obj), &s->irq, 1); +} + typedef struct via_pm_init_info { uint16_t device_id; } ViaPMInitInfo; @@ -238,6 +236,7 @@ static void via_pm_class_init(ObjectClass *klass, void = *data) static const TypeInfo via_pm_info =3D { .name =3D TYPE_VIA_PM, .parent =3D TYPE_PCI_DEVICE, + .instance_init =3D via_pm_init, .instance_size =3D sizeof(ViaPMState), .abstract =3D true, .interfaces =3D (InterfaceInfo[]) { @@ -568,6 +567,21 @@ static const VMStateDescription vmstate_via =3D { } }; =20 +static void via_isa_set_pm_irq(void *opaque, int n, int level) +{ + ViaISAState *s =3D opaque; + uint8_t irq =3D pci_get_byte(s->pm.dev.config + 0x42) & 0xf; + + if (irq =3D=3D 2) { + qemu_log_mask(LOG_GUEST_ERROR, "IRQ 2 for PM controller is reserve= d"); + return; + } + + if (irq !=3D 0) { + qemu_set_irq(s->isa_irqs[irq], level); + } +} + static void via_isa_init(Object *obj) { ViaISAState *s =3D VIA_ISA(obj); @@ -578,6 +592,8 @@ static void via_isa_init(Object *obj) object_initialize_child(obj, "uhci2", &s->uhci[1], TYPE_VT82C686B_USB_= UHCI); object_initialize_child(obj, "ac97", &s->ac97, TYPE_VIA_AC97); object_initialize_child(obj, "mc97", &s->mc97, TYPE_VIA_MC97); + + qdev_init_gpio_in_named(DEVICE(obj), via_isa_set_pm_irq, "sci", 1); } =20 static const TypeInfo via_isa_info =3D { @@ -664,6 +680,8 @@ static void via_isa_realize(PCIDevice *d, Error **errp) if (!qdev_realize(DEVICE(&s->pm), BUS(pci_bus), errp)) { return; } + qdev_connect_gpio_out(DEVICE(&s->pm), 0, + qdev_get_gpio_in_named(DEVICE(d), "sci", 0)); =20 /* Function 5: AC97 Audio */ qdev_prop_set_int32(DEVICE(&s->ac97), "addr", d->devfn + 5); --=20 2.39.1 From nobody Sat May 4 21:25:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1675028143; cv=none; d=zohomail.com; s=zohoarc; b=k/+HFUrfM4pdNaCa0sn8TBVeVgZ+s2bDIgDCpV/b6as5Ea+ElPDBiRy8NwYhg8lUUBJZRZPPUFrX4XoXS7MJtewddlYOR/4w1K1kuQKWFbnQfudV/zv4ekJiTARAFAfGcfTsSJBdM6IWNrUcNYh0s5/dSs0E2go6LQOwM2EzgNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675028143; 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=g0s4LRa/makxygYBgDhNmGrmQZc7h77dDyIM/yLM5Qg=; b=BMiV3r70Pa5UXyTW0u43IJtZ/cwhsEOWvRGtdScgY902uPie/OhYTpe/1KpTxYA1YZ7VEIAaFbmN+clEhhRkyZWRKCrrRRXD2QRQujv73PnHhiqhvvoEAj2WILJviyM1sp/wXn60JA9+vURcZxgCPrzmw734Hl2QQ4EWxAfG09Y= 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+importer2=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 167502814314985.7041237612226; Sun, 29 Jan 2023 13:35:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMFJv-0002PG-O1; Sun, 29 Jan 2023 16:34:39 -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 1pMFJu-0002Oh-Lz for qemu-devel@nongnu.org; Sun, 29 Jan 2023 16:34:38 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMFJt-0001Lu-7e for qemu-devel@nongnu.org; Sun, 29 Jan 2023 16:34:38 -0500 Received: by mail-ed1-x52a.google.com with SMTP id x7so6027530edr.0 for ; Sun, 29 Jan 2023 13:34:36 -0800 (PST) Received: from localhost.localdomain ([46.183.103.17]) by smtp.gmail.com with ESMTPSA id d1-20020aa7d681000000b0049be07c9ff5sm5831220edr.4.2023.01.29.13.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 13:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=g0s4LRa/makxygYBgDhNmGrmQZc7h77dDyIM/yLM5Qg=; b=bLbGj0DkYKgkMmiKnZnDbcMbIYgHf/1aZid7c9bml2Caz6F3MR9abbzJwI/xEbWnZz yEg2uSRqpldrWC6wIkl0vTuHer7TG3VsEXwQ/DUg0p2xw4zbA9JYAUHEv5WgGfEdOkhK AFDYcQTzAC3bPb8+py3m+cz4166JfgkN4AWqAXsZMabidtBSHvf8mL3fLRNGqh9klcLv f22gBAk9JwQdarVVtZWrDdMjlgkIxt0q28Sk5bXlTGeaE2CK9KYP8R4ho9b4qbCwtO0N s2xGsk82cxUPTIhwAAoyDFZH9ahg3K+Knw44BkWU/ilR9lC3QXTkT8CkBR6JCiJ2TRpo Nqmg== 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=g0s4LRa/makxygYBgDhNmGrmQZc7h77dDyIM/yLM5Qg=; b=EwgcAl2/QJEPkRGjEuo3JWg8smZQbJu4HUSLDI/RBWNj2ELMggbUMS2Fg1H7ULnS/I y1wIBkw6gCev7WmhhGvCYg7I+OKKTCSkez5Uk4sPtLP/7zeLQcmjKwyI89ANk8bsujyE rZpAQO6u+3xG4flcoAGbie2MhpQeOkQqJQkfBSSP98p+VKo/0P70nnfxIS5ckPtzd7/d O17c2ahOtCHW5CIQoOqASmVyFS/CamtsGt/43Olz1C+vPXN4lNtiF/uFoVQeQY7+rRYl 7s89mzQ/WXhKF95JuUhp6wAx4TVTjmws9mJ2M+9bXz2y88uNyOYRIZ4nuvnjTuW4YI1c QWiw== X-Gm-Message-State: AFqh2kr7ocZNxAn3D2TsBMoeMGvJJDsheuXO6vpGOocPd6x/jixa2ioo YXjD1tOeOfkFiRjbLeh/ZsXo8tJuSag= X-Google-Smtp-Source: AMrXdXuCOsmHoG4D7DUz0e+PP5SOsiqyphrt8PUjgQwGU6/WSO/4os43dRtQzdjaTTdcdNCeoMllOA== X-Received: by 2002:a05:6402:1946:b0:48b:c8de:9d20 with SMTP id f6-20020a056402194600b0048bc8de9d20mr53795428edz.32.1675028075809; Sun, 29 Jan 2023 13:34:35 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Huacai Chen , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH 2/3] hw/isa/vt82c686: Allow PM controller to switch to ACPI mode Date: Sun, 29 Jan 2023 22:34:17 +0100 Message-Id: <20230129213418.87978-3-shentey@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230129213418.87978-1-shentey@gmail.com> References: <20230129213418.87978-1-shentey@gmail.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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=shentey@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1675028144001100003 Content-Type: text/plain; charset="utf-8" Adds missing functionality the real hardware supports. Signed-off-by: Bernhard Beschow --- hw/isa/vt82c686.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 2189be6f20..b0765d4ed8 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -37,6 +37,9 @@ #include "qemu/timer.h" #include "trace.h" =20 +#define ACPI_ENABLE 0xf1 +#define ACPI_DISABLE 0xf0 + #define TYPE_VIA_PM "via-pm" OBJECT_DECLARE_SIMPLE_TYPE(ViaPMState, VIA_PM) =20 @@ -50,6 +53,19 @@ struct ViaPMState { qemu_irq irq; }; =20 +static void via_pm_apm_ctrl_changed(uint32_t val, void *arg) +{ + ViaPMState *s =3D arg; + + /* ACPI specs 3.0, 4.7.2.5 */ + acpi_pm1_cnt_update(&s->ar, val =3D=3D ACPI_ENABLE, val =3D=3D ACPI_DI= SABLE); + if (val =3D=3D ACPI_ENABLE || val =3D=3D ACPI_DISABLE) { + return; + } + + qemu_log_mask(LOG_UNIMP, "%s: unimplemented value 0x%x", __func__, val= ); +} + static void pm_io_space_update(ViaPMState *s) { uint32_t pmbase =3D pci_get_long(s->dev.config + 0x48) & 0xff80UL; @@ -193,7 +209,7 @@ static void via_pm_realize(PCIDevice *dev, Error **errp) memory_region_add_subregion(pci_address_space_io(dev), 0, &s->smb.io); memory_region_set_enabled(&s->smb.io, false); =20 - apm_init(dev, &s->apm, NULL, s); + apm_init(dev, &s->apm, via_pm_apm_ctrl_changed, s); =20 memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s, "via-pm", 12= 8); memory_region_add_subregion(pci_address_space_io(dev), 0, &s->io); --=20 2.39.1 From nobody Sat May 4 21:25:12 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1675028136; cv=none; d=zohomail.com; s=zohoarc; b=Fp37HZsBUGV6FWzjDgcpaMcS0CdyZjxkXwdzAe7ERbSpWK0o9Y976a5QLka4r2mpFfYcH5y/YbqkOzBAoKpUWk+fATSsbLeGyhPZ6ooid/+Mtk+5qx+3VTxhV8+DFlUWysJbq4dA+DA02TpZjkPrpLo7JAfXf8zU48ix9a+n5EA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675028136; 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=yk47PqZmuOTiniLSu6qFGT/8lOr+9kd9+ln4IWTKIHI=; b=cxgWXi+DpUVmI+x+z6b2on8FY0vWZ1HAx5cp4Q4AOQ0F3jAcfzKzdrHHLBgdLxqRcu8Ab+HhDZGi56QEump1P4b8Kjy9Bh7rAh+BhYpQGpxnug7vktCvM4O+PJvDh3uYoRfgS3S93j3ITLpy/55zhK4BS5FznSUpGFwTrzGMwvk= 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+importer2=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 1675028136114660.9358434088361; Sun, 29 Jan 2023 13:35:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMFJy-0002Q2-6D; Sun, 29 Jan 2023 16:34:42 -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 1pMFJw-0002Pc-AU for qemu-devel@nongnu.org; Sun, 29 Jan 2023 16:34:40 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMFJu-0001MI-SA for qemu-devel@nongnu.org; Sun, 29 Jan 2023 16:34:40 -0500 Received: by mail-ed1-x534.google.com with SMTP id n6so6617335edo.9 for ; Sun, 29 Jan 2023 13:34:38 -0800 (PST) Received: from localhost.localdomain ([46.183.103.17]) by smtp.gmail.com with ESMTPSA id d1-20020aa7d681000000b0049be07c9ff5sm5831220edr.4.2023.01.29.13.34.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Jan 2023 13:34:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=yk47PqZmuOTiniLSu6qFGT/8lOr+9kd9+ln4IWTKIHI=; b=jcB2/DN5GQSDU6XT+v+JLKHif5Yk1QSlA8vScXPbaY0v9DZ2n7euV2cqVpLKWjJA5X KR/b+RriTUVO+CZDcmhNUnu7tYoDlKFhwklLQ0Suobc7N8isAZ83/T4TAh5RHhq4hNU5 uFtotzcrke3tqSn7k401T3BvtrWG/qKVBguS+EYEzEqm0KP8jNV/Oq3GI0oT9Z+xF0p4 BxCYXyAPo6INJKpRFvT5vFIEtPNPALsberGUM9fH+95w7J4PfRcUpTa9cjs7gwHBHrZX xGgZsngadYkUSYMQrYDjQsDarssqWrsYPJJCekmwU8IyxUdX1I6Zz4rR9T8n7WC0uZ8E eJzg== 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=yk47PqZmuOTiniLSu6qFGT/8lOr+9kd9+ln4IWTKIHI=; b=KsAc6d2XNB2qTogwgVTv9puiAtoRkny/vC+RmxS5CqIkTVTskDrh5dH8riKMSdILED N+jGUUxXnJKCyMFNtxiFY19R3zVNq4Xj/ifERMaW7FVCQttUpJuMeInAcSQKFi+d7D15 kaT6pvmnaU/EoL9SrW/jEDzu61Cg1q7F16C74j2ey8v2AocMwJdFi72edZvDtfc60PZ7 CUVya8TJztTQoLqkC5U5I1b7f4+8F+aExp054BjdCc7arE9r1srfRy3ys/TUemYMVPCB Tkl9CmNOlJPheC+7C9B4wCY7hXisSetN2eCPvIdsPTsmqrq696YPTBwe7iDeO6jYX33i Uq/Q== X-Gm-Message-State: AFqh2kqIqyOK/AtRMG+nOyDjB0UknIRClBx1kgu+CabnKcYzMPSje3qD lGh0GvTwCVLg00AHUGS/sQGkFOYSABc= X-Google-Smtp-Source: AMrXdXtf6WvLxlBNkdRG7d9Wzfh7Z3jcCJFTUdKgmA54kWd0OBMts1eK3T6tPQUGtMer5c3K766eXA== X-Received: by 2002:aa7:cc81:0:b0:47e:eaae:9a5b with SMTP id p1-20020aa7cc81000000b0047eeaae9a5bmr48468343edt.42.1675028077073; Sun, 29 Jan 2023 13:34:37 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Huacai Chen , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH 3/3] hw/isa/vt82c686: Implement ACPI powerdown Date: Sun, 29 Jan 2023 22:34:18 +0100 Message-Id: <20230129213418.87978-4-shentey@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230129213418.87978-1-shentey@gmail.com> References: <20230129213418.87978-1-shentey@gmail.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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=shentey@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1675028137882100007 Content-Type: text/plain; charset="utf-8" Signed-off-by: Bernhard Beschow --- hw/isa/vt82c686.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index b0765d4ed8..2db54d1649 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -33,8 +33,10 @@ #include "qapi/error.h" #include "qemu/log.h" #include "qemu/module.h" +#include "qemu/notify.h" #include "qemu/range.h" #include "qemu/timer.h" +#include "sysemu/runstate.h" #include "trace.h" =20 #define ACPI_ENABLE 0xf1 @@ -50,6 +52,8 @@ struct ViaPMState { APMState apm; PMSMBus smb; =20 + Notifier powerdown_notifier; + qemu_irq irq; }; =20 @@ -198,6 +202,14 @@ static void via_pm_reset(DeviceState *d) smb_io_space_update(s); } =20 +static void via_pm_powerdown_req(Notifier *n, void *opaque) +{ + ViaPMState *s =3D container_of(n, ViaPMState, powerdown_notifier); + + assert(s !=3D NULL); + acpi_pm1_evt_power_down(&s->ar); +} + static void via_pm_realize(PCIDevice *dev, Error **errp) { ViaPMState *s =3D VIA_PM(dev); @@ -218,6 +230,9 @@ static void via_pm_realize(PCIDevice *dev, Error **errp) acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io); acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2, false); + + s->powerdown_notifier.notify =3D via_pm_powerdown_req; + qemu_register_powerdown_notifier(&s->powerdown_notifier); } =20 static void via_pm_init(Object *obj) --=20 2.39.1