Commit a58a4cb1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging 



vhost, virtio, pci, pc, acpi

nvdimm work
sparse cpu id rework
ipmi enhancements
fixes all over the place
pxb option to tweak chassis number

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 15 Mar 2016 14:33:10 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"

* remotes/mst/tags/for_upstream: (51 commits)
  hw/acpi: fix GSI links UID
  ipmi: add some local variables in ipmi_sdr_init
  ipmi: remove the need of an ending record in the SDR table
  ipmi: use a function to initialize the SDR table
  ipmi: add a realize function to the device class
  ipmi: add rsp_buffer_set_error() helper
  ipmi: remove IPMI_CHECK_RESERVATION() macro
  ipmi: replace IPMI_ADD_RSP_DATA() macro with inline helpers
  ipmi: remove IPMI_CHECK_CMD_LEN() macro
  MAINTAINERS: machine core
  MAINTAINERS: Add an entry for virtio header files
  pc: acpi: clarify why possible LAPIC entries must be present in MADT
  pc: acpi: drop cpu->found_cpus bitmap
  pc: acpi: create Processor and Notify objects only for valid lapics
  pc: acpi: create MADT.lapic entries only for valid lapics
  pc: acpi: SRAT: create only valid processor lapic entries
  pc: acpi: cleanup qdev_get_machine() calls
  machine: introduce MachineClass.possible_cpu_arch_ids() hook
  pc: init pcms->apic_id_limit once and use it throughout pc.c
  pc: acpi: remove NOP assignment
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f84d5871 6a991e07

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -717,6 +717,12 @@ F: hw/timer/hpet* 
F: hw/timer/i8254*

F: hw/timer/mc146818rtc*



Machine core

M: Eduardo Habkost <ehabkost@redhat.com>

M: Marcel Apfelbaum <marcel@redhat.com>

S: Supported

F: hw/core/machine.c

F: include/hw/boards.h



Xtensa Machines

---------------
@@ -878,6 +884,7 @@ M: Michael S. Tsirkin <mst@redhat.com> 
S: Supported

F: hw/*/virtio*

F: net/vhost-user.c

F: include/hw/virtio/



virtio-9p

M: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

docs/pci_expander_bridge.txt

+3 −3
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ A detailed command line would be: 
-object memory-backend-ram,size=1024M,policy=bind,host-nodes=0,id=ram-node0 -numa node,nodeid=0,cpus=0,memdev=ram-node0

-object memory-backend-ram,size=1024M,policy=bind,host-nodes=1,id=ram-node1 -numa node,nodeid=1,cpus=1,memdev=ram-node1

-device pxb,id=bridge1,bus=pci.0,numa_node=1,bus_nr=4 -netdev user,id=nd -device e1000,bus=bridge1,addr=0x4,netdev=nd

-device pxb,id=bridge2,bus=pci.0,numa_node=0,bus_nr=8, -device e1000,bus=bridge2,addr=0x3

-device pxb,id=bridge3,bus=pci.0,bus_nr=40, -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1

-device pxb,id=bridge2,bus=pci.0,numa_node=0,bus_nr=8 -device e1000,bus=bridge2,addr=0x3

-device pxb,id=bridge3,bus=pci.0,bus_nr=40 -drive if=none,id=drive0,file=[img] -device virtio-blk-pci,drive=drive0,scsi=off,bus=bridge3,addr=1



Here you have:

 - 2 NUMA nodes for the guest, 0 and 1. (both mapped to the same NUMA node in host, but you can and should put it in different host NUMA nodes)
@@ -43,7 +43,7 @@ Implementation 
==============

The PXB is composed by:

- HostBridge (TYPE_PXB_HOST)

  The host bridge allows to register and query the PXB's rPCI root bus in QEMU.

  The host bridge allows to register and query the PXB's PCI root bus in QEMU.

- PXBDev(TYPE_PXB_DEVICE)

  It is a regular PCI Device that resides on the piix host-bridge bus and its bus uses the same PCI domain.

  However, the bus behind is exposed through ACPI as a primary PCI bus and starts a new PCI hierarchy.

docs/specs/pci-ids.txt

+17 −7
Original line number Diff line number Diff line
@@ -15,13 +15,23 @@ The 1000 -> 10ff device ID range is used as follows for virtio-pci devices. 
Note that this allocation separate from the virtio device IDs, which are

maintained as part of the virtio specification.



1af4:1000  network device

1af4:1001  block device

1af4:1002  balloon device

1af4:1003  console device

1af4:1004  SCSI host bus adapter device

1af4:1005  entropy generator device

1af4:1009  9p filesystem device

1af4:1000  network device (legacy)

1af4:1001  block device (legacy)

1af4:1002  balloon device (legacy)

1af4:1003  console device (legacy)

1af4:1004  SCSI host bus adapter device (legacy)

1af4:1005  entropy generator device (legacy)

1af4:1009  9p filesystem device (legacy)



1af4:1041  network device (modern)

1af4:1042  block device (modern)

1af4:1043  console device (modern)

1af4:1044  entropy generator device (modern)

1af4:1045  balloon device (modern)

1af4:1048  SCSI host bus adapter device (modern)

1af4:1049  9p filesystem device (modern)

1af4:1050  virtio gpu device (modern)

1af4:1052  virtio input device (modern)



1af4:10f0  Available for experimental usage without registration.  Must get

   to      official ID when the code leaves the test lab (i.e. when seeking

hw/acpi/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o 
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o

common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o cpu_hotplug_acpi_table.o

common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o memory_hotplug_acpi_table.o

common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o

obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o

common-obj-$(CONFIG_ACPI) += acpi_interface.o

common-obj-$(CONFIG_ACPI) += bios-linker-loader.o

common-obj-$(CONFIG_ACPI) += aml-build.o

hw/acpi/aml-build.c

+51 −2
Original line number Diff line number Diff line
@@ -258,6 +258,34 @@ static void build_append_int(GArray *table, uint64_t value) 
    }

}



/*

 * Build NAME(XXXX, 0x00000000) where 0x00000000 is encoded as a dword,

 * and return the offset to 0x00000000 for runtime patching.

 *

 * Warning: runtime patching is best avoided. Only use this as

 * a replacement for DataTableRegion (for guests that don't

 * support it).

 */

int

build_append_named_dword(GArray *array, const char *name_format, ...)

{

    int offset;

    va_list ap;



    build_append_byte(array, 0x08); /* NameOp */

    va_start(ap, name_format);

    build_append_namestringv(array, name_format, ap);

    va_end(ap);



    build_append_byte(array, 0x0C); /* DWordPrefix */



    offset = array->len;

    build_append_int_noprefix(array, 0x00000000, 4);

    assert(array->len == offset + 4);



    return offset;

}



static GPtrArray *alloc_list;



static Aml *aml_alloc(void)
@@ -942,14 +970,14 @@ Aml *aml_package(uint8_t num_elements) 


/* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: DefOpRegion */

Aml *aml_operation_region(const char *name, AmlRegionSpace rs,

                          uint32_t offset, uint32_t len)

                          Aml *offset, uint32_t len)

{

    Aml *var = aml_alloc();

    build_append_byte(var->buf, 0x5B); /* ExtOpPrefix */

    build_append_byte(var->buf, 0x80); /* OpRegionOp */

    build_append_namestring(var->buf, "%s", name);

    build_append_byte(var->buf, rs);

    build_append_int(var->buf, offset);

    aml_append(var, offset);

    build_append_int(var->buf, len);

    return var;

}
@@ -997,6 +1025,20 @@ Aml *create_field_common(int opcode, Aml *srcbuf, Aml *index, const char *name) 
    return var;

}



/* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: DefCreateField */

Aml *aml_create_field(Aml *srcbuf, Aml *bit_index, Aml *num_bits,

                      const char *name)

{

    Aml *var = aml_alloc();

    build_append_byte(var->buf, 0x5B); /* ExtOpPrefix */

    build_append_byte(var->buf, 0x13); /* CreateFieldOp */

    aml_append(var, srcbuf);

    aml_append(var, bit_index);

    aml_append(var, num_bits);

    build_append_namestring(var->buf, "%s", name);

    return var;

}



/* ACPI 1.0b: 16.2.5.2 Named Objects Encoding: DefCreateDWordField */

Aml *aml_create_dword_field(Aml *srcbuf, Aml *index, const char *name)

{
@@ -1423,6 +1465,13 @@ Aml *aml_alias(const char *source_object, const char *alias_object) 
    return var;

}



/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefConcat */

Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target)

{

    return build_opcode_2arg_dst(0x73 /* ConcatOp */, source1, source2,

                                 target);

}



void

build_header(GArray *linker, GArray *table_data,

             AcpiTableHeader *h, const char *sig, int len, uint8_t rev,