From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org
Subject: [PATCH] Read MADT entries from memory in processors _MAT method.
Date: Mon, 1 Jun 2009 12:22:48 +0300 [thread overview]
Message-ID: <20090601092248.GH3948@redhat.com> (raw)
Also use enable/disable bit from ACPI MADT entries to track CPU hot
plug. This removes assumptions about APIC ids from AML code and simplify
cup hotplug handling.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/kvm/bios/acpi-dsdt.dsl b/kvm/bios/acpi-dsdt.dsl
index c756fed..69e1426 100755
--- a/kvm/bios/acpi-dsdt.dsl
+++ b/kvm/bios/acpi-dsdt.dsl
@@ -27,36 +27,32 @@ DefinitionBlock (
{
Scope (\_PR)
{
- OperationRegion(PRST, SystemIO, 0xaf00, 32)
- Field (PRST, ByteAcc, NoLock, Preserve)
+ /* pointer to fist element of MADT APIC structures */
+ OperationRegion(ATPR, SystemMemory, 0x0514, 4)
+ Field (ATPR, DwordAcc, NoLock, Preserve)
{
- PRS, 256
+ ATP, 32
}
- Name(PRSS, Buffer(32){}) /* shadow CPU status bitmask */
- Name(SSVL, 0)
-
- Method(CRST, 1) {
- If (LEqual(SSVL, 0)) {
- Store(PRS, PRSS) /* read CPUs status bitmaks from HW */
- Store(1, SSVL)
- }
- ShiftRight(Arg0, 3, Local1)
- Store(DerefOf(Index(PRSS, Local1)), Local2)
- Return(And(Local2, ShiftLeft(1, And(Arg0, 0x7))))
- }
+#define madt_addr(nr) Add (ATP, Multiply(nr, 8))
#define gen_processor(nr, name) \
Processor (CPU##name, nr, 0x0000b010, 0x06) { \
- Name (PREN, Buffer(0x8) {0x0, 0x8, nr, nr, 0x1, 0x0, 0x0, 0x0}) \
- Name (PRDS, Buffer(0x8) {0x0, 0x8, nr, nr, 0x0, 0x0, 0x0, 0x0}) \
+ OperationRegion (MATR, SystemMemory, madt_addr(nr), 8) \
+ Field (MATR, ByteAcc, NoLock, Preserve) \
+ { \
+ MAT, 64 \
+ } \
+ Field (MATR, ByteAcc, NoLock, Preserve) \
+ { \
+ Offset(4), \
+ FLG, 1 \
+ } \
Method(_MAT, 0) { \
- If (CRST(nr)) { Return(PREN) } \
- Else { Return(PRDS) } \
+ Return(MAT) \
} \
Method (_STA) { \
- If (CRST(nr)) { Return(0xF) } \
- Else { Return(0x9) } \
+ If (FLG) { Return(0xF) } Else { Return(0x9) } \
} \
} \
@@ -78,9 +74,16 @@ DefinitionBlock (
gen_processor(14, E)
Method (NTFY, 2) {
-#define gen_ntfy(nr) \
- If (LEqual(Arg0, 0x##nr)) { \
- Notify(CPU##nr, Arg1) \
+#define gen_ntfy(nr) \
+ If (LEqual(Arg0, 0x##nr)) { \
+ If (LNotEqual(Arg1, \_PR.CPU##nr.FLG)) { \
+ Store (Arg1, \_PR.CPU##nr.FLG) \
+ If (LEqual(Arg1, 1)) { \
+ Notify(CPU##nr, 1) \
+ } Else { \
+ Notify(CPU##nr, 3) \
+ } \
+ } \
}
gen_ntfy(0)
gen_ntfy(1)
@@ -100,41 +103,26 @@ DefinitionBlock (
Return(One)
}
- /* Works on 8 bit quentity.
- * Arg1 - Shadow status bits
- * Arg2 - Current status bits
- */
- Method(PR1, 3) {
- Xor(Arg1, Arg2, Local0) /* figure out what chaged */
- ShiftLeft(Arg0, 3, Local1)
- While (LNotEqual(Local0, Zero)) {
- If (And(Local0, 1)) { /* if staus have changed */
- if(And(Arg2, 1)) { /* check previous status */
- Store(3, Local3)
- } Else {
- Store(1, Local3)
- }
- NTFY(Local1, Local3)
- }
- ShiftRight(Local0, 1, Local0)
- ShiftRight(Arg2, 1, Arg2)
- Increment(Local1)
- }
- Return(One)
+ OperationRegion(PRST, SystemIO, 0xaf00, 32)
+ Field (PRST, ByteAcc, NoLock, Preserve)
+ {
+ PRS, 256
}
Method(PRSC, 0) {
- Store(Buffer(32){}, Local0)
- Store(PRS, Local0) /* read CPUs status bitmask into Local0 */
- Store(Zero, Local1)
- /* loop over bitmask byte by byte to see what have chaged */
- While(LLess(Local1, 32)) {
- Store(DerefOf(Index(Local0, Local1)), Local2)
- Store(DerefOf(Index(PRSS, Local1)), Local3)
- PR1(Local1, Local2, Local3)
- Increment(Local1)
- }
- Store(Local0, PRSS) /* store curr satust bitmask into shadow */
+ Store(PRS, Local3)
+ Store(Zero, Local0)
+ While(LLess(Local0, 32)) {
+ Store(Zero, Local1)
+ Store(DerefOf(Index(Local3, Local0)), Local2)
+ While(LLess(Local1, 8)) {
+ NTFY(Add(Multiply(Local0, 8), Local1),
+ And(Local2, 1))
+ ShiftRight(Local2, 1, Local2)
+ Increment(Local1)
+ }
+ Increment(Local0)
+ }
Return(One)
}
}
diff --git a/kvm/bios/rombios.h b/kvm/bios/rombios.h
index aadee7a..514507d 100644
--- a/kvm/bios/rombios.h
+++ b/kvm/bios/rombios.h
@@ -57,6 +57,7 @@
#define PM_IO_BASE 0xb000
#define SMB_IO_BASE 0xb100
#define SMP_MSR_ADDR 0x0510
+#define APIC_MADT_PTR 0x0514
#define MAX_CPUS 16
diff --git a/kvm/bios/rombios32.c b/kvm/bios/rombios32.c
index cbd5f15..369cbef 100755
--- a/kvm/bios/rombios32.c
+++ b/kvm/bios/rombios32.c
@@ -1740,7 +1740,7 @@ void acpi_bios_init(void)
memset(madt, 0, madt_size);
madt->local_apic_address = cpu_to_le32(0xfee00000);
madt->flags = cpu_to_le32(1);
- apic = (void *)(madt + 1);
+ *(uint32_t*)APIC_MADT_PTR = apic = (void *)(madt + 1);
for(i=0;i<MAX_CPUS;i++) {
apic->type = APIC_PROCESSOR;
apic->length = sizeof(*apic);
--
Gleb.
next reply other threads:[~2009-06-01 9:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-01 9:22 Gleb Natapov [this message]
2009-06-02 10:22 ` [PATCH] Read MADT entries from memory in processors _MAT method Avi Kivity
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=20090601092248.GH3948@redhat.com \
--to=gleb@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.