[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/20] q35: update lpc pci config space according to
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 20/20] q35: update lpc pci config space according to configured devices |
Date: |
Fri, 23 Nov 2012 16:48:31 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/ich9.h | 1 +
hw/lpc_ich9.c | 29 +++++++++++++++++++++++++++++
hw/smbus_ich9.c | 12 ------------
3 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/hw/ich9.h b/hw/ich9.h
index de49135..34e216f 100644
--- a/hw/ich9.h
+++ b/hw/ich9.h
@@ -51,6 +51,7 @@ typedef struct ICH9LPCState {
/* isa bus */
ISABus *isa_bus;
MemoryRegion rbca_mem;
+ Notifier machine_ready;
qemu_irq *pic;
qemu_irq *ioapic;
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c
index 2fc83a4..6585236 100644
--- a/hw/lpc_ich9.c
+++ b/hw/lpc_ich9.c
@@ -60,6 +60,7 @@
#include "pam.h"
#include "pci_internals.h"
#include "exec-memory.h"
+#include "sysemu.h"
static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
@@ -456,6 +457,30 @@ static const MemoryRegionOps rbca_mmio_ops = {
.endianness = DEVICE_LITTLE_ENDIAN,
};
+static void ich9_lpc_machine_ready(Notifier *n, void *opaque)
+{
+ ICH9LPCState *s = container_of(n, ICH9LPCState, machine_ready);
+ uint8_t *pci_conf;
+
+ pci_conf = s->d.config;
+ if (isa_is_ioport_assigned(0x3f8)) {
+ /* com1 */
+ pci_conf[0x82] |= 0x01;
+ }
+ if (isa_is_ioport_assigned(0x2f8)) {
+ /* com2 */
+ pci_conf[0x82] |= 0x02;
+ }
+ if (isa_is_ioport_assigned(0x378)) {
+ /* lpt */
+ pci_conf[0x82] |= 0x04;
+ }
+ if (isa_is_ioport_assigned(0x3f0)) {
+ /* floppy */
+ pci_conf[0x82] |= 0x08;
+ }
+}
+
static int ich9_lpc_initfn(PCIDevice *d)
{
ICH9LPCState *lpc = ICH9_LPC_DEVICE(d);
@@ -473,6 +498,10 @@ static int ich9_lpc_initfn(PCIDevice *d)
ich9_cc_init(lpc);
apm_init(&lpc->apm, ich9_apm_ctrl_changed, lpc);
+
+ lpc->machine_ready.notify = ich9_lpc_machine_ready;
+ qemu_add_machine_init_done_notifier(&lpc->machine_ready);
+
return 0;
}
diff --git a/hw/smbus_ich9.c b/hw/smbus_ich9.c
index 54e7e12..4194785 100644
--- a/hw/smbus_ich9.c
+++ b/hw/smbus_ich9.c
@@ -78,18 +78,6 @@ static int ich9_smbus_initfn(PCIDevice *d)
pci_config_set_interrupt_pin(d->config, 0x01); /* interrupt pin 1 */
pci_set_byte(d->config + ICH9_SMB_HOSTC, 0);
-
- /*
- * update parameters based on
- * paralell_hds[0]
- * serial_hds[0]
- * serial_hds[0]
- * fdc
- *
- * Is there any OS that depends on them?
- */
-
- pci_set_byte(d->config + ICH9_SMB_HOSTC, 0);
/* TODO bar0, bar1: 64bit BAR support*/
pm_smbus_init(&d->qdev, &s->smb);
--
1.7.1
- [Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9], (continued)
- [Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 03/20] apci: switch vt82c686 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 17/20] apci: switch piix4 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 07/20] apci: switch cnt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 12/20] apci: switch ich9 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 08/20] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 01/20] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 06/20] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 18/20] acpi: remove acpi_gpe_blk, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 20/20] q35: update lpc pci config space according to configured devices,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 11/20] acpi: cleanup vt82c686 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 09/20] apci: switch evt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 14/20] acpi: cleanup ich9 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 10/20] acpi: cleanup piix4 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 04/20] apci: switch timer to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 15/20] acpi: switch smbus to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 19/20] apci: switch piix4 pci hotplug to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 13/20] apci: switch ich9 smi to memory api, Gerd Hoffmann, 2012/11/23