From: Annie Li <annie.li@oracle.com>
To: qemu-devel@nongnu.org, imammedo@redhat.com
Cc: annie.li@oracle.com, miguel.luis@oracle.com
Subject: [RFC PATCH 10/11] tests/acpi: Update FACP and DSDT tables for sleep button
Date: Tue, 5 Dec 2023 00:30:38 +0000 [thread overview]
Message-ID: <20231205003038.1118-1-annie.li@oracle.com> (raw)
In-Reply-To: <20231205002143.562-1-annie.li@oracle.com>
From: Miguel Luis <miguel.luis@oracle.com>
*
* ACPI Data Table [FACP]
*
* Format: [HexOffset DecimalOffset ByteLength] FieldName : FieldValue
*/
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)]
[004h 0004 4] Table Length : 00000114
[008h 0008 1] Revision : 06
-[009h 0009 1] Checksum : 15
+[009h 0009 1] Checksum : E2
[00Ah 0010 6] Oem ID : "BOCHS "
[010h 0016 8] Oem Table ID : "BXPC "
[018h 0024 4] Oem Revision : 00000001
[01Ch 0028 4] Asl Compiler ID : "BXPC"
[020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] FACS Address : 00000000
[028h 0040 4] DSDT Address : 00000000
[02Ch 0044 1] Model : 00
[02Dh 0045 1] PM Profile : 00 [Unspecified]
[02Eh 0046 2] SCI Interrupt : 0000
[030h 0048 4] SMI Command Port : 00000000
[034h 0052 1] ACPI Enable Value : 00
[035h 0053 1] ACPI Disable Value : 00
[036h 0054 1] S4BIOS Command : 00
[037h 0055 1] P-State Control : 00
@@ -148,50 +148,50 @@
[0DCh 0220 1] Space ID : 00 [SystemMemory]
[0DDh 0221 1] Bit Width : 00
[0DEh 0222 1] Bit Offset : 00
[0DFh 0223 1] Encoded Access Width : 00 [Undefined/Legacy]
[0E0h 0224 8] Address : 0000000000000000
[0E8h 0232 12] GPE1 Block : [Generic Address Structure]
[0E8h 0232 1] Space ID : 00 [SystemMemory]
[0E9h 0233 1] Bit Width : 00
[0EAh 0234 1] Bit Offset : 00
[0EBh 0235 1] Encoded Access Width : 00 [Undefined/Legacy]
[0ECh 0236 8] Address : 0000000000000000
[0F4h 0244 12] Sleep Control Register : [Generic Address Structure]
[0F4h 0244 1] Space ID : 00 [SystemMemory]
-[0F5h 0245 1] Bit Width : 00
+[0F5h 0245 1] Bit Width : 08
[0F6h 0246 1] Bit Offset : 00
[0F7h 0247 1] Encoded Access Width : 00 [Undefined/Legacy]
-[0F8h 0248 8] Address : 0000000000000000
+[0F8h 0248 8] Address : 0000000009080000
[100h 0256 12] Sleep Status Register : [Generic Address Structure]
[100h 0256 1] Space ID : 00 [SystemMemory]
-[101h 0257 1] Bit Width : 00
+[101h 0257 1] Bit Width : 08
[102h 0258 1] Bit Offset : 00
[103h 0259 1] Encoded Access Width : 00 [Undefined/Legacy]
-[104h 0260 8] Address : 0000000000000000
+[104h 0260 8] Address : 0000000009080001
[10Ch 0268 8] Hypervisor ID : 00000000554D4551
Raw Table Data: Length 276 (0x114)
- 0000: 46 41 43 50 14 01 00 00 06 15 42 4F 43 48 53 20 // FACP......BOCHS
+ 0000: 46 41 43 50 14 01 00 00 06 E2 42 4F 43 48 53 20 // FACP......BOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0080: 00 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00C0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 00F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 0100: 00 00 00 00 00 00 00 00 00 00 00 00 51 45 4D 55 // ............QEMU
+ 00F0: 00 00 00 00 00 08 00 00 00 00 08 09 00 00 00 00 // ................
+ 0100: 00 08 00 00 01 00 08 09 00 00 00 00 51 45 4D 55 // ............QEMU
0110: 00 00 00 00 // ....
*
* Original Table Header:
* Signature "DSDT"
- * Length 0x0000144C (5196)
+ * Length 0x0000149E (5278)
* Revision 0x02
- * Checksum 0x9F
+ * Checksum 0x2B
* OEM ID "BOCHS "
* OEM Table ID "BXPC "
* OEM Revision 0x00000001 (1)
* Compiler ID "BXPC"
* Compiler Version 0x00000001 (1)
*/
DefinitionBlock ("", "DSDT", 2, "BOCHS ", "BXPC ", 0x00000001)
{
Scope (\_SB)
{
Device (C000)
{
Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
@@ -1876,27 +1876,48 @@
0x00000029,
}
})
OperationRegion (EREG, SystemMemory, 0x09080000, 0x04)
Field (EREG, DWordAcc, NoLock, WriteAsZeros)
{
ESEL, 32
}
Method (_EVT, 1, Serialized) // _EVT: Event
{
Local0 = ESEL /* \_SB_.GED_.ESEL */
If (((Local0 & 0x02) == 0x02))
{
Notify (PWRB, 0x80) // Status Change
}
+
+ If (((Local0 & 0x08) == 0x08))
+ {
+ Notify (SLPB, 0x80) // Status Change
+ }
}
}
Device (PWRB)
{
Name (_HID, "PNP0C0C" /* Power Button Device */) // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
}
+
+ Device (\_SB.SLPB)
+ {
+ Name (_HID, EisaId ("PNP0C0E") /* Sleep Button Device */) // _HID: Hardware ID
+ Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
+ {
+ One,
+ 0x04
+ })
+ OperationRegion (\B**, SystemIO, 0x0201, One)
+ Field (\B**, ByteAcc, NoLock, WriteAsZeros)
+ {
+ SBP, 1,
+ SBW, 1
+ }
+ }
}
}
Signed-off-by: Miguel Luis <miguel.luis@oracle.com>
---
tests/data/acpi/virt/DSDT | Bin 5196 -> 5278 bytes
tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 5282 -> 5364 bytes
tests/data/acpi/virt/DSDT.memhp | Bin 6557 -> 6639 bytes
tests/data/acpi/virt/DSDT.pxb | Bin 7679 -> 7761 bytes
tests/data/acpi/virt/DSDT.topology | Bin 5398 -> 5480 bytes
tests/data/acpi/virt/FACP | Bin 276 -> 276 bytes
tests/qtest/bios-tables-test-allowed-diff.h | 7 -------
7 files changed, 7 deletions(-)
diff --git a/tests/data/acpi/virt/DSDT b/tests/data/acpi/virt/DSDT
index c47503990715d389914fdf9c8bccb510761741ac..ca4e2949adc72f70282bd9d5d311b67ed1f5d4eb 100644
GIT binary patch
delta 146
zcmX@3F;A1rCD<ioo(Ka2llDX|X{Jv1jp{RmnVdN$9~2JO){A!y3*jtq4R-ZOSRgRD
zI)RIcfs3gvAUw#4s{taw!NA4Q7VHx+Sx-dHF}le<MlU|tDIO@`#1Ze|>B8f9frpPH
qJ|HMuh?R+vizT`t#wkBPo{^i8i7~oS5X^B5b_$4R40Z~SX9NIW&nAEX
delta 63
zcmbQIc}9cFCD<jzM}&caY5qhmX{L6kjp{RmnVi@s9~2Ijl8tu_3*jtq4R-ZOSRgRD
TI)RIcfs3gvAUtTYy@(tDF;fvg
diff --git a/tests/data/acpi/virt/DSDT.acpihmatvirt b/tests/data/acpi/virt/DSDT.acpihmatvirt
index aee6ba017cd730948bfa93e91551eb10a6809293..37f122b0425807d0e83da2a8438571f2ddf028a0 100644
GIT binary patch
delta 148
zcmZ3a`9+h<CD<k8iwFY)(~F5*(oFq68`a+lGdXii78eO-)SH|wB9ps7U~+W=7Y73u
zM_aH@fD>0kbdzL2c#soEyoaX?Z-8HbfwO@#14n$Qrwc=LlYNX{e6UkINF`VSkK+X%
sK92Z+pl~5pCPprn=!O`l{QP)EZbl}?=te;>$1&I`Af7SUDLkGL0REXLM*si-
delta 66
zcmeyOxk!`CCD<iokq83=Q_MszX{KKHjq2}&nVi@si;Dy^%1+J}k&%vWk_-qBa^i^h
W@O0q~@Cz_-HgIO(h!6F2VE_PNB@p!h
diff --git a/tests/data/acpi/virt/DSDT.memhp b/tests/data/acpi/virt/DSDT.memhp
index bae36cdd397473afe3923c52f030641a5ab19d5d..1dc2a3b7ed6785fae1c81b57db04fb991669f35e 100644
GIT binary patch
delta 126
zcmbPh{N9+$CD<k8y(9wzQ}jeGX{N3@8`WnBGdXcjJ}4Z_<jXo)OvH<SfxzVI1TGE+
zE{?Wfp8%)LaU%Atj?qo_F?#XAPVpcij(87G7aqq8JbWDS0YTwHtW1ntEYS@yPWk!q
ZjNFV&jM0sPV2)$3Q$Rdpuv2(EBLKABA&me4
delta 44
zcmaEFJlB}ZCD<iot|S8k(}9Ux(o7xGH>%GNW^&}3d{8);$%kdKn26WrLJ?b505dcU
A*Z=?k
diff --git a/tests/data/acpi/virt/DSDT.pxb b/tests/data/acpi/virt/DSDT.pxb
index fbd78f44c4785d19759daea909fe6d6f9a6e6b01..785e3834f17f021ce0212c1b943f3d88aa3409d6 100644
GIT binary patch
delta 123
zcmexwebI)?CD<h-P>z9t$!j8)G*i!`jq2XAOwJsWOJsu?^(LQ?mEl_;Fu6K`i-UoS
zqb=AcVDdv*ImhTG`xw3WV5fMXfD=c&ho=jV;{_f*j`)C}a3NMEMlP1<h8U;({CGxg
XMkdDSMnN#gG1w^}o-x=dJf0B%b;u!O
delta 66
zcmca;^WU1wCD<k8zbpd-)BcHE(o9`<H>!KfGC8qNE|Cppl%0G+Rz^CyNirZj$cZD~
W!_$Q~z%RhS*}$2BBR<sAg#iG*84}|F
diff --git a/tests/data/acpi/virt/DSDT.topology b/tests/data/acpi/virt/DSDT.topology
index 501314c91be01d927fd125e0c72e919fdd85592e..fdd1e628080fbb5822bf940b173b4946dce3b7c4 100644
GIT binary patch
delta 123
zcmbQH^+JowCD<h-LzIDmNq!=iG*ffPM)f2SCTEVx-6Fw^dXw*q$nY%?m|UH}#lgVE
z(H86zF!_gwoMUv8eT-gwuv0uxz=<Q?!_$Sw@d6JYM|?m~xDYE7BNt0_LyS{?emo;L
XBNJnEqac{$80-`f&lv0!9?u8>2rM9S
delta 42
ycmaE%HBF1lCD<iIOq79vY4SuaX{JX1jp|7vOit{RyG4Q-WhdVkk(taRDh&YhehUEr
diff --git a/tests/data/acpi/virt/FACP b/tests/data/acpi/virt/FACP
index ac05c35a69451519bd1152c54d1e741af36390f5..0899918d8195f87ed060539dbdcac3380086e97f 100644
GIT binary patch
delta 50
tcmbQjG=+)F&CxkPgpq-P?a@T8*YX?;K)}HXA{l^eMkqVb)i)F*1OU>l23`OF
delta 30
kcmbQjG=+)F&CxkPgpq-PO>`pH>xl;99D%OBp$tF(0B1o49{>OV
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index 83d368734c..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,8 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/virt/DSDT",
-"tests/data/acpi/virt/DSDT.acpihmatvirt",
-"tests/data/acpi/virt/DSDT.memhp",
-"tests/data/acpi/virt/DSDT.pxb",
-"tests/data/acpi/virt/DSDT.topology",
-"tests/data/acpi/virt/FACP",
-
--
2.34.3
next prev parent reply other threads:[~2023-12-05 0:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-05 0:21 [RFC PATCH 00/11] Support ACPI Control Method Sleep button Annie Li
2023-12-05 0:23 ` [RFC PATCH 01/11] acpi: hmp/qmp: Add hmp/qmp support for system_sleep Annie Li
2023-12-05 9:44 ` Philippe Mathieu-Daudé
2023-12-05 14:43 ` Annie.li
2023-12-05 20:34 ` Markus Armbruster
2023-12-05 21:46 ` Annie.li
2023-12-22 12:37 ` Markus Armbruster
2023-12-22 18:39 ` Annie.li
2023-12-05 0:26 ` [RFC PATCH 02/11] acpi: Implement control method sleep button Annie Li
2023-12-05 0:26 ` [RFC PATCH 03/11] test/acpi: allow DSDT table changes Annie Li
2023-12-05 0:27 ` [RFC PATCH 04/11] acpi: Support Control Method sleep button for x86 Annie Li
2023-12-05 0:27 ` [RFC PATCH 05/11] tests/acpi/bios-tables-test: update DSDT tables for Control Method Sleep button Annie Li
2023-12-05 0:28 ` [RFC PATCH 06/11] acpi: Send the GPE event of suspend and wakeup for x86 Annie Li
2023-12-05 0:28 ` [RFC PATCH 07/11] hw/acpi: Add ACPI GED support for the sleep event Annie Li
2023-12-05 0:29 ` [RFC PATCH 08/11] tests/acpi: allow FACP and DSDT table changes for arm/virt Annie Li
2023-12-05 0:29 ` [RFC PATCH 09/11] hw/arm: enable sleep support " Annie Li
2023-12-05 0:30 ` Annie Li [this message]
2023-12-05 0:31 ` [RFC PATCH 11/11] arm/virt: enable sleep support Annie Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231205003038.1118-1-annie.li@oracle.com \
--to=annie.li@oracle.com \
--cc=imammedo@redhat.com \
--cc=miguel.luis@oracle.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).