SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

Re: [SeaBIOS] [RFC PATCH v4 00/30] ACPI memory hotplug
by Gerd Hoffmann 19 Dec '12

19 Dec '12

Hi, > correct, only the number of channels and ranks(dimms) per channel has been > emulated so far (2 channels of 4 dimms each). So it is still paravirtual memory > hotplug, not native. Native support still needs to be worked on. Ok. >> I think the paravirtual memory hotplug controller should be a PCI device >> (which we then can add as function to the chipset). Having some fixed >> magic addresses is bad. > > ok, so in your opinion a pci-based hotplug controller sounds better than adding > acpi ports to piix4 or ich9? > > Magic acpi_ich9 ports can be avoided if q35 native support is implemented. Yes. We should go that route for q35. > For > i440fx/piix4 it was discussed and more or less decided we would only support > a paravirtual way of memory hotplug. Sure, there is no other way to do it. It is probably a good idea to model piix4 paravirtual to work simliar to q35 native. > In the description. I meant "paravirtual memory bus" to describe a memory bus > with unlimited number of dimm devices. But the "hotplug control" has always > been acpi-based so far and not a pci device. It still can (and should) be acpi-based. It is just that: (a) Instead of using get_system_io() as parent memory region you use create a pci device and place the memory region in one of the PCI bars. (b) Instead of using OperationRegion($name, SystemIO, $magicaddress) you use OperationRegion($name, PciBarTarget, ...) to access the registers. cheers, Gerd

1 0

Re: [SeaBIOS] [RFC PATCH v4 00/30] ACPI memory hotplug
by Gerd Hoffmann 19 Dec '12

19 Dec '12

Hi, > - multiple memory buses can be registered. Memory buses of the real hw/chipset > or a paravirtual memory bus can be added. IIRC q35 supports memory hotplug natively (picked up in some discussion). Is that correct? What does the code emulate? It doesn't look like it emulates q35 memory hotplug ... I think the paravirtual memory hotplug controller should be a PCI device (which we then can add as function to the chipset). Having some fixed magic addresses is bad. [ btw: same goes for ACPI PCI hotplug, that is hardly fixable without breaking compatibility though, for q35 we should be able to do better ]. cheers, Gerd

2 1

Re: [SeaBIOS] VGA Callback function in SeaBIOS
by Wolfgang Kamp - datakamp 18 Dec '12

18 Dec '12

Hi Ronny, unfortunately the vBIOS filename does not give you really information about the video BIOS configuration. When you want to obtain the vBIOS from AMD support you have to fill out a request form with the configuration details. You must choose the INT15H interface, LVDS support and so on. I know that the Persimmon Video BIOS supports INT10H, INT15H and LVDS. Then you have to ways to support native LVDS TFT. One is to add some code to "VGAHOOKS.c" in SeaBIOS to supply EDID data for the TFT or you can add an I2C EEPROM (24C02) with EDID data on the LVDS port I2C lines. The 2nd choice is the way I solved my problem. Regards, Wolfgang

1 0

[RFC PATCH v4 30/30] Implement _PS3 for dimm
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

This will allow us to update dimm state on OSPM-initiated eject operations e.g. with "echo 1 > /sys/bus/acpi/devices/PNP0C80\:00/eject" v3->v4: Add support for ich9 --- docs/specs/acpi_hotplug.txt | 7 +++++++ hw/acpi_ich9.c | 7 +++++-- hw/acpi_ich9.h | 1 + hw/acpi_piix4.c | 9 ++++++--- hw/dimm.c | 4 ++++ hw/dimm.h | 3 ++- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/docs/specs/acpi_hotplug.txt b/docs/specs/acpi_hotplug.txt index 536da16..69868fe 100644 --- a/docs/specs/acpi_hotplug.txt +++ b/docs/specs/acpi_hotplug.txt @@ -45,3 +45,10 @@ insertion failed. Written by ACPI memory device _OST method to notify qemu of failed hot-add. Write-only. +Memory Dimm _PS3 power-off initiated by OSPM (IO port 0xafa4, 1-byte access): +--------------------------------------------------------------- +Dimm hot-add _PS3 initiated by OSPM. Byte value indicates Dimm slot which +entered D3 state. + +Written by ACPI memory device _PS3 method to notify qemu of power-off state for +the dimm. Write-only. diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index 2705230..5e7fca6 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -120,6 +120,9 @@ static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) case ICH9_MEM_OST_ADD_FAIL - ICH9_MEM_BASE: dimm_notify(val, DIMM_ADD_FAIL); break; + case ICH9_MEM_PS3 - ICH9_MEM_BASE: + dimm_notify(val, DIMM_OSPM_POWEROFF); + break; default: ICH9_DEBUG("memhp write invalid %x <== %d\n", addr, val); } @@ -134,7 +137,7 @@ static const MemoryRegionOps ich9_memhp_ops = { }, { .offset = ICH9_MEM_EJ_BASE - ICH9_MEM_BASE, - .len = 4, .size = 1, + .len = 5, .size = 1, .write = memhp_writeb, }, PORTIO_END_OF_LIST() @@ -321,7 +324,7 @@ void ich9_pm_init(void *device, qemu_irq sci_irq, qemu_irq cmos_s3) memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); memory_region_init_io(&pm->io_memhp, &ich9_memhp_ops, pm, "apci-memhp0", - DIMM_BITMAP_BYTES + 4); + DIMM_BITMAP_BYTES + 5); memory_region_add_subregion(get_system_io(), ICH9_MEM_BASE, &pm->io_memhp); dimm_bus_hotplug(ich9_dimm_hotplug, ich9_dimm_revert, &lpc->d.qdev); diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h index 8f57cd8..816d453 100644 --- a/hw/acpi_ich9.h +++ b/hw/acpi_ich9.h @@ -29,6 +29,7 @@ #define ICH9_MEM_OST_REMOVE_FAIL 0xafa1 #define ICH9_MEM_OST_ADD_SUCCESS 0xafa2 #define ICH9_MEM_OST_ADD_FAIL 0xafa3 +#define ICH9_MEM_PS3 0xafa4 typedef struct ICH9LPCPMRegs { /* diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 70aa480..6c953c2 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -54,6 +54,7 @@ #define MEM_OST_REMOVE_FAIL 0xafa1 #define MEM_OST_ADD_SUCCESS 0xafa2 #define MEM_OST_ADD_FAIL 0xafa3 +#define MEM_PS3 0xafa4 #define PIIX4_MEM_HOTPLUG_STATUS 8 #define PIIX4_PCI_HOTPLUG_STATUS 2 @@ -564,6 +565,9 @@ static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) case MEM_OST_ADD_FAIL - MEM_BASE: dimm_notify(val, DIMM_ADD_FAIL); break; + case MEM_PS3 - MEM_BASE: + dimm_notify(val, DIMM_OSPM_POWEROFF); + break; default: PIIX4_DPRINTF("memhp write invalid %x <== %d\n", addr, val); } @@ -577,7 +581,7 @@ static const MemoryRegionOps piix4_memhp_ops = { .read = memhp_readb, }, { - .offset = MEM_EJ_BASE - MEM_BASE, .len = 4, + .offset = MEM_EJ_BASE - MEM_BASE, .len = 5, .size = 1, .write = memhp_writeb, }, @@ -666,7 +670,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) memory_region_add_subregion(get_system_io(), PCI_HOTPLUG_ADDR, &s->io_pci); memory_region_init_io(&s->io_memhp, &piix4_memhp_ops, s, "apci-memhp0", - DIMM_BITMAP_BYTES + 4); + DIMM_BITMAP_BYTES + 5); memory_region_add_subregion(get_system_io(), MEM_BASE, &s->io_memhp); for (i = 0; i < DIMM_BITMAP_BYTES; i++) { @@ -726,7 +730,6 @@ static int piix4_dimm_revert(DeviceState *qdev, DimmDevice *dev, int add) struct gpe_regs *g = &s->gperegs; DimmDevice *slot = DIMM(dev); int idx = slot->idx; - if (add) { g->mems_sts[idx/8] &= ~(1 << (idx%8)); } else { diff --git a/hw/dimm.c b/hw/dimm.c index 69b97b6..2454e38 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -407,6 +407,10 @@ void dimm_notify(uint32_t idx, uint32_t event) qdev_unplug_complete((DeviceState *)slot, NULL); QTAILQ_REMOVE(&bus->dimmlist, slot, nextdimm); QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); + case DIMM_OSPM_POWEROFF: + if (bus->dimm_revert) { + bus->dimm_revert(bus->dimm_hotplug_qdev, slot, 1); + } default: g_free(result); break; diff --git a/hw/dimm.h b/hw/dimm.h index f43f745..081f2db 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -15,7 +15,8 @@ typedef enum { DIMM_REMOVE_SUCCESS = 0, DIMM_REMOVE_FAIL = 1, DIMM_ADD_SUCCESS = 2, - DIMM_ADD_FAIL = 3 + DIMM_ADD_FAIL = 3, + DIMM_OSPM_POWEROFF = 4 } dimm_hp_result_code; typedef enum { -- 1.7.9

1 0

[RFC PATCH v4 29/30] Implement _PS3 method for memory device
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

--- src/acpi-dsdt-mem-hotplug.dsl | 15 +++++++++++++++ src/ssdt-mem.dsl | 4 ++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/src/acpi-dsdt-mem-hotplug.dsl b/src/acpi-dsdt-mem-hotplug.dsl index a648bee..7d7c078 100644 --- a/src/acpi-dsdt-mem-hotplug.dsl +++ b/src/acpi-dsdt-mem-hotplug.dsl @@ -49,6 +49,13 @@ Scope(\_SB) { MIF, 8 } + /* Memory _PS3 byte */ + OperationRegion(MPSB, SystemIO, 0xafa4, 1) + Field (MPSB, ByteAcc, NoLock, Preserve) + { + MPS, 8 + } + Method(MESC, 0) { // Local5 = active memdevice bitmap Store (MES, Local5) @@ -90,6 +97,14 @@ Scope(\_SB) { Sleep(200) } + + Method (MPS3, 1, NotSerialized) { + // _PS3 method - power-off method + Store(Arg0, MPS) + Store(Zero, Index(MEON, Arg0)) + Sleep(200) + } + Method (MOST, 3, Serialized) { // _OST method - OS status indication Switch (And(Arg0, 0xFF)) { diff --git a/src/ssdt-mem.dsl b/src/ssdt-mem.dsl index 47a3b4f..9827a58 100644 --- a/src/ssdt-mem.dsl +++ b/src/ssdt-mem.dsl @@ -39,6 +39,7 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) External(CMST, MethodObj) External(MPEJ, MethodObj) External(MOST, MethodObj) + External(MPS3, MethodObj) Name(_CRS, ResourceTemplate() { QwordMemory( @@ -64,6 +65,9 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) Method (_OST, 3) { MOST(Arg0, Arg1, ID) } + Method (_PS3, 0) { + MPS3(ID) + } } } -- 1.7.9

1 0

[RFC PATCH v4 28/30] Add _OST dimm support
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

This allows qemu to receive notifications from the guest OS on success or failure of a memory hotplug request. The guest OS needs to implement the _OST functionality for this to work (linux-next: http://lkml.org/lkml/2012/6/25/321) This patch also updates dimm bitmap state and hot-remove pending flag on hot-remove fail. This allows failed hot operations to be retried at anytime (only works for guests that use _OST notification). Also adds new _OST registers in docs/specs/acpi_hotplug.txt --- docs/specs/acpi_hotplug.txt | 25 +++++++++++++++++++++++++ hw/acpi_ich9.c | 31 ++++++++++++++++++++++++++++--- hw/acpi_ich9.h | 3 +++ hw/acpi_piix4.c | 35 ++++++++++++++++++++++++++++++++--- hw/dimm.c | 28 +++++++++++++++++++++++++++- hw/dimm.h | 11 ++++++++++- 6 files changed, 125 insertions(+), 8 deletions(-) diff --git a/docs/specs/acpi_hotplug.txt b/docs/specs/acpi_hotplug.txt index cf86242..536da16 100644 --- a/docs/specs/acpi_hotplug.txt +++ b/docs/specs/acpi_hotplug.txt @@ -20,3 +20,28 @@ ejected. Written by ACPI memory device _EJ0 method to notify qemu of successfull hot-removal. Write-only. + +Memory Dimm ejection failure notification (IO port 0xafa1, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _OST notification. Byte value indicates Dimm slot for which +ejection failed. + +Written by ACPI memory device _OST method to notify qemu of failed +hot-removal. Write-only. + +Memory Dimm insertion success notification (IO port 0xafa2, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _OST notification. Byte value indicates Dimm slot for which +insertion succeeded. + +Written by ACPI memory device _OST method to notify qemu of failed +hot-add. Write-only. + +Memory Dimm insertion failure notification (IO port 0xafa3, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _OST notification. Byte value indicates Dimm slot for which +insertion failed. + +Written by ACPI memory device _OST method to notify qemu of failed +hot-add. Write-only. + diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index f5dc1c9..2705230 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -111,6 +111,15 @@ static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) case ICH9_MEM_EJ_BASE - ICH9_MEM_BASE: dimm_notify(val, DIMM_REMOVE_SUCCESS); break; + case ICH9_MEM_OST_REMOVE_FAIL - ICH9_MEM_BASE: + dimm_notify(val, DIMM_REMOVE_FAIL); + break; + case ICH9_MEM_OST_ADD_SUCCESS - ICH9_MEM_BASE: + dimm_notify(val, DIMM_ADD_SUCCESS); + break; + case ICH9_MEM_OST_ADD_FAIL - ICH9_MEM_BASE: + dimm_notify(val, DIMM_ADD_FAIL); + break; default: ICH9_DEBUG("memhp write invalid %x <== %d\n", addr, val); } @@ -125,7 +134,7 @@ static const MemoryRegionOps ich9_memhp_ops = { }, { .offset = ICH9_MEM_EJ_BASE - ICH9_MEM_BASE, - .len = 1, .size = 1, + .len = 4, .size = 1, .write = memhp_writeb, }, PORTIO_END_OF_LIST() @@ -274,6 +283,22 @@ static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int return 0; } +static int ich9_dimm_revert(DeviceState *qdev, DimmDevice *dev, int add) +{ + PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, qdev); + ICH9LPCState *s = DO_UPCAST(ICH9LPCState, d, pci_dev); + struct gpe_regs *g = &s->pm.gperegs; + DimmDevice *slot = DIMM(dev); + int idx = slot->idx; + + if (add) { + g->mems_sts[idx/8] &= ~(1 << (idx%8)); + } else { + g->mems_sts[idx/8] |= (1 << (idx%8)); + } + return 0; +} + void ich9_pm_init(void *device, qemu_irq sci_irq, qemu_irq cmos_s3) { ICH9LPCState *lpc = (ICH9LPCState *)device; @@ -296,10 +321,10 @@ void ich9_pm_init(void *device, qemu_irq sci_irq, qemu_irq cmos_s3) memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); memory_region_init_io(&pm->io_memhp, &ich9_memhp_ops, pm, "apci-memhp0", - DIMM_BITMAP_BYTES + 1); + DIMM_BITMAP_BYTES + 4); memory_region_add_subregion(get_system_io(), ICH9_MEM_BASE, &pm->io_memhp); - dimm_bus_hotplug(ich9_dimm_hotplug, &lpc->d.qdev); + dimm_bus_hotplug(ich9_dimm_hotplug, ich9_dimm_revert, &lpc->d.qdev); pm->irq = sci_irq; qemu_register_reset(pm_reset, pm); diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h index af61a2d..8f57cd8 100644 --- a/hw/acpi_ich9.h +++ b/hw/acpi_ich9.h @@ -26,6 +26,9 @@ #define ICH9_MEM_BASE 0xaf80 #define ICH9_MEM_EJ_BASE 0xafa0 #define ICH9_MEM_HOTPLUG_STATUS 8 +#define ICH9_MEM_OST_REMOVE_FAIL 0xafa1 +#define ICH9_MEM_OST_ADD_SUCCESS 0xafa2 +#define ICH9_MEM_OST_ADD_FAIL 0xafa3 typedef struct ICH9LPCPMRegs { /* diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 6e4718e..70aa480 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -51,6 +51,9 @@ #define PCI_RMV_BASE 0xae0c #define MEM_BASE 0xaf80 #define MEM_EJ_BASE 0xafa0 +#define MEM_OST_REMOVE_FAIL 0xafa1 +#define MEM_OST_ADD_SUCCESS 0xafa2 +#define MEM_OST_ADD_FAIL 0xafa3 #define PIIX4_MEM_HOTPLUG_STATUS 8 #define PIIX4_PCI_HOTPLUG_STATUS 2 @@ -90,6 +93,7 @@ typedef struct PIIX4PMState { uint8_t s4_val; } PIIX4PMState; +static int piix4_dimm_revert(DeviceState *qdev, DimmDevice *dev, int add); static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s); #define ACPI_ENABLE 0xf1 @@ -551,6 +555,15 @@ static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) case MEM_EJ_BASE - MEM_BASE: dimm_notify(val, DIMM_REMOVE_SUCCESS); break; + case MEM_OST_REMOVE_FAIL - MEM_BASE: + dimm_notify(val, DIMM_REMOVE_FAIL); + break; + case MEM_OST_ADD_SUCCESS - MEM_BASE: + dimm_notify(val, DIMM_ADD_SUCCESS); + break; + case MEM_OST_ADD_FAIL - MEM_BASE: + dimm_notify(val, DIMM_ADD_FAIL); + break; default: PIIX4_DPRINTF("memhp write invalid %x <== %d\n", addr, val); } @@ -564,7 +577,7 @@ static const MemoryRegionOps piix4_memhp_ops = { .read = memhp_readb, }, { - .offset = MEM_EJ_BASE - MEM_BASE, .len = 1, + .offset = MEM_EJ_BASE - MEM_BASE, .len = 4, .size = 1, .write = memhp_writeb, }, @@ -653,7 +666,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) memory_region_add_subregion(get_system_io(), PCI_HOTPLUG_ADDR, &s->io_pci); memory_region_init_io(&s->io_memhp, &piix4_memhp_ops, s, "apci-memhp0", - DIMM_BITMAP_BYTES + 1); + DIMM_BITMAP_BYTES + 4); memory_region_add_subregion(get_system_io(), MEM_BASE, &s->io_memhp); for (i = 0; i < DIMM_BITMAP_BYTES; i++) { @@ -661,7 +674,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) } pci_bus_hotplug(bus, piix4_device_hotplug, &s->dev.qdev); - dimm_bus_hotplug(piix4_dimm_hotplug, &s->dev.qdev); + dimm_bus_hotplug(piix4_dimm_hotplug, piix4_dimm_revert, &s->dev.qdev); } static void enable_device(PIIX4PMState *s, int slot) @@ -706,6 +719,22 @@ static int piix4_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int return 0; } +static int piix4_dimm_revert(DeviceState *qdev, DimmDevice *dev, int add) +{ + PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, qdev); + PIIX4PMState *s = DO_UPCAST(PIIX4PMState, dev, pci_dev); + struct gpe_regs *g = &s->gperegs; + DimmDevice *slot = DIMM(dev); + int idx = slot->idx; + + if (add) { + g->mems_sts[idx/8] &= ~(1 << (idx%8)); + } else { + g->mems_sts[idx/8] |= (1 << (idx%8)); + } + return 0; +} + static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev, PCIHotplugState state) { diff --git a/hw/dimm.c b/hw/dimm.c index 4670ae6..69b97b6 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -149,7 +149,8 @@ void dimm_config_create(char *id, uint64_t size, const char *bus, uint64_t node, QTAILQ_INSERT_TAIL(&dimmconfig_list, dimm_cfg, nextdimmcfg); } -void dimm_bus_hotplug(dimm_hotplug_fn hotplug, DeviceState *qdev) +void dimm_bus_hotplug(dimm_hotplug_fn hotplug, dimm_hotplug_fn revert, + DeviceState *qdev) { DimmBus *bus; QLIST_FOREACH(bus, &memory_buses, next) { @@ -157,6 +158,7 @@ void dimm_bus_hotplug(dimm_hotplug_fn hotplug, DeviceState *qdev) bus->qbus.allow_hotplug = 1; bus->dimm_hotplug_qdev = qdev; bus->dimm_hotplug = hotplug; + bus->dimm_revert = revert; } } @@ -168,6 +170,7 @@ static void dimm_plug_device(DimmDevice *slot) if (bus->dimm_hotplug) { bus->dimm_hotplug(bus->dimm_hotplug_qdev, slot, 1); } + slot->pending = DIMM_ADD_PENDING; } static int dimm_unplug_device(DeviceState *qdev) @@ -177,6 +180,7 @@ static int dimm_unplug_device(DeviceState *qdev) if (bus->dimm_hotplug) { bus->dimm_hotplug(bus->dimm_hotplug_qdev, DIMM(qdev), 0); } + DIMM(qdev)->pending = DIMM_REMOVE_PENDING; return 1; } @@ -353,6 +357,7 @@ static int dimm_init(DeviceState *s) slot->start = slotcfg->start; slot->size = slotcfg->size; slot->node = slotcfg->node; + slot->pending = DIMM_NO_PENDING; QTAILQ_INSERT_TAIL(&bus->dimmlist, slot, nextdimm); dimm_plug_device(slot); @@ -374,13 +379,34 @@ void dimm_notify(uint32_t idx, uint32_t event) result = g_malloc0(sizeof(*result)); slotcfg = dimmcfg_find_from_name(bus, slot->qdev.id); result->dimmname = slotcfg->name; + result->ret = event; switch (event) { case DIMM_REMOVE_SUCCESS: + slot->pending = DIMM_NO_PENDING; qdev_unplug_complete((DeviceState *)slot, NULL); QTAILQ_REMOVE(&bus->dimmlist, slot, nextdimm); QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); break; + case DIMM_REMOVE_FAIL: + slot->pending = DIMM_NO_PENDING; + if (bus->dimm_revert) { + bus->dimm_revert(bus->dimm_hotplug_qdev, slot, 0); + } + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); + break; + case DIMM_ADD_SUCCESS: + slot->pending = DIMM_NO_PENDING; + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); + break; + case DIMM_ADD_FAIL: + slot->pending = DIMM_NO_PENDING; + if (bus->dimm_revert) { + bus->dimm_revert(bus->dimm_hotplug_qdev, slot, 1); + } + qdev_unplug_complete((DeviceState *)slot, NULL); + QTAILQ_REMOVE(&bus->dimmlist, slot, nextdimm); + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); default: g_free(result); break; diff --git a/hw/dimm.h b/hw/dimm.h index 8f9546b..f43f745 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -18,6 +18,12 @@ typedef enum { DIMM_ADD_FAIL = 3 } dimm_hp_result_code; +typedef enum { + DIMM_NO_PENDING = 0, + DIMM_ADD_PENDING = 1, + DIMM_REMOVE_PENDING = 2, +} dimm_hp_pending_code; + #define TYPE_DIMM "dimm" #define DIMM(obj) \ OBJECT_CHECK(DimmDevice, (obj), TYPE_DIMM) @@ -43,6 +49,7 @@ struct DimmDevice { uint32_t node; /* numa node proximity */ uint32_t populated; /* 1 means device has been hotplugged. Default is 0. */ MemoryRegion *mr; /* MemoryRegion for this slot. !NULL only if populated */ + dimm_hp_pending_code pending; /* pending hot operation for this dimm */ QTAILQ_ENTRY(DimmDevice) nextdimm; }; @@ -68,6 +75,7 @@ typedef struct DimmBus { DeviceState *dimm_hotplug_qdev; dimm_hotplug_fn dimm_hotplug; DimmConfiglist dimmconfig_list; + dimm_hotplug_fn dimm_revert; QTAILQ_HEAD(Dimmlist, DimmDevice) dimmlist; QTAILQ_HEAD(dimm_hp_result_head, dimm_hp_result) dimm_hp_result_queue; QLIST_ENTRY(DimmBus) next; @@ -79,7 +87,8 @@ struct dimm_hp_result { QTAILQ_ENTRY(dimm_hp_result) next; }; -void dimm_bus_hotplug(dimm_hotplug_fn hotplug, DeviceState *qdev); +void dimm_bus_hotplug(dimm_hotplug_fn hotplug, dimm_hotplug_fn revert, + DeviceState *qdev); void dimm_setup_fwcfg_layout(uint64_t *fw_cfg_slots); int dimm_add(char *id); DimmBus *dimm_bus_create(Object *parent, const char *name, uint32_t max_dimms, -- 1.7.9

1 0

[RFC PATCH v4 27/30] Add _OST dimm method
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

Add support for _OST method. _OST method will write into the correct I/O byte to signal success / failure of hot-add or hot-remove to qemu. --- src/acpi-dsdt-mem-hotplug.dsl | 51 ++++++++++++++++++++++++++++++++++++++++- src/ssdt-mem.dsl | 4 +++ 2 files changed, 54 insertions(+), 1 deletions(-) diff --git a/src/acpi-dsdt-mem-hotplug.dsl b/src/acpi-dsdt-mem-hotplug.dsl index fd73ea7..a648bee 100644 --- a/src/acpi-dsdt-mem-hotplug.dsl +++ b/src/acpi-dsdt-mem-hotplug.dsl @@ -27,7 +27,28 @@ Scope(\_SB) { { MPE, 8 } - + + /* Memory hot-remove notify failure byte */ + OperationRegion(MEEF, SystemIO, 0xafa1, 1) + Field (MEEF, ByteAcc, NoLock, Preserve) + { + MEF, 8 + } + + /* Memory hot-add notify success byte */ + OperationRegion(MPIS, SystemIO, 0xafa2, 1) + Field (MPIS, ByteAcc, NoLock, Preserve) + { + MIS, 8 + } + + /* Memory hot-add notify failure byte */ + OperationRegion(MPIF, SystemIO, 0xafa3, 1) + Field (MPIF, ByteAcc, NoLock, Preserve) + { + MIF, 8 + } + Method(MESC, 0) { // Local5 = active memdevice bitmap Store (MES, Local5) @@ -69,4 +90,32 @@ Scope(\_SB) { Sleep(200) } + Method (MOST, 3, Serialized) { + // _OST method - OS status indication + Switch (And(Arg0, 0xFF)) { + Case(0x3) + { + Switch(And(Arg1, 0xFF)) { + Case(0x1) { + Store(Arg2, MEF) + // Revert MEON flag for this memory device to one + Store(One, Index(MEON, Arg2)) + } + } + } + Case(0x1) + { + Switch(And(Arg1, 0xFF)) { + Case(0x0) { + Store(Arg2, MIS) + } + Case(0x1) { + Store(Arg2, MIF) + // Revert MEON flag for this memory device to zero + Store(Zero, Index(MEON, Arg2)) + } + } + } + } + } } diff --git a/src/ssdt-mem.dsl b/src/ssdt-mem.dsl index eef84b6..47a3b4f 100644 --- a/src/ssdt-mem.dsl +++ b/src/ssdt-mem.dsl @@ -38,6 +38,7 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) External(CMST, MethodObj) External(MPEJ, MethodObj) + External(MOST, MethodObj) Name(_CRS, ResourceTemplate() { QwordMemory( @@ -60,6 +61,9 @@ DefinitionBlock ("ssdt-mem.aml", "SSDT", 0x02, "BXPC", "CSSDT", 0x1) Method (_EJ0, 1, NotSerialized) { MPEJ(ID, Arg0) } + Method (_OST, 3) { + MOST(Arg0, Arg1, ID) + } } } -- 1.7.9

1 0

[RFC PATCH v4 26/30] Implement qmp and hmp commands for notification lists
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

Guest can respond to ACPI hotplug events e.g. with _EJ or _OST method. This patch implements a tail queue to store guest notifications for memory hot-add and hot-remove requests. Guest responses for memory hotplug command on a per-dimm basis can be detected with the new hmp command "info memory-hotplug" or the new qmp command "query-memory-hotplug" Examples: (qemu) device_add dimm,id=ram0 (qemu) info memory-hotplug dimm: ram0 hot-add success or dimm: ram0 hot-add failure (qemu) device_del ram3 (qemu) info memory-hotplug dimm: ram3 hot-remove success or dimm: ram3 hot-remove failure Results are removed from the queue once read. This patch only queues _EJ events that signal hot-remove success. For _OST event queuing, which cover the hot-remove failure and hot-add success/failure cases, the _OST patches in this series are are also needed. These notification items should probably be part of migration state (not yet implemented). Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> --- hmp-commands.hx | 2 + hmp.c | 17 +++++++++++++++ hmp.h | 1 + hw/dimm.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ hw/dimm.h | 1 + monitor.c | 7 ++++++ qapi-schema.json | 26 +++++++++++++++++++++++ qmp-commands.hx | 37 ++++++++++++++++++++++++++++++++ 8 files changed, 152 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 65d799e..b94b7a2 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1574,6 +1574,8 @@ show roms show memory-total @item info dimm show dimm +@item info memory-hotplug +show memory-hotplug @end table ETEXI diff --git a/hmp.c b/hmp.c index f8456fd..727ed80 100644 --- a/hmp.c +++ b/hmp.c @@ -652,6 +652,23 @@ void hmp_info_dimm(Monitor *mon) qapi_free_DimmInfoList(info); } +void hmp_info_memory_hotplug(Monitor *mon) +{ + MemHpInfoList *info; + MemHpInfoList *item; + MemHpInfo *dimm; + + info = qmp_query_memory_hotplug(NULL); + for (item = info; item; item = item->next) { + dimm = item->value; + monitor_printf(mon, "dimm: %s %s %s\n", dimm->dimm, + dimm->request, dimm->result); + dimm->dimm = NULL; + } + + qapi_free_MemHpInfoList(info); +} + void hmp_quit(Monitor *mon, const QDict *qdict) { monitor_suspend(mon); diff --git a/hmp.h b/hmp.h index 74ac061..92095df 100644 --- a/hmp.h +++ b/hmp.h @@ -38,6 +38,7 @@ void hmp_info_pci(Monitor *mon); void hmp_info_block_jobs(Monitor *mon); void hmp_info_memory_total(Monitor *mon); void hmp_info_dimm(Monitor *mon); +void hmp_info_memory_hotplug(Monitor *mon); void hmp_quit(Monitor *mon, const QDict *qdict); void hmp_stop(Monitor *mon, const QDict *qdict); void hmp_system_reset(Monitor *mon, const QDict *qdict); diff --git a/hw/dimm.c b/hw/dimm.c index 0b4e22d..4670ae6 100644 --- a/hw/dimm.c +++ b/hw/dimm.c @@ -67,6 +67,7 @@ static void dimm_bus_initfn(Object *obj) DimmBus *bus = DIMM_BUS(obj); QTAILQ_INIT(&bus->dimmconfig_list); QTAILQ_INIT(&bus->dimmlist); + QTAILQ_INIT(&bus->dimm_hp_result_queue); } static const TypeInfo dimm_bus_info = { @@ -278,6 +279,58 @@ DimmInfoList *qmp_query_dimm_info(Error **errp) return head; } +MemHpInfoList *qmp_query_memory_hotplug(Error **errp) +{ + DimmBus *bus; + MemHpInfoList *head = NULL, *cur_item = NULL, *info; + struct dimm_hp_result *item, *nextitem; + + QLIST_FOREACH(bus, &memory_buses, next) { + QTAILQ_FOREACH_SAFE(item, &bus->dimm_hp_result_queue, next, nextitem) { + + info = g_malloc0(sizeof(*info)); + info->value = g_malloc0(sizeof(*info->value)); + info->value->dimm = g_malloc0(sizeof(char) * 32); + info->value->request = g_malloc0(sizeof(char) * 16); + info->value->result = g_malloc0(sizeof(char) * 16); + switch (item->ret) { + case DIMM_REMOVE_SUCCESS: + strcpy(info->value->request, "hot-remove"); + strcpy(info->value->result, "success"); + break; + case DIMM_REMOVE_FAIL: + strcpy(info->value->request, "hot-remove"); + strcpy(info->value->result, "failure"); + break; + case DIMM_ADD_SUCCESS: + strcpy(info->value->request, "hot-add"); + strcpy(info->value->result, "success"); + break; + case DIMM_ADD_FAIL: + strcpy(info->value->request, "hot-add"); + strcpy(info->value->result, "failure"); + break; + default: + break; + } + strcpy(info->value->dimm, item->dimmname); + /* XXX: waiting for the qapi to support GSList */ + if (!cur_item) { + head = cur_item = info; + } else { + cur_item->next = info; + cur_item = info; + } + + /* hotplug notification copied to qmp list, delete original item */ + QTAILQ_REMOVE(&bus->dimm_hp_result_queue, item, next); + g_free(item); + } + } + + return head; +} + static int dimm_init(DeviceState *s) { DimmBus *bus = DIMM_BUS(qdev_get_parent_bus(s)); @@ -311,17 +364,25 @@ void dimm_notify(uint32_t idx, uint32_t event) { DimmBus *bus; DimmDevice *slot; + DimmConfig *slotcfg; + struct dimm_hp_result *result; slot = dimm_find_from_idx(idx); assert(slot != NULL); bus = DIMM_BUS(qdev_get_parent_bus(&slot->qdev)); + result = g_malloc0(sizeof(*result)); + slotcfg = dimmcfg_find_from_name(bus, slot->qdev.id); + result->dimmname = slotcfg->name; + switch (event) { case DIMM_REMOVE_SUCCESS: qdev_unplug_complete((DeviceState *)slot, NULL); QTAILQ_REMOVE(&bus->dimmlist, slot, nextdimm); + QTAILQ_INSERT_TAIL(&bus->dimm_hp_result_queue, result, next); break; default: + g_free(result); break; } } diff --git a/hw/dimm.h b/hw/dimm.h index 86c7cd5..8f9546b 100644 --- a/hw/dimm.h +++ b/hw/dimm.h @@ -69,6 +69,7 @@ typedef struct DimmBus { dimm_hotplug_fn dimm_hotplug; DimmConfiglist dimmconfig_list; QTAILQ_HEAD(Dimmlist, DimmDevice) dimmlist; + QTAILQ_HEAD(dimm_hp_result_head, dimm_hp_result) dimm_hp_result_queue; QLIST_ENTRY(DimmBus) next; } DimmBus; diff --git a/monitor.c b/monitor.c index de1dcf1..40a7b7e 100644 --- a/monitor.c +++ b/monitor.c @@ -2715,6 +2715,13 @@ static mon_cmd_t info_cmds[] = { .mhandler.info = hmp_info_memory_total, }, { + .name = "memory-hotplug", + .args_type = "", + .params = "", + .help = "show memory hotplug status", + .mhandler.info = hmp_info_memory_hotplug, + }, + { .name = "qtree", .args_type = "", .params = "", diff --git a/qapi-schema.json b/qapi-schema.json index 5a20577..d2e9831 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2940,6 +2940,32 @@ { 'command': 'query-dimm-info', 'returns': ['DimmInfo'] } ## +# @MemHpInfo: +# +# Information about status of a memory hotplug command +# +# @dimm: the Dimm associated with the result +# +# @result: the result of the hotplug command +# +# Since: 1.4 +# +## +{ 'type': 'MemHpInfo', + 'data': {'dimm': 'str', 'request': 'str', 'result': 'str'} } + +## +# @query-memory-hotplug: +# +# Returns a list of information about pending hotplug commands +# +# Returns: a list of @MemhpInfo +# +# Since: 1.4 +## +{ 'command': 'query-memory-hotplug', 'returns': ['MemHpInfo'] } + +## # @QKeyCode: # # An enumeration of key name. diff --git a/qmp-commands.hx b/qmp-commands.hx index a99117a..ad0dac7 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2674,3 +2674,40 @@ Example: } EQMP + { + .name = "query-memory-hotplug", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_memory_hotplug + }, +SQMP +query-memory-hotplug +---------- + +Show memory hotplug command notifications. + +Return a json-array. Each DIMM that has a pending notification is represented +by a json-object, which contains: + +- "dimm": Dimm name (json-str) +- "request": type of hot request: hot-add or hot-remove (json-str) +- "result": result of the hotplug request for this Dimm success or failure (json-str) + +Example: + +-> { "execute": "query-memory-hotplug" } +<- { + "return":[ + { + "result": "failure", + "request": "hot-remove", + "dimm": "dimm10" + }, + { + "result": "success", + "request": "hot-add", + "dimm": "dimm3" + } + ] + } + +EQMP -- 1.7.9

1 0

[RFC PATCH v4 25/30] acpi_ich9: add hot-remove capability
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

--- hw/acpi_ich9.c | 28 +++++++++++++++++++++++++++- hw/acpi_ich9.h | 1 + 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c index abafbb5..f5dc1c9 100644 --- a/hw/acpi_ich9.c +++ b/hw/acpi_ich9.c @@ -105,12 +105,29 @@ static uint32_t memhp_readb(void *opaque, uint32_t addr) return val; } +static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) +{ + switch (addr) { + case ICH9_MEM_EJ_BASE - ICH9_MEM_BASE: + dimm_notify(val, DIMM_REMOVE_SUCCESS); + break; + default: + ICH9_DEBUG("memhp write invalid %x <== %d\n", addr, val); + } + ICH9_DEBUG("memhp write %x <== %d\n", addr, val); +} + static const MemoryRegionOps ich9_memhp_ops = { .old_portio = (MemoryRegionPortio[]) { { .offset = 0, .len = DIMM_BITMAP_BYTES, .size = 1, .read = memhp_readb, }, + { + .offset = ICH9_MEM_EJ_BASE - ICH9_MEM_BASE, + .len = 1, .size = 1, + .write = memhp_writeb, + }, PORTIO_END_OF_LIST() }, .endianness = DEVICE_LITTLE_ENDIAN, @@ -234,6 +251,13 @@ static void enable_mem_device(ICH9LPCState *s, int memdevice) g->mems_sts[memdevice/8] |= (1 << (memdevice%8)); } +static void disable_mem_device(ICH9LPCState *s, int memdevice) +{ + struct gpe_regs *g = &s->pm.gperegs; + s->pm.acpi_regs.gpe.sts[0] |= ICH9_MEM_HOTPLUG_STATUS; + g->mems_sts[memdevice/8] &= ~(1 << (memdevice%8)); +} + static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int add) { @@ -243,6 +267,8 @@ static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int if (add) { enable_mem_device(s, slot->idx); + } else { + disable_mem_device(s, slot->idx); } pm_update_sci(&s->pm); return 0; @@ -270,7 +296,7 @@ void ich9_pm_init(void *device, qemu_irq sci_irq, qemu_irq cmos_s3) memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); memory_region_init_io(&pm->io_memhp, &ich9_memhp_ops, pm, "apci-memhp0", - DIMM_BITMAP_BYTES); + DIMM_BITMAP_BYTES + 1); memory_region_add_subregion(get_system_io(), ICH9_MEM_BASE, &pm->io_memhp); dimm_bus_hotplug(ich9_dimm_hotplug, &lpc->d.qdev); diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h index 4419247..af61a2d 100644 --- a/hw/acpi_ich9.h +++ b/hw/acpi_ich9.h @@ -24,6 +24,7 @@ #include "acpi.h" #define ICH9_MEM_BASE 0xaf80 +#define ICH9_MEM_EJ_BASE 0xafa0 #define ICH9_MEM_HOTPLUG_STATUS 8 typedef struct ICH9LPCPMRegs { -- 1.7.9

1 0

[RFC PATCH v4 24/30] acpi_piix4: add hot-remove capability
by Vasilis Liaskovitis 18 Dec '12

18 Dec '12

--- docs/specs/acpi_hotplug.txt | 8 ++++++++ hw/acpi_piix4.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/docs/specs/acpi_hotplug.txt b/docs/specs/acpi_hotplug.txt index 8391713..cf86242 100644 --- a/docs/specs/acpi_hotplug.txt +++ b/docs/specs/acpi_hotplug.txt @@ -12,3 +12,11 @@ Dimm hot-plug notification pending. One bit per slot. Read by ACPI BIOS GPE.3 handler to notify OS of memory hot-add or hot-remove events. Read-only. + +Memory Dimm ejection success notification (IO port 0xafa0, 1-byte access): +--------------------------------------------------------------- +Dimm hot-remove _EJ0 notification. Byte value indicates Dimm slot that was +ejected. + +Written by ACPI memory device _EJ0 method to notify qemu of successfull +hot-removal. Write-only. diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 879d8a0..6e4718e 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -50,6 +50,7 @@ #define PCI_EJ_BASE 0xae08 #define PCI_RMV_BASE 0xae0c #define MEM_BASE 0xaf80 +#define MEM_EJ_BASE 0xafa0 #define PIIX4_MEM_HOTPLUG_STATUS 8 #define PIIX4_PCI_HOTPLUG_STATUS 2 @@ -544,12 +545,29 @@ static uint32_t memhp_readb(void *opaque, uint32_t addr) return val; } +static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) +{ + switch (addr) { + case MEM_EJ_BASE - MEM_BASE: + dimm_notify(val, DIMM_REMOVE_SUCCESS); + break; + default: + PIIX4_DPRINTF("memhp write invalid %x <== %d\n", addr, val); + } + PIIX4_DPRINTF("memhp write %x <== %d\n", addr, val); +} + static const MemoryRegionOps piix4_memhp_ops = { .old_portio = (MemoryRegionPortio[]) { { .offset = 0, .len = DIMM_BITMAP_BYTES, .size = 1, .read = memhp_readb, }, + { + .offset = MEM_EJ_BASE - MEM_BASE, .len = 1, + .size = 1, + .write = memhp_writeb, + }, PORTIO_END_OF_LIST() }, .endianness = DEVICE_LITTLE_ENDIAN, @@ -635,7 +653,7 @@ static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s) memory_region_add_subregion(get_system_io(), PCI_HOTPLUG_ADDR, &s->io_pci); memory_region_init_io(&s->io_memhp, &piix4_memhp_ops, s, "apci-memhp0", - DIMM_BITMAP_BYTES); + DIMM_BITMAP_BYTES + 1); memory_region_add_subregion(get_system_io(), MEM_BASE, &s->io_memhp); for (i = 0; i < DIMM_BITMAP_BYTES; i++) { @@ -665,6 +683,13 @@ static void enable_mem_device(PIIX4PMState *s, int memdevice) g->mems_sts[memdevice/8] |= (1 << (memdevice%8)); } +static void disable_mem_device(PIIX4PMState *s, int memdevice) +{ + struct gpe_regs *g = &s->gperegs; + s->ar.gpe.sts[0] |= PIIX4_MEM_HOTPLUG_STATUS; + g->mems_sts[memdevice/8] &= ~(1 << (memdevice%8)); +} + static int piix4_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int add) { @@ -674,6 +699,8 @@ static int piix4_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int if (add) { enable_mem_device(s, slot->idx); + } else { + disable_mem_device(s, slot->idx); } pm_update_sci(s); return 0; -- 1.7.9

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS