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

virtio,pc,acpi: fixes, tests

Fixes and tests all over the place.
Batch iommu updates for vdpa.
Removal of deprecated cpu hotplug commands.
SMBIOS OEM string support.

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

# gpg: Signature made Tue 29 Sep 2020 08:09:21 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream: (48 commits)
  libvhost-user: return on error in vu_log_queue_fill()
  libvhost-user: return early on virtqueue errors
  hw: virtio-pmem: detach the element fromt the virtqueue when error occurs
  tests/acpi: update golden master DSDT binary table blobs for q35
  piix4: don't reserve hw resources when hotplug is off globally
  Add ACPI DSDT tables for q35 that are being updated by the next patch
  tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag
  tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag
  tests/acpi: list added acpi table binary file for pci bridge hotplug test
  i440fx/acpi: do not add hotplug related amls for cold plugged bridges
  Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus
  tests/acpi: add a new ACPI table in order to test root pci hotplug on/off
  tests/acpi: add new unit test to test hotplug off/on feature on the root pci bus
  tests/acpi: mark addition of table DSDT.roothp for unit testing root pci hotplug
  vhost-user: save features of multiqueues if chardev is closed
  qemu-options: document SMBIOS type 11 settings
  hw/smbios: report error if table size is too large
  hw/smbios: support loading OEM strings values from a file
  tests: acpi: update acpi blobs with new AML
  x68: acpi: trigger SMI before sending hotplug Notify event to OSPM
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

1 files changed, 205 insertions, 0 deletions

diff --git a/tests/data/acpi/pc/SSDT.dsl b/tests/data/acpi/pc/SSDT.dsl
new file mode 100644
index 0000000000..abd64f6133
--- /dev/null
+++ b/tests/data/acpi/pc/SSDT.dsl
@@ -0,0 +1,205 @@
+/*
+ * Intel ACPI Component Architecture
+ * AML/ASL+ Disassembler version 20190509 (64-bit version)
+ * Copyright (c) 2000 - 2019 Intel Corporation
+ * 
+ * Disassembling to symbolic ASL+ operators
+ *
+ * Disassembly of tests/data/acpi/pc/SSDT.dimmpxm, Mon Sep 28 17:24:38 2020
+ *
+ * Original Table Header:
+ *     Signature        "SSDT"
+ *     Length           0x000002DE (734)
+ *     Revision         0x01
+ *     Checksum         0x56
+ *     OEM ID           "BOCHS "
+ *     OEM Table ID     "NVDIMM"
+ *     OEM Revision     0x00000001 (1)
+ *     Compiler ID      "BXPC"
+ *     Compiler Version 0x00000001 (1)
+ */
+DefinitionBlock ("", "SSDT", 1, "BOCHS ", "NVDIMM", 0x00000001)
+{
+    Scope (\_SB)
+    {
+        Device (NVDR)
+        {
+            Name (_HID, "ACPI0012" /* NVDIMM Root Device */)  // _HID: Hardware ID
+            Method (NCAL, 5, Serialized)
+            {
+                Local6 = MEMA /* \MEMA */
+                OperationRegion (NPIO, SystemIO, 0x0A18, 0x04)
+                OperationRegion (NRAM, SystemMemory, Local6, 0x1000)
+                Field (NPIO, DWordAcc, NoLock, Preserve)
+                {
+                    NTFI,   32
+                }
+
+                Field (NRAM, DWordAcc, NoLock, Preserve)
+                {
+                    HDLE,   32, 
+                    REVS,   32, 
+                    FUNC,   32, 
+                    FARG,   32672
+                }
+
+                Field (NRAM, DWordAcc, NoLock, Preserve)
+                {
+                    RLEN,   32, 
+                    ODAT,   32736
+                }
+
+                If ((Arg4 == Zero))
+                {
+                    Local0 = ToUUID ("2f10e7a4-9e91-11e4-89d3-123b93f75cba")
+                }
+                ElseIf ((Arg4 == 0x00010000))
+                {
+                    Local0 = ToUUID ("648b9cf2-cda1-4312-8ad9-49c4af32bd62")
+                }
+                Else
+                {
+                    Local0 = ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66")
+                }
+
+                If (((Local6 == Zero) | (Arg0 != Local0)))
+                {
+                    If ((Arg2 == Zero))
+                    {
+                        Return (Buffer (One)
+                        {
+                             0x00                                             // .
+                        })
+                    }
+
+                    Return (Buffer (One)
+                    {
+                         0x01                                             // .
+                    })
+                }
+
+                HDLE = Arg4
+                REVS = Arg1
+                FUNC = Arg2
+                If (((ObjectType (Arg3) == 0x04) & (SizeOf (Arg3) == One)))
+                {
+                    Local2 = Arg3 [Zero]
+                    Local3 = DerefOf (Local2)
+                    FARG = Local3
+                }
+
+                NTFI = Local6
+                Local1 = (RLEN - 0x04)
+                If ((Local1 < 0x08))
+                {
+                    Local2 = Zero
+                    Name (TBUF, Buffer (One)
+                    {
+                         0x00                                             // .
+                    })
+                    Local7 = Buffer (Zero){}
+                    While ((Local2 < Local1))
+                    {
+                        TBUF [Zero] = DerefOf (ODAT [Local2])
+                        Concatenate (Local7, TBUF, Local7)
+                        Local2++
+                    }
+
+                    Return (Local7)
+                }
+
+                Local1 = (Local1 << 0x03)
+                CreateField (ODAT, Zero, Local1, OBUF)
+                Return (OBUF) /* \_SB_.NVDR.NCAL.OBUF */
+            }
+
+            Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+            {
+                Return (NCAL (Arg0, Arg1, Arg2, Arg3, Zero))
+            }
+
+            Name (RSTA, Zero)
+            Method (RFIT, 1, Serialized)
+            {
+                Name (OFST, Zero)
+                OFST = Arg0
+                Local0 = NCAL (ToUUID ("648b9cf2-cda1-4312-8ad9-49c4af32bd62"), One, One, Package (0x01)
+                        {
+                            OFST
+                        }, 0x00010000)
+                CreateDWordField (Local0, Zero, STAU)
+                RSTA = STAU /* \_SB_.NVDR.RFIT.STAU */
+                If ((Zero != STAU))
+                {
+                    Return (Buffer (Zero){})
+                }
+
+                Local1 = SizeOf (Local0)
+                Local1 -= 0x04
+                If ((Local1 == Zero))
+                {
+                    Return (Buffer (Zero){})
+                }
+
+                CreateField (Local0, 0x20, (Local1 << 0x03), BUFF)
+                Return (BUFF) /* \_SB_.NVDR.RFIT.BUFF */
+            }
+
+            Method (_FIT, 0, Serialized)  // _FIT: Firmware Interface Table
+            {
+                Local2 = Buffer (Zero){}
+                Local3 = Zero
+                While (One)
+                {
+                    Local0 = RFIT (Local3)
+                    Local1 = SizeOf (Local0)
+                    If ((RSTA == 0x0100))
+                    {
+                        Local2 = Buffer (Zero){}
+                        Local3 = Zero
+                    }
+                    Else
+                    {
+                        If ((Local1 == Zero))
+                        {
+                            Return (Local2)
+                        }
+
+                        Local3 += Local1
+                        Concatenate (Local2, Local0, Local2)
+                    }
+                }
+            }
+
+            Device (NV00)
+            {
+                Name (_ADR, One)  // _ADR: Address
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    Return (NCAL (Arg0, Arg1, Arg2, Arg3, One))
+                }
+            }
+
+            Device (NV01)
+            {
+                Name (_ADR, 0x02)  // _ADR: Address
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x02))
+                }
+            }
+
+            Device (NV02)
+            {
+                Name (_ADR, 0x03)  // _ADR: Address
+                Method (_DSM, 4, NotSerialized)  // _DSM: Device-Specific Method
+                {
+                    Return (NCAL (Arg0, Arg1, Arg2, Arg3, 0x03))
+                }
+            }
+        }
+    }
+
+    Name (MEMA, 0x07FFE000)
+}
+