From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DCABEC7EE29 for ; Thu, 8 Jun 2023 15:14:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7HL1-00076J-S7; Thu, 08 Jun 2023 11:14:11 -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 1q7HL0-000750-Pv for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:14:10 -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 1q7HKx-00080s-Le for qemu-devel@nongnu.org; Thu, 08 Jun 2023 11:14:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686237245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tHt4SuKFySu7m7c/dfUOeHzbeRgWiOEFKPaCihDYKJc=; b=WKtt86+EHv78ENVXH+s5kzIaYPJboEWG8G0D9mjO4w0mRcu3nTIYp1/eKoMFSmReP3wGbt b0LEqhfqKKh5qfHAmtz1se5cNBwilUC4j8dMgID1+ZisrKgY/2a+G9US23zCI078s58EK2 UNeDqfkXsmZWsv/ggSSXR92FS4xdRFM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-187-Ic1hDesxPji2YKWEOGMRFg-1; Thu, 08 Jun 2023 11:14:04 -0400 X-MC-Unique: Ic1hDesxPji2YKWEOGMRFg-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3f6089a9689so4717555e9.1 for ; Thu, 08 Jun 2023 08:14:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686237243; x=1688829243; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tHt4SuKFySu7m7c/dfUOeHzbeRgWiOEFKPaCihDYKJc=; b=iXYA7jLtvFK974OYhm4gtPkjyEt0EXAy2WgC1gQZrEYi9vWVkEtEO+jjYPMXYZkqLk gx5EHUI80OlVDHrY7my2GUVhdBFAUdO1+J/+R+8HKWVCxJEKl5pdwhjAC/Ze2CQIQewL SsYcOd0DB48qXyrqucr8EEL98IjDzFxCQcymoufuRapJ0Blj9182iV6eFVxkekBEBwK5 6gw9fzzZOMaDqrRvQX03enRxiFbpQKhNeQveipvm1AlEyXhsidjO6IndUZQgyQSUM4po 4cNK53JgQ6d0zcrRr6jxrovsDmY7eI8EfdneJdc8rWE557gCTlMQcsN156HF73Bx4sZq 7dNQ== X-Gm-Message-State: AC+VfDxF1TLzzlcFrINgOjfn7AAIMU1yoUxpLdrjuYSLuw8pkUEY5PG5 ZZO8yZPn4yuqE+D8qyXE3/b4ryHFDLFgi7Y50RPA7uCH9YQa2XMdZrdu2PcxW6J6P6G1vCEMY5y 0kj52sIGE0bGsXRY= X-Received: by 2002:a7b:c00b:0:b0:3f7:b1de:f95e with SMTP id c11-20020a7bc00b000000b003f7b1def95emr1736827wmb.0.1686237243112; Thu, 08 Jun 2023 08:14:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7StAxF9o69WJ7FV5ei6kcD5nrkTmO0cbJZmOXjb2oX4CLwhx6mICjf2b84ZgUdsUB2kxs4GA== X-Received: by 2002:a7b:c00b:0:b0:3f7:b1de:f95e with SMTP id c11-20020a7bc00b000000b003f7b1def95emr1736805wmb.0.1686237242748; Thu, 08 Jun 2023 08:14:02 -0700 (PDT) Received: from redhat.com ([2.55.4.169]) by smtp.gmail.com with ESMTPSA id hn32-20020a05600ca3a000b003f60e143d38sm2299031wmb.11.2023.06.08.08.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jun 2023 08:14:02 -0700 (PDT) Date: Thu, 8 Jun 2023 11:13:58 -0400 From: "Michael S. Tsirkin" To: Mark Cave-Ayland Cc: BALATON Zoltan , qemu-devel@nongnu.org, Igor Mammedov , Paolo Bonzini Subject: Re: [PATCH v2] hw/acpi: Fix PM control register access Message-ID: <20230608111241-mutt-send-email-mst@kernel.org> References: <20230607200125.A9988746377@zero.eik.bme.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Jun 08, 2023 at 12:37:08PM +0100, Mark Cave-Ayland wrote: > On 07/06/2023 21:01, BALATON Zoltan wrote: > > > On pegasos2 which has ACPI as part of VT8231 south bridge the board > > firmware writes PM control register by accessing the second byte so > > addr will be 1. This wasn't handled correctly and the write went to > > addr 0 instead. Remove the acpi_pm1_cnt_write() function which is used > > only once and does not take addr into account and handle non-zero > > address in acpi_pm_cnt_{read|write}. This fixes ACPI shutdown with > > pegasos2 firmware. > > > > Signed-off-by: BALATON Zoltan > > --- > > hw/acpi/core.c | 52 +++++++++++++++++++++++++------------------------- > > 1 file changed, 26 insertions(+), 26 deletions(-) > > > > diff --git a/hw/acpi/core.c b/hw/acpi/core.c > > index 6da275c599..00b1e79a30 100644 > > --- a/hw/acpi/core.c > > +++ b/hw/acpi/core.c > > @@ -551,30 +551,6 @@ void acpi_pm_tmr_reset(ACPIREGS *ar) > > } > > /* ACPI PM1aCNT */ > > -static void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val) > > -{ > > - ar->pm1.cnt.cnt = val & ~(ACPI_BITMASK_SLEEP_ENABLE); > > - > > - if (val & ACPI_BITMASK_SLEEP_ENABLE) { > > - /* change suspend type */ > > - uint16_t sus_typ = (val >> 10) & 7; > > - switch (sus_typ) { > > - case 0: /* soft power off */ > > - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > > - break; > > - case 1: > > - qemu_system_suspend_request(); > > - break; > > - default: > > - if (sus_typ == ar->pm1.cnt.s4_val) { /* S4 request */ > > - qapi_event_send_suspend_disk(); > > - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > > - } > > - break; > > - } > > - } > > -} > > - > > void acpi_pm1_cnt_update(ACPIREGS *ar, > > bool sci_enable, bool sci_disable) > > { > > @@ -593,13 +569,37 @@ void acpi_pm1_cnt_update(ACPIREGS *ar, > > static uint64_t acpi_pm_cnt_read(void *opaque, hwaddr addr, unsigned width) > > { > > ACPIREGS *ar = opaque; > > - return ar->pm1.cnt.cnt; > > + return ar->pm1.cnt.cnt >> addr * 8; > > This shift here... > > > } > > static void acpi_pm_cnt_write(void *opaque, hwaddr addr, uint64_t val, > > unsigned width) > > { > > - acpi_pm1_cnt_write(opaque, val); > > + ACPIREGS *ar = opaque; > > + > > + if (addr == 1) { > > + val = val << 8 | (ar->pm1.cnt.cnt & 0xff); > > + } > > and this shift here look similar to my workaround in https://patchew.org/QEMU/20230524211104.686087-1-mark.cave-ayland@ilande.co.uk/20230524211104.686087-31-mark.cave-ayland@ilande.co.uk/ > which is a symptom of https://gitlab.com/qemu-project/qemu/-/issues/360. > > Whilst there is no imminent fix for the above issue, it may be worth a few > mins to determine if this is the same issue and if so document it with > comments accordingly as I did so that the workaround can be removed at a > later date. So I will add this triggers a but in memory core, (see https://gitlab.com/qemu-project/qemu/-/issues/360 for more detail) ? > > + ar->pm1.cnt.cnt = val & ~(ACPI_BITMASK_SLEEP_ENABLE); > > + > > + if (val & ACPI_BITMASK_SLEEP_ENABLE) { > > + /* change suspend type */ > > + uint16_t sus_typ = (val >> 10) & 7; > > + switch (sus_typ) { > > + case 0: /* soft power off */ > > + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > > + break; > > + case 1: > > + qemu_system_suspend_request(); > > + break; > > + default: > > + if (sus_typ == ar->pm1.cnt.s4_val) { /* S4 request */ > > + qapi_event_send_suspend_disk(); > > + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); > > + } > > + break; > > + } > > + } > > } > > static const MemoryRegionOps acpi_pm_cnt_ops = { > > > ATB, > > Mark.