From nobody Sat Jun 29 15:40:10 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1698484671; cv=none; d=zohomail.com; s=zohoarc; b=TM4KR/oSNvbe6+TOdkTijSSxm2x/gvWc1zHSsJAcLfrEsUiaxmYKyhnrk/mPQvCbkKDhGCR56M+5EKnWh2RsEzJxbI6gmJG2MwVwrLzMH+SRHtpIFn4o0Wyc7H5j1SQI1qFYngSgNI/ut+jTTIcNi+++TqsH98wYIWSyxnxUIwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698484671; 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=Wi4p1sAuChlWfUU4ra+G274cuGU0HLuvHEq0YGgvFkE=; b=cmBaRZBsPsoopFHo/x6Q3bw3CwlutiGZ1pyCS0Iap+al5YKRhuNlHSsnJJ/no8AIiA4/FUl202nqn6C/7RTUVGGfhbebvv3KtUj+cUec8pVSjAsBy5pVFCMcup0Kuqf5lP22mRnvOMd3kh1VGnYliwJJlZbkNLiAt0GYgKU80So= 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 1698484671157532.23828474735; Sat, 28 Oct 2023 02:17:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qwfQm-0004bY-7a; Sat, 28 Oct 2023 05:16:32 -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 1qwfQc-0004Y0-6H for qemu-devel@nongnu.org; Sat, 28 Oct 2023 05:16:24 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwfQa-0007LL-Jc for qemu-devel@nongnu.org; Sat, 28 Oct 2023 05:16:21 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-542d3e47fd5so658182a12.0 for ; Sat, 28 Oct 2023 02:16:19 -0700 (PDT) Received: from Provence.localdomain (dynamic-089-012-044-170.89.12.pool.telefonica.de. [89.12.44.170]) by smtp.gmail.com with ESMTPSA id q23-20020a50c357000000b00542df4a03d0sm571444edb.16.2023.10.28.02.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Oct 2023 02:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698484578; x=1699089378; darn=nongnu.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=Wi4p1sAuChlWfUU4ra+G274cuGU0HLuvHEq0YGgvFkE=; b=amrrpOXYDq0e44g/PPgWQSsRKR4om9awERmTA9EtZg/iMAm71yskBLzO8kk4wxT9BP dJnN7JiV0ANpYUpKnzMNypUZ38cdfS21wfCPJI50n/zHLHvSAM3DWm9qdrYv8f0LonT8 8QzXjE5JzJPR8tNZGS1YSK1kUV2H6EA6FNNvI2xglhSzGIQde3uTDykTzICJrk29c3i4 yYMJiYir0VDEa5m92r3+UaX+LlvIQqlCgvD04x2wau/Uk5Skp9XzE5yJA5pN7JQ129S/ 1FAf9kMA7ZG7nt+uTBuXYgvbbUDDkOPQwT//A4LM+sKRQx6miDraO//sws8qNrzSDyXw 5qqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698484578; x=1699089378; 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=Wi4p1sAuChlWfUU4ra+G274cuGU0HLuvHEq0YGgvFkE=; b=eNnuD7brTBGDkky/xKYeT7FdVAZzt1wyhM81cZc2reMG8KKiCAsncXZoFb8EfDnB8R OTlpBR2vuOSqjxsMwoeCSv+FN9BtuU+dqQZ9HXA02yYUtv8RZshaKPiy1crjghogcSM1 1HT4Ap+ODJZtoFQF4gqfZB955DvNn8Ep+1Gij8z/70q62Ja61e0Nop2q1KvQ2u0ry22a KLtJIz+3wrctpU9MLR0cuiE8i4NF8vmlOqa7ZjbdrDpfrHhkH8Y/2/pmIv+LdqME5adx X7pURVfkf3zOsaoALJDWnret6FZBiro+TAlfRRGzxzzo6yqdhzmLfQzG0+yoiIiyZtwU grrQ== X-Gm-Message-State: AOJu0YxP3CYhtmmmx7GTFz8/GPi5FE/HTVJk+5tD3Zxhtyx0MmhpVCp9 SUeG9KSZ8sQGhzBZM/8QMyp5OU/GCHE= X-Google-Smtp-Source: AGHT+IG0CIwc3IYLrssR3ntG503WjKwg/WI1LDPgOCHA78sutJDtZScVM7bvaKAMse+n3KpIwdmnbg== X-Received: by 2002:a50:fa93:0:b0:533:4c15:c337 with SMTP id w19-20020a50fa93000000b005334c15c337mr4217563edr.16.1698484577507; Sat, 28 Oct 2023 02:16:17 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: BALATON Zoltan , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bernhard Beschow Subject: [PATCH v5 3/5] hw/isa/vt82c686: Reuse acpi_update_sci() Date: Sat, 28 Oct 2023 11:16:04 +0200 Message-ID: <20231028091606.23700-4-shentey@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028091606.23700-1-shentey@gmail.com> References: <20231028091606.23700-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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=shentey@gmail.com; helo=mail-ed1-x529.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 @gmail.com) X-ZM-MESSAGEID: 1698484672381100003 Content-Type: text/plain; charset="utf-8" acpi_update_sci() covers everything pm_update_sci() does. It implements com= mon ACPI funtionality in a generic fashion. Note that it agnostic to any Frankenstein usage of the general purpose event registers in other device models. It just implements a generic mechanism which can be wired to arbitr= ary functionality. Signed-off-by: Bernhard Beschow --- hw/isa/vt82c686.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 60ca781e03..7b44ad9485 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -145,26 +145,10 @@ static const MemoryRegionOps pm_io_ops =3D { }, }; =20 -static void pm_update_sci(ViaPMState *s) -{ - int sci_level, pmsts; - - pmsts =3D acpi_pm1_evt_get_sts(&s->ar); - sci_level =3D (((pmsts & s->ar.pm1.evt.en) & - (ACPI_BITMASK_RT_CLOCK_ENABLE | - ACPI_BITMASK_POWER_BUTTON_ENABLE | - ACPI_BITMASK_GLOBAL_LOCK_ENABLE | - ACPI_BITMASK_TIMER_ENABLE)) !=3D 0); - qemu_set_irq(s->sci_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)); -} - static void pm_tmr_timer(ACPIREGS *ar) { ViaPMState *s =3D container_of(ar, ViaPMState, ar); - pm_update_sci(s); + acpi_update_sci(&s->ar, s->sci_irq); } =20 static void via_pm_reset(DeviceState *d) @@ -182,7 +166,7 @@ static void via_pm_reset(DeviceState *d) acpi_pm1_cnt_reset(&s->ar); acpi_pm_tmr_reset(&s->ar); acpi_gpe_reset(&s->ar); - pm_update_sci(s); + acpi_update_sci(&s->ar, s->sci_irq); =20 pm_io_space_update(s); smb_io_space_update(s); --=20 2.42.0