|
 |
218e99 |
From 085e956d2dbbc280727760ffa620b8a22db1cb6e Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 14:41:17 +0100
|
|
|
218e99 |
Subject: [PATCH 41/81] ich9: Document why cannot_instantiate_with_device_add_yet
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Message-id: <1383748882-22831-13-git-send-email-kwolf@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55538
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 12/17] ich9: Document why cannot_instantiate_with_device_add_yet
|
|
|
218e99 |
Bugzilla: 1001216
|
|
|
218e99 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
An ICH9 southbridge contains several PCI devices, some of them with
|
|
|
218e99 |
multiple functions. We model each function as a separate qdev. Two
|
|
|
218e99 |
of them need some special wiring set up in pc_q35_init() to work: the
|
|
|
218e99 |
LPC controller at 00:1f.0, and the SMBus controller at 00:1f.3.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
218e99 |
(cherry picked from pending upstream submission)
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i2c/smbus_ich9.c | 6 +++++-
|
|
|
218e99 |
hw/isa/lpc_ich9.c | 7 +++++--
|
|
|
218e99 |
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i2c/smbus_ich9.c | 6 +++++-
|
|
|
218e99 |
hw/isa/lpc_ich9.c | 7 +++++--
|
|
|
218e99 |
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
|
|
|
218e99 |
index c1ffa34..8d47eaf 100644
|
|
|
218e99 |
--- a/hw/i2c/smbus_ich9.c
|
|
|
218e99 |
+++ b/hw/i2c/smbus_ich9.c
|
|
|
218e99 |
@@ -97,11 +97,15 @@ static void ich9_smb_class_init(ObjectClass *klass, void *data)
|
|
|
218e99 |
k->device_id = PCI_DEVICE_ID_INTEL_ICH9_6;
|
|
|
218e99 |
k->revision = ICH9_A2_SMB_REVISION;
|
|
|
218e99 |
k->class_id = PCI_CLASS_SERIAL_SMBUS;
|
|
|
218e99 |
- dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */
|
|
|
218e99 |
dc->vmsd = &vmstate_ich9_smbus;
|
|
|
218e99 |
dc->desc = "ICH9 SMBUS Bridge";
|
|
|
218e99 |
k->init = ich9_smbus_initfn;
|
|
|
218e99 |
k->config_write = ich9_smbus_write_config;
|
|
|
218e99 |
+ /*
|
|
|
218e99 |
+ * Reason: part of ICH9 southbridge, needs to be wired up by
|
|
|
218e99 |
+ * pc_q35_init()
|
|
|
218e99 |
+ */
|
|
|
218e99 |
+ dc->cannot_instantiate_with_device_add_yet = true;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
i2c_bus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base)
|
|
|
218e99 |
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
|
|
|
218e99 |
index 580e9ac..4f834b9 100644
|
|
|
218e99 |
--- a/hw/isa/lpc_ich9.c
|
|
|
218e99 |
+++ b/hw/isa/lpc_ich9.c
|
|
|
218e99 |
@@ -603,14 +603,17 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)
|
|
|
218e99 |
dc->reset = ich9_lpc_reset;
|
|
|
218e99 |
k->init = ich9_lpc_initfn;
|
|
|
218e99 |
dc->vmsd = &vmstate_ich9_lpc;
|
|
|
218e99 |
- dc->cannot_instantiate_with_device_add_yet = true; /* FIXME explain why */
|
|
|
218e99 |
k->config_write = ich9_lpc_config_write;
|
|
|
218e99 |
dc->desc = "ICH9 LPC bridge";
|
|
|
218e99 |
k->vendor_id = PCI_VENDOR_ID_INTEL;
|
|
|
218e99 |
k->device_id = PCI_DEVICE_ID_INTEL_ICH9_8;
|
|
|
218e99 |
k->revision = ICH9_A2_LPC_REVISION;
|
|
|
218e99 |
k->class_id = PCI_CLASS_BRIDGE_ISA;
|
|
|
218e99 |
-
|
|
|
218e99 |
+ /*
|
|
|
218e99 |
+ * Reason: part of ICH9 southbridge, needs to be wired up by
|
|
|
218e99 |
+ * pc_q35_init()
|
|
|
218e99 |
+ */
|
|
|
218e99 |
+ dc->cannot_instantiate_with_device_add_yet = true;
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
static const TypeInfo ich9_lpc_info = {
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|