 e90f2a8c3e
			
		
	
	
		e90f2a8c3e
		
	
	
	
	
		
			
			cannot_instantiate_with_device_add_yet was introduced by commit
efec3dd631d94160288392721a5f9c39e50fb2bc to replace no_user. It was
supposed to be a temporary measure.
When it was introduced, we had 54
cannot_instantiate_with_device_add_yet=true lines in the code.
Today (3 years later) this number has not shrunk: we now have
57 cannot_instantiate_with_device_add_yet=true lines. I think it
is safe to say it is not a temporary measure, and we won't see
the flag go away soon.
Instead of a long field name that misleads people to believe it
is temporary, replace it a shorter and less misleading field:
user_creatable.
Except for code comments, changes were generated using the
following Coccinelle patch:
  @@
  expression DC;
  @@
  (
  -DC->cannot_instantiate_with_device_add_yet = false;
  +DC->user_creatable = true;
  |
  -DC->cannot_instantiate_with_device_add_yet = true;
  +DC->user_creatable = false;
  )
  @@
  typedef ObjectClass;
  expression dc;
  identifier class, data;
  @@
   static void device_class_init(ObjectClass *class, void *data)
   {
   ...
   dc->hotpluggable = true;
  +dc->user_creatable = true;
   ...
   }
  @@
  @@
   struct DeviceClass {
   ...
  -bool cannot_instantiate_with_device_add_yet;
  +bool user_creatable;
   ...
  }
  @@
  expression DC;
  @@
  (
  -!DC->cannot_instantiate_with_device_add_yet
  +DC->user_creatable
  |
  -DC->cannot_instantiate_with_device_add_yet
  +!DC->user_creatable
  )
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Acked-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170503203604.31462-2-ehabkost@redhat.com>
[ehabkost: kept "TODO remove once we're there" comment]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
		
	
			
		
			
				
	
	
		
			130 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			130 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * ACPI implementation
 | |
|  *
 | |
|  * Copyright (c) 2006 Fabrice Bellard
 | |
|  * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
 | |
|  *               VA Linux Systems Japan K.K.
 | |
|  * Copyright (C) 2012 Jason Baron <jbaron@redhat.com>
 | |
|  *
 | |
|  * This is based on acpi.c, but heavily rewritten.
 | |
|  *
 | |
|  * This library is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU Lesser General Public
 | |
|  * License version 2 as published by the Free Software Foundation.
 | |
|  *
 | |
|  * This library is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with this library; if not, see <http://www.gnu.org/licenses/>
 | |
|  *
 | |
|  * Contributions after 2012-01-13 are licensed under the terms of the
 | |
|  * GNU GPL, version 2 or (at your option) any later version.
 | |
|  *
 | |
|  */
 | |
| #include "qemu/osdep.h"
 | |
| #include "hw/hw.h"
 | |
| #include "hw/i386/pc.h"
 | |
| #include "hw/i2c/pm_smbus.h"
 | |
| #include "hw/pci/pci.h"
 | |
| #include "sysemu/sysemu.h"
 | |
| #include "hw/i2c/i2c.h"
 | |
| #include "hw/i2c/smbus.h"
 | |
| 
 | |
| #include "hw/i386/ich9.h"
 | |
| 
 | |
| #define ICH9_SMB_DEVICE(obj) \
 | |
|      OBJECT_CHECK(ICH9SMBState, (obj), TYPE_ICH9_SMB_DEVICE)
 | |
| 
 | |
| typedef struct ICH9SMBState {
 | |
|     PCIDevice dev;
 | |
| 
 | |
|     PMSMBus smb;
 | |
| } ICH9SMBState;
 | |
| 
 | |
| static const VMStateDescription vmstate_ich9_smbus = {
 | |
|     .name = "ich9_smb",
 | |
|     .version_id = 1,
 | |
|     .minimum_version_id = 1,
 | |
|     .fields = (VMStateField[]) {
 | |
|         VMSTATE_PCI_DEVICE(dev, struct ICH9SMBState),
 | |
|         VMSTATE_END_OF_LIST()
 | |
|     }
 | |
| };
 | |
| 
 | |
| static void ich9_smbus_write_config(PCIDevice *d, uint32_t address,
 | |
|                                     uint32_t val, int len)
 | |
| {
 | |
|     ICH9SMBState *s = ICH9_SMB_DEVICE(d);
 | |
| 
 | |
|     pci_default_write_config(d, address, val, len);
 | |
|     if (range_covers_byte(address, len, ICH9_SMB_HOSTC)) {
 | |
|         uint8_t hostc = s->dev.config[ICH9_SMB_HOSTC];
 | |
|         if ((hostc & ICH9_SMB_HOSTC_HST_EN) &&
 | |
|             !(hostc & ICH9_SMB_HOSTC_I2C_EN)) {
 | |
|             memory_region_set_enabled(&s->smb.io, true);
 | |
|         } else {
 | |
|             memory_region_set_enabled(&s->smb.io, false);
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void ich9_smbus_realize(PCIDevice *d, Error **errp)
 | |
| {
 | |
|     ICH9SMBState *s = ICH9_SMB_DEVICE(d);
 | |
| 
 | |
|     /* TODO? D31IP.SMIP in chipset configuration space */
 | |
|     pci_config_set_interrupt_pin(d->config, 0x01); /* interrupt pin 1 */
 | |
| 
 | |
|     pci_set_byte(d->config + ICH9_SMB_HOSTC, 0);
 | |
|     /* TODO bar0, bar1: 64bit BAR support*/
 | |
| 
 | |
|     pm_smbus_init(&d->qdev, &s->smb);
 | |
|     pci_register_bar(d, ICH9_SMB_SMB_BASE_BAR, PCI_BASE_ADDRESS_SPACE_IO,
 | |
|                      &s->smb.io);
 | |
| }
 | |
| 
 | |
| static void ich9_smb_class_init(ObjectClass *klass, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(klass);
 | |
|     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 | |
| 
 | |
|     k->vendor_id = PCI_VENDOR_ID_INTEL;
 | |
|     k->device_id = PCI_DEVICE_ID_INTEL_ICH9_6;
 | |
|     k->revision = ICH9_A2_SMB_REVISION;
 | |
|     k->class_id = PCI_CLASS_SERIAL_SMBUS;
 | |
|     dc->vmsd = &vmstate_ich9_smbus;
 | |
|     dc->desc = "ICH9 SMBUS Bridge";
 | |
|     k->realize = ich9_smbus_realize;
 | |
|     k->config_write = ich9_smbus_write_config;
 | |
|     /*
 | |
|      * Reason: part of ICH9 southbridge, needs to be wired up by
 | |
|      * pc_q35_init()
 | |
|      */
 | |
|     dc->user_creatable = false;
 | |
| }
 | |
| 
 | |
| I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base)
 | |
| {
 | |
|     PCIDevice *d =
 | |
|         pci_create_simple_multifunction(bus, devfn, true, TYPE_ICH9_SMB_DEVICE);
 | |
|     ICH9SMBState *s = ICH9_SMB_DEVICE(d);
 | |
|     return s->smb.smbus;
 | |
| }
 | |
| 
 | |
| static const TypeInfo ich9_smb_info = {
 | |
|     .name   = TYPE_ICH9_SMB_DEVICE,
 | |
|     .parent = TYPE_PCI_DEVICE,
 | |
|     .instance_size = sizeof(ICH9SMBState),
 | |
|     .class_init = ich9_smb_class_init,
 | |
| };
 | |
| 
 | |
| static void ich9_smb_register(void)
 | |
| {
 | |
|     type_register_static(&ich9_smb_info);
 | |
| }
 | |
| 
 | |
| type_init(ich9_smb_register);
 |