mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci: allow hotplug removal of cold-plugged devices

Browse Source 
This patch fixes hot unplug of cold plugged devices
(those present at system start), which got broken by
5beb8ad503 .

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Cam Macdonell <cam@cs.ualberta.ca>
Tested-by: Cam Macdonell <cam@cs.ualberta.ca>
Reported-by: Cam Macdonell <cam@cs.ualberta.ca>.
This commit is contained in:
Michael S. Tsirkin 2010-11-12 16:21:35 +09:00
parent 7f5feab4dd
commit e927d48722
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/acpi_piix4.c
View File

@ -585,7 +585,8 @@ static void pciej_write(void *opaque, uint32_t addr, uint32_t val)
PIIX4_DPRINTF("pciej write %x <== %d\n", addr, val); PIIX4_DPRINTF("pciej write %x <== %d\n", addr, val);
} }
static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state); static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
PCIHotplugState state);
static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s)
{ {
@ -615,18 +616,23 @@ static void disable_device(PIIX4PMState *s, int slot)
s->pci0_status.down |= (1 << slot); s->pci0_status.down |= (1 << slot);
} }
static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, int state) static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
PCIHotplugState state)
{ {
int slot = PCI_SLOT(dev->devfn); int slot = PCI_SLOT(dev->devfn);
PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev,
DO_UPCAST(PCIDevice, qdev, qdev)); DO_UPCAST(PCIDevice, qdev, qdev));
if (!dev->qdev.hotplugged) /* Don't send event when device is enabled during qemu machine creation:
* it is present on boot, no hotplug event is necessary. We do send an
* event when the device is disabled later. */
if (state == PCI_COLDPLUG_ENABLED) {
return 0; return 0;
}
s->pci0_status.up = 0; s->pci0_status.up = 0;
s->pci0_status.down = 0; s->pci0_status.down = 0;
if (state) { if (state == PCI_HOTPLUG_ENABLED) {
enable_device(s, slot); enable_device(s, slot);
} else { } else {
disable_device(s, slot); disable_device(s, slot);

10
hw/pci.c
View File

@ -1558,8 +1558,11 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base)
pci_add_option_rom(pci_dev); pci_add_option_rom(pci_dev);
if (bus->hotplug) { if (bus->hotplug) {
/* lower layer must check qdev->hotplugged */ /* Let buses differentiate between hotplug and when device is
rc = bus->hotplug(bus->hotplug_qdev, pci_dev, 1); * enabled during qemu machine creation. */
rc = bus->hotplug(bus->hotplug_qdev, pci_dev,
qdev->hotplugged ? PCI_HOTPLUG_ENABLED:
PCI_COLDPLUG_ENABLED);
if (rc != 0) { if (rc != 0) {
int r = pci_unregister_device(&pci_dev->qdev); int r = pci_unregister_device(&pci_dev->qdev);
assert(!r); assert(!r);
@ -1573,7 +1576,8 @@ static int pci_unplug_device(DeviceState *qdev)
{ {
PCIDevice *dev = DO_UPCAST(PCIDevice, qdev, qdev); PCIDevice *dev = DO_UPCAST(PCIDevice, qdev, qdev);
return dev->bus->hotplug(dev->bus->hotplug_qdev, dev, 0); return dev->bus->hotplug(dev->bus->hotplug_qdev, dev,
PCI_HOTPLUG_DISABLED);
} }
void pci_qdev_register(PCIDeviceInfo *info) void pci_qdev_register(PCIDeviceInfo *info)

10
hw/pci.h
View File

@ -214,7 +214,15 @@ int pci_device_load(PCIDevice *s, QEMUFile *f);
typedef void (*pci_set_irq_fn)(void *opaque, int irq_num, int level); typedef void (*pci_set_irq_fn)(void *opaque, int irq_num, int level);
typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num); typedef int (*pci_map_irq_fn)(PCIDevice *pci_dev, int irq_num);
typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, int state);
typedef enum {
PCI_HOTPLUG_DISABLED,
PCI_HOTPLUG_ENABLED,
PCI_COLDPLUG_ENABLED,
} PCIHotplugState;
typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev,
PCIHotplugState state);
void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent,
const char *name, int devfn_min); const char *name, int devfn_min);
PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min); PCIBus *pci_bus_new(DeviceState *parent, const char *name, int devfn_min);

10
hw/pcie.c
View File

@ -192,14 +192,16 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpressHotPlugEvent event)
} }
static int pcie_cap_slot_hotplug(DeviceState *qdev, static int pcie_cap_slot_hotplug(DeviceState *qdev,
PCIDevice *pci_dev, int state) PCIDevice *pci_dev, PCIHotplugState state)
{ {
PCIDevice *d = DO_UPCAST(PCIDevice, qdev, qdev); PCIDevice *d = DO_UPCAST(PCIDevice, qdev, qdev);
uint8_t *exp_cap = d->config + d->exp.exp_cap; uint8_t *exp_cap = d->config + d->exp.exp_cap;
uint16_t sltsta = pci_get_word(exp_cap + PCI_EXP_SLTSTA); uint16_t sltsta = pci_get_word(exp_cap + PCI_EXP_SLTSTA);
if (!pci_dev->qdev.hotplugged) { /* Don't send event when device is enabled during qemu machine creation:
assert(state); /* this case only happens at machine creation. */ * it is present on boot, no hotplug event is necessary. We do send an
* event when the device is disabled later. */
if (state == PCI_COLDPLUG_ENABLED) {
pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA, pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
PCI_EXP_SLTSTA_PDS); PCI_EXP_SLTSTA_PDS);
return 0; return 0;
@ -219,7 +221,7 @@ static int pcie_cap_slot_hotplug(DeviceState *qdev,
*/ */
assert(PCI_FUNC(pci_dev->devfn) == 0); assert(PCI_FUNC(pci_dev->devfn) == 0);
if (state) { if (state == PCI_HOTPLUG_ENABLED) {
pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA, pci_word_test_and_set_mask(exp_cap + PCI_EXP_SLTSTA,
PCI_EXP_SLTSTA_PDS); PCI_EXP_SLTSTA_PDS);
pcie_cap_slot_event(d, PCI_EXP_HP_EV_PDC); pcie_cap_slot_event(d, PCI_EXP_HP_EV_PDC);