From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41415)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ghammer@redhat.com>) id 1VtJUJ-0000jG-Aq
	for qemu-devel@nongnu.org; Wed, 18 Dec 2013 10:56:49 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ghammer@redhat.com>) id 1VtJUD-0006Cn-B1
	for qemu-devel@nongnu.org; Wed, 18 Dec 2013 10:56:43 -0500
Received: from mx1.redhat.com ([209.132.183.28]:56403)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ghammer@redhat.com>) id 1VtJUD-0006Cf-2r
	for qemu-devel@nongnu.org; Wed, 18 Dec 2013 10:56:37 -0500
Message-ID: <52B1C654.2070308@redhat.com>
Date: Wed, 18 Dec 2013 17:59:16 +0200
From: Gal Hammer <ghammer@redhat.com>
MIME-Version: 1.0
References: <1386753670-11238-1-git-send-email-ghammer@redhat.com>
	<52B1AFC3.1050809@redhat.com>
In-Reply-To: <52B1AFC3.1050809@redhat.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] piix: do not reset APIC base address
	(0x80) on piix4_reset.
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: "seabios@seabios.org" <seabios@seabios.org>, qemu-devel@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>

On 18/12/2013 16:22, Paolo Bonzini wrote:
> Il 11/12/2013 10:21, Gal Hammer ha scritto:
>> Fix a bug that was introduced in commit c046e8c4. QEMU fails to
>> resume from suspend mode (S3).
>>
>> Signed-off-by: Gal Hammer <ghammer@redhat.com>
>> ---
>>   hw/acpi/piix4.c | 1 -
>>   1 file changed, 1 deletion(-)
>>
>> diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
>> index 93849c8..5c736a4 100644
>> --- a/hw/acpi/piix4.c
>> +++ b/hw/acpi/piix4.c
>> @@ -376,7 +376,6 @@ static void piix4_reset(void *opaque)
>>       pci_conf[0x5b] =3D 0;
>>
>>       pci_conf[0x40] =3D 0x01; /* PM io base read only bit */
>> -    pci_conf[0x80] =3D 0;
>>
>>       if (s->kvm_enabled) {
>>           /* Mark SMM as already inited (until KVM supports SMM). */
>
> Note this is not the APIC base address, that one is 80h on the ISA
> bridge (function 0).  You're changing the behavior for 80h on the power
> management function, which is function 3.  The register is "PMBA=97POWE=
R
> MANAGEMENT BASE ADDRESS" and it is indeed initialized by SeaBIOS in
> piix4_pm_setup (src/fw/pciinit.c).

I think we both made a mistake and the right name is=20
"PMREGMISC=97MISCELLANEOUS POWER MANAGEMENT (FUNCTION 3)" :-).

> Michael, perhaps a part of pci_setup (same file) should run on S3 resum=
e?
>
> Paolo
>

     Gal.