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 X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92233C433E0 for ; Wed, 17 Mar 2021 09:42:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0951C64F6C for ; Wed, 17 Mar 2021 09:42:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0951C64F6C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMShR-00026q-V9 for qemu-devel@archiver.kernel.org; Wed, 17 Mar 2021 05:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMSgr-0001g4-F6 for qemu-devel@nongnu.org; Wed, 17 Mar 2021 05:42:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20146) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lMSgo-0000k0-7T for qemu-devel@nongnu.org; Wed, 17 Mar 2021 05:42:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615974121; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KSW6D5vKF/944z+RrGn+7aj98lNetXU1A5J8P24dLb4=; b=dcmVNtmcuv6x5aK3XpkLQlSEN4olAxsM1u19MJlg5gXlQR++UmOl5Eqdq50dLwVhKhxiRw JPqG6zbnVUMVQe/9HuqdBa/Vp/3p6Fnrg339Ro1kgAVH2YMhE8VqKWpPs7vMNWw/nPCkwj m7GK1YaM+RIep5nzm9+rPmK/dz0qwl0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-nU2OWYmHPb6Jzor2pnYuZg-1; Wed, 17 Mar 2021 05:41:56 -0400 X-MC-Unique: nU2OWYmHPb6Jzor2pnYuZg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 387A6801817; Wed, 17 Mar 2021 09:41:54 +0000 (UTC) Received: from localhost (unknown [10.40.208.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB5CA690F6; Wed, 17 Mar 2021 09:41:48 +0000 (UTC) Date: Wed, 17 Mar 2021 10:41:46 +0100 From: Igor Mammedov To: Isaku Yamahata Subject: Re: [PATCH for-6.0] x86:acpi:piix4: reinitialize PM1.CNT on reset Message-ID: <20210317104146.784de0c1@redhat.com> In-Reply-To: <20210316205603.GA1037316@private.email.ne.jp> References: <20210316202956.3041128-1-imammedo@redhat.com> <20210316205603.GA1037316@private.email.ne.jp> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: isaku.yamahata@intel.com, berrange@redhat.com, mst@redhat.com, f4bug@amsat.org, qemu-devel@nongnu.org, reinoud@NetBSD.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 16 Mar 2021 13:56:03 -0700 Isaku Yamahata wrote: > The fix itself looks good to me for the reported issue. > Should more registers be reset in theory? > But it would cause other issues. > > i.e. > acpi_pm1_evt_reset(&s->ar); > acpi_pm_tmr_reset(&s->ar); > acpi_gpe_reset(&s->ar); It's very possible we should reset other registers too. Can you look into it, please? > > Reviewed-by: Isaku Yamahata Thanks! > > Thanks, > > > On Tue, Mar 16, 2021 at 04:29:56PM -0400, > Igor Mammedov wrote: > > > Commit 6be8cf56bc8b made sure that SCI is enabled in PM1.CNT > > on reset in acpi_only mode by modifying acpi_pm1_cnt_reset() and > > that worked for q35 as expected. > > > > The function was introduced by commit > > eaba51c573a (acpi, acpi_piix, vt82c686: factor out PM1_CNT logic) > > that forgot to actually call it at piix4 reset time and as result > > SCI_EN wasn't set as was expected by 6be8cf56bc8b in acpi_only mode. > > > > So Windows crashes when it notices that SCI_EN is not set and FADT is > > not providing information about how to enable it anymore. > > Reproducer: > > qemu-system-x86_64 -enable-kvm -M pc-i440fx-6.0,smm=off -cdrom any_windows_10x64.iso > > > > Fix it by calling acpi_pm1_cnt_reset() at piix4 reset time. > > > > Fixes: 6be8cf56bc8b (acpi/core: always set SCI_EN when SMM isn't supported) > > Signed-off-by: Igor Mammedov > > --- > > CC: isaku.yamahata@intel.com > > CC: mst@redhat.com > > CC: reinoud@NetBSD.org > > CC: isaku.yamahata@gmail.com > > CC: berrange@redhat.com > > CC: pbonzini@redhat.com > > CC: f4bug@amsat.org > > --- > > hw/acpi/piix4.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > > index 1efc0ded9f..7cab438015 100644 > > --- a/hw/acpi/piix4.c > > +++ b/hw/acpi/piix4.c > > @@ -325,6 +325,7 @@ static void piix4_pm_reset(DeviceState *dev) > > /* Mark SMM as already inited (until KVM supports SMM). */ > > pci_conf[0x5B] = 0x02; > > } > > + acpi_pm1_cnt_reset(&s->ar); > > pm_io_space_update(s); > > acpi_pcihp_reset(&s->acpi_pci_hotplug, !s->use_acpi_root_pci_hotplug); > > } > > -- > > 2.27.0 > > > > >