[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] wakeup: make serial configurable
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/4] wakeup: make serial configurable |
Date: |
Thu, 6 Sep 2012 09:42:46 +0200 |
serial port #1 gets gpe 0x0a. Now that the wakeup is guest-configurable
via acpi we also enable it unconditionally.
Other serial ports are unchanged: they continue to use the "other" exit
reason and are disabled unless explicitly enabled via wakeup property.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/serial.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/hw/serial.c b/hw/serial.c
index a421d1e..06f7e28 100644
--- a/hw/serial.c
+++ b/hw/serial.c
@@ -140,6 +140,7 @@ struct SerialState {
int baudbase;
int tsr_retry;
uint32_t wakeup;
+ WakeupReason reason;
uint64_t last_xmit_ts; /* Time when the last byte was
successfully sent out of the tsr */
SerialFIFO recv_fifo;
@@ -641,7 +642,7 @@ static void serial_receive1(void *opaque, const uint8_t
*buf, int size)
SerialState *s = opaque;
if (s->wakeup) {
- qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
+ qemu_system_wakeup_request(s->reason);
}
if(s->fcr & UART_FCR_FE) {
int i;
@@ -789,6 +790,13 @@ static int serial_isa_initfn(ISADevice *dev)
isa->isairq = isa_serial_irq[isa->index];
index++;
+ if (isa->iobase == 0x3f8) {
+ s->reason = QEMU_WAKEUP_REASON_GPE_a;
+ s->wakeup = 1;
+ } else {
+ s->reason = QEMU_WAKEUP_REASON_OTHER;
+ }
+
s->baudbase = 115200;
isa_init_irq(dev, &s->irq, isa->isairq);
serial_init_core(s);
--
1.7.1
- [Qemu-devel] [PULL 0/4] wakeup: make wakeup events guest-configurable, Gerd Hoffmann, 2012/09/06
- [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Peter Maydell, 2012/09/06
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Gerd Hoffmann, 2012/09/06
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Blue Swirl, 2012/09/08
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Paolo Bonzini, 2012/09/08
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Anthony Liguori, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Paolo Bonzini, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Peter Maydell, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Anthony Liguori, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Gerd Hoffmann, 2012/09/10
[Qemu-devel] [PATCH 1/4] wakeup: add acpi gpe wakeup reasons, Gerd Hoffmann, 2012/09/06