From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Ian Campbell <Ian.Campbell@eu.citrix.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH] hvmloader: don't use AML operations on 64-bit fields
Date: Tue, 27 May 2014 09:57:08 +0100 [thread overview]
Message-ID: <53846F840200007800015E99@mail.emea.novell.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2529 bytes --]
WinXP and Win2K3, while having no problem with the QWordMemory resource
(there was another one there before), don't like operations on 64-bit
fields. Split the fields d0688669 ("hvmloader: also cover PCI MMIO
ranges above 4G with UC MTRR ranges") added to 32-bit ones, handling
carry over explicitly.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/tools/firmware/hvmloader/acpi/dsdt.asl
+++ b/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -57,8 +57,10 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
MSUA, 32, /* MADT checksum address */
MAPA, 32, /* MADT LAPIC0 address */
VGIA, 32, /* VM generation id address */
- HMIN, 64,
- HLEN, 64
+ LMIN, 32,
+ HMIN, 32,
+ LLEN, 32,
+ HLEN, 32
}
/* Fix HCT test for 0x400 pci memory:
@@ -176,15 +178,27 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
Add(MMIN, MLEN, MMAX)
Subtract(MMAX, One, MMAX)
- CreateQWordField(PRT0, \_SB.PCI0._CRS._Y02._MIN, HMIN)
- CreateQWordField(PRT0, \_SB.PCI0._CRS._Y02._MAX, HMAX)
- CreateQWordField(PRT0, \_SB.PCI0._CRS._Y02._LEN, HLEN)
-
- Store(\_SB.HMIN, HMIN)
- Store(\_SB.HLEN, HLEN)
- Add(HMIN, HLEN, HMAX)
- If(LOr(HMIN, HLEN)) {
- Subtract(HMAX, One, HMAX)
+ CreateDWordField(PRT0, \_SB.PCI0._CRS._Y02._MIN, MINL)
+ CreateDWordField(PRT0, \_SB.PCI0._CRS._Y02._MAX, MAXL)
+ CreateDWordField(PRT0, \_SB.PCI0._CRS._Y02._LEN, LENL)
+ CreateDWordField(PRT0, Add(\_SB.PCI0._CRS._Y02._MIN, 4), MINH)
+ CreateDWordField(PRT0, Add(\_SB.PCI0._CRS._Y02._MAX, 4), MAXH)
+ CreateDWordField(PRT0, Add(\_SB.PCI0._CRS._Y02._LEN, 4), LENH)
+
+ Store(\_SB.LMIN, MINL)
+ Store(\_SB.HMIN, MINH)
+ Store(\_SB.LLEN, LENL)
+ Store(\_SB.HLEN, LENH)
+ Add(MINL, LENL, MAXL)
+ Add(MINH, LENH, MAXH)
+ If(LLess(MAXL, MINL)) {
+ Add(MAXH, One, MAXH)
+ }
+ If(LOr(MINH, LENL)) {
+ If(LEqual(MAXL, 0)) {
+ Subtract(MAXH, One, MAXH)
+ }
+ Subtract(MAXL, One, MAXL)
}
Return (PRT0)
[-- Attachment #2: hvmloader-WinXP.patch --]
[-- Type: text/plain, Size: 2579 bytes --]
hvmloader: don't use AML operations on 64-bit fields
WinXP and Win2K3, while having no problem with the QWordMemory resource
(there was another one there before), don't like operations on 64-bit
fields. Split the fields d0688669 ("hvmloader: also cover PCI MMIO
ranges above 4G with UC MTRR ranges") added to 32-bit ones, handling
carry over explicitly.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/tools/firmware/hvmloader/acpi/dsdt.asl
+++ b/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -57,8 +57,10 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
MSUA, 32, /* MADT checksum address */
MAPA, 32, /* MADT LAPIC0 address */
VGIA, 32, /* VM generation id address */
- HMIN, 64,
- HLEN, 64
+ LMIN, 32,
+ HMIN, 32,
+ LLEN, 32,
+ HLEN, 32
}
/* Fix HCT test for 0x400 pci memory:
@@ -176,15 +178,27 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
Add(MMIN, MLEN, MMAX)
Subtract(MMAX, One, MMAX)
- CreateQWordField(PRT0, \_SB.PCI0._CRS._Y02._MIN, HMIN)
- CreateQWordField(PRT0, \_SB.PCI0._CRS._Y02._MAX, HMAX)
- CreateQWordField(PRT0, \_SB.PCI0._CRS._Y02._LEN, HLEN)
-
- Store(\_SB.HMIN, HMIN)
- Store(\_SB.HLEN, HLEN)
- Add(HMIN, HLEN, HMAX)
- If(LOr(HMIN, HLEN)) {
- Subtract(HMAX, One, HMAX)
+ CreateDWordField(PRT0, \_SB.PCI0._CRS._Y02._MIN, MINL)
+ CreateDWordField(PRT0, \_SB.PCI0._CRS._Y02._MAX, MAXL)
+ CreateDWordField(PRT0, \_SB.PCI0._CRS._Y02._LEN, LENL)
+ CreateDWordField(PRT0, Add(\_SB.PCI0._CRS._Y02._MIN, 4), MINH)
+ CreateDWordField(PRT0, Add(\_SB.PCI0._CRS._Y02._MAX, 4), MAXH)
+ CreateDWordField(PRT0, Add(\_SB.PCI0._CRS._Y02._LEN, 4), LENH)
+
+ Store(\_SB.LMIN, MINL)
+ Store(\_SB.HMIN, MINH)
+ Store(\_SB.LLEN, LENL)
+ Store(\_SB.HLEN, LENH)
+ Add(MINL, LENL, MAXL)
+ Add(MINH, LENH, MAXH)
+ If(LLess(MAXL, MINL)) {
+ Add(MAXH, One, MAXH)
+ }
+ If(LOr(MINH, LENL)) {
+ If(LEqual(MAXL, 0)) {
+ Subtract(MAXH, One, MAXH)
+ }
+ Subtract(MAXL, One, MAXL)
}
Return (PRT0)
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next reply other threads:[~2014-05-27 8:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 8:57 Jan Beulich [this message]
2014-05-27 10:44 ` [PATCH] hvmloader: don't use AML operations on 64-bit fields Jan Beulich
2014-05-27 13:21 ` [PATCH v2] " Jan Beulich
2014-05-28 8:52 ` Ian Campbell
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=53846F840200007800015E99@mail.emea.novell.com \
--to=jbeulich@suse.com \
--cc=Ian.Campbell@eu.citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xenproject.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).