From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org
Subject: Re: [PATCH 2/4] Fix CPU hotplug
Date: Mon, 9 Feb 2009 15:52:12 +0200 [thread overview]
Message-ID: <20090209135212.GE28969@redhat.com> (raw)
In-Reply-To: <20090205134246.20515.46264.stgit@dhcp-1-237.tlv.redhat.com>
Use this patch instead (return 0x9 from disabled processor's _STA method
instead of 0).
On Thu, Feb 05, 2009 at 03:42:46PM +0200, Gleb Natapov wrote:
> 1) Disabled processor's _STA method should return 0 (this fixes Vista's
> BSOD on resuming after hibernate problem)
> 2) Disabled processor's _MAT method should return disabled MADT entry
> instead of 0 (this fixes Linux kernel complains during boot)
> 3) Extend bitmask of hot pluggable CPUs to be 256 bit long
> 4) Generate interrupt only if corespondent EN bit is set
>
Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/bios/acpi-dsdt.dsl b/bios/acpi-dsdt.dsl
index d67616d..1684820 100755
--- a/bios/acpi-dsdt.dsl
+++ b/bios/acpi-dsdt.dsl
@@ -27,28 +27,41 @@ DefinitionBlock (
{
Scope (\_PR)
{
- OperationRegion( PRST, SystemIO, 0xaf00, 0x02)
- Field (PRST, ByteAcc, NoLock, WriteAsZeros)
+ OperationRegion(PRST, SystemIO, 0xaf00, 32)
+ Field (PRST, ByteAcc, NoLock, Preserve)
{
- PRU, 8,
- PRD, 8,
+ PRS, 256
+ }
+
+ 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 gen_processor(nr, name) \
Processor (CPU##name, nr, 0x0000b010, 0x06) { \
- Name (TMP, Buffer(0x8) {0x0, 0x8, nr, nr, 0x1, 0x0, 0x0, 0x0}) \
+ Name (PREN, Buffer(0x8) {0x0, 0x8, nr, nr, 0x1, 0x0, 0x0, 0x0}) \
+ Name (PRDS, Buffer(0x8) {0x0, 0x8, nr, nr, 0x0, 0x0, 0x0, 0x0}) \
Method(_MAT, 0) { \
- If (And(\_PR.PRU, ShiftLeft(1, nr))) { Return(TMP) } \
- Else { Return(0x0) } \
+ If (CRST(nr)) { Return(PREN) } \
+ Else { Return(PRDS) } \
} \
Method (_STA) { \
- Return(0xF) \
+ If (CRST(nr)) { Return(0xF) } \
+ Else { Return(0x9) } \
} \
} \
-
- Processor (CPU0, 0x00, 0x0000b010, 0x06) {Method (_STA) { Return(0xF)}}
+ gen_processor(0, 0)
gen_processor(1, 1)
gen_processor(2, 2)
gen_processor(3, 3)
@@ -63,6 +76,67 @@ DefinitionBlock (
gen_processor(12, C)
gen_processor(13, D)
gen_processor(14, E)
+
+ Method (NTFY, 2) {
+#define gen_ntfy(nr) \
+ If (LEqual(Arg0, 0x##nr)) { \
+ Notify(CPU##nr, Arg1) \
+ }
+ gen_ntfy(0)
+ gen_ntfy(1)
+ gen_ntfy(2)
+ gen_ntfy(3)
+ gen_ntfy(4)
+ gen_ntfy(5)
+ gen_ntfy(6)
+ gen_ntfy(7)
+ gen_ntfy(8)
+ gen_ntfy(9)
+ gen_ntfy(A)
+ gen_ntfy(B)
+ gen_ntfy(C)
+ gen_ntfy(D)
+ gen_ntfy(E)
+ 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)
+ }
+
+ 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 */
+ Return(One)
+ }
}
Scope (\)
@@ -666,34 +740,13 @@ DefinitionBlock (
Zero, /* reserved */
Zero /* reserved */
})
+
Scope (\_GPE)
{
-
-#define gen_cpu_hotplug(name, nr) \
- If (And(\_PR.PRU, ShiftLeft(1, nr))) { \
- Notify(\_PR.CPU##name, 1) \
- } \
- If (And(\_PR.PRD, ShiftLeft(1, nr))) { \
- Notify(\_PR.CPU##name, 3) \
- }
+ Name(_HID, "ACPI0006")
Method(_L00) {
- gen_cpu_hotplug(1, 1)
- gen_cpu_hotplug(2, 2)
- gen_cpu_hotplug(3, 3)
- gen_cpu_hotplug(4, 4)
- gen_cpu_hotplug(5, 5)
- gen_cpu_hotplug(6, 6)
- gen_cpu_hotplug(7, 7)
- gen_cpu_hotplug(8, 8)
- gen_cpu_hotplug(9, 9)
- gen_cpu_hotplug(A, 10)
- gen_cpu_hotplug(B, 11)
- gen_cpu_hotplug(C, 12)
- gen_cpu_hotplug(D, 13)
- gen_cpu_hotplug(E, 14)
-
- Return(0x01)
+ Return(\_PR.PRSC())
}
#define gen_pci_hotplug(nr) \
@@ -739,6 +792,7 @@ DefinitionBlock (
Return(0x01)
}
+
Method(_L02) {
Return(0x01)
}
diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c
index f7b3862..d857149 100644
--- a/qemu/hw/acpi.c
+++ b/qemu/hw/acpi.c
@@ -578,8 +578,7 @@ void qemu_system_powerdown(void)
struct gpe_regs {
uint16_t sts; /* status */
uint16_t en; /* enabled */
- uint8_t up;
- uint8_t down;
+ uint8_t cpus_sts[32];
};
struct pci_status {
@@ -602,11 +601,8 @@ static uint32_t gpe_readb(void *opaque, uint32_t addr)
uint32_t val = 0;
struct gpe_regs *g = opaque;
switch (addr) {
- case PROC_BASE:
- val = g->up;
- break;
- case PROC_BASE + 1:
- val = g->down;
+ case PROC_BASE ... PROC_BASE+31:
+ val = g->cpus_sts[addr - PROC_BASE];
break;
case GPE_BASE:
@@ -651,11 +647,8 @@ static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val)
{
struct gpe_regs *g = opaque;
switch (addr) {
- case PROC_BASE:
- g->up = val;
- break;
- case PROC_BASE + 1:
- g->down = val;
+ case PROC_BASE ... PROC_BASE + 31:
+ /* don't allow to change cpus_sts from inside a guest */
break;
case GPE_BASE:
@@ -736,11 +729,17 @@ static const char *model;
void qemu_system_hot_add_init(const char *cpu_model)
{
+ int i = 0, cpus = smp_cpus;
+
+ while (cpus > 0) {
+ gpe.cpus_sts[i++] = (cpus < 8) ? (1 << cpus) - 1 : 0xff;
+ cpus -= 8;
+ }
register_ioport_write(GPE_BASE, 4, 1, gpe_writeb, &gpe);
register_ioport_read(GPE_BASE, 4, 1, gpe_readb, &gpe);
- register_ioport_write(PROC_BASE, 4, 1, gpe_writeb, &gpe);
- register_ioport_read(PROC_BASE, 4, 1, gpe_readb, &gpe);
+ register_ioport_write(PROC_BASE, 32, 1, gpe_writeb, &gpe);
+ register_ioport_read(PROC_BASE, 32, 1, gpe_readb, &gpe);
register_ioport_write(PCI_BASE, 8, 4, pcihotplug_write, &pci0_status);
register_ioport_read(PCI_BASE, 8, 4, pcihotplug_read, &pci0_status);
@@ -754,15 +753,13 @@ void qemu_system_hot_add_init(const char *cpu_model)
static void enable_processor(struct gpe_regs *g, int cpu)
{
g->sts |= 1;
- g->en |= 1;
- g->up |= (1 << cpu);
+ g->cpus_sts[cpu/8] |= (1 << (cpu%8));
}
static void disable_processor(struct gpe_regs *g, int cpu)
{
g->sts |= 1;
- g->en |= 1;
- g->down |= (1 << cpu);
+ g->cpus_sts[cpu/8] &= ~(1 << (cpu%8));
}
#if defined(TARGET_I386) || defined(TARGET_X86_64)
@@ -800,14 +797,14 @@ void qemu_system_cpu_hot_add(int cpu, int state)
}
}
- qemu_set_irq(pm_state->irq, 1);
- gpe.up = 0;
- gpe.down = 0;
if (state)
enable_processor(&gpe, cpu);
else
disable_processor(&gpe, cpu);
- qemu_set_irq(pm_state->irq, 0);
+ if (gpe.en & 1) {
+ qemu_set_irq(pm_state->irq, 1);
+ qemu_set_irq(pm_state->irq, 0);
+ }
}
#endif
--
Gleb.
next prev parent reply other threads:[~2009-02-09 13:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-05 13:42 [PATCH 1/4] Fix GPE registers read/write handling Gleb Natapov
2009-02-05 13:42 ` [PATCH 2/4] Fix CPU hotplug Gleb Natapov
2009-02-09 13:52 ` Gleb Natapov [this message]
2009-02-05 13:42 ` [PATCH 3/4] Use reserved STS bits from PIIX4 chipset to avoid clash in the future Gleb Natapov
2009-02-05 13:42 ` [PATCH 4/4] PCI hotplug fixes Gleb Natapov
2009-02-10 0:36 ` Marcelo Tosatti
2009-02-09 13:58 ` [PATCH 1/4] Fix GPE registers read/write handling Avi Kivity
2009-02-10 13:52 ` Glauber Costa
2009-02-11 12:14 ` 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=20090209135212.GE28969@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.