pci,pc,virtio: features, tests, fixes, cleanups
Holiday here tomorrow, so most likely this is it for features for this release.
The following changes since commit 75d30fde55485b965a1168a21d016dd07b50ed32:
Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2022-10-30 15:07:25 -0400)
are available in the Git repository at:
https://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
for you to fetch changes up to 3e624c953b9c37f5aafdf92c16c721818ec8c648:
intel-iommu: PASID support (2022-10-31 08:46:50 -0400)
----------------------------------------------------------------
pci,pc,virtio: features, tests, fixes, cleanups
lots of acpi rework
first version of biosbits infrastructure
ASID support in vhost-vdpacore_count2 support in smbios
PCIe DOE emulation
virtio vq reset
HMAT support
part of infrastructure for viommu support in vhost-vdpa VTD PASID support
fixes, tests all over the place
----------------------------------------------------------------
Akihiko Odaki (1):
msix: Assert that specified vector is in range
Alex Bennée (1):
virtio: re-order vm_running and use_started checks
Ani Sinha (7):
hw/i386/e820: remove legacy reserved entries for e820 acpi/tests/avocado/bits: initial commit of test scripts that are run by biosbits acpi/tests/avocado/bits: disable acpi PSS tests that are failing in biosbits acpi/tests/avocado/bits: add biosbits config file for running bios tests acpi/tests/avocado/bits: add acpi and smbios avocado tests that uses biosbits acpi/tests/avocado/bits/doc: add a doc file to describe the acpi bits test
MAINTAINERS: add myself as the maintainer for acpi biosbits avocado tests
Bernhard Beschow (3):
hw/i386/acpi-build: Remove unused struct hw/i386/acpi-build: Resolve redundant attribute hw/i386/acpi-build: Resolve north rather than south bridges
Brice Goglin (4):
hmat acpi: Don't require initiator value in -numa
tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
tests: acpi: q35: add test for hmat nodes without initiators
tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT:
Christian A. Ehrhardt (1):
hw/acpi/erst.c: Fix memory handling issues
Cindy Lu (1):
vfio: move implement of vfio_get_xlat_addr() to memory.c
David Daney (1):
virtio-rng-pci: Allow setting nvectors, so we can use MSI-X
Eric Auger (1):
hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus
Gregory Price (1):
hw/i386/pc.c: CXL Fixed Memory Window should not reserve e820 in bios
Hesham Almatary (3):
tests: Add HMAT AArch64/virt empty table files
tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators
tests: virt: Update expected *.acpihmatvirt tables
Huai-Cheng Kuo (3):
hw/pci: PCIe Data Object Exchange emulation hw/cxl/cdat: CXL CDAT Data Object Exchange implementation hw/mem/cxl-type3: Add CXL CDAT Data Object Exchange
Igor Mammedov (11):
acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML
tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge
tests: acpi: whitelist DSDT before generating ICH9_SMB AML automatically
acpi: add get_dev_aml_func() helper
acpi: enumerate SMB bridge automatically along with other PCI devices
tests: acpi: update expected blobs
tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
acpi: pc/35: sanitize _GPE declaration order
tests: acpi: update expected blobs
Jason Wang (4):
intel-iommu: don't warn guest errors when getting rid2pasid entry
intel-iommu: drop VTDBus
intel-iommu: convert VTD_PE_GET_FPD_ERR() to be a function
intel-iommu: PASID support
Jonathan Cameron (2):
hw/mem/cxl-type3: Add MSIX support hw/pci-bridge/cxl-upstream: Add a CDAT table access DOE
Julia Suvorova (5):
hw/smbios: add core_count2 to smbios table type 4
bios-tables-test: teach test to use smbios 3.0 tables tests/acpi: allow changes for core_count2 test
bios-tables-test: add test for number of cores > 255 tests/acpi: update tables for new core count test
Kangjie Xu (10):
virtio: introduce virtio_queue_enable()
virtio: core: vq reset feature negotation support
virtio-pci: support queue enable
vhost: expose vhost_virtqueue_start()
vhost: expose vhost_virtqueue_stop()
vhost-net: vhost-kernel: introduce vhost_net_virtqueue_reset()
vhost-net: vhost-kernel: introduce vhost_net_virtqueue_restart()
virtio-net: introduce flush_or_purge_queued_packets()
virtio-net: support queue_enable
vhost: vhost-kernel: enable vq reset feature
Lei He (4):
virtio-crypto: Support asynchronous mode
crypto: Support DER encodings
crypto: Support export akcipher to pkcs8
cryptodev: Add a lkcf-backend for cryptodev
Lev Kujawski (2):
qpci_device_enable: Allow for command bits hardwired to 0 hw/ide/piix: Ignore writes of hardwired PCI command register bits
Markus Armbruster (1):
MAINTAINERS: Add qapi/virtio.json to section "virtio"
Michael S. Tsirkin (1):
bios-tables-test: do not ignore allowed diff list
Miguel Luis (4):
tests/acpi: virt: allow acpi MADT and FADT changes
acpi: fadt: support revision 6.0 of the ACPI specification
acpi: arm/virt: madt: bump to revision 4 accordingly to ACPI 6.0 Errata A tests/acpi: virt: update ACPI MADT and FADT binaries
Robert Hoo (5):
tests/acpi: allow SSDT changes
acpi/ssdt: Fix aml_or() and aml_and() in if clause acpi/nvdimm: define macro for NVDIMM Device _DSM acpi/nvdimm: Implement ACPI NVDIMM Label Methods test/acpi/bios-tables-test: SSDT: update golden master binaries
Thomas Huth (1):
tests/qtest/cxl-test: Remove temporary directories after testing
Xiang Chen (1):
hw/arm/virt: Enable HMAT on arm virt machine
Xuan Zhuo (5):
virtio: introduce __virtio_queue_reset()
virtio: introduce virtio_queue_reset()
virtio-pci: support queue reset
virtio-net: support queue reset
virtio-net: enable vq reset feature
Yajun Wu (3):
vhost: Change the sequence of device start
vhost-user: Support vhost_dev_start
vhost-user: Fix out of order vring host notification handling
tests/avocado/acpi-bits/bits-config/bits-cfg.txt | 18 + qapi/qom.json | 2 + crypto/der.h | 211 +- crypto/rsakey.h | 11 +- hw/display/vga_int.h | 2 + hw/i386/e820_memory_layout.h | 8 - hw/i386/fw_cfg.h | 1 - hw/i386/intel_iommu_internal.h | 16 +- hw/smbios/smbios_build.h | 9 +- include/crypto/akcipher.h | 21 + include/exec/memory.h | 4 + include/hw/acpi/acpi_aml_interface.h | 13 +- include/hw/cxl/cxl_cdat.h | 166 ++ include/hw/cxl/cxl_component.h | 7 + include/hw/cxl/cxl_device.h | 3 + include/hw/cxl/cxl_pci.h | 1 + include/hw/firmware/smbios.h | 12 + include/hw/i386/intel_iommu.h | 18 +- include/hw/ide/pci.h | 1 + include/hw/pci/msix.h | 4 +- include/hw/pci/pci_bus.h | 2 + include/hw/pci/pci_ids.h | 3 + include/hw/pci/pcie.h | 1 + include/hw/pci/pcie_doe.h | 123 ++ include/hw/pci/pcie_regs.h | 4 + include/hw/virtio/vhost.h | 5 + include/hw/virtio/virtio-pci.h | 5 + include/hw/virtio/virtio.h | 16 +- include/net/vhost_net.h | 4 + include/sysemu/cryptodev.h | 61 +- tests/qtest/libqos/pci.h | 1 + backends/cryptodev-builtin.c | 69 +- backends/cryptodev-lkcf.c | 645 ++++++ backends/cryptodev-vhost-user.c | 53 +- backends/cryptodev.c | 44 +- crypto/akcipher.c | 18 + crypto/der.c | 313 ++- crypto/rsakey.c | 42 + hw/acpi/aml-build.c | 13 +- hw/acpi/erst.c | 6 +- hw/acpi/nvdimm.c | 106 +- hw/arm/virt-acpi-build.c | 33 +- hw/block/vhost-user-blk.c | 18 +- hw/core/machine.c | 10 +- hw/cxl/cxl-cdat.c | 224 ++ hw/display/acpi-vga-stub.c | 7 + hw/display/acpi-vga.c | 26 + hw/display/vga-pci.c | 4 + hw/i386/acpi-build.c | 203 +- hw/i386/e820_memory_layout.c | 20 +- hw/i386/fw_cfg.c | 3 - hw/i386/intel_iommu.c | 692 +++--- hw/i386/microvm.c | 2 - hw/i386/pc.c | 2 - hw/ide/piix.c | 24 + hw/isa/lpc_ich9.c | 23 + hw/isa/piix3.c | 17 +- hw/mem/cxl_type3.c | 264 +++ hw/net/e1000e.c | 15 +- hw/net/rocker/rocker.c | 23 +- hw/net/vhost_net-stub.c | 12 + hw/net/vhost_net.c | 91 +- hw/net/virtio-net.c | 57 +- hw/net/vmxnet3.c | 27 +- hw/nvme/ctrl.c | 5 +- hw/pci-bridge/cxl_upstream.c | 195 +- hw/pci/msix.c | 24 +- hw/pci/pcie_doe.c | 367 ++++ hw/rdma/vmw/pvrdma_main.c | 7 +- hw/remote/vfio-user-obj.c | 9 +- hw/smbios/smbios.c | 19 +- hw/vfio/common.c | 66 +- hw/virtio/vhost-user.c | 79 +- hw/virtio/vhost.c | 16 +- hw/virtio/virtio-crypto.c | 326 +-- hw/virtio/virtio-iommu-pci.c | 12 +- hw/virtio/virtio-pci.c | 83 +- hw/virtio/virtio-rng-pci.c | 14 + hw/virtio/virtio.c | 62 +- softmmu/memory.c | 72 + tests/qtest/bios-tables-test.c | 269 ++- tests/qtest/cxl-test.c | 3 + tests/qtest/ide-test.c | 1 + tests/qtest/libqos/pci.c | 13 +- tests/unit/test-crypto-der.c | 126 +- MAINTAINERS | 15 + backends/meson.build | 3 + docs/devel/acpi-bits.rst | 145 ++ docs/devel/index-build.rst | 1 + hw/arm/Kconfig | 1 + hw/cxl/meson.build | 1 + hw/display/meson.build | 17 + hw/i386/trace-events | 2 + hw/pci/meson.build | 1 + tests/avocado/acpi-bits.py | 396 ++++ tests/avocado/acpi-bits/bits-tests/smbios.py2 | 2430 ++++++++++++++++++++++ tests/avocado/acpi-bits/bits-tests/testacpi.py2 | 283 +++ tests/avocado/acpi-bits/bits-tests/testcpuid.py2 | 83 + tests/data/acpi/pc/DSDT | Bin 6422 -> 6501 bytes tests/data/acpi/pc/DSDT.acpierst | Bin 6382 -> 6461 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 7747 -> 7826 bytes tests/data/acpi/pc/DSDT.bridge | Bin 9496 -> 9575 bytes tests/data/acpi/pc/DSDT.cphp | Bin 6886 -> 6965 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 8076 -> 8155 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 6382 -> 6461 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3107 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 6494 -> 6573 bytes tests/data/acpi/pc/DSDT.memhp | Bin 7781 -> 7860 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 6280 -> 6359 bytes tests/data/acpi/pc/DSDT.numamem | Bin 6428 -> 6507 bytes tests/data/acpi/pc/DSDT.roothp | Bin 6656 -> 6699 bytes tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes tests/data/acpi/q35/APIC.core-count2 | Bin 0 -> 2478 bytes tests/data/acpi/q35/DSDT | Bin 8320 -> 8412 bytes tests/data/acpi/q35/DSDT.acpierst | Bin 8337 -> 8429 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9645 -> 9737 bytes tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes tests/data/acpi/q35/DSDT.applesmc | Bin 8366 -> 8458 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11449 -> 11541 bytes tests/data/acpi/q35/DSDT.core-count2 | Bin 0 -> 32414 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8784 -> 8876 bytes tests/data/acpi/q35/DSDT.cxl | Bin 9646 -> 9738 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9974 -> 10066 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8395 -> 8487 bytes tests/data/acpi/q35/DSDT.ipmismbus | Bin 8409 -> 8500 bytes tests/data/acpi/q35/DSDT.ivrs | Bin 8337 -> 8429 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9679 -> 9771 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9450 -> 9542 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8732 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8178 -> 8270 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8326 -> 8418 bytes tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8421 -> 8513 bytes tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8926 -> 9018 bytes tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8952 -> 9044 bytes tests/data/acpi/q35/DSDT.viot | Bin 9429 -> 9521 bytes tests/data/acpi/q35/DSDT.xapic | Bin 35683 -> 35775 bytes tests/data/acpi/q35/FACP.core-count2 | Bin 0 -> 244 bytes tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/virt/APIC | Bin 168 -> 172 bytes tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes tests/data/acpi/virt/APIC.memhp | Bin 168 -> 172 bytes tests/data/acpi/virt/APIC.numamem | Bin 168 -> 172 bytes tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes tests/data/acpi/virt/FACP | Bin 268 -> 276 bytes tests/data/acpi/virt/FACP.memhp | Bin 268 -> 276 bytes tests/data/acpi/virt/FACP.numamem | Bin 268 -> 276 bytes tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 1817 bytes 153 files changed, 7991 insertions(+), 1014 deletions(-) create mode 100644 tests/avocado/acpi-bits/bits-config/bits-cfg.txt create mode 100644 include/hw/cxl/cxl_cdat.h create mode 100644 include/hw/pci/pcie_doe.h create mode 100644 backends/cryptodev-lkcf.c create mode 100644 hw/cxl/cxl-cdat.c create mode 100644 hw/display/acpi-vga-stub.c create mode 100644 hw/display/acpi-vga.c create mode 100644 hw/pci/pcie_doe.c create mode 100644 docs/devel/acpi-bits.rst create mode 100644 tests/avocado/acpi-bits.py create mode 100644 tests/avocado/acpi-bits/bits-tests/smbios.py2 create mode 100644 tests/avocado/acpi-bits/bits-tests/testacpi.py2 create mode 100644 tests/avocado/acpi-bits/bits-tests/testcpuid.py2 create mode 100644 tests/data/acpi/q35/APIC.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/APIC.core-count2 create mode 100644 tests/data/acpi/q35/DSDT.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/DSDT.core-count2 create mode 100644 tests/data/acpi/q35/FACP.core-count2 create mode 100644 tests/data/acpi/q35/HMAT.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/SRAT.acpihmat-noinitiator create mode 100644 tests/data/acpi/virt/APIC.acpihmatvirt create mode 100644 tests/data/acpi/virt/DSDT.acpihmatvirt create mode 100644 tests/data/acpi/virt/HMAT.acpihmatvirt create mode 100644 tests/data/acpi/virt/PPTT.acpihmatvirt create mode 100644 tests/data/acpi/virt/SRAT.acpihmatvirt
[PULL 05/86] acpi/nvdimm: define macro for NVDIMM Device _DSM
From: Robert Hoo <[email protected]>
Since it will be heavily used in next patch, define macro NVDIMM_DEVICE_DSM_UUID for "4309AC30-0D11-11E4-9191-0800200C9A66", which is NVDIMM device specific method uuid defined in NVDIMM _DSM interface spec, Section 3. [1]
No functional changes in this patch.
[1] https://pmem.io/documents/IntelOptanePMem_DSM_Interface-V2.0.pdf
Message-Id: <[email protected]>
--- hw/acpi/nvdimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/acpi/nvdimm.c +2 -2
@@ -922,6 +922,7 @@ void nvdimm_init_acpi_state(NVDIMMState *state, MemoryRegion *io,#define NVDIMM_DSM_RFIT_STATUS "RSTA"#define NVDIMM_QEMU_RSVD_UUID "648B9CF2-CDA1-4312-8AD9-49C4AF32BD62" +#define NVDIMM_DEVICE_DSM_UUID "4309AC30-0D11-11E4-9191-0800200C9A66"static void nvdimm_build_common_dsm (Aml *dev,NVDIMMState *nvdimm_state)
@@ -1029,8 +1030,7 @@ static void nvdimm_build_common_dsm(Aml *dev, /* UUID for QEMU internal use */), expected_uuid));aml_append (elsectx, ifctx); elsectx2 =aml_else (); -aml_append (elsectx2,aml_store ( -aml_touuid ("4309AC30-0D11-11E4-9191-0800200C9A66" ) +aml_append (elsectx2,aml_store (aml_touuid (NVDIMM_DEVICE_DSM_UUID )/* UUID for NVDIMM Devices */ , expected_uuid));aml_append (elsectx, elsectx2);aml_append (method, elsectx);
Signature · 1 line
MST
[PULL 08/86] virtio-crypto: Support asynchronous mode
In reply to Michael S. TsirkinFrom: Lei He <[email protected]>
virtio-crypto: Modify the current interface of virtio-crypto device to support asynchronous mode.
Message-Id: <[email protected]>
--- include/sysemu/cryptodev.h | 60 ++++-- backends/cryptodev-builtin.c | 69 +++++-- backends/cryptodev-vhost-user.c | 53 ++++-- backends/cryptodev.c | 44 +++-- hw/virtio/virtio-crypto.c | 326 ++++++++++++++++++-------------- 5 files changed, 338 insertions(+), 214 deletions(-)
include/sysemu/cryptodev.h +42 -18
@@ -113,6 +113,7 @@ typedef struct CryptoDevBackendSessionInfo {CryptoDevBackendSymSessionInfo sym_sess_info;CryptoDevBackendAsymSessionInfo asym_sess_info; } u; +uint64_t session_id; } CryptoDevBackendSessionInfo;/**
@@ -188,21 +189,30 @@ typedef struct CryptoDevBackendOpInfo { } u; } CryptoDevBackendOpInfo; +typedef void (*CryptoDevCompletionFunc ) (void *opaque,int ret);struct CryptoDevBackendClass {ObjectClass parent_class;void (*init)(CryptoDevBackend *backend,Error **errp);void (*cleanup)(CryptoDevBackend *backend,Error **errp); -int64_t (*create_session)(CryptoDevBackend *backend, -CryptoDevBackendSessionInfo *sess_info, -uint32_t queue_index,Error **errp); +int (*create_session)(CryptoDevBackend *backend, +CryptoDevBackendSessionInfo *sess_info, +uint32_t queue_index, +CryptoDevCompletionFunc cb, +void *opaque); +int (*close_session)(CryptoDevBackend *backend, -uint64_t session_id, -uint32_t queue_index,Error **errp); +uint64_t session_id, +uint32_t queue_index, +CryptoDevCompletionFunc cb, +void *opaque); +int (*do_op)(CryptoDevBackend *backend, -CryptoDevBackendOpInfo *op_info, -uint32_t queue_index,Error **errp); +CryptoDevBackendOpInfo *op_info, +uint32_t queue_index, +CryptoDevCompletionFunc cb, +void *opaque); }; typedef enum CryptoDevBackendOptionsType {
@@ -303,15 +313,20 @@ void cryptodev_backend_cleanup(* @sess_info: parameters needed by session creating * @queue_index: queue index of cryptodev backend client * @errp: pointer to a NULL-initialized error object +* @cb: callback when session create is compeleted +* @opaque: parameter passed to callback * -* Create a session for symmetric/symmetric algorithms +* Create a session for symmetric/asymmetric algorithms * -* Returns: session id on success, or -1 on error +* Returns: 0 for success and cb will be called when creation is completed, +* negative value for error, and cb will not be called. */ -int64_t cryptodev_backend_create_session ( +int cryptodev_backend_create_session (CryptoDevBackend *backend,CryptoDevBackendSessionInfo *sess_info, -uint32_t queue_index,Error **errp); +uint32_t queue_index, +CryptoDevCompletionFunc cb, +void *opaque);/** * cryptodev_backend_close_session:
@@ -319,34 +334,43 @@ int64_t cryptodev_backend_create_session(* @session_id: the session id * @queue_index: queue index of cryptodev backend client * @errp: pointer to a NULL-initialized error object +* @cb: callback when session create is compeleted +* @opaque: parameter passed to callback * * Close a session for which was previously * created by cryptodev_backend_create_session() * -* Returns: 0 on success, or Negative on error +* Returns: 0 for success and cb will be called when creation is completed, +* negative value for error, and cb will not be called. */ int cryptodev_backend_close_session (CryptoDevBackend *backend,uint64_t session_id, -uint32_t queue_index,Error **errp); +uint32_t queue_index, +CryptoDevCompletionFunc cb, +void *opaque);/** * cryptodev_backend_crypto_operation: * @backend: the cryptodev backend object -* @opaque: pointer to a VirtIOCryptoReq object +* @opaque1: pointer to a VirtIOCryptoReq object * @queue_index: queue index of cryptodev backend client * @errp: pointer to a NULL-initialized error object +* @cb: callbacks when operation is completed +* @opaque2: parameter passed to cb * * Do crypto operation, such as encryption and * decryption * -* Returns: VIRTIO_CRYPTO_OK on success, -* or -VIRTIO_CRYPTO_* on error +* Returns: 0 for success and cb will be called when creation is completed, +* negative value for error, and cb will not be called. */ int cryptodev_backend_crypto_operation (CryptoDevBackend *backend, -void *opaque, -uint32_t queue_index,Error **errp); +void *opaque1, +uint32_t queue_index, +CryptoDevCompletionFunc cb, +void *opaque2);/** * cryptodev_backend_set_used:
backends/cryptodev-builtin.c +51 -18
138 lines not on this page · raw message
backends/cryptodev-vhost-user.c +39 -14
91 lines not on this page · raw message
backends/cryptodev.c +24 -20
99 lines not on this page · raw message
hw/virtio/virtio-crypto.c +182 -144
524 lines not on this page · raw message
Signature · 1 line
MST
[PULL 01/86] bios-tables-test: do not ignore allowed diff list
In reply to Michael S. Tsirkinwe had such a beautiful structure for updating expected files, designed to keep bisect working. It turns out that we ignored the result of the allow list checks unless all tables matched anyway.
Sigh.
Let's at least make it work going forward.
--- tests/qtest/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/bios-tables-test.c +1 -1
@@ -458,7 +458,7 @@ static void test_acpi_asl(test_data *data)"for instructions on how to update expected files.\n" , exp_sdt->aml, sdt->aml_file, exp_sdt->aml_file); - all_tables_match = all_tables_match && + all_tables_match = all_tables_match ||test_acpi_find_diff_allowed (exp_sdt);/*
Signature · 1 line
MST
Re: [PULL 01/86] bios-tables-test: do not ignore allowed diff list
Quoted 9 lines · Michael S. Tsirkin
we had such a beautiful structure for updating expected files, designed to keep bisect working. It turns out that we ignored the result of the allow list checks unless all tables matched anyway.
Sigh.
Let's at least make it work going forward.
Don't forget to drop this.
Quoted 24 lines
Signed-off-by Michael S. Tsirkin <[email protected]>--- tests/qtest/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tests/qtest/bios-tables-test.c +1
-2@@ -458,7 +458,7 @@ static void test_acpi_asl(test_data *data)"for instructions on how to update expected files.\n" , exp_sdt->aml, sdt->aml_file, exp_sdt->aml_file); - all_tables_match = all_tables_match && + all_tables_match = all_tables_match ||test_acpi_find_diff_allowed (exp_sdt);/* -- MST
Re: [PULL 01/86] bios-tables-test: do not ignore allowed diff list
Quoted 10 lines · Ani Sinha
On Mon, Oct 31, 2022 at 6:20 PM Michael S. Tsirkin <[email protected]> wrote:
we had such a beautiful structure for updating expected files, designed to keep bisect working. It turns out that we ignored the result of the allow list checks unless all tables matched anyway.
Quoted 6 lines
Sigh.
Let's at least make it work going forward.
Don't forget to drop this.
Ugh. ENOCOFFE. I will re-push without this.
Quoted 26 lines
Signed-off-by: Michael S. Tsirkin <[email protected]>
---
tests/qtest/bios-tables-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/
bios-tables-test.c
index e6096e7f73..a72f6ca326 100644
--- a/tests/qtest/bios-tables-test.c
+++ b/tests/qtest/bios-tables-test.c
@@ -458,7 +458,7 @@ static void test_acpi_asl(test_data *data)
"for instructions on how to update expected files.\n",
exp_sdt->aml, sdt->aml_file, exp_sdt->aml_file);
- all_tables_match = all_tables_match &&
+ all_tables_match = all_tables_match ||
test_acpi_find_diff_allowed(exp_sdt);
/*
--
MST[PULL 09/86] crypto: Support DER encodings
In reply to Michael S. TsirkinFrom: Lei He <[email protected]>
Add encoding interfaces for DER encoding:
1. support decoding of 'bit string', 'octet string', 'object id' and 'context specific tag' for DER encoder.
2. implemented a simple DER encoder.
3. add more testsuits for DER encoder.
Message-Id: <[email protected]>
--- crypto/der.h | 211 ++++++++++++++++++++++- crypto/der.c | 313 ++++++++++++++++++++++++++++++++--- tests/unit/test-crypto-der.c | 126 +++++++++++--- 3 files changed, 600 insertions(+), 50 deletions(-)
crypto/der.h +208 -3
@@ -22,6 +22,11 @@#include "qapi/error.h" +typedef struct QCryptoEncodeContext QCryptoEncodeContext ; + +/* rsaEncryption: 1.2.840.113549.1.1.1 */ +#define QCRYPTO_OID_rsaEncryption "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x01" +/* Simple decoder used to parse DER encoded rsa keys. */ /**
@@ -47,14 +52,13 @@ typedef int (*QCryptoDERDecodeCb) (void *opaque, const uint8_t *value,* will be set to the rest length of data, if cb is not NULL, must * return 0 to make decode success, at last, the length of the data * part of the decoded INTEGER will be returned. Otherwise, -1 is -* returned. +* returned and the valued of *data and *dlen keep unchanged. */ int qcrypto_der_decode_int (const uint8_t **data,size_t *dlen,QCryptoDERDecodeCb cb,void *opaque,Error **errp); -/** * qcrypto_der_decode_seq: *
@@ -70,7 +74,7 @@ int qcrypto_der_decode_int(const uint8_t **data,* will be set to the rest length of data, if cb is not NULL, must * return 0 to make decode success, at last, the length of the data * part of the decoded SEQUENCE will be returned. Otherwise, -1 is -* returned. +* returned and the valued of *data and *dlen keep unchanged. */ int qcrypto_der_decode_seq(const uint8_t **data, size_t *dlen,
@@ -78,4 +82,205 @@ int qcrypto_der_decode_seq(const uint8_t **data,void *opaque, Error **errp); +/** +* qcrypto_der_decode_oid: +* +* Decode OID from DER-encoded data, similar with der_decode_int. +* +* @data: pointer to address of input data +* @dlen: pointer to length of input data +* @cb: callback invoked when decode succeed, if cb equals NULL, no +* callback will be invoked +* @opaque: parameter passed to cb +* +* Returns: On success, *data points to rest data, and *dlen +* will be set to the rest length of data, if cb is not NULL, must +* return 0 to make decode success, at last, the length of the data +* part of the decoded OID will be returned. Otherwise, -1 is +* returned and the valued of *data and *dlen keep unchanged. +*/ +int qcrypto_der_decode_oid (const uint8_t **data, +size_t *dlen, +QCryptoDERDecodeCb cb, +void *opaque, +Error **errp); + +/** +* qcrypto_der_decode_octet_str: +* +* Decode OCTET STRING from DER-encoded data, similar with der_decode_int. +* +* @data: pointer to address of input data +* @dlen: pointer to length of input data +* @cb: callback invoked when decode succeed, if cb equals NULL, no +* callback will be invoked +* @opaque: parameter passed to cb +* +* Returns: On success, *data points to rest data, and *dlen +* will be set to the rest length of data, if cb is not NULL, must +* return 0 to make decode success, at last, the length of the data +* part of the decoded OCTET STRING will be returned. Otherwise, -1 is +* returned and the valued of *data and *dlen keep unchanged. +*/ +int qcrypto_der_decode_octet_str (const uint8_t **data, +size_t *dlen, +QCryptoDERDecodeCb cb, +void *opaque, +Error **errp); + +/** +* qcrypto_der_decode_bit_str: +* +* Decode BIT STRING from DER-encoded data, similar with der_decode_int. +* +* @data: pointer to address of input data +* @dlen: pointer to length of input data +* @cb: callback invoked when decode succeed, if cb equals NULL, no +* callback will be invoked +* @opaque: parameter passed to cb +* +* Returns: On success, *data points to rest data, and *dlen +* will be set to the rest length of data, if cb is not NULL, must +* return 0 to make decode success, at last, the length of the data +* part of the decoded BIT STRING will be returned. Otherwise, -1 is +* returned and the valued of *data and *dlen keep unchanged. +*/ +int qcrypto_der_decode_bit_str (const uint8_t **data, +size_t *dlen, +QCryptoDERDecodeCb cb, +void *opaque, +Error **errp); + + +/** +* qcrypto_der_decode_ctx_tag: +* +* Decode context specific tag +* +* @data: pointer to address of input data +* @dlen: pointer to length of input data +* @tag: expected value of context specific tag +* @cb: callback invoked when decode succeed, if cb equals NULL, no +* callback will be invoked +* @opaque: parameter passed to cb +* +* Returns: On success, *data points to rest data, and *dlen +* will be set to the rest length of data, if cb is not NULL, must +* return 0 to make decode success, at last, the length of the data +* part of the decoded BIT STRING will be returned. Otherwise, -1 is +* returned and the valued of *data and *dlen keep unchanged. +*/ +int qcrypto_der_decode_ctx_tag (const uint8_t **data, +size_t *dlen,int tag_id, +QCryptoDERDecodeCb cb, +void *opaque, +Error **errp); + +/** +* qcrypto_der_encode_ctx_new: +* +* Allocate a context used for der encoding. +*/ +QCryptoEncodeContext *qcrypto_der_encode_ctx_new (void ); + +/** +* qcrypto_der_encode_seq_begin: +* @ctx: the encode context. +* +* Start encoding a SEQUENCE for ctx. +* +*/ +void qcrypto_der_encode_seq_begin (QCryptoEncodeContext *ctx); + +/** +* qcrypto_der_encode_seq_begin: +* @ctx: the encode context. +* +* Finish uencoding a SEQUENCE for ctx. +* +*/ +void qcrypto_der_encode_seq_end (QCryptoEncodeContext *ctx); + + +/** +* qcrypto_der_encode_oid: +* @ctx: the encode context. +* @src: the source data of oid, note it should be already encoded, this +* function only add tag and length part for it. +* +* Encode an oid into ctx. +*/ +void qcrypto_der_encode_oid (QCryptoEncodeContext *ctx, +const uint8_t *src,size_t src_len); + +/** +* qcrypto_der_encode_int: +* @ctx: the encode context. +* @src: the source data of integer, note it should be already encoded, this +* function only add tag and length part for it. +* +* Encode an integer into ctx. +*/ +void qcrypto_der_encode_int (QCryptoEncodeContext *ctx, +const uint8_t *src,size_t src_len); + +/** +* qcrypto_der_encode_null: +* @ctx: the encode context. +* +* Encode a null into ctx. +*/ +void qcrypto_der_encode_null (QCryptoEncodeContext *ctx); + +/** +* qcrypto_der_encode_octet_str: +* @ctx: the encode context. +* @src: the source data of the octet string. +* +* Encode a octet string into ctx. +*/ +void qcrypto_der_encode_octet_str (QCryptoEncodeContext *ctx, +const uint8_t *src,size_t src_len); + +/** +* qcrypto_der_encode_octet_str_begin: +* @ctx: the encode context. +* +* Start encoding a octet string, All fields between +* qcrypto_der_encode_octet_str_begin and qcrypto_der_encode_octet_str_end +* are encoded as an octet string. This is useful when we need to encode a +* encoded SEQUNCE as OCTET STRING. +*/ +void qcrypto_der_encode_octet_str_begin (QCryptoEncodeContext *ctx); + +/** +* qcrypto_der_encode_octet_str_end: +* @ctx: the encode context. +* +* Finish encoding a octet string, All fields between +* qcrypto_der_encode_octet_str_begin and qcrypto_der_encode_octet_str_end +* are encoded as an octet string. This is useful when we need to encode a +* encoded SEQUNCE as OCTET STRING. +*/ +void qcrypto_der_encode_octet_str_end (QCryptoEncodeContext *ctx); + +/** +* qcrypto_der_encode_ctx_buffer_len: +* @ctx: the encode context. +* +* Compute the expected buffer size to save all encoded things. +*/ +size_t qcrypto_der_encode_ctx_buffer_len (QCryptoEncodeContext *ctx); + +/** +* qcrypto_der_encode_ctx_flush_and_free: +* @ctx: the encode context. +* @dst: the distination to save the encoded data, the length of dst should +* not less than qcrypto_der_encode_cxt_buffer_len +* +* Flush all encoded data into dst, then free ctx. +*/ +void qcrypto_der_encode_ctx_flush_and_free (QCryptoEncodeContext *ctx, +uint8_t *dst); +#endif /* QCRYPTO_ASN1_DECODER_H */
crypto/der.c +288 -25
348 lines not on this page · raw message
tests/unit/test-crypto-der.c +104 -22
178 lines not on this page · raw message
Signature · 1 line
MST
[PULL 02/86] hw/i386/e820: remove legacy reserved entries for e820
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
e820 reserved entries were used before the dynamic entries with fw config files were intoduced. Please see the following change:
7d67110f2d9a6("pc: add etc/e820 fw_cfg file")
Identical support was introduced into seabios as well with the following commit:ce39bd4031820 ("Add support for etc/e820 fw_cfg file")
Both the above commits are now quite old. QEMU machines 1.7 and newer no longer use the reserved entries. Seabios uses fw config files and
dynamic e820 entries by default and only falls back to using reserved entries when it has to work with old qemu (versions earlier than 1.7). Please see functions qemu_cfg_e820() and qemu_early_e820(). It is safe to remove legacy FW_CFG_E820_TABLE and associated code now as QEMU 7.0 has deprecated i440fx machines 1.7 and older. It would be incredibly rare to run the latest qemu version with a very old version of seabios that did not support fw config files for e820.
As far as I could see, edk2/ovfm never supported reserved entries and uses fw config files from the beginning. So there should be no incompatibilities with ovfm as well.
Message-Id: <[email protected]>
--- hw/i386/e820_memory_layout.h | 8 -------- hw/i386/fw_cfg.h | 1 - hw/i386/e820_memory_layout.c | 20 +------------------- hw/i386/fw_cfg.c | 3 --- hw/i386/microvm.c | 2 -- 5 files changed, 1 insertion(+), 33 deletions(-)
hw/i386/e820_memory_layout.h +0 -8
@@ -16,20 +16,12 @@#define E820_NVS 4#define E820_UNUSABLE 5 -#define E820_NR_ENTRIES 16 -struct e820_entry {uint64_t address;uint64_t length;uint32_t type; } QEMU_PACKED __attribute((__aligned__(4))); -struct e820_table { -uint32_t count; -struct e820_entry entry[E820_NR_ENTRIES ]; -} QEMU_PACKED __attribute((__aligned__(4))); - -extern struct e820_table e820_reserve;extern struct e820_entry *e820_table;int e820_add_entry (uint64_t address,uint64_t length,uint32_t type);
hw/i386/fw_cfg.h +0 -1
@@ -17,7 +17,6 @@#define FW_CFG_ACPI_TABLES (FW_CFG_ARCH_LOCAL + 0)#define FW_CFG_SMBIOS_ENTRIES (FW_CFG_ARCH_LOCAL + 1)#define FW_CFG_IRQ0_OVERRIDE (FW_CFG_ARCH_LOCAL + 2) -#define FW_CFG_E820_TABLE (FW_CFG_ARCH_LOCAL + 3)#define FW_CFG_HPET (FW_CFG_ARCH_LOCAL + 4) FWCfgState *fw_cfg_arch_create(MachineState *ms,
hw/i386/e820_memory_layout.c +1 -19
@@ -11,29 +11,11 @@#include "e820_memory_layout.h" static size_t e820_entries; -struct e820_table e820_reserve;struct e820_entry *e820_table;int e820_add_entry (uint64_t address,uint64_t length,uint32_t type) { -int index =le32_to_cpu (e820_reserve.count); -struct e820_entry *entry; - -if (type !=E820_RAM ) { -/* old FW_CFG_E820_TABLE entry -- reservations only */ -if (index >=E820_NR_ENTRIES ) { -return -EBUSY ; - } - entry = &e820_reserve.entry[index++]; - - entry->address =cpu_to_le64 (address); - entry->length =cpu_to_le64 (length); - entry->type =cpu_to_le32 (type); - - e820_reserve.count =cpu_to_le32 (index); - } - -/* new "etc/e820" file -- include ram too */ +/* new "etc/e820" file -- include ram and reserved entries */ e820_table = g_renew(struct e820_entry, e820_table, e820_entries + 1); e820_table[e820_entries].address =cpu_to_le64 (address); e820_table[e820_entries].length =cpu_to_le64 (length);
hw/i386/fw_cfg.c +0 -3
@@ -36,7 +36,6 @@ const char *fw_cfg_arch_key_name(uint16_t key) {FW_CFG_ACPI_TABLES, "acpi_tables"}, {FW_CFG_SMBIOS_ENTRIES, "smbios_entries"}, {FW_CFG_IRQ0_OVERRIDE, "irq0_override"}, - {FW_CFG_E820_TABLE, "e820_table"}, {FW_CFG_HPET, "hpet"}, };
@@ -127,8 +126,6 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms,#endif fw_cfg_add_i32 (fw_cfg,FW_CFG_IRQ0_OVERRIDE ,1 ); -fw_cfg_add_bytes (fw_cfg,FW_CFG_E820_TABLE , - &e820_reserve,sizeof (e820_reserve));fw_cfg_add_file (fw_cfg,"etc/e820" , e820_table,sizeof (struct e820_entry ) *e820_get_num_entries ());
hw/i386/microvm.c +0 -2
@@ -324,8 +324,6 @@ static void microvm_memory_init(MicrovmMachineState *mms)fw_cfg_add_i16 (fw_cfg,FW_CFG_MAX_CPUS , machine->smp.max_cpus);fw_cfg_add_i64 (fw_cfg,FW_CFG_RAM_SIZE , (uint64_t )machine->ram_size);fw_cfg_add_i32 (fw_cfg,FW_CFG_IRQ0_OVERRIDE ,1 ); -fw_cfg_add_bytes (fw_cfg,FW_CFG_E820_TABLE , - &e820_reserve,sizeof (e820_reserve));fw_cfg_add_file (fw_cfg,"etc/e820" , e820_table,sizeof (struct e820_entry ) *e820_get_num_entries ());
Signature · 1 line
MST
[PULL 07/86] test/acpi/bios-tables-test: SSDT: update golden master binaries
In reply to Michael S. TsirkinFrom: Robert Hoo <[email protected]>
And empty bios-tables-test-allowed-diff.h.
Diff of ASL form, from qtest testlog.txt:
@@ -1,30 +1,30 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20180629 (64-bit version)
* Copyright (c) 2000 - 2018 Intel Corporation
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/SSDT.dimmpxm, Thu Sep 22 18:25:06 2022
+ * Disassembly of /tmp/aml-YYZZS1, Thu Sep 22 18:25:06 2022
*
* Original Table Header:
* Signature "SSDT"
- * Length 0x000002DE (734)
+ * Length 0x00000717 (1815)
* Revision 0x01
- * Checksum 0x56
+ * Checksum 0xBC
* 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 */
@@ -49,52 +49,52 @@
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 (((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)))
+ 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){}
@@ -161,45 +161,234 @@
Else
{
If ((Local1 == Zero))
{
Return (Local2)
}
Local3 += Local1
Concatenate (Local2, Local0, Local2)
}
}
}
Device (NV00)
{
Name (_ADR, One) // _ADR: Address
+ Method (_LSI, 0, Serialized) // _LSI: Label Storage Information
+ {
+ Local0 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66"), One, 0x04, Zero, One)
+ CreateDWordField (Local0, Zero, STTS)
+ CreateDWordField (Local0, 0x04, SLSA)
+ CreateDWordField (Local0, 0x08, MAXT)
+ Local1 = Package (0x03)
+ {
+ STTS,
+ SLSA,
+ MAXT+ }
+ Return (Local1)
+ }
+
+ Method (_LSR, 2, Serialized) // _LSR: Label Storage Read
+ {
+ Name (INPT, Buffer (0x08)
+ {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........
+ })
+ CreateDWordField (INPT, Zero, OFST)
+ CreateDWordField (INPT, 0x04, LEN)
+ OFST = Arg0
+ LEN = Arg1
+ Local0 = Package (0x01)
+ {
+ INPT
+ }
+ Local3 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66"), One, 0x05, Local0, One)
+ CreateDWordField (Local3, Zero, STTS)
+ CreateField (Local3, 0x20, (LEN << 0x03), LDAT)
+ Name (LSA, Buffer (Zero){})
+ ToBuffer (LDAT, LSA) /* \_SB_.NVDR.NV00._LSR.LSA_ */
+ Local1 = Package (0x02)+ {
+ STTS,
+ LSA
+ }
+ Return (Local1)
+ }
+
+ Method (_LSW, 3, Serialized) // _LSW: Label Storage Write
+ {
+ Local2 = Arg2
+ Name (INPT, Buffer (0x08)
+ {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // ........
+ })
+ CreateDWordField (INPT, Zero, OFST)
+ CreateDWordField (INPT, 0x04, TLEN)
+ OFST = Arg0
+ TLEN = Arg1
+ Concatenate (INPT, Local2, INPT) /* \_SB_.NVDR.NV00._LSW.INPT */
+ Local0 = Package (0x01)
+ {
+ INPT
+ }
+ Local3 = NCAL (ToUUID ("4309ac30-0d11-11e4-9191-0800200c9a66"), One, 0x06, Local0, One)
+ CreateDWordField (Local3, Zero, STTS)
+ Return (STTS) /* \_SB_.NVDR.NV00._LSW.STTS */+ }
+
(iterates in each NV)
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 2 -- tests/data/acpi/pc/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/q35/SSDT.dimmpxm | Bin 734 -> 1815 bytes tests/data/acpi/virt/SSDT.memhp | Bin 736 -> 1817 bytes 4 files changed, 2 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -2
@@ -1,3 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/SSDT.dimmpxm" , -"tests/data/acpi/q35/SSDT.dimmpxm",
tests/data/acpi/pc/SSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/SSDT.dimmpxm binary +0 -0
tests/data/acpi/virt/SSDT.memhp binary +0 -0
Signature · 1 line
MST
[PULL 15/86] acpi/tests/avocado/bits: add acpi and smbios avocado tests that uses biosbits
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
This introduces QEMU acpi/smbios biosbits avocado test which is run from within the python virtual environment. When the bits tests are run, bits binaries are downloaded from an external repo/location, bios bits iso is regenerated containing the acpi/smbios bits tests that are maintained as a part of the QEMU source under tests/avocado/acpi-bits/bits-test . When the VM is spawned with the iso, it runs the tests in batch mode and the results are pushed out from the VM to the test machine where they are analyzed by this script and pass/fail results are reported.
Message-Id: <[email protected]>
--- tests/avocado/acpi-bits.py | 396 +++++++++++++++++++++++++++++++++++++ 1 file changed, 396 insertions(+) create mode 100644 tests/avocado/acpi-bits.py
tests/avocado/acpi-bits.py new file +396 -0
@@ -0,0 +1,396 @@ +#!/usr/bin/env python3 +# group: rw quick +# Exercize QEMU generated ACPI/SMBIOS tables using biosbits, +# https://biosbits.org/ +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# +# Author: +# Ani Sinha <[email protected]> + +# pylint: disable=invalid-name +# pylint: disable=consider-using-f-string + +""" +This is QEMU ACPI/SMBIOS avocado tests using biosbits. +Biosbits is available originally at https://biosbits.org/. +This test uses a fork of the upstream bits and has numerous fixes +including an upgraded acpica. The fork is located here: +https://gitlab.com/qemu-project/biosbits-bits . +""" + +import logging +import os +import platform +import re +import shutil +import subprocess +import tarfile +import tempfile +import time +import zipfile +from typing import ( + List, + Optional, + Sequence, +) +from qemu.machine import QEMUMachine +from avocado import skipIf +from avocado_qemu import QemuBaseTest + +deps = ["xorriso"] # dependent tools needed in the test setup/box. +supported_platforms = ['x86_64'] # supported test platforms. + + +def which(tool): + """ looks up the full path for @tool, returns None if not found + or if @tool does not have executable permissions. + """ + paths=os.getenv('PATH') + for p in paths.split(os.path.pathsep): + p = os.path.join(p, tool) + if os.path.exists(p) and os.access(p, os.X_OK): + return p + return None + +def missing_deps(): + """ returns True if any of the test dependent tools are absent. + """ + for dep in deps: + if which(dep) is None: + return True + return False + +def supported_platform(): + """ checks if the test is running on a supported platform. + """ + return platform.machine() in supported_platforms + +class QEMUBitsMachine(QEMUMachine): # pylint: disable=too-few-public-methods + """ + A QEMU VM, with isa-debugcon enabled and bits iso passed + using -cdrom to QEMU commandline. + + """ + def __init__(self, + binary: str, + args: Sequence[str] = (), + wrapper: Sequence[str] = (), + name: Optional[str] = None, + base_temp_dir: str = "/var/tmp", + debugcon_log: str = "debugcon-log.txt", + debugcon_addr: str = "0x403", + sock_dir: Optional[str] = None, + qmp_timer: Optional[float] = None): + # pylint: disable=too-many-arguments + + if name is None: + name = "qemu-bits-%d" % os.getpid() + if sock_dir is None: + sock_dir = base_temp_dir + super().__init__(binary, args, wrapper=wrapper, name=name, + base_temp_dir=base_temp_dir, + sock_dir=sock_dir, qmp_timer=qmp_timer) + self.debugcon_log = debugcon_log + self.debugcon_addr = debugcon_addr + self.base_temp_dir = base_temp_dir + + @property + def _base_args(self) -> List[str]: + args = super()._base_args + args.extend([ + '-chardev', + 'file,path=%s,id=debugcon' %os.path.join(self.base_temp_dir, + self.debugcon_log), + '-device', + 'isa-debugcon,iobase=%s,chardev=debugcon' %self.debugcon_addr, + ]) + return args + + def base_args(self): + """return the base argument to QEMU binary""" + return self._base_args + +@skipIf(not supported_platform() or missing_deps() or os.getenv('GITLAB_CI'), + 'incorrect platform or dependencies (%s) not installed ' \ + 'or running on GitLab' % ','.join(deps)) +class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes + """ + ACPI and SMBIOS tests using biosbits. + + :avocado: tags=arch:x86_64 + :avocado: tags=acpi + + """ + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self._vm = None + self._workDir = None + self._baseDir = None + + # following are some standard configuration constants + self._bitsInternalVer = 2020 + self._bitsCommitHash = 'b48b88ff' # commit hash must match + # the artifact tag below + self._bitsTag = "qemu-bits-10182022" # this is the latest bits + # release as of today. + self._bitsArtSHA1Hash = 'b04790ac9b99b5662d0416392c73b97580641fe5' + self._bitsArtURL = ("https://gitlab.com/qemu-project/" + "biosbits-bits/-/jobs/artifacts/%s/" + "download?job=qemu-bits-build" %self._bitsTag) + self._debugcon_addr = '0x403' + self._debugcon_log = 'debugcon-log.txt' + logging.basicConfig(level=logging.INFO) + self.logger = logging.getLogger('acpi-bits') + + def _print_log(self, log): + self.logger.info('\nlogs from biosbits follows:') + self.logger.info('==========================================\n') + self.logger.info(log) + self.logger.info('==========================================\n') + + def copy_bits_config(self): + """ copies the bios bits config file into bits. + """ + config_file = 'bits-cfg.txt' + bits_config_dir = os.path.join(self._baseDir, 'acpi-bits', + 'bits-config') + target_config_dir = os.path.join(self._workDir, + 'bits-%d' %self._bitsInternalVer, + 'boot') + self.assertTrue(os.path.exists(bits_config_dir)) + self.assertTrue(os.path.exists(target_config_dir)) + self.assertTrue(os.access(os.path.join(bits_config_dir, + config_file), os.R_OK)) + shutil.copy2(os.path.join(bits_config_dir, config_file), + target_config_dir) + self.logger.info('copied config file %s to %s', + config_file, target_config_dir) + + def copy_test_scripts(self): + """copies the python test scripts into bits. """ + + bits_test_dir = os.path.join(self._baseDir, 'acpi-bits', + 'bits-tests') + target_test_dir = os.path.join(self._workDir, + 'bits-%d' %self._bitsInternalVer, + 'boot', 'python') + + self.assertTrue(os.path.exists(bits_test_dir)) + self.assertTrue(os.path.exists(target_test_dir)) + + for filename in os.listdir(bits_test_dir): + if os.path.isfile(os.path.join(bits_test_dir, filename)) and \ + filename.endswith('.py2'): + # all test scripts are named with extension .py2 so that + # avocado does not try to load them. These scripts are + # written for python 2.7 not python 3 and hence if avocado + # loaded them, it would complain about python 3 specific + # syntaxes. + newfilename = os.path.splitext(filename)[0] + '.py' + shutil.copy2(os.path.join(bits_test_dir, filename), + os.path.join(target_test_dir, newfilename)) + self.logger.info('copied test file %s to %s', + filename, target_test_dir) + + # now remove the pyc test file if it exists, otherwise the + # changes in the python test script won't be executed. + testfile_pyc = os.path.splitext(filename)[0] + '.pyc' + if os.access(os.path.join(target_test_dir, testfile_pyc), + os.F_OK): + os.remove(os.path.join(target_test_dir, testfile_pyc)) + self.logger.info('removed compiled file %s', + os.path.join(target_test_dir, + testfile_pyc)) + + def fix_mkrescue(self, mkrescue): + """ grub-mkrescue is a bash script with two variables, 'prefix' and + 'libdir'. They must be pointed to the right location so that the + iso can be generated appropriately. We point the two variables to + the directory where we have extracted our pre-built bits grub + tarball. + """ + grub_x86_64_mods = os.path.join(self._workDir, 'grub-inst-x86_64-efi') + grub_i386_mods = os.path.join(self._workDir, 'grub-inst') + + self.assertTrue(os.path.exists(grub_x86_64_mods)) + self.assertTrue(os.path.exists(grub_i386_mods)) + + new_script = "" + with open(mkrescue, 'r', encoding='utf-8') as filehandle: + orig_script = filehandle.read() + new_script = re.sub('(^prefix=)(.*)', + r'\1"%s"' %grub_x86_64_mods, + orig_script, flags=re.M) + new_script = re.sub('(^libdir=)(.*)', r'\1"%s/lib"' %grub_i386_mods, + new_script, flags=re.M) + + with open(mkrescue, 'w', encoding='utf-8') as filehandle: + filehandle.write(new_script) + + def generate_bits_iso(self): + """ Uses grub-mkrescue to generate a fresh bits iso with the python + test scripts + """ + bits_dir = os.path.join(self._workDir, + 'bits-%d' %self._bitsInternalVer) + iso_file = os.path.join(self._workDir, + 'bits-%d.iso' %self._bitsInternalVer) + mkrescue_script = os.path.join(self._workDir, + 'grub-inst-x86_64-efi', 'bin', + 'grub-mkrescue') + + self.assertTrue(os.access(mkrescue_script, + os.R_OK | os.W_OK | os.X_OK)) + + self.fix_mkrescue(mkrescue_script) + + self.logger.info('using grub-mkrescue for generating biosbits iso ...') + + try: + if os.getenv('V'): + subprocess.check_call([mkrescue_script, '-o', iso_file, + bits_dir], stderr=subprocess.STDOUT) + else: + subprocess.check_call([mkrescue_script, '-o', + iso_file, bits_dir], + stderr=subprocess.DEVNULL, + stdout=subprocess.DEVNULL) + except Exception as e: # pylint: disable=broad-except + self.skipTest("Error while generating the bits iso. " + "Pass V=1 in the environment to get more details. " + + str(e)) + + self.assertTrue(os.access(iso_file, os.R_OK)) + + self.logger.info('iso file %s successfully generated.', iso_file) + + def setUp(self): # pylint: disable=arguments-differ + super().setUp('qemu-system-') + + self._baseDir = os.getenv('AVOCADO_TEST_BASEDIR') + + # workdir could also be avocado's own workdir in self.workdir. + # At present, I prefer to maintain my own temporary working + # directory. It gives us more control over the generated bits + # log files and also for debugging, we may chose not to remove + # this working directory so that the logs and iso can be + # inspected manually and archived if needed. + self._workDir = tempfile.mkdtemp(prefix='acpi-bits-', + suffix='.tmp') + self.logger.info('working dir: %s', self._workDir) + + prebuiltDir = os.path.join(self._workDir, 'prebuilt') + if not os.path.isdir(prebuiltDir): + os.mkdir(prebuiltDir, mode=0o775) + + bits_zip_file = os.path.join(prebuiltDir, 'bits-%d-%s.zip' + %(self._bitsInternalVer, + self._bitsCommitHash)) + grub_tar_file = os.path.join(prebuiltDir, + 'bits-%d-%s-grub.tar.gz' + %(self._bitsInternalVer, + self._bitsCommitHash)) + + bitsLocalArtLoc = self.fetch_asset(self._bitsArtURL, + asset_hash=self._bitsArtSHA1Hash) + self.logger.info("downloaded bits artifacts to %s", bitsLocalArtLoc) + + # extract the bits artifact in the temp working directory + with zipfile.ZipFile(bitsLocalArtLoc, 'r') as zref: + zref.extractall(prebuiltDir) + + # extract the bits software in the temp working directory + with zipfile.ZipFile(bits_zip_file, 'r') as zref: + zref.extractall(self._workDir) + + with tarfile.open(grub_tar_file, 'r', encoding='utf-8') as tarball: + tarball.extractall(self._workDir) + + self.copy_test_scripts() + self.copy_bits_config() + self.generate_bits_iso() + + def parse_log(self): + """parse the log generated by running bits tests and + check for failures. + """ + debugconf = os.path.join(self._workDir, self._debugcon_log) + log = "" + with open(debugconf, 'r', encoding='utf-8') as filehandle: + log = filehandle.read() + + matchiter = re.finditer(r'(.*Summary: )(\d+ passed), (\d+ failed).*', + log) + for match in matchiter: + # verify that no test cases failed. + try: + self.assertEqual(match.group(3).split()[0], '0', + 'Some bits tests seems to have failed. ' \ + 'Please check the test logs for more info.') + except AssertionError as e: + self._print_log(log) + raise e + else: + if os.getenv('V'): + self._print_log(log) + + def tearDown(self): + """ + Lets do some cleanups. + """ + if self._vm: + self.assertFalse(not self._vm.is_running) + self.logger.info('removing the work directory %s', self._workDir) + shutil.rmtree(self._workDir) + super().tearDown() + + def test_acpi_smbios_bits(self): + """The main test case implementaion.""" + + iso_file = os.path.join(self._workDir, + 'bits-%d.iso' %self._bitsInternalVer) + + self.assertTrue(os.access(iso_file, os.R_OK)) + + self._vm = QEMUBitsMachine(binary=self.qemu_bin, + base_temp_dir=self._workDir, + debugcon_log=self._debugcon_log, + debugcon_addr=self._debugcon_addr) + + self._vm.add_args('-cdrom', '%s' %iso_file) + # the vm needs to be run under icount so that TCG emulation is + # consistent in terms of timing. smilatency tests have consistent + # timing requirements. + self._vm.add_args('-icount', 'auto') + + args = " ".join(str(arg) for arg in self._vm.base_args()) + \ + " " + " ".join(str(arg) for arg in self._vm.args) + + self.logger.info("launching QEMU vm with the following arguments: %s", + args) + + self._vm.launch() + # biosbits has been configured to run all the specified test suites + # in batch mode and then automatically initiate a vm shutdown. + # sleep for maximum of one minute + max_sleep_time = time.monotonic() + 60 + while self._vm.is_running() and time.monotonic() < max_sleep_time: + time.sleep(1) + + self.assertFalse(time.monotonic() > max_sleep_time, + 'The VM seems to have failed to shutdown in time') + + self.parse_log()
Signature · 1 line
MST
[PULL 17/86] MAINTAINERS: add myself as the maintainer for acpi biosbits avocado tests
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
I wrote the biosbits avocado tests for testing QEMU's ACPI/SMBIOS implementation and all the related changes including fixes in biosbits software itself. Making myself as the maintainer for QEMU's biosbits related files and test scripts.
Message-Id: <[email protected]>
--- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+)
MAINTAINERS +7 -0
@@ -1859,6 +1859,13 @@ S: Supported F: hw/acpi/viot.c F: hw/acpi/viot.h +ACPI/AVOCADO/BIOSBITS +M: Ani Sinha <[email protected]> +S: Supported +F: tests/avocado/acpi-bits/* +F: tests/avocado/acpi-bits.py +F: docs/devel/acpi-bits.rst + ACPI/HEST/GHES R: Dongjiu Geng <[email protected]> L: [email protected]
Signature · 1 line
MST
[PULL 21/86] bios-tables-test: add test for number of cores > 255
In reply to Michael S. TsirkinFrom: Julia Suvorova <[email protected]>
The new test is run with a large number of cpus and checks if the core_count field in smbios_cpu_test (structure type 4) is correct.
Choose q35 as it allows to run with -smp > 255.
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 13 deletions(-)
tests/qtest/bios-tables-test.c +45 -13
@@ -92,6 +92,8 @@ typedef struct {SmbiosEntryPoint smbios_ep_table;uint16_t smbios_cpu_max_speed;uint16_t smbios_cpu_curr_speed; +uint8_t smbios_core_count; +uint16_t smbios_core_count2;uint8_t *required_struct_types;int required_struct_types_len;QTestState *qts;
@@ -631,29 +633,42 @@ static inline bool smbios_single_instance(uint8_t type) } } -static bool smbios_cpu_test (test_data *data,uint32_t addr) +static void smbios_cpu_test (test_data *data,uint32_t addr, +SmbiosEntryPointType ep_type) { -uint16_t expect_speed[2 ]; -uint16_t real; +uint8_t core_count, expected_core_count = data->smbios_core_count; +uint16_t speed, expected_speed[2 ]; +uint16_t core_count2, expected_core_count2 = data->smbios_core_count2;int offset[2 ];int i;/* Check CPU speed for backward compatibility */ offset[0 ] = offsetof(struct smbios_type_4 , max_speed); offset[1 ] = offsetof(struct smbios_type_4 , current_speed); - expect_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; - expect_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ; + expected_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; + expected_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ;for (i =0 ; i <2 ; i++) { - real =qtest_readw (data->qts, addr + offset[i]); -if (real != expect_speed[i]) { -fprintf (stderr,"Unexpected SMBIOS CPU speed: real %u expect %u\n" , - real, expect_speed[i]); -return false; - } + speed =qtest_readw (data->qts, addr + offset[i]); + g_assert_cmpuint(speed, ==, expected_speed[i]); } -return true; + core_count =qtest_readb (data->qts, + addr + offsetof(struct smbios_type_4 , core_count)); + +if (expected_core_count) { + g_assert_cmpuint(core_count, ==, expected_core_count); + } + +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_64 ) { + core_count2 =qtest_readw (data->qts, + addr + offsetof(struct smbios_type_4 , core_count2)); + +/* Core Count has reached its limit, checking Core Count 2 */ +if (expected_core_count ==0xFF && expected_core_count2) { + g_assert_cmpuint(core_count2, ==, expected_core_count2); + } + } }static void test_smbios_structs (test_data *data,SmbiosEntryPointType ep_type)
@@ -686,7 +701,7 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)set_bit (type, struct_bitmap);if (type ==4 ) { -g_assert (smbios_cpu_test (data, addr)); +smbios_cpu_test (data, addr, ep_type); }/* seek to end of unformatted string area of this struct ("\0\0") */
@@ -908,6 +923,21 @@ static void test_acpi_q35_tcg(void)free_test_data (&data); } +static void test_acpi_q35_tcg_core_count2 (void ) +{ +test_data data = { + .machine =MACHINE_Q35 , + .variant =".core-count2" , + .required_struct_types = base_required_struct_types, + .required_struct_types_len =ARRAY_SIZE (base_required_struct_types), + .smbios_core_count =0xFF , + .smbios_core_count2 =275 , + }; + +test_acpi_one ("-machine smbios-entry-point-type=64 -smp 275" , &data); +free_test_data (&data); +} +static void test_acpi_q35_tcg_bridge (void ) {test_data data;
@@ -1859,6 +1889,8 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/tpm12-tis" , test_acpi_q35_tcg_tpm12_tis); } +qtest_add_func ("acpi/q35/core-count2" , + test_acpi_q35_tcg_core_count2);qtest_add_func ("acpi/q35/bridge" , test_acpi_q35_tcg_bridge);qtest_add_func ("acpi/q35/multif-bridge" , test_acpi_q35_multif_bridge);
Signature · 1 line
MST
Re: [PULL 21/86] bios-tables-test: add test for number of cores > 255
Quoted 6 lines · On Mon, 31 Oct 2022 08:51:44 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
From: Julia Suvorova <[email protected]>
The new test is run with a large number of cpus and checks if the
core_countfield insmbios_cpu_test(structure type 4) is correct.Choose q35 as it allows to run with -smp > 255.
Getting a failure on this on i386.
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
Note that was on bisection of this pull request applied to current mainline (also in the CI report for the HMAT set - though there is another issue there.)
My guess is fix is don't run it unless 64 bit?
Jonathan
Quoted 119 lines
Signed-off-by Julia Suvorova <[email protected]>Message-Id: <[email protected]>
Message-Id: <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 13 deletions(-)tests/qtest/bios-tables-test.c +45
-13@@ -92,6 +92,8 @@ typedef struct {SmbiosEntryPoint smbios_ep_table;uint16_t smbios_cpu_max_speed;uint16_t smbios_cpu_curr_speed; +uint8_t smbios_core_count; +uint16_t smbios_core_count2;uint8_t *required_struct_types;int required_struct_types_len;QTestState *qts;@@ -631,29 +633,42 @@ static inline bool smbios_single_instance(uint8_t type) } } -static bool smbios_cpu_test (test_data *data,uint32_t addr) +static void smbios_cpu_test (test_data *data,uint32_t addr, +SmbiosEntryPointType ep_type) { -uint16_t expect_speed[2 ]; -uint16_t real; +uint8_t core_count, expected_core_count = data->smbios_core_count; +uint16_t speed, expected_speed[2 ]; +uint16_t core_count2, expected_core_count2 = data->smbios_core_count2;int offset[2 ];int i;/* Check CPU speed for backward compatibility */ offset[0 ] = offsetof(struct smbios_type_4 , max_speed); offset[1 ] = offsetof(struct smbios_type_4 , current_speed); - expect_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; - expect_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ; + expected_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; + expected_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ;for (i =0 ; i <2 ; i++) { - real =qtest_readw (data->qts, addr + offset[i]); -if (real != expect_speed[i]) { -fprintf (stderr,"Unexpected SMBIOS CPU speed: real %u expect %u\n" , - real, expect_speed[i]); -return false; - } + speed =qtest_readw (data->qts, addr + offset[i]); + g_assert_cmpuint(speed, ==, expected_speed[i]); } -return true; + core_count =qtest_readb (data->qts, + addr + offsetof(struct smbios_type_4 , core_count)); + +if (expected_core_count) { + g_assert_cmpuint(core_count, ==, expected_core_count); + } + +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_64 ) { + core_count2 =qtest_readw (data->qts, + addr + offsetof(struct smbios_type_4 , core_count2)); + +/* Core Count has reached its limit, checking Core Count 2 */ +if (expected_core_count ==0xFF && expected_core_count2) { + g_assert_cmpuint(core_count2, ==, expected_core_count2); + } + } }static void test_smbios_structs (test_data *data,SmbiosEntryPointType ep_type)@@ -686,7 +701,7 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)set_bit (type, struct_bitmap);if (type ==4 ) { -g_assert (smbios_cpu_test (data, addr)); +smbios_cpu_test (data, addr, ep_type); }/* seek to end of unformatted string area of this struct ("\0\0") */ @@ -908,6 +923,21 @@ static void test_acpi_q35_tcg(void)free_test_data (&data); } +static void test_acpi_q35_tcg_core_count2 (void ) +{ +test_data data = { + .machine =MACHINE_Q35 , + .variant =".core-count2" , + .required_struct_types = base_required_struct_types, + .required_struct_types_len =ARRAY_SIZE (base_required_struct_types), + .smbios_core_count =0xFF , + .smbios_core_count2 =275 , + }; + +test_acpi_one ("-machine smbios-entry-point-type=64 -smp 275" , &data); +free_test_data (&data); +} +static void test_acpi_q35_tcg_bridge (void ) {test_data data;@@ -1859,6 +1889,8 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/tpm12-tis" , test_acpi_q35_tcg_tpm12_tis); } +qtest_add_func ("acpi/q35/core-count2" , + test_acpi_q35_tcg_core_count2);qtest_add_func ("acpi/q35/bridge" , test_acpi_q35_tcg_bridge);qtest_add_func ("acpi/q35/multif-bridge" , test_acpi_q35_multif_bridge);
Re: [PULL 21/86] bios-tables-test: add test for number of cores > 255
Quoted 10 lines · On Tue, Nov 1, 2022 at 19:22 Jonathan Cameron <[email protected]>…
Quoted 6 lines · On Mon, 31 Oct 2022 08:51:44 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
From: Julia Suvorova <[email protected]>
The new test is run with a large number of cpus and checks if the
core_countfield insmbios_cpu_test(structure type 4) is correct.Choose q35 as it allows to run with -smp > 255.
Quoted 8 lines
Getting a failure on this on i386.
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
Note that was on bisection of this pull request applied to current mainline (also in the CI report for the HMAT set - though there is another issue there.)
Can you point me to the CI report?
Quoted 137 lines
My guess is fix is don't run it unless 64 bit?
Jonathan
Quoted 4 lines
Signed-off-by Julia Suvorova <[email protected]>Message-Id: <[email protected]>
Message-Id: <[email protected]>Review
Quoted 8 lines
Reviewed-by Michael S. Tsirkin <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 13 deletions(-)(quoted diff) +0
-0
b/tests/qtest/bios-tables-test.ctests/qtest/bios-tables-test.c static inline bool smbios_single_instance(uint8_t
Quoted 13 lines
index
d4fbe6791d..e402b57d46100644tests/qtest/bios-tables-test.c +2
-0@@ -92,6 +92,8 @@ typedef struct {SmbiosEntryPoint smbios_ep_table;uint16_t smbios_cpu_max_speed;uint16_t smbios_cpu_curr_speed; +uint8_t smbios_core_count; +uint16_t smbios_core_count2;uint8_t *required_struct_types;int required_struct_types_len;QTestState *qts;@@ -631,29 +633,42 @@ static inline bool smbios_single_instance(uint8_ttype)
tests/qtest/bios-tables-test.c static inline bool smbios_single_instance(uint8_t type)
Quoted 12 lines
tests/qtest/bios-tables-test.c +5
-3} } -static bool smbios_cpu_test (test_data *data,uint32_t addr) +static void smbios_cpu_test (test_data *data,uint32_t addr, +SmbiosEntryPointType ep_type) { -uint16_t expect_speed[2 ]; -uint16_t real; +uint8_t core_count, expected_core_count = data->smbios_core_count; +uint16_t speed, expected_speed[2 ]; + uint16_t core_count2, expected_core_count2 =
data->smbios_core_count2;Quoted 5 lines
tests/qtest/bios-tables-test.c +0
-0int offset[2 ];int i;/* Check CPU speed for backward compatibility */ offset[0 ] = offsetof(struct smbios_type_4 , max_speed);tests/qtest/bios-tables-test.c static inline bool smbios_single_instance(uint8_t type)
Quoted 10 lines
tests/qtest/bios-tables-test.c +2
-5offset[1 ] = offsetof(struct smbios_type_4 , current_speed); - expect_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; - expect_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ; + expected_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; + expected_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ;for (i =0 ; i <2 ; i++) { - real =qtest_readw (data->qts, addr + offset[i]); -if (real != expect_speed[i]) { - fprintf(stderr, "Unexpected SMBIOS CPU speed: real %uexpect %u\n",
Quoted 8 lines
tests/qtest/bios-tables-test.c +2
-4- real, expect_speed[i]); -return false; - } + speed =qtest_readw (data->qts, addr + offset[i]); + g_assert_cmpuint(speed, ==, expected_speed[i]); } -return true;tests/qtest/bios-tables-test.c static inline bool smbios_single_instance(uint8_t type)
Quoted 10 lines
tests/qtest/bios-tables-test.c +10
-0+ core_count =qtest_readb (data->qts, + addr + offsetof(struct smbios_type_4 , core_count)); + +if (expected_core_count) { + g_assert_cmpuint(core_count, ==, expected_core_count); + } + +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_64 ) { + core_count2 = qtest_readw(data->qts, + addr + offsetof(struct smbios_type_4,
core_count2));tests/qtest/bios-tables-test.c static inline bool smbios_single_instance(uint8_t type)
Quoted 9 lines
tests/qtest/bios-tables-test.c +6
-0+ +/* Core Count has reached its limit, checking Core Count 2 */ +if (expected_core_count ==0xFF && expected_core_count2) { + g_assert_cmpuint(core_count2, ==, expected_core_count2); + } + } } static void test_smbios_structs(test_data *data, SmbiosEntryPointType
ep_type)tests/qtest/bios-tables-test.c static void test_smbios_structs(test_data *data,
Quoted 1 line
tests/qtest/bios-tables-test.c +0
-0@@ -686,7 +701,7 @@ static void test_smbios_structs(test_data *data,SmbiosEntryPointType
ep_type)tests/qtest/bios-tables-test.c static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)
Quoted 8 lines
tests/qtest/bios-tables-test.c +1
-1set_bit (type, struct_bitmap);if (type ==4 ) { -g_assert (smbios_cpu_test (data, addr)); +smbios_cpu_test (data, addr, ep_type); }/* seek to end of unformatted string area of this struct ("\0\0") */
tests/qtest/bios-tables-test.c static void test_acpi_q35_tcg(void) · line 932
Quoted 11 lines
tests/qtest/bios-tables-test.c +7
-0@@ -908,6 +923,21 @@ static void test_acpi_q35_tcg(void)free_test_data (&data); } +static void test_acpi_q35_tcg_core_count2(void) +{ + test_data data = { + .machine = MACHINE_Q35, + .variant = ".core-count2", + .required_struct_types = base_required_struct_types, + .required_struct_types_len =
ARRAY_SIZE(base_required_struct_types),tests/qtest/bios-tables-test.c static void test_acpi_q35_tcg(void)
Quoted 5 lines
tests/qtest/bios-tables-test.c +5
-0+ .smbios_core_count = 0xFF, + .smbios_core_count2 = 275, + }; + + test_acpi_one("-machine smbios-entry-point-type=64 -smp 275",&data);
Quoted 15 lines
tests/qtest/bios-tables-test.c +5
-0+free_test_data (&data); +} +static void test_acpi_q35_tcg_bridge (void ) {test_data data;@@ -1859,6 +1889,8 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/tpm12-tis" , test_acpi_q35_tcg_tpm12_tis); } +qtest_add_func ("acpi/q35/core-count2" , + test_acpi_q35_tcg_core_count2);qtest_add_func ("acpi/q35/bridge" , test_acpi_q35_tcg_bridge);qtest_add_func ("acpi/q35/multif-bridge" , test_acpi_q35_multif_bridge);
Re: [PULL 21/86] bios-tables-test: add test for number of cores > 255
Quoted 17 lines · Ani Sinha
Quoted 13 lines · On Tue, Nov 1, 2022 at 19:22 Jonathan Cameron <[email protected]>…
Quoted 6 lines · On Mon, 31 Oct 2022 08:51:44 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
From: Julia Suvorova <[email protected]>
The new test is run with a large number of cpus and checks if the
core_countfield insmbios_cpu_test(structure type 4) is correct.Choose q35 as it allows to run with -smp > 255.
Getting a failure on this on i386.
Quoted 7 lines
Quoted 4 lines
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
Note that was on bisection of this pull request applied to current mainline (also in the CI report for the HMAT set - though there is another issue there.)
Can you point me to the CI report?
To answer my own question:
https://gitlab.com/qemu-project/qemu/-/jobs/3253817453 Also interesting to see all kinds of cross build and test configs :-)
Re: [PULL 21/86] bios-tables-test: add test for number of cores > 255
In reply to Jonathan Cameron viaQuoted 5 lines · On Tue, 1 Nov 2022 13:52:21 +0000 Jonathan Cameron…
Quoted 2 lines · On Mon, 31 Oct 2022 08:51:44 -0400 "Michael S. Tsirkin" <[email protected]> wrote:
From: Julia Suvorova <[email protected]>
Quoted 8 lines
Quoted 4 lines
The new test is run with a large number of cpus and checks if the
core_countfield insmbios_cpu_test(structure type 4) is correct.Choose q35 as it allows to run with -smp > 255.
Getting a failure on this on i386.
qemu-system-i386: current -smp configuration requires kernel irqchip and X2APIC API support.
just posted a fixup, see my other reply to Stefan in this pull req.
Quoted 129 lines
Note that was on bisection of this pull request applied to current mainline (also in the CI report for the HMAT set - though there is another issue there.)
My guess is fix is don't run it unless 64 bit?
Jonathan
Quoted 119 lines
Signed-off-by Julia Suvorova <[email protected]>Message-Id: <[email protected]>
Message-Id: <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>Reviewed-by Igor Mammedov <[email protected]>--- tests/qtest/bios-tables-test.c | 58 ++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 13 deletions(-)tests/qtest/bios-tables-test.c +45
-13@@ -92,6 +92,8 @@ typedef struct {SmbiosEntryPoint smbios_ep_table;uint16_t smbios_cpu_max_speed;uint16_t smbios_cpu_curr_speed; +uint8_t smbios_core_count; +uint16_t smbios_core_count2;uint8_t *required_struct_types;int required_struct_types_len;QTestState *qts;@@ -631,29 +633,42 @@ static inline bool smbios_single_instance(uint8_t type) } } -static bool smbios_cpu_test (test_data *data,uint32_t addr) +static void smbios_cpu_test (test_data *data,uint32_t addr, +SmbiosEntryPointType ep_type) { -uint16_t expect_speed[2 ]; -uint16_t real; +uint8_t core_count, expected_core_count = data->smbios_core_count; +uint16_t speed, expected_speed[2 ]; +uint16_t core_count2, expected_core_count2 = data->smbios_core_count2;int offset[2 ];int i;/* Check CPU speed for backward compatibility */ offset[0 ] = offsetof(struct smbios_type_4 , max_speed); offset[1 ] = offsetof(struct smbios_type_4 , current_speed); - expect_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; - expect_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ; + expected_speed[0 ] = data->smbios_cpu_max_speed ? :2000 ; + expected_speed[1 ] = data->smbios_cpu_curr_speed ? :2000 ;for (i =0 ; i <2 ; i++) { - real =qtest_readw (data->qts, addr + offset[i]); -if (real != expect_speed[i]) { -fprintf (stderr,"Unexpected SMBIOS CPU speed: real %u expect %u\n" , - real, expect_speed[i]); -return false; - } + speed =qtest_readw (data->qts, addr + offset[i]); + g_assert_cmpuint(speed, ==, expected_speed[i]); } -return true; + core_count =qtest_readb (data->qts, + addr + offsetof(struct smbios_type_4 , core_count)); + +if (expected_core_count) { + g_assert_cmpuint(core_count, ==, expected_core_count); + } + +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_64 ) { + core_count2 =qtest_readw (data->qts, + addr + offsetof(struct smbios_type_4 , core_count2)); + +/* Core Count has reached its limit, checking Core Count 2 */ +if (expected_core_count ==0xFF && expected_core_count2) { + g_assert_cmpuint(core_count2, ==, expected_core_count2); + } + } }static void test_smbios_structs (test_data *data,SmbiosEntryPointType ep_type)@@ -686,7 +701,7 @@ static void test_smbios_structs(test_data *data, SmbiosEntryPointType ep_type)set_bit (type, struct_bitmap);if (type ==4 ) { -g_assert (smbios_cpu_test (data, addr)); +smbios_cpu_test (data, addr, ep_type); }/* seek to end of unformatted string area of this struct ("\0\0") */ @@ -908,6 +923,21 @@ static void test_acpi_q35_tcg(void)free_test_data (&data); } +static void test_acpi_q35_tcg_core_count2 (void ) +{ +test_data data = { + .machine =MACHINE_Q35 , + .variant =".core-count2" , + .required_struct_types = base_required_struct_types, + .required_struct_types_len =ARRAY_SIZE (base_required_struct_types), + .smbios_core_count =0xFF , + .smbios_core_count2 =275 , + }; + +test_acpi_one ("-machine smbios-entry-point-type=64 -smp 275" , &data); +free_test_data (&data); +} +static void test_acpi_q35_tcg_bridge (void ) {test_data data;@@ -1859,6 +1889,8 @@ int main(int argc, char *argv[])qtest_add_func ("acpi/q35/tpm12-tis" , test_acpi_q35_tcg_tpm12_tis); } +qtest_add_func ("acpi/q35/core-count2" , + test_acpi_q35_tcg_core_count2);qtest_add_func ("acpi/q35/bridge" , test_acpi_q35_tcg_bridge);qtest_add_func ("acpi/q35/multif-bridge" , test_acpi_q35_multif_bridge);
[PULL 18/86] hw/smbios: add core_count2 to smbios table type 4
In reply to Michael S. TsirkinFrom: Julia Suvorova <[email protected]>
In order to use the increased number of cpus, we need to bring smbios tables in line with the SMBIOS 3.0 specification. This allows us to introduce core_count2 which acts as a duplicate of core_count if we have fewer cores than 256, and contains the actual core number per socket if we have more.
core_enabled2 and thread_count2 fields work the same way.
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- hw/smbios/smbios_build.h | 9 +++++++-- include/hw/firmware/smbios.h | 12 ++++++++++++ hw/smbios/smbios.c | 19 ++++++++++++++++--- 3 files changed, 35 insertions(+), 5 deletions(-)
hw/smbios/smbios_build.h +7 -2
@@ -27,6 +27,11 @@ extern unsigned smbios_table_max;extern unsigned smbios_table_cnt;#define SMBIOS_BUILD_TABLE_PRE (tbl_type, tbl_handle, tbl_required) \ + SMBIOS_BUILD_TABLE_PRE_SIZE(tbl_type, tbl_handle, tbl_required, \ + sizeof(struct smbios_type_##tbl_type))\ + +#define SMBIOS_BUILD_TABLE_PRE_SIZE (tbl_type, tbl_handle, \ + tbl_required, tbl_len) \ struct smbios_type_##tbl_type *t; \ size_t t_off;/* table offset into smbios_tables */ \int str_index =0 ; \
@@ -39,12 +44,12 @@ extern unsigned smbios_table_cnt;/* use offset of table t within smbios_tables */ \/* (pointer must be updated after each realloc) */ \ t_off = smbios_tables_len; \ - smbios_tables_len +=sizeof (*t); \ + smbios_tables_len += tbl_len; \ smbios_tables =g_realloc (smbios_tables, smbios_tables_len); \ t = (struct smbios_type_##tbl_type *)(smbios_tables + t_off); \ \ t->header.type = tbl_type; \ - t->header.length =sizeof (*t); \ + t->header.length = tbl_len; \ t->header.handle =cpu_to_le16 (tbl_handle); \ }while (0 )
include/hw/firmware/smbios.h +12 -0
@@ -18,6 +18,8 @@#define SMBIOS_MAX_TYPE 127 +#define offsetofend (TYPE ,MEMBER ) \ + (offsetof(TYPE, MEMBER) + sizeof_field(TYPE, MEMBER))/* memory area description, used by type 19 table */ struct smbios_phys_mem_area {
@@ -187,8 +189,18 @@ struct smbios_type_4 {uint8_t thread_count;uint16_t processor_characteristics;uint16_t processor_family2; +/* SMBIOS spec 3.0.0, Table 21 */ +uint16_t core_count2; +uint16_t core_enabled2; +uint16_t thread_count2; }QEMU_PACKED ; +typedef enum smbios_type_4_len_ver { + SMBIOS_TYPE_4_LEN_V28 = offsetofend(struct smbios_type_4, + processor_family2), + SMBIOS_TYPE_4_LEN_V30 = offsetofend(struct smbios_type_4, thread_count2), +}smbios_type_4_len_ver ; +/* SMBIOS type 8 - Port Connector Information */ struct smbios_type_8 {struct smbios_structure_header header;
hw/smbios/smbios.c +16 -3
@@ -711,8 +711,14 @@ static void smbios_build_type_3_table(void)static void smbios_build_type_4_table (MachineState *ms,unsigned instance) {char sock_str[128 ]; +size_t tbl_len =SMBIOS_TYPE_4_LEN_V28 ; -SMBIOS_BUILD_TABLE_PRE (4 ,T4_BASE + instance, true);/* required */ +if (smbios_ep_type ==SMBIOS_ENTRY_POINT_TYPE_64 ) { + tbl_len =SMBIOS_TYPE_4_LEN_V30 ; + } + +SMBIOS_BUILD_TABLE_PRE_SIZE (4 ,T4_BASE + instance, + true, tbl_len);/* required */ snprintf (sock_str,sizeof (sock_str),"%s%2x" , type4.sock_pfx, instance);SMBIOS_TABLE_SET_STR (4 , socket_designation_str, sock_str);
@@ -739,8 +745,15 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance)SMBIOS_TABLE_SET_STR (4 , serial_number_str, type4.serial);SMBIOS_TABLE_SET_STR (4 , asset_tag_number_str, type4.asset);SMBIOS_TABLE_SET_STR (4 , part_number_str, type4.part); - t->core_count = t->core_enabled = ms->smp.cores; - t->thread_count = ms->smp.threads; + + t->core_count = (ms->smp.cores >255 ) ?0xFF : ms->smp.cores; + t->core_enabled = t->core_count; + + t->core_count2 = t->core_enabled2 =cpu_to_le16 (ms->smp.cores); + + t->thread_count = (ms->smp.threads >255 ) ?0xFF : ms->smp.threads; + t->thread_count2 =cpu_to_le16 (ms->smp.threads); + t->processor_characteristics =cpu_to_le16 (0x02 );/* Unknown */ t->processor_family2 =cpu_to_le16 (0x01 );/* Other */
Signature · 1 line
MST
[PULL 19/86] bios-tables-test: teach test to use smbios 3.0 tables
In reply to Michael S. TsirkinFrom: Julia Suvorova <[email protected]>
Introduce the 64-bit entry point. Since we no longer have a total number of structures, stop checking for the new ones at the EOF structure (type 127).
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test.c | 100 +++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 24 deletions(-)
tests/qtest/bios-tables-test.c +76 -24
@@ -88,8 +88,8 @@ typedef struct {uint64_t rsdp_addr;uint8_t rsdp_table[36 /* ACPI 2.0+ RSDP size */ ];GArray *tables; -uint32_t smbios_ep_addr; -struct smbios_21_entry_point smbios_ep_table; +uint64_t smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE__MAX ]; +SmbiosEntryPoint smbios_ep_table;uint16_t smbios_cpu_max_speed;uint16_t smbios_cpu_curr_speed;uint8_t *required_struct_types;
@@ -533,10 +533,9 @@ static void test_acpi_asl(test_data *data)free_test_data (&exp_data); } -static bool smbios_ep_table_ok (test_data *data) +static bool smbios_ep2_table_ok (test_data *data,uint32_t addr) { -struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; -uint32_t addr = data->smbios_ep_addr; +struct smbios_21_entry_point *ep_table = &data->smbios_ep_table.ep21;qtest_memread (data->qts, addr, ep_table,sizeof (*ep_table));if (memcmp (ep_table->anchor_string,"_SM_" ,4 )) {
@@ -559,13 +558,29 @@ static bool smbios_ep_table_ok(test_data *data)return true; } -static void test_smbios_entry_point (test_data *data) +static bool smbios_ep3_table_ok (test_data *data,uint64_t addr) +{ +struct smbios_30_entry_point *ep_table = &data->smbios_ep_table.ep30; + +qtest_memread (data->qts, addr, ep_table,sizeof (*ep_table)); +if (memcmp (ep_table->anchor_string,"_SM3_" ,5 )) { +return false; + } + +if (acpi_calc_checksum ((uint8_t *)ep_table,sizeof *ep_table)) { +return false; + } + +return true; +} + +static SmbiosEntryPointType test_smbios_entry_point (test_data *data) {uint32_t off;/* find smbios entry point structure */ for (off =0xf0000 ; off <0x100000 ; off +=0x10 ) { -uint8_t sig[] ="_SM_" ; +uint8_t sig[] ="_SM_" , sig3[] ="_SM3_" ;int i;for (i =0 ; i <sizeof sig -1 ; ++i) {
@@ -574,14 +589,30 @@ static void test_smbios_entry_point(test_data *data)if (!memcmp (sig,"_SM_" ,sizeof sig)) {/* signature match, but is this a valid entry point? */ - data->smbios_ep_addr = off; -if (smbios_ep_table_ok (data)) { +if (smbios_ep2_table_ok (data, off)) { + data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_32 ] = off; + } + } + +for (i =0 ; i <sizeof sig3 -1 ; ++i) { + sig3[i] =qtest_readb (data->qts, off + i); + } + +if (!memcmp (sig3,"_SM3_" ,sizeof sig3)) { +if (smbios_ep3_table_ok (data, off)) { + data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64 ] = off; +/* found 64-bit entry point, no need to look for 32-bit one */ break ; } } } - g_assert_cmphex(off, <, 0x100000); +/* found at least one entry point */ +g_assert_true (data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_32 ] || + data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64 ]); + +return data->smbios_ep_addr[SMBIOS_ENTRY_POINT_TYPE_64 ] ? +SMBIOS_ENTRY_POINT_TYPE_64 :SMBIOS_ENTRY_POINT_TYPE_32 ; }static inline bool smbios_single_instance (uint8_t type)
@@ -625,16 +656,23 @@ static bool smbios_cpu_test(test_data *data, uint32_t addr)return true; } -static void test_smbios_structs (test_data *data) +static void test_smbios_structs (test_data *data,SmbiosEntryPointType ep_type) { DECLARE_BITMAP(struct_bitmap, SMBIOS_MAX_TYPE+1) = { 0 }; -struct smbios_21_entry_point *ep_table = &data->smbios_ep_table; -uint32_t addr =le32_to_cpu (ep_table->structure_table_address); -int i, len, max_len =0 ; + +SmbiosEntryPoint *ep_table = &data->smbios_ep_table; +int i =0 , len, max_len =0 ;uint8_t type, prv, crt; +uint64_t addr; + +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_32 ) { + addr =le32_to_cpu (ep_table->ep21.structure_table_address); + }else { + addr =le64_to_cpu (ep_table->ep30.structure_table_address); + }/* walk the smbios tables */ -for (i =0 ; i <le16_to_cpu (ep_table->number_of_structures); i++) { + do { /* grab type and formatted area length from struct header */ type = qtest_readb(data->qts, addr);
@@ -660,19 +698,33 @@ static void test_smbios_structs(test_data *data) }/* keep track of max. struct size */ -if (max_len < len) { +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_32 && max_len < len) { max_len = len; - g_assert_cmpuint(max_len, <=, ep_table->max_structure_size); + g_assert_cmpuint(max_len, <=, ep_table->ep21.max_structure_size); }/* start of next structure */ addr += len; - } -/* total table length and max struct size must match entry point values */ - g_assert_cmpuint(le16_to_cpu(ep_table->structure_table_length), ==, - addr -le32_to_cpu (ep_table->structure_table_address)); - g_assert_cmpuint(le16_to_cpu(ep_table->max_structure_size), ==, max_len); +/* +* Until all structures have been scanned (ep21) +* or an EOF structure is found (ep30) +*/ + }while (ep_type ==SMBIOS_ENTRY_POINT_TYPE_32 ? + ++i <le16_to_cpu (ep_table->ep21.number_of_structures) : + type !=127 ); + +if (ep_type ==SMBIOS_ENTRY_POINT_TYPE_32 ) { +/* +* Total table length and max struct size +* must match entry point values +*/ + g_assert_cmpuint(le16_to_cpu(ep_table->ep21.structure_table_length), ==, + addr -le32_to_cpu (ep_table->ep21.structure_table_address)); + + g_assert_cmpuint(le16_to_cpu(ep_table->ep21.max_structure_size), ==, + max_len); + }/* required struct types must all be present */ for (i =0 ; i < data->required_struct_types_len; i++) {
@@ -756,8 +808,8 @@ static void test_acpi_one(const char *params, test_data *data)* https://bugs.launchpad.net/qemu/+bug/1821884 */ if (!use_uefi) { -test_smbios_entry_point (data); -test_smbios_structs (data); +SmbiosEntryPointType ep_type =test_smbios_entry_point (data); +test_smbios_structs (data, ep_type); }qtest_quit (data->qts);
Signature · 1 line
MST
[PULL 26/86] tests/acpi: virt: update ACPI MADT and FADT binaries
In reply to Michael S. TsirkinFrom: Miguel Luis <[email protected]>
Step 6 & 7 of the bios-tables-test.c documented procedure.
Differences between disassembled ASL files for MADT:
@@ -11,9 +11,9 @@
*/
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)] -[004h 0004 4] Table Length : 000000A8 -[008h 0008 1] Revision : 03 -[009h 0009 1] Checksum : 50 +[004h 0004 4] Table Length : 000000AC +[008h 0008 1] Revision : 04 +[009h 0009 1] Checksum : 47 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001
@@ -34,7 +34,7 @@
[041h 0065 3] Reserved : 000000
[044h 0068 1] Subtable Type : 0B [Generic Interrupt Controller] -[045h 0069 1] Length : 4C +[045h 0069 1] Length : 50 [046h 0070 2] Reserved : 0000 [048h 0072 4] CPU Interface Number : 00000000 [04Ch 0076 4] Processor UID : 00000000 @@ -51,28 +51,29 @@ [07Ch 0124 4] Virtual GIC Interrupt : 00000000 [080h 0128 8] Redistributor Base Address : 0000000000000000 [088h 0136 8] ARM MPIDR : 0000000000000000
-/**** ACPI subtable terminates early - may be older version (dump table) */
+[090h 0144 1] Efficiency Class : 00
+[091h 0145 3] Reserved : 000000
-[090h 0144 1] Subtable Type : 0D [Generic MSI Frame]
-[091h 0145 1] Length : 18
-[092h 0146 2] Reserved : 0000
-[094h 0148 4] MSI Frame ID : 00000000
-[098h 0152 8] Base Address : 0000000008020000
-[0A0h 0160 4] Flags (decoded below) : 00000001
+[094h 0148 1] Subtable Type : 0D [Generic MSI Frame]
+[095h 0149 1] Length : 18
+[096h 0150 2] Reserved : 0000
+[098h 0152 4] MSI Frame ID : 00000000
+[09Ch 0156 8] Base Address : 0000000008020000
+[0A4h 0164 4] Flags (decoded below) : 00000001
Select SPI : 1
-[0A4h 0164 2] SPI Count : 0040
-[0A6h 0166 2] SPI Base : 0050
+[0A8h 0168 2] SPI Count : 0040
+[0AAh 0170 2] SPI Base : 0050-Raw Table Data: Length 168 (0xA8)
+Raw Table Data: Length 172 (0xAC)
- 0000: 41 50 49 43 A8 00 00 00 03 50 42 4F 43 48 53 20 // APIC.....PBOCHS
+ 0000: 41 50 49 43 AC 00 00 00 04 47 42 4F 43 48 53 20 // APIC.....GBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 0C 18 00 00 // ................
0030: 00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 00 // ................
- 0040: 02 00 00 00 0B 4C 00 00 00 00 00 00 00 00 00 00 // .....L..........
+ 0040: 02 00 00 00 0B 50 00 00 00 00 00 00 00 00 00 00 // .....P..........
0050: 01 00 00 00 00 00 00 00 17 00 00 00 00 00 00 00 // ................
0060: 00 00 00 00 00 00 01 08 00 00 00 00 00 00 04 08 // ................
0070: 00 00 00 00 00 00 03 08 00 00 00 00 00 00 00 00 // ................
0080: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 0090: 0D 18 00 00 00 00 00 00 00 00 02 08 00 00 00 00 // ................
- 00A0: 01 00 00 00 40 00 50 00 // [email protected].
+ 0090: 00 00 00 00 0D 18 00 00 00 00 00 00 00 00 02 08 // ................
+ 00A0: 00 00 00 00 01 00 00 00 40 00 50 00 // [email protected].Differences between disassembled ASL files for FADT:
@@ -11,9 +11,9 @@
*/
[000h 0000 4] Signature : "FACP" [Fixed ACPI Description Table (FADT)] -[004h 0004 4] Table Length : 0000010C -[008h 0008 1] Revision : 05 -[009h 0009 1] Checksum : 55 +[004h 0004 4] Table Length : 00000114 +[008h 0008 1] Revision : 06 +[009h 0009 1] Checksum : 15 [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001
@@ -99,7 +99,7 @@
PSCI Compliant : 1
Must use HVC for PSCI : 1
-[083h 0131 1] FADT Minor Revision : 01 +[083h 0131 1] FADT Minor Revision : 00 [084h 0132 8] FACS Address : 0000000000000000 [08Ch 0140 8] DSDT Address : 0000000000000000
[094h 0148 12] PM1A Event Block : [Generic Address Structure]
@@ -173,11 +173,11 @@
[103h 0259 1] Encoded Access Width : 00 [Undefined/Legacy]
[104h 0260 8] Address : 0000000000000000
-/**** ACPI table terminates in the middle of a data structure! (dump table) */
+[10Ch 0268 8] Hypervisor ID : 00000000554D4551
-Raw Table Data: Length 268 (0x10C)
+Raw Table Data: Length 276 (0x114)
- 0000: 46 41 43 50 0C 01 00 00 05 55 42 4F 43 48 53 20 // FACP.....UBOCHS
+ 0000: 46 41 43 50 14 01 00 00 06 15 42 4F 43 48 53 20 // FACP......BOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
@@ -185,7 +185,7 @@ Raw Table Data: Length 268 (0x10C)
0050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 10 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 0080: 00 03 00 01 00 00 00 00 00 00 00 00 00 00 00 00 // ................
+ 0080: 00 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00B0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
@@ -193,4 +193,5 @@ Raw Table Data: Length 268 (0x10C)
00D0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00E0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00F0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
- 0100: 00 00 00 00 00 00 00 00 00 00 00 00 // ............
+ 0100: 00 00 00 00 00 00 00 00 00 00 00 00 51 45 4D 55 // ............QEMU
+ 0110: 00 00 00 00 // ....Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ------ tests/data/acpi/virt/APIC | Bin 168 -> 172 bytes tests/data/acpi/virt/APIC.memhp | Bin 168 -> 172 bytes tests/data/acpi/virt/APIC.numamem | Bin 168 -> 172 bytes tests/data/acpi/virt/FACP | Bin 268 -> 276 bytes tests/data/acpi/virt/FACP.memhp | Bin 268 -> 276 bytes tests/data/acpi/virt/FACP.numamem | Bin 268 -> 276 bytes 7 files changed, 6 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -6
@@ -1,7 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/FACP" , -"tests/data/acpi/virt/FACP.numamem" , -"tests/data/acpi/virt/FACP.memhp" , -"tests/data/acpi/virt/APIC" , -"tests/data/acpi/virt/APIC.memhp" , -"tests/data/acpi/virt/APIC.numamem",
tests/data/acpi/virt/APIC binary +0 -0
tests/data/acpi/virt/APIC.memhp binary +0 -0
tests/data/acpi/virt/APIC.numamem binary +0 -0
tests/data/acpi/virt/FACP binary +0 -0
tests/data/acpi/virt/FACP.memhp binary +0 -0
tests/data/acpi/virt/FACP.numamem binary +0 -0
Signature · 1 line
MST
[PULL 11/86] cryptodev: Add a lkcf-backend for cryptodev
In reply to Michael S. TsirkinFrom: Lei He <[email protected]>
cryptodev: Added a new type of backend named lkcf-backend for cryptodev. This backend upload asymmetric keys to linux kernel, and let kernel do the accelerations if possible.
The lkcf stands for Linux Kernel Cryptography Framework.
Message-Id: <[email protected]>
--- qapi/qom.json | 2 + include/sysemu/cryptodev.h | 1 + backends/cryptodev-lkcf.c | 645 +++++++++++++++++++++++++++++++++++++ backends/meson.build | 3 + 4 files changed, 651 insertions(+) create mode 100644 backends/cryptodev-lkcf.c
qapi/qom.json +2 -0
@@ -850,6 +850,7 @@ 'colo-compare', 'cryptodev-backend', 'cryptodev-backend-builtin', + 'cryptodev-backend-lkcf', { 'name': 'cryptodev-vhost-user', 'if': 'CONFIG_VHOST_CRYPTO' }, 'dbus-vmstate',
@@ -917,6 +918,7 @@ 'colo-compare': 'ColoCompareProperties', 'cryptodev-backend': 'CryptodevBackendProperties', 'cryptodev-backend-builtin': 'CryptodevBackendProperties', + 'cryptodev-backend-lkcf': 'CryptodevBackendProperties', 'cryptodev-vhost-user': { 'type': 'CryptodevVhostUserProperties', 'if': 'CONFIG_VHOST_CRYPTO' }, 'dbus-vmstate': 'DBusVMStateProperties',
include/sysemu/cryptodev.h +1 -0
@@ -219,6 +219,7 @@ typedef enum CryptoDevBackendOptionsType {CRYPTODEV_BACKEND_TYPE_NONE =0 ,CRYPTODEV_BACKEND_TYPE_BUILTIN =1 ,CRYPTODEV_BACKEND_TYPE_VHOST_USER =2 , +CRYPTODEV_BACKEND_TYPE_LKCF =3 ,CRYPTODEV_BACKEND_TYPE__MAX , } CryptoDevBackendOptionsType;
backends/cryptodev-lkcf.c new file +645 -0
645 lines not on this page · raw message
backends/meson.build +3 -0
@@ -12,6 +12,9 @@ softmmu_ss.add([files( softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c')) softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c')) softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c')) +if keyutils.found() + softmmu_ss.add(keyutils, files('cryptodev-lkcf.c')) +endif if have_vhost_user softmmu_ss.add(when: 'CONFIG_VIRTIO', if_true: files('vhost-user.c')) endif
Signature · 1 line
MST
[PULL 22/86] tests/acpi: update tables for new core count test
In reply to Michael S. TsirkinFrom: Julia Suvorova <[email protected]>
Changes in the tables (for 275 cores):
FACP:
+ Use APIC Cluster Model (V4) : 1
APIC:
+[02Ch 0044 1] Subtable Type : 00 [Processor Local APIC] +[02Dh 0045 1] Length : 08 +[02Eh 0046 1] Processor ID : 00 +[02Fh 0047 1] Local Apic ID : 00 +[030h 0048 4] Flags (decoded below) : 00000001 + Processor Enabled : 1 ... + +[81Ch 2076 1] Subtable Type : 00 [Processor Local APIC] +[81Dh 2077 1] Length : 08 +[81Eh 2078 1] Processor ID : FE +[81Fh 2079 1] Local Apic ID : FE +[820h 2080 4] Flags (decoded below) : 00000001 + Processor Enabled : 1 + Runtime Online Capable : 0 + +[824h 2084 1] Subtable Type : 09 [Processor Local x2APIC] +[825h 2085 1] Length : 10 +[826h 2086 2] Reserved : 0000 +[828h 2088 4] Processor x2Apic ID : 000000FF +[82Ch 2092 4] Flags (decoded below) : 00000001
+ Processor Enabled : 1
+[830h 2096 4] Processor UID : 000000FF
...
DSDT:
+ Processor (C001, 0x01, 0x00000000, 0x00)
+ {
+ Method (_STA, 0, Serialized) // _STA: Status
+ {
+ Return (CSTA (One))
+ }
+
+ Name (_MAT, Buffer (0x08) // _MAT: Multiple APIC Table Entry
+ {
+ 0x00, 0x08, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00 // ........
+ })
+ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
+ {+ CEJ0 (One)
+ }
+
+ Method (_OST, 3, Serialized) // _OST: OSPM Status Indication
+ {
+ COST (One, Arg0, Arg1, Arg2)
+ }
+ }
...
+ Processor (C0FE, 0xFE, 0x00000000, 0x00)
+ {
+ Method (_STA, 0, Serialized) // _STA: Status
+ {
+ Return (CSTA (0xFE))
+ }
+
+ Name (_MAT, Buffer (0x08) // _MAT: Multiple APIC Table Entry
+ {
+ 0x00, 0x08, 0xFE, 0xFE, 0x01, 0x00, 0x00, 0x00 // ........
+ })
+ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
+ {+ CEJ0 (0xFE)
+ }
+
+ Method (_OST, 3, Serialized) // _OST: OSPM Status Indication
+ {
+ COST (0xFE, Arg0, Arg1, Arg2)
+ }
+ }
+
+ Device (C0FF)
+ {
+ Name (_HID, "ACPI0007" /* Processor Device */) // _HID: Hardware ID
+ Name (_UID, 0xFF) // _UID: Unique ID
+ Method (_STA, 0, Serialized) // _STA: Status
+ {+ Return (CSTA (0xFF))
+ }
+
+ Name (_MAT, Buffer (0x10) // _MAT: Multiple APIC Table Entry
+ {
+ /* 0000 */ 0x09, 0x10, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, // ........
+ /* 0008 */ 0x01, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00 // ........
+ })
+ Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device, x=0-9
+ {+ CEJ0 (0xFF)
+ }
+
+ Method (_OST, 3, Serialized) // _OST: OSPM Status Indication
+ {
+ COST (0xFF, Arg0, Arg1, Arg2)
+ }
+ }
+
...
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 3 --- tests/data/acpi/q35/APIC.core-count2 | Bin 0 -> 2478 bytes tests/data/acpi/q35/DSDT.core-count2 | Bin 0 -> 32414 bytes tests/data/acpi/q35/FACP.core-count2 | Bin 0 -> 244 bytes 4 files changed, 3 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -3
@@ -1,4 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/APIC.core-count2" , -"tests/data/acpi/q35/DSDT.core-count2" , -"tests/data/acpi/q35/FACP.core-count2",
tests/data/acpi/q35/APIC.core-count2 binary +0 -0
tests/data/acpi/q35/DSDT.core-count2 binary +0 -0
tests/data/acpi/q35/FACP.core-count2 binary +0 -0
Signature · 1 line
MST
[PULL 31/86] hw/pci-bridge/cxl-upstream: Add a CDAT table access DOE
In reply to Michael S. TsirkinFrom: Jonathan Cameron <[email protected]>
This Data Object Exchange Mailbox allows software to query the latency and bandwidth between ports on the switch. For now only provide information on routes between the upstream port and each downstream port (not p2p).
--
Changes since v8: Mostly to match the type 3 equivalent
- Move enum out of function and give it a more descriptive namespace.
Message-Id: <[email protected]>
--- include/hw/cxl/cxl_cdat.h | 1 + hw/pci-bridge/cxl_upstream.c | 195 ++++++++++++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 1 deletion(-)
include/hw/cxl/cxl_cdat.h +1 -0
@@ -131,6 +131,7 @@ typedef struct CDATSslbisHeader {uint64_t entry_base_unit; }QEMU_PACKED CDATSslbisHeader; +#define CDAT_PORT_ID_USP 0x100/* Switch Scoped Latency and Bandwidth Entry - CDAT Table 10 */ typedef struct CDATSslbe { uint16_t port_x_id;
hw/pci-bridge/cxl_upstream.c +194 -1
253 lines not on this page · raw message
Signature · 1 line
MST
[PULL 35/86] hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus
In reply to Michael S. TsirkinFrom: Eric Auger <[email protected]>
In theory the virtio-iommu-pci could be plugged anywhere in the PCIe topology and as long as the dt/acpi info are properly built this should work. However at the moment we fail to do that because the virtio-iommu-pci BDF is not computed at plug time and in that case vms->virtio_iommu_bdf gets an incorrect value.
For instance if the virtio-iommu-pci is plugged onto a pcie root port and the virtio-iommu protects a virtio-block-pci device the guest does not boot.
So let's do not pretend we do support this case and fail the initialize() if we detect the virtio-iommu-pci is plugged anywhere else than on the root bus. Anyway this ability is not needed.
Message-Id: <[email protected]>
--- hw/virtio/virtio-iommu-pci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
hw/virtio/virtio-iommu-pci.c +10 -2
@@ -17,6 +17,7 @@#include "hw/qdev-properties-system.h" #include "qapi/error.h" #include "hw/boards.h" +#include "hw/pci/pci_bus.h" #include "qom/object.h" typedef struct VirtIOIOMMUPCI VirtIOIOMMUPCI ;
@@ -44,6 +45,7 @@ static Property virtio_iommu_pci_properties[] = {static void virtio_iommu_pci_realize (VirtIOPCIProxy *vpci_dev,Error **errp) {VirtIOIOMMUPCI *dev =VIRTIO_IOMMU_PCI (vpci_dev); +PCIBus *pbus =pci_get_bus (&vpci_dev->pci_dev);DeviceState *vdev =DEVICE (&dev->vdev);VirtIOIOMMU *s =VIRTIO_IOMMU (vdev);
@@ -57,11 +59,17 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) s->reserved_regions[i].type != VIRTIO_IOMMU_RESV_MEM_T_MSI) {error_setg (errp,"reserved region %d has an invalid type" , i);error_append_hint (errp,"Valid values are 0 and 1\n" ); +return ; } } +if (!pci_bus_is_root (pbus)) { +error_setg (errp,"virtio-iommu-pci must be plugged on the root bus" ); +return ; + } +object_property_set_link (OBJECT (dev),"primary-bus" , -OBJECT (pci_get_bus (&vpci_dev->pci_dev)), - &error_abort); +OBJECT (pbus), &error_abort); +virtio_pci_force_virtio_1 (vpci_dev);qdev_realize (vdev,BUS (&vpci_dev->bus), errp); }
Signature · 1 line
MST
[PULL 45/86] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_reset()
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Introduce vhost_virtqueue_reset(), which can reset the specific virtqueue in the device. Then it will unmap vrings and the desc of the virtqueue.
Here we do not reuse the vhost_net_stop_one() or vhost_dev_stop(), because they work at queue pair level. We do not use vhost_virtqueue_stop() because it may stop the device in the backend.
This patch only considers the case of vhost-kernel, when NetClientDriver is NET_CLIENT_DRIVER_TAP.
Furthermore, we do not need net->nc->info->poll() because it enables userspace datapath and we want to stop all datapaths for this reset virtqueue here.
Message-Id: <[email protected]>
--- include/net/vhost_net.h | 2 ++ hw/net/vhost_net-stub.c | 6 ++++++ hw/net/vhost_net.c | 25 +++++++++++++++++++++++++ 3 files changed, 33 insertions(+)
include/net/vhost_net.h +2 -0
@@ -48,4 +48,6 @@ uint64_t vhost_net_get_acked_features(VHostNetState *net);int vhost_net_set_mtu (struct vhost_net *net,uint16_t mtu); +void vhost_net_virtqueue_reset (VirtIODevice *vdev,NetClientState *nc, +int vq_index);#endif
hw/net/vhost_net-stub.c +6 -0
@@ -101,3 +101,9 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu) {return 0 ; } + +void vhost_net_virtqueue_reset (VirtIODevice *vdev,NetClientState *nc, +int vq_index) +{ + +}
hw/net/vhost_net.c +25 -0
@@ -531,3 +531,28 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu)return vhost_ops->vhost_net_set_mtu (&net->dev, mtu); } + +void vhost_net_virtqueue_reset (VirtIODevice *vdev,NetClientState *nc, +int vq_index) +{ +VHostNetState *net =get_vhost_net (nc->peer); +const VhostOps *vhost_ops = net->dev.vhost_ops; +struct vhost_vring_file file = { .fd =-1 }; +int idx; + +/* should only be called after backend is connected */ +assert (vhost_ops); + + idx = vhost_ops->vhost_get_vq_index (&net->dev, vq_index); + +if (net->nc->info->type ==NET_CLIENT_DRIVER_TAP ) { + file.index = idx; +int r =vhost_net_set_backend (&net->dev, &file); +assert (r >=0 ); + } + +vhost_virtqueue_stop (&net->dev, + vdev, + net->dev.vqs + idx, + net->dev.vq_index + idx); +}
Signature · 1 line
MST
[PULL 25/86] acpi: arm/virt: madt: bump to revision 4 accordingly to ACPI 6.0 Errata A
In reply to Michael S. TsirkinFrom: Miguel Luis <[email protected]>
MADT has been updated with the GIC Structures from ACPI 6.0 Errata A and so MADT revision and GICC Structure must be updated also.
Message-Id: <[email protected]>
--- hw/arm/virt-acpi-build.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
hw/arm/virt-acpi-build.c +7 -9
@@ -685,7 +685,7 @@ build_dbg2(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) };/* -* ACPI spec, Revision 5.1 Errata A +* ACPI spec, Revision 6.0 Errata A * 5.2.12 Multiple APIC Description Table (MADT) */ static void build_append_gicr (GArray *table_data,uint64_t base,uint32_t size)
@@ -704,7 +704,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)int i;VirtMachineClass *vmc =VIRT_MACHINE_GET_CLASS (vms);const MemMapEntry *memmap = vms->memmap; -AcpiTable table = { .sig ="APIC" , .rev =3 , .oem_id = vms->oem_id, +AcpiTable table = { .sig ="APIC" , .rev =4 , .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id };acpi_table_begin (&table, table_data);
@@ -739,7 +739,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)/* 5.2.12.14 GIC Structure */ build_append_int_noprefix (table_data,0xB ,1 );/* Type */ -build_append_int_noprefix (table_data,76 ,1 );/* Length */ +build_append_int_noprefix (table_data,80 ,1 );/* Length */ build_append_int_noprefix (table_data,0 ,2 );/* Reserved */ build_append_int_noprefix (table_data, i,4 );/* GIC ID */ build_append_int_noprefix (table_data, i,4 );/* ACPI Processor UID */
@@ -759,6 +759,10 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)build_append_int_noprefix (table_data,0 ,8 );/* GICR Base Address*/ /* MPIDR */ build_append_int_noprefix (table_data, armcpu->mp_affinity,8 ); +/* Processor Power Efficiency Class */ +build_append_int_noprefix (table_data,0 ,1 ); +/* Reserved */ +build_append_int_noprefix (table_data,0 ,3 ); }if (vms->gic_version !=VIRT_GIC_VERSION_2 ) {
@@ -770,12 +774,6 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }if (its_class_name () && !vmc->no_its) { -/* -* FIXME: Structure is from Revision 6.0 where 'GIC Structure' -* has additional fields on top of implemented 5.1 Errata A, -* to make it consistent with v6.0 we need to bump everything -* to v6.0 -*/ /* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length)
Signature · 1 line
MST
[PULL 06/86] acpi/nvdimm: Implement ACPI NVDIMM Label Methods
In reply to Michael S. TsirkinFrom: Robert Hoo <[email protected]>
Recent ACPI spec [1] has defined NVDIMM Label Methods _LS{I,R,W}, which deprecates corresponding _DSM Functions defined by PMEM _DSM Interface spec [2].
Since the semantics of the new Label Methods are almost same as old _DSM methods, the implementations here simply wrapper old ones.
ASL form diff can be found in next patch of updating golden master binaries.
[1] ACPI Spec v6.4, 6.5.10 NVDIMM Label Methods
https://uefi.org/sites/default/files/resources/ACPI_Spec_6_4_Jan22.pdf
[2] Intel PMEM _DSM Interface Spec v2.0, 3.10 Deprecated Functions
https://pmem.io/documents/IntelOptanePMem_DSM_Interface-V2.0.pdf
Message-Id: <[email protected]>
--- hw/acpi/nvdimm.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
hw/acpi/nvdimm.c +95 -0
@@ -1243,6 +1243,7 @@ static void nvdimm_build_fit(Aml *dev)static void nvdimm_build_nvdimm_devices (Aml *root_dev,uint32_t ram_slots) {uint32_t slot; +Aml *method, *pkg, *field, *com_call;for (slot =0 ; slot < ram_slots; slot++) {uint32_t handle =nvdimm_slot_to_handle (slot);
@@ -1260,6 +1261,100 @@ static void nvdimm_build_nvdimm_devices(Aml *root_dev, uint32_t ram_slots)*/ aml_append (nvdimm_dev,aml_name_decl ("_ADR" ,aml_int (handle))); +/* +* ACPI v6.4: Section 6.5.10 NVDIMM Label Methods +*/ +/* _LSI */ + method =aml_method ("_LSI" ,0 ,AML_SERIALIZED ); + com_call =aml_call5 (NVDIMM_COMMON_DSM , +aml_touuid (NVDIMM_DEVICE_DSM_UUID ), +aml_int (1 ),aml_int (4 ),aml_int (0 ), +aml_int (handle)); +aml_append (method,aml_store (com_call,aml_local (0 ))); + +aml_append (method,aml_create_dword_field (aml_local (0 ), +aml_int (0 ),"STTS" )); +aml_append (method,aml_create_dword_field (aml_local (0 ),aml_int (4 ), +"SLSA" )); +aml_append (method,aml_create_dword_field (aml_local (0 ),aml_int (8 ), +"MAXT" )); + + pkg =aml_package (3 ); +aml_append (pkg,aml_name ("STTS" )); +aml_append (pkg,aml_name ("SLSA" )); +aml_append (pkg,aml_name ("MAXT" )); +aml_append (method,aml_store (pkg,aml_local (1 ))); +aml_append (method,aml_return (aml_local (1 ))); + +aml_append (nvdimm_dev, method); + +/* _LSR */ + method =aml_method ("_LSR" ,2 ,AML_SERIALIZED ); +aml_append (method,aml_name_decl ("INPT" ,aml_buffer (8 ,NULL ))); + +aml_append (method,aml_create_dword_field (aml_name ("INPT" ), +aml_int (0 ),"OFST" )); +aml_append (method,aml_create_dword_field (aml_name ("INPT" ), +aml_int (4 ),"LEN" )); +aml_append (method,aml_store (aml_arg (0 ),aml_name ("OFST" ))); +aml_append (method,aml_store (aml_arg (1 ),aml_name ("LEN" ))); + + pkg =aml_package (1 ); +aml_append (pkg,aml_name ("INPT" )); +aml_append (method,aml_store (pkg,aml_local (0 ))); + + com_call =aml_call5 (NVDIMM_COMMON_DSM , +aml_touuid (NVDIMM_DEVICE_DSM_UUID ), +aml_int (1 ),aml_int (5 ),aml_local (0 ), +aml_int (handle)); +aml_append (method,aml_store (com_call,aml_local (3 ))); + field =aml_create_dword_field (aml_local (3 ),aml_int (0 ),"STTS" ); +aml_append (method, field); + field =aml_create_field (aml_local (3 ),aml_int (32 ), +aml_shiftleft (aml_name ("LEN" ),aml_int (3 )), +"LDAT" ); +aml_append (method, field); +aml_append (method,aml_name_decl ("LSA" ,aml_buffer (0 ,NULL ))); +aml_append (method,aml_to_buffer (aml_name ("LDAT" ),aml_name ("LSA" ))); + + pkg =aml_package (2 ); +aml_append (pkg,aml_name ("STTS" )); +aml_append (pkg,aml_name ("LSA" )); + +aml_append (method,aml_store (pkg,aml_local (1 ))); +aml_append (method,aml_return (aml_local (1 ))); + +aml_append (nvdimm_dev, method); + +/* _LSW */ + method =aml_method ("_LSW" ,3 ,AML_SERIALIZED ); +aml_append (method,aml_store (aml_arg (2 ),aml_local (2 ))); +aml_append (method,aml_name_decl ("INPT" ,aml_buffer (8 ,NULL ))); + field =aml_create_dword_field (aml_name ("INPT" ), +aml_int (0 ),"OFST" ); +aml_append (method, field); + field =aml_create_dword_field (aml_name ("INPT" ), +aml_int (4 ),"TLEN" ); +aml_append (method, field); +aml_append (method,aml_store (aml_arg (0 ),aml_name ("OFST" ))); +aml_append (method,aml_store (aml_arg (1 ),aml_name ("TLEN" ))); + +aml_append (method,aml_concatenate (aml_name ("INPT" ),aml_local (2 ), +aml_name ("INPT" ))); + pkg =aml_package (1 ); +aml_append (pkg,aml_name ("INPT" )); +aml_append (method,aml_store (pkg,aml_local (0 ))); + com_call =aml_call5 (NVDIMM_COMMON_DSM , +aml_touuid (NVDIMM_DEVICE_DSM_UUID ), +aml_int (1 ),aml_int (6 ),aml_local (0 ), +aml_int (handle)); +aml_append (method,aml_store (com_call,aml_local (3 ))); + field =aml_create_dword_field (aml_local (3 ),aml_int (0 ),"STTS" ); +aml_append (method, field); +aml_append (method,aml_return (aml_name ("STTS" ))); + +aml_append (nvdimm_dev, method); +nvdimm_build_device_dsm (nvdimm_dev, handle);aml_append (root_dev, nvdimm_dev); }
Signature · 1 line
MST
[PULL 30/86] hw/mem/cxl-type3: Add CXL CDAT Data Object Exchange
In reply to Michael S. TsirkinFrom: Huai-Cheng Kuo <[email protected]>
The CDAT can be specified in two ways. One is to add ",cdat=<filename>" in "-device cxl-type3"'s command option. The file is required to provide the whole CDAT table in binary mode. The other is to use the default that provides some 'reasonable' numbers based on type of memory and size.
The DOE capability supporting CDAT is added to hw/mem/cxl_type3.c with capability offset 0x190. The config read/write to this capability range can be generated in the OS to request the CDAT data.
Message-Id: <[email protected]>
--- hw/mem/cxl_type3.c | 255 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 255 insertions(+)
hw/mem/cxl_type3.c +255 -0
@@ -12,9 +12,246 @@#include "qemu/range.h" #include "qemu/rcu.h" #include "sysemu/hostmem.h" +#include "sysemu/numa.h" #include "hw/cxl/cxl.h" #include "hw/pci/msix.h" +#define DWORD_BYTE 4 + +/* Default CDAT entries for a memory region */ +enum { +CT3_CDAT_DSMAS , +CT3_CDAT_DSLBIS0 , +CT3_CDAT_DSLBIS1 , +CT3_CDAT_DSLBIS2 , +CT3_CDAT_DSLBIS3 , +CT3_CDAT_DSEMTS , +CT3_CDAT_NUM_ENTRIES +}; + +static int ct3_build_cdat_entries_for_mr (CDATSubHeader **cdat_table, +int dsmad_handle,MemoryRegion *mr) +{ + g_autofree CDATDsmas *dsmas = NULL; + g_autofree CDATDslbis *dslbis0 = NULL; + g_autofree CDATDslbis *dslbis1 = NULL; + g_autofree CDATDslbis *dslbis2 = NULL; + g_autofree CDATDslbis *dslbis3 = NULL; + g_autofree CDATDsemts *dsemts = NULL; + + dsmas =g_malloc (sizeof (*dsmas)); +if (!dsmas) { +return -ENOMEM ; + } + *dsmas = (CDATDsmas ) { + .header = { + .type =CDAT_TYPE_DSMAS , + .length =sizeof (*dsmas), + }, + .DSMADhandle = dsmad_handle, + .flags =CDAT_DSMAS_FLAG_NV , + .DPA_base =0 , + .DPA_length =int128_get64 (mr->size), + }; + +/* For now, no memory side cache, plausiblish numbers */ + dslbis0 =g_malloc (sizeof (*dslbis0)); +if (!dslbis0) { +return -ENOMEM ; + } + *dslbis0 = (CDATDslbis ) { + .header = { + .type =CDAT_TYPE_DSLBIS , + .length =sizeof (*dslbis0), + }, + .handle = dsmad_handle, + .flags =HMAT_LB_MEM_MEMORY , + .data_type =HMAT_LB_DATA_READ_LATENCY , + .entry_base_unit =10000 ,/* 10ns base */ + .entry[0 ] =15 ,/* 150ns */ + }; + + dslbis1 =g_malloc (sizeof (*dslbis1)); +if (!dslbis1) { +return -ENOMEM ; + } + *dslbis1 = (CDATDslbis ) { + .header = { + .type =CDAT_TYPE_DSLBIS , + .length =sizeof (*dslbis1), + }, + .handle = dsmad_handle, + .flags =HMAT_LB_MEM_MEMORY , + .data_type =HMAT_LB_DATA_WRITE_LATENCY , + .entry_base_unit =10000 , + .entry[0 ] =25 ,/* 250ns */ + }; + + dslbis2 =g_malloc (sizeof (*dslbis2)); +if (!dslbis2) { +return -ENOMEM ; + } + *dslbis2 = (CDATDslbis ) { + .header = { + .type =CDAT_TYPE_DSLBIS , + .length =sizeof (*dslbis2), + }, + .handle = dsmad_handle, + .flags =HMAT_LB_MEM_MEMORY , + .data_type =HMAT_LB_DATA_READ_BANDWIDTH , + .entry_base_unit =1000 ,/* GB/s */ + .entry[0 ] =16 , + }; + + dslbis3 =g_malloc (sizeof (*dslbis3)); +if (!dslbis3) { +return -ENOMEM ; + } + *dslbis3 = (CDATDslbis ) { + .header = { + .type =CDAT_TYPE_DSLBIS , + .length =sizeof (*dslbis3), + }, + .handle = dsmad_handle, + .flags =HMAT_LB_MEM_MEMORY , + .data_type =HMAT_LB_DATA_WRITE_BANDWIDTH , + .entry_base_unit =1000 ,/* GB/s */ + .entry[0 ] =16 , + }; + + dsemts =g_malloc (sizeof (*dsemts)); +if (!dsemts) { +return -ENOMEM ; + } + *dsemts = (CDATDsemts ) { + .header = { + .type =CDAT_TYPE_DSEMTS , + .length =sizeof (*dsemts), + }, + .DSMAS_handle = dsmad_handle, +/* Reserved - the non volatile from DSMAS matters */ + .EFI_memory_type_attr =2 , + .DPA_offset =0 , + .DPA_length =int128_get64 (mr->size), + }; + +/* Header always at start of structure */ + cdat_table[CT3_CDAT_DSMAS ] =g_steal_pointer (&dsmas); + cdat_table[CT3_CDAT_DSLBIS0 ] =g_steal_pointer (&dslbis0); + cdat_table[CT3_CDAT_DSLBIS1 ] =g_steal_pointer (&dslbis1); + cdat_table[CT3_CDAT_DSLBIS2 ] =g_steal_pointer (&dslbis2); + cdat_table[CT3_CDAT_DSLBIS3 ] =g_steal_pointer (&dslbis3); + cdat_table[CT3_CDAT_DSEMTS ] =g_steal_pointer (&dsemts); + +return 0 ; +} + +static int ct3_build_cdat_table (CDATSubHeader ***cdat_table,void *priv) +{ + g_autofree CDATSubHeader **table = NULL; +MemoryRegion *nonvolatile_mr; +CXLType3Dev *ct3d = priv; +int dsmad_handle =0 ; +int rc; + +if (!ct3d->hostmem) { +return 0 ; + } + + nonvolatile_mr =host_memory_backend_get_memory (ct3d->hostmem); +if (!nonvolatile_mr) { +return -EINVAL ; + } + + table =g_malloc0 (CT3_CDAT_NUM_ENTRIES *sizeof (*table)); +if (!table) { +return -ENOMEM ; + } + + rc =ct3_build_cdat_entries_for_mr (table, dsmad_handle++, nonvolatile_mr); +if (rc <0 ) { +return rc; + } + + *cdat_table =g_steal_pointer (&table); + +return CT3_CDAT_NUM_ENTRIES ; +} + +static void ct3_free_cdat_table (CDATSubHeader **cdat_table,int num,void *priv) +{ +int i; + +for (i =0 ; i < num; i++) { +g_free (cdat_table[i]); + } +g_free (cdat_table); +} + +static bool cxl_doe_cdat_rsp (DOECap *doe_cap) +{ +CDATObject *cdat = &CXL_TYPE3 (doe_cap->pdev)->cxl_cstate.cdat; +uint16_t ent; +void *base; +uint32_t len; +CDATReq *req =pcie_doe_get_write_mbox_ptr (doe_cap); +CDATRsp rsp; + +assert (cdat->entry_len); + +/* Discard if request length mismatched */ +if (pcie_doe_get_obj_len (req) < +DIV_ROUND_UP (sizeof (CDATReq),DWORD_BYTE )) { +return false; + } + + ent = req->entry_handle; + base = cdat->entry[ent].base; + len = cdat->entry[ent].length; + + rsp = (CDATRsp ) { + .header = { + .vendor_id =CXL_VENDOR_ID , + .data_obj_type =CXL_DOE_TABLE_ACCESS , + .reserved =0x0 , + .length =DIV_ROUND_UP ((sizeof (rsp) + len),DWORD_BYTE ), + }, + .rsp_code =CXL_DOE_TAB_RSP , + .table_type =CXL_DOE_TAB_TYPE_CDAT , + .entry_handle = (ent < cdat->entry_len -1 ) ? + ent +1 :CXL_DOE_TAB_ENT_MAX , + }; + +memcpy (doe_cap->read_mbox, &rsp,sizeof (rsp)); +memcpy (doe_cap->read_mbox +DIV_ROUND_UP (sizeof (rsp),DWORD_BYTE ), + base, len); + + doe_cap->read_mbox_len += rsp.header.length; + +return true; +} + +static uint32_t ct3d_config_read (PCIDevice *pci_dev,uint32_t addr,int size) +{ +CXLType3Dev *ct3d =CXL_TYPE3 (pci_dev); +uint32_t val; + +if (pcie_doe_read_config (&ct3d->doe_cdat, addr, size, &val)) { +return val; + } + +return pci_default_read_config (pci_dev, addr, size); +} + +static void ct3d_config_write (PCIDevice *pci_dev,uint32_t addr,uint32_t val, +int size) +{ +CXLType3Dev *ct3d =CXL_TYPE3 (pci_dev); + +pcie_doe_write_config (&ct3d->doe_cdat, addr, val, size); +pci_default_write_config (pci_dev, addr, val, size); +} +/* * Null value of all Fs suggested by IEEE RA guidelines for use of * EU, OUI and CID
@@ -140,6 +377,11 @@ static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp)return true; } +static DOEProtocol doe_cdat_prot[] = { + {CXL_VENDOR_ID ,CXL_DOE_TABLE_ACCESS , cxl_doe_cdat_rsp }, + { } +}; +static void ct3_realize (PCIDevice *pci_dev,Error **errp) {CXLType3Dev *ct3d =CXL_TYPE3 (pci_dev);
@@ -189,6 +431,14 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)for (i =0 ; i < msix_num; i++) {msix_vector_use (pci_dev, i); } + +/* DOE Initailization */ +pcie_doe_init (pci_dev, &ct3d->doe_cdat,0x190 , doe_cdat_prot, true,0 ); + + cxl_cstate->cdat.build_cdat_table = ct3_build_cdat_table; + cxl_cstate->cdat.free_cdat_table = ct3_free_cdat_table; + cxl_cstate->cdat.private = ct3d; +cxl_doe_cdat_init (cxl_cstate, errp); }static void ct3_exit (PCIDevice *pci_dev)
@@ -197,6 +447,7 @@ static void ct3_exit(PCIDevice *pci_dev)CXLComponentState *cxl_cstate = &ct3d->cxl_cstate;ComponentRegisters *regs = &cxl_cstate->crb; +cxl_doe_cdat_release (cxl_cstate);g_free (regs->special_ops);address_space_destroy (&ct3d->hostmem_as); }
@@ -296,6 +547,7 @@ static Property ct3_props[] = {DEFINE_PROP_LINK ("lsa" , CXLType3Dev, lsa,TYPE_MEMORY_BACKEND , HostMemoryBackend *),DEFINE_PROP_UINT64 ("sn" , CXLType3Dev, sn,UI64_NULL ), +DEFINE_PROP_STRING ("cdat" , CXLType3Dev, cxl_cstate.cdat.filename), DEFINE_PROP_END_OF_LIST(), };
@@ -361,6 +613,9 @@ static void ct3_class_init(ObjectClass *oc, void *data) pc->device_id =0xd93 ;/* LVF for now */ pc->revision =1 ; + pc->config_write = ct3d_config_write; + pc->config_read = ct3d_config_read; +set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); dc->desc ="CXL PMEM Device (Type 3)" ; dc->reset = ct3d_reset;
Signature · 1 line
MST
[PULL 14/86] acpi/tests/avocado/bits: add biosbits config file for running bios tests
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
This change adds initial biosbits config file that instructs biosbits to run bios test suits in batch mode. Additionally acpi and smbios structures are also dumped.
Message-Id: <[email protected]>
--- .../avocado/acpi-bits/bits-config/bits-cfg.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tests/avocado/acpi-bits/bits-config/bits-cfg.txt
tests/avocado/acpi-bits/bits-config/bits-cfg.txt new file +18 -0
@@ -0,0 +1,18 @@ +# BITS configuration file +[bits] + +# To run BITS in batch mode, set batch to a list of one or more of the +# following keywords; BITS will then run all of the requested operations, then +# save the log file to disk. +# +# test: Run the full BITS testsuite. +# acpi: Dump all ACPI structures. +# smbios: Dump all SMBIOS structures. +# +# Leave batch set to an empty string to disable batch mode. +# batch = + +# Uncomment the following to run all available batch operations +# please take a look at boot/python/init.py in bits zip file +# to see how these options are parsed and used. +batch = test acpi smbios
Signature · 1 line
MST
[PULL 28/86] hw/mem/cxl-type3: Add MSIX support
In reply to Michael S. TsirkinFrom: Jonathan Cameron <[email protected]>
This will be used by several upcoming patch sets so break it out such that it doesn't matter which one lands first.
Message-Id: <[email protected]>
--- hw/mem/cxl_type3.c | 9 +++++++++ 1 file changed, 9 insertions(+)
hw/mem/cxl_type3.c +9 -0
@@ -13,6 +13,7 @@#include "qemu/rcu.h" #include "sysemu/hostmem.h" #include "hw/cxl/cxl.h" +#include "hw/pci/msix.h" /* * Null value of all Fs suggested by IEEE RA guidelines for use of
@@ -146,6 +147,8 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)ComponentRegisters *regs = &cxl_cstate->crb;MemoryRegion *mr = ®s->component_registers;uint8_t *pci_conf = pci_dev->config; +unsigned short msix_num =1 ; +int i;if (!cxl_setup_memory (ct3d, errp)) {return ;
@@ -180,6 +183,12 @@ static void ct3_realize(PCIDevice *pci_dev, Error **errp)PCI_BASE_ADDRESS_SPACE_MEMORY |PCI_BASE_ADDRESS_MEM_TYPE_64 , &ct3d->cxl_dstate.device_registers); + +/* MSI(-X) Initailization */ +msix_init_exclusive_bar (pci_dev, msix_num,4 ,NULL ); +for (i =0 ; i < msix_num; i++) { +msix_vector_use (pci_dev, i); + } }static void ct3_exit (PCIDevice *pci_dev)
Signature · 1 line
MST
[PULL 36/86] virtio: re-order vm_running and use_started checks
In reply to Michael S. TsirkinFrom: Alex Bennée <[email protected]>
During migration the virtio device state can be restored before we restart the VM. As no devices can be running while the VM is paused it makes sense to bail out early in that case.
This returns the order introduced in:
9f6bcfd99f (hw/virtio: move vm_running check to virtio_device_started)
to what virtio-sock was doing longhand.
Message-Id: <[email protected]>
--- include/hw/virtio/virtio.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/hw/virtio/virtio.h +4 -4
@@ -385,14 +385,14 @@ static inline bool virtio_is_big_endian(VirtIODevice *vdev)static inline bool virtio_device_started (VirtIODevice *vdev,uint8_t status) { -if (vdev->use_started) { -return vdev->started; - } -if (!vdev->vm_running) {return false; } +if (vdev->use_started) { +return vdev->started; + } +return status &VIRTIO_CONFIG_S_DRIVER_OK ; }
Signature · 1 line
MST
[PULL 04/86] acpi/ssdt: Fix aml_or() and aml_and() in if clause
In reply to Michael S. TsirkinFrom: Robert Hoo <[email protected]>
In If condition, using bitwise and/or, rather than logical and/or.
The result change in AML code:
If (((Local6 == Zero) | (Arg0 != Local0)))
==>
If (((Local6 == Zero) || (Arg0 != Local0)))
If (((ObjectType (Arg3) == 0x04) & (SizeOf (Arg3) == One))) ==>
If (((ObjectType (Arg3) == 0x04) && (SizeOf (Arg3) == One)))
Message-Id: <[email protected]>
--- hw/acpi/nvdimm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/acpi/nvdimm.c +3 -4
@@ -1037,7 +1037,7 @@ static void nvdimm_build_common_dsm(Aml *dev, uuid_invalid =aml_lnot (aml_equal (uuid, expected_uuid)); - unsupport =aml_if (aml_or (unpatched, uuid_invalid,NULL )); + unsupport =aml_if (aml_lor (unpatched, uuid_invalid));/* * function 0 is called to inquire what functions are supported by
@@ -1069,10 +1069,9 @@ static void nvdimm_build_common_dsm(Aml *dev,* in the DSM Spec. */ pckg =aml_arg (3 ); - ifctx =aml_if (aml_and (aml_equal (aml_object_type (pckg), + ifctx =aml_if (aml_land (aml_equal (aml_object_type (pckg),aml_int (4 /* Package */ ))/* It is a Package? */ , -aml_equal (aml_sizeof (pckg),aml_int (1 ))/* 1 element? */ , -NULL )); +aml_equal (aml_sizeof (pckg),aml_int (1 ))/* 1 element? */ )); pckg_index =aml_local (2 ); pckg_buf =aml_local (3 );
Signature · 1 line
MST
[PULL 55/86] tests: acpi: whitelist DSDT before generating PCI-ISA bridge AML automatically
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +34 -0
@@ -1 +1,35 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/DSDT" , +"tests/data/acpi/pc/DSDT.acpierst" , +"tests/data/acpi/pc/DSDT.acpihmat" , +"tests/data/acpi/pc/DSDT.bridge" , +"tests/data/acpi/pc/DSDT.cphp" , +"tests/data/acpi/pc/DSDT.dimmpxm" , +"tests/data/acpi/pc/DSDT.hpbridge" , +"tests/data/acpi/pc/DSDT.hpbrroot" , +"tests/data/acpi/pc/DSDT.ipmikcs" , +"tests/data/acpi/pc/DSDT.memhp" , +"tests/data/acpi/pc/DSDT.nohpet" , +"tests/data/acpi/pc/DSDT.numamem" , +"tests/data/acpi/pc/DSDT.roothp" , +"tests/data/acpi/q35/DSDT" , +"tests/data/acpi/q35/DSDT.acpierst" , +"tests/data/acpi/q35/DSDT.acpihmat" , +"tests/data/acpi/q35/DSDT.applesmc" , +"tests/data/acpi/q35/DSDT.bridge" , +"tests/data/acpi/q35/DSDT.cphp" , +"tests/data/acpi/q35/DSDT.cxl" , +"tests/data/acpi/q35/DSDT.dimmpxm" , +"tests/data/acpi/q35/DSDT.ipmibt" , +"tests/data/acpi/q35/DSDT.ipmismbus" , +"tests/data/acpi/q35/DSDT.ivrs" , +"tests/data/acpi/q35/DSDT.memhp" , +"tests/data/acpi/q35/DSDT.mmio64" , +"tests/data/acpi/q35/DSDT.multi-bridge" , +"tests/data/acpi/q35/DSDT.nohpet" , +"tests/data/acpi/q35/DSDT.numamem" , +"tests/data/acpi/q35/DSDT.pvpanic-isa" , +"tests/data/acpi/q35/DSDT.tis.tpm12" , +"tests/data/acpi/q35/DSDT.tis.tpm2" , +"tests/data/acpi/q35/DSDT.viot" , +"tests/data/acpi/q35/DSDT.xapic",
Signature · 1 line
MST
[PULL 10/86] crypto: Support export akcipher to pkcs8
In reply to Michael S. TsirkinFrom: Lei He <[email protected]>
crypto: support export RSA private keys with PKCS#8 standard. So that users can upload this private key to linux kernel.
Message-Id: <[email protected]>
--- crypto/rsakey.h | 11 +++++++++- include/crypto/akcipher.h | 21 ++++++++++++++++++++ crypto/akcipher.c | 18 +++++++++++++++++ crypto/rsakey.c | 42 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 1 deletion(-)
crypto/rsakey.h +10 -1
@@ -22,7 +22,6 @@#ifndef QCRYPTO_RSAKEY_H #define QCRYPTO_RSAKEY_H -#include "qemu/osdep.h" #include "qemu/host-utils.h" #include "crypto/akcipher.h"
@@ -84,6 +83,16 @@ QCryptoAkCipherRSAKey *qcrypto_akcipher_rsakey_parse(QCryptoAkCipherKeyType type, const uint8_t *key, size_t keylen, Error **errp); +/** +* qcrypto_akcipher_rsakey_export_as_p8info: +* +* Export RSA private key to PKCS#8 private key info. +*/ +void qcrypto_akcipher_rsakey_export_p8info (const uint8_t *key, +size_t keylen, +uint8_t **dst, +size_t *dlen); +void qcrypto_akcipher_rsakey_free (QCryptoAkCipherRSAKey *key); G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoAkCipherRSAKey,
include/crypto/akcipher.h +21 -0
@@ -153,6 +153,27 @@ int qcrypto_akcipher_max_dgst_len(QCryptoAkCipher *akcipher);*/ void qcrypto_akcipher_free (QCryptoAkCipher *akcipher); +/** +* qcrypto_akcipher_export_p8info: +* @opts: the options of the akcipher to be exported. +* @key: the original key of the akcipher to be exported. +* @keylen: length of the 'key' +* @dst: output parameter, if export succeed, *dst is set to the +* PKCS#8 encoded private key, caller MUST free this key with +* g_free after use. +* @dst_len: output parameter, indicates the length of PKCS#8 encoded +* key. +* +* Export the akcipher into DER encoded pkcs#8 private key info, expects +* |key| stores a valid asymmetric PRIVATE key. +* +* Returns: 0 for succeed, otherwise -1 is returned. +*/ +int qcrypto_akcipher_export_p8info (const QCryptoAkCipherOptions *opts, +uint8_t *key,size_t keylen, +uint8_t **dst,size_t *dst_len, +Error **errp); + G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoAkCipher, qcrypto_akcipher_free)#endif /* QCRYPTO_AKCIPHER_H */
crypto/akcipher.c +18 -0
@@ -22,6 +22,8 @@#include "qemu/osdep.h" #include "crypto/akcipher.h" #include "akcipherpriv.h" +#include "der.h" +#include "rsakey.h" #if defined(CONFIG_GCRYPT )#include "akcipher-gcrypt.c.inc"
@@ -106,3 +108,19 @@ void qcrypto_akcipher_free(QCryptoAkCipher *akcipher) drv->free (akcipher); } + +int qcrypto_akcipher_export_p8info (const QCryptoAkCipherOptions *opts, +uint8_t *key,size_t keylen, +uint8_t **dst,size_t *dst_len, +Error **errp) +{ +switch (opts->alg) { +case QCRYPTO_AKCIPHER_ALG_RSA : +qcrypto_akcipher_rsakey_export_p8info (key, keylen, dst, dst_len); +return 0 ; + +default : +error_setg (errp,"Unsupported algorithm: %u" , opts->alg); +return -1 ; + } +}
crypto/rsakey.c +42 -0
54 lines not on this page · raw message
Signature · 1 line
MST
[PULL 64/86] tests: acpi: update expected blobs
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Expected changes are:
1) Moving _GPE scope declaration achec of all _E0x methods
+ Scope (_GPE)
+ {
+ Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID
+ }
+
Scope (_SB)
{
Device (\_SB.PCI0.PRES)
============
\_SB.CPUS.CSCN ()
} - Scope (_GPE)
- {
- Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID
- }
2) Moving _E01 handler after PCI0 scope is defined
- Scope (_GPE)
- {
- Name (_HID, "ACPI0006" /* GPE Block Device */) // _HID: Hardware ID
- Method (_E01, 0, NotSerialized) // _Exx: Edge-Triggered GPE
- {
- Acquire (\_SB.PCI0.BLCK, 0xFFFF)
- \_SB.PCI0.PCNT ()
- Release (\_SB.PCI0.BLCK)
- }
- }
-
Scope (\_SB.PCI0)
{
Name (_CRS, ResourceTemplate () // _CRS: Current Resource Settings
=============
}
}
}
+
+ Scope (_GPE)
+ {
+ Method (_E01, 0, NotSerialized) // _Exx: Edge-Triggered GPE
+ {
+ Acquire (\_SB.PCI0.BLCK, 0xFFFF)
+ \_SB.PCI0.PCNT ()
+ Release (\_SB.PCI0.BLCK)
+ }
+ }
}
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 34 -------------------- tests/data/acpi/pc/DSDT | Bin 6496 -> 6501 bytes tests/data/acpi/pc/DSDT.acpierst | Bin 6456 -> 6461 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 7821 -> 7826 bytes tests/data/acpi/pc/DSDT.bridge | Bin 9570 -> 9575 bytes tests/data/acpi/pc/DSDT.cphp | Bin 6960 -> 6965 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 8150 -> 8155 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 6456 -> 6461 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3107 -> 3107 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 6568 -> 6573 bytes tests/data/acpi/pc/DSDT.memhp | Bin 7855 -> 7860 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 6354 -> 6359 bytes tests/data/acpi/pc/DSDT.numamem | Bin 6502 -> 6507 bytes tests/data/acpi/pc/DSDT.roothp | Bin 6694 -> 6699 bytes tests/data/acpi/q35/DSDT | Bin 8407 -> 8412 bytes tests/data/acpi/q35/DSDT.acpierst | Bin 8424 -> 8429 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9732 -> 9737 bytes tests/data/acpi/q35/DSDT.applesmc | Bin 8453 -> 8458 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11536 -> 11541 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8871 -> 8876 bytes tests/data/acpi/q35/DSDT.cxl | Bin 9733 -> 9738 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 10061 -> 10066 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8482 -> 8487 bytes tests/data/acpi/q35/DSDT.ipmismbus | Bin 8495 -> 8500 bytes tests/data/acpi/q35/DSDT.ivrs | Bin 8424 -> 8429 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9766 -> 9771 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9537 -> 9542 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8727 -> 8732 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8265 -> 8270 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8413 -> 8418 bytes tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8508 -> 8513 bytes tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 9013 -> 9018 bytes tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 9039 -> 9044 bytes tests/data/acpi/q35/DSDT.viot | Bin 9516 -> 9521 bytes tests/data/acpi/q35/DSDT.xapic | Bin 35770 -> 35775 bytes 35 files changed, 34 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -34
@@ -1,35 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/DSDT" , -"tests/data/acpi/pc/DSDT.bridge" , -"tests/data/acpi/pc/DSDT.ipmikcs" , -"tests/data/acpi/pc/DSDT.cphp" , -"tests/data/acpi/pc/DSDT.memhp" , -"tests/data/acpi/pc/DSDT.numamem" , -"tests/data/acpi/pc/DSDT.nohpet" , -"tests/data/acpi/pc/DSDT.dimmpxm" , -"tests/data/acpi/pc/DSDT.acpihmat" , -"tests/data/acpi/pc/DSDT.acpierst" , -"tests/data/acpi/pc/DSDT.roothp" , -"tests/data/acpi/pc/DSDT.hpbridge" , -"tests/data/acpi/pc/DSDT.hpbrroot" , -"tests/data/acpi/q35/DSDT" , -"tests/data/acpi/q35/DSDT.tis.tpm2" , -"tests/data/acpi/q35/DSDT.tis.tpm12" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/DSDT.multi-bridge" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.cphp" , -"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.nohpet" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/DSDT.acpierst" , -"tests/data/acpi/q35/DSDT.applesmc" , -"tests/data/acpi/q35/DSDT.pvpanic-isa" , -"tests/data/acpi/q35/DSDT.ivrs" , -"tests/data/acpi/q35/DSDT.viot" , -"tests/data/acpi/q35/DSDT.cxl" , -"tests/data/acpi/q35/DSDT.ipmismbus" , -"tests/data/acpi/q35/DSDT.xapic",
tests/data/acpi/pc/DSDT binary +0 -0
tests/data/acpi/pc/DSDT.acpierst binary +0 -0
tests/data/acpi/pc/DSDT.acpihmat binary +0 -0
tests/data/acpi/pc/DSDT.bridge binary +0 -0
tests/data/acpi/pc/DSDT.cphp binary +0 -0
tests/data/acpi/pc/DSDT.dimmpxm binary +0 -0
tests/data/acpi/pc/DSDT.hpbridge binary +0 -0
tests/data/acpi/pc/DSDT.hpbrroot binary +0 -0
tests/data/acpi/pc/DSDT.ipmikcs binary +0 -0
tests/data/acpi/pc/DSDT.memhp binary +0 -0
tests/data/acpi/pc/DSDT.nohpet binary +0 -0
tests/data/acpi/pc/DSDT.numamem binary +0 -0
tests/data/acpi/pc/DSDT.roothp binary +0 -0
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.cxl binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/q35/DSDT.viot binary +0 -0
tests/data/acpi/q35/DSDT.xapic binary +0 -0
Signature · 1 line
MST
[PULL 12/86] acpi/tests/avocado/bits: initial commit of test scripts that are run by biosbits
In reply to Michael S. TsirkinFrom: Ani Sinha <[email protected]>
This is initial commit of cpuid, acpi and smbios python test scripts for biosbits to execute. No change has been made to them from the original code written by the biosbits author Josh Triplett. They are required to be installed into the bits iso file and then run from within the virtual machine booted off with biosbits iso.
The test scripts have a ".py2" extension in order to prevent avocado from loading them. They are written in python 2.7 and are run from within bios bits. There is no need for avocado to try to load them and call out errors on python3 specific syntaxes.
The original location of these tests are here:
https://github.com/biosbits/bits/blob/master/python/testacpi.py
https://github.com/biosbits/bits/blob/master/python/smbios.py
https://github.com/biosbits/bits/blob/master/python/testcpuid.py
For QEMU, we maintain a fork of the above repo here with numerious fixes:
https://gitlab.com/qemu-project/biosbits-bits
The acpi test for example is maintained here in the fork:
https://gitlab.com/qemu-project/biosbits-bits/-/raw/master/python/testacpi.py
Message-Id: <[email protected]>
--- tests/avocado/acpi-bits/bits-tests/smbios.py2 | 2430 +++++++++++++++++ .../avocado/acpi-bits/bits-tests/testacpi.py2 | 283 ++ .../acpi-bits/bits-tests/testcpuid.py2 | 83 + 3 files changed, 2796 insertions(+) create mode 100644 tests/avocado/acpi-bits/bits-tests/smbios.py2 create mode 100644 tests/avocado/acpi-bits/bits-tests/testacpi.py2 create mode 100644 tests/avocado/acpi-bits/bits-tests/testcpuid.py2
tests/avocado/acpi-bits/bits-tests/smbios.py2 new file +2430 -0
@@ -0,0 +1,2430 @@ +# Copyright (c) 2015, Intel Corporation +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# * Neither the name of Intel Corporation nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +"""SMBIOS/DMI module.""" + +import bits +import bitfields +import ctypes +import redirect +import struct +import uuid +import unpack +import ttypager +import sys + +class SMBIOS(unpack.Struct): + def __new__(cls): + if sys.platform == "BITS-EFI": + import efi + sm_ptr = efi.system_table.ConfigurationTableDict.get(efi.SMBIOS_TABLE_GUID) + else: + address = 0xF0000 + mem = bits.memory(0xF0000, 0x10000) + for offset in range(0, len(mem), 16): + signature = (ctypes.c_char * 4).from_address(address + offset).value + if signature == "_SM_": + entry_point_length = ctypes.c_ubyte.from_address(address + offset + 5).value + csum = sum(map(ord, mem[offset:offset + entry_point_length])) & 0xff + if csum == 0: + sm_ptr = address + offset + break + else: + return None + + if not sm_ptr: + return None + + sm = super(SMBIOS, cls).__new__(cls) + sm._header_memory = bits.memory(sm_ptr, 0x1f) + return sm + + def __init__(self): + super(SMBIOS, self).__init__() + u = unpack.Unpackable(self._header_memory) + self.add_field('header', Header(u)) + self._structure_memory = bits.memory(self.header.structure_table_address, self.header.structure_table_length) + u = unpack.Unpackable(self._structure_memory) + self.add_field('structures', unpack.unpack_all(u, _smbios_structures, self), unpack.format_each("\n\n{!r}")) + + def structure_type(self, num): + '''Dumps structure of given Type if present''' + try: + types_present = [self.structures[x].smbios_structure_type for x in range(len(self.structures))] + matrix = dict() + for index in range(len(types_present)): + if types_present.count(types_present[index]) == 1: + matrix[types_present[index]] = self.structures[index] + else: # if multiple structures of the same type, return a list of structures for the type number + if matrix.has_key(types_present[index]): + matrix[types_present[index]].append(self.structures[index]) + else: + matrix[types_present[index]] = [self.structures[index]] + return matrix[num] + except: + print "Failure: Type {} - not found".format(num) + +class Header(unpack.Struct): + def __new__(cls, u): + return super(Header, cls).__new__(cls) + + def __init__(self, u): + super(Header, self).__init__() + self.raw_data = u.unpack_rest() + u = unpack.Unpackable(self.raw_data) + self.add_field('anchor_string', u.unpack_one("4s")) + self.add_field('checksum', u.unpack_one("B")) + self.add_field('length', u.unpack_one("B")) + self.add_field('major_version', u.unpack_one("B")) + self.add_field('minor_version', u.unpack_one("B")) + self.add_field('max_structure_size', u.unpack_one("<H")) + self.add_field('entry_point_revision', u.unpack_one("B")) + self.add_field('formatted_area', u.unpack_one("5s")) + self.add_field('intermediate_anchor_string', u.unpack_one("5s")) + self.add_field('intermediate_checksum', u.unpack_one("B")) + self.add_field('structure_table_length', u.unpack_one("<H")) + self.add_field('structure_table_address', u.unpack_one("<I")) + self.add_field('number_structures', u.unpack_one("<H")) + self.add_field('bcd_revision', u.unpack_one("B")) + if not u.at_end(): + self.add_field('data', u.unpack_rest()) + +class SmbiosBaseStructure(unpack.Struct): + def __new__(cls, u, sm): + t = u.unpack_peek_one("B") + if cls.smbios_structure_type is not None and t != cls.smbios_structure_type: + return None + return super(SmbiosBaseStructure, cls).__new__(cls) + + def __init__(self, u, sm): + super(SmbiosBaseStructure, self).__init__() + self.start_offset = u.offset + length = u.unpack_peek_one("<xB") + self.raw_data = u.unpack_raw(length) + self.u = unpack.Unpackable(self.raw_data) + + self.strings_offset = u.offset + def unpack_string(): + return "".join(iter(lambda: u.unpack_one("c"), "\x00")) + strings = list(iter(unpack_string, "")) + if not strings: + u.skip(1) + + self.strings_length = u.offset - self.strings_offset + self.raw_strings = str(bits.memory(sm.header.structure_table_address + self.strings_offset, self.strings_length)) + + if len(strings): + self.strings = strings + + self.add_field('type', self.u.unpack_one("B")) + self.add_field('length', self.u.unpack_one("B")) + self.add_field('handle', self.u.unpack_one("<H")) + + def fini(self): + if not self.u.at_end(): + self.add_field('data', self.u.unpack_rest()) + del self.u + + def fmtstr(self, i): + """Format the specified index and the associated string""" + return "{} '{}'".format(i, self.getstr(i)) + + def getstr(self, i): + """Get the string associated with the given index""" + if i == 0: + return "(none)" + if not hasattr(self, "strings"): + return "(error: structure has no strings)" + if i > len(self.strings): + return "(error: string index out of range)" + return self.strings[i - 1] + +class BIOSInformation(SmbiosBaseStructure): + smbios_structure_type = 0 + + def __init__(self, u, sm): + super(BIOSInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('vendor', u.unpack_one("B"), self.fmtstr) + self.add_field('version', u.unpack_one("B"), self.fmtstr) + self.add_field('starting_address_segment', u.unpack_one("<H")) + self.add_field('release_date', u.unpack_one("B"), self.fmtstr) + self.add_field('rom_size', u.unpack_one("B")) + self.add_field('characteristics', u.unpack_one("<Q")) + minor_version_str = str(sm.header.minor_version) # 34 is .34, 4 is .4, 41 is .41; compare ASCIIbetically to compare initial digits rather than numeric value + if (sm.header.major_version, minor_version_str) >= (2,"4"): + characteristic_bytes = 2 + else: + characteristic_bytes = self.length - 0x12 + self.add_field('characteristics_extensions', [u.unpack_one("B") for b in range(characteristic_bytes)]) + if (sm.header.major_version, minor_version_str) >= (2,"4"): + self.add_field('major_release', u.unpack_one("B")) + self.add_field('minor_release', u.unpack_one("B")) + self.add_field('ec_major_release', u.unpack_one("B")) + self.add_field('ec_minor_release', u.unpack_one("B")) + except: + self.decode_failure = True + print "Error parsing BIOSInformation" + import traceback + traceback.print_exc() + self.fini() + +class SystemInformation(SmbiosBaseStructure): + smbios_structure_type = 1 + + def __init__(self, u, sm): + super(SystemInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('manufacturer', u.unpack_one("B"), self.fmtstr) + self.add_field('product_name', u.unpack_one("B"), self.fmtstr) + self.add_field('version', u.unpack_one("B"), self.fmtstr) + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0x8: + self.add_field('uuid', uuid.UUID(bytes_le=u.unpack_one("16s"))) + wakeup_types = { + 0: 'Reserved', + 1: 'Other', + 2: 'Unknown', + 3: 'APM Timer', + 4: 'Modem Ring', + 5: 'LAN Remote', + 6: 'Power Switch', + 7: 'PCI PME#', + 8: 'AC Power Restored' + } + self.add_field('wakeup_type', u.unpack_one("B"), unpack.format_table("{}", wakeup_types)) + if self.length > 0x19: + self.add_field('sku_number', u.unpack_one("B"), self.fmtstr) + self.add_field('family', u.unpack_one("B"), self.fmtstr) + except: + self.decode_failure = True + print "Error parsing SystemInformation" + import traceback + traceback.print_exc() + self.fini() + +_board_types = { + 1: 'Unknown', + 2: 'Other', + 3: 'Server Blade', + 4: 'Connectivity Switch', + 5: 'System Management Module', + 6: 'Processor Module', + 7: 'I/O Module', + 8: 'Memory Module', + 9: 'Daughter Board', + 0xA: 'Motherboard', + 0xB: 'Processor/Memory Module', + 0xC: 'Processor/IO Module', + 0xD: 'Interconnect Board' +} + +class BaseboardInformation(SmbiosBaseStructure): + smbios_structure_type = 2 + + def __init__(self, u, sm): + super(BaseboardInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('manufacturer', u.unpack_one("B"), self.fmtstr) + self.add_field('product', u.unpack_one("B"), self.fmtstr) + self.add_field('version', u.unpack_one("B"), self.fmtstr) + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + + if self.length > 0x8: + self.add_field('asset_tag', u.unpack_one("B"), self.fmtstr) + + if self.length > 0x9: + self.add_field('feature_flags', u.unpack_one("B")) + self.add_field('hosting_board', bool(bitfields.getbits(self.feature_flags, 0)), "feature_flags[0]={}") + self.add_field('requires_daughter_card', bool(bitfields.getbits(self.feature_flags, 1)), "feature_flags[1]={}") + self.add_field('removable', bool(bitfields.getbits(self.feature_flags, 2)), "feature_flags[2]={}") + self.add_field('replaceable', bool(bitfields.getbits(self.feature_flags, 3)), "feature_flags[3]={}") + self.add_field('hot_swappable', bool(bitfields.getbits(self.feature_flags, 4)), "feature_flags[4]={}") + + if self.length > 0xA: + self.add_field('location', u.unpack_one("B"), self.fmtstr) + + if self.length > 0xB: + self.add_field('chassis_handle', u.unpack_one("<H")) + + if self.length > 0xD: + self.add_field('board_type', u.unpack_one("B"), unpack.format_table("{}", _board_types)) + + if self.length > 0xE: + self.add_field('handle_count', u.unpack_one("B")) + if self.handle_count > 0: + self.add_field('contained_object_handles', tuple(u.unpack_one("<H") for i in range(self.handle_count))) + except: + self.decode_failure = True + print "Error parsing BaseboardInformation" + import traceback + traceback.print_exc() + self.fini() + +class SystemEnclosure(SmbiosBaseStructure): + smbios_structure_type = 3 + + def __init__(self, u, sm): + super(SystemEnclosure, self).__init__(u, sm) + u = self.u + try: + self.add_field('manufacturer', u.unpack_one("B"), self.fmtstr) + self.add_field('enumerated_type', u.unpack_one("B")) + self.add_field('chassis_lock_present', bool(bitfields.getbits(self.enumerated_type, 7)), "enumerated_type[7]={}") + board_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Desktop', + 0x04: 'Low Profile Desktop', + 0x05: 'Pizza Box', + 0x06: 'Mini Tower', + 0x07: 'Tower', + 0x08: 'Portable', + 0x09: 'Laptop', + 0x0A: 'Notebook', + 0x0B: 'Hand Held', + 0x0C: 'Docking Station', + 0x0D: 'All in One', + 0x0E: 'Sub Notebook', + 0x0F: 'Space-saving', + 0x10: 'Lunch Box', + 0x11: 'Main Server Chassis', + 0x12: 'Expansion Chassis', + 0x13: 'SubChassis', + 0x14: 'Bus Expansion Chassis', + 0x15: 'Peripheral Chassis', + 0x16: 'RAID Chassis', + 0x17: 'Rack Mount Chassis', + 0x18: 'Sealed-case PC', + 0x19: 'Multi-system chassis W', + 0x1A: 'Compact PCI', + 0x1B: 'Advanced TCA', + 0x1C: 'Blade', + 0x1D: 'Blade Enclosure', + } + self.add_field('system_enclosure_type', bitfields.getbits(self.enumerated_type, 6, 0), unpack.format_table("enumerated_type[6:0]={}", board_types)) + self.add_field('version', u.unpack_one("B"), self.fmtstr) + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + self.add_field('asset_tag', u.unpack_one("B"), self.fmtstr) + minor_version_str = str(sm.header.minor_version) # 34 is .34, 4 is .4, 41 is .41; compare ASCIIbetically to compare initial digits rather than numeric value + if self.length > 9: + chassis_states = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Safe', + 0x04: 'Warning', + 0x05: 'Critical', + 0x06: 'Non-recoverable', + } + self.add_field('bootup_state', u.unpack_one("B"), unpack.format_table("{}", chassis_states)) + self.add_field('power_supply_state', u.unpack_one("B"), unpack.format_table("{}", chassis_states)) + self.add_field('thermal_state', u.unpack_one("B"), unpack.format_table("{}", chassis_states)) + security_states = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'None', + 0x04: 'External interface locked out', + 0x05: 'External interface enabled', + } + self.add_field('security_status', u.unpack_one("B"), unpack.format_table("{}", security_states)) + if self.length > 0xd: + self.add_field('oem_defined', u.unpack_one("<I")) + if self.length > 0x11: + self.add_field('height', u.unpack_one("B")) + self.add_field('num_power_cords', u.unpack_one("B")) + self.add_field('contained_element_count', u.unpack_one("B")) + self.add_field('contained_element_length', u.unpack_one("B")) + if getattr(self, 'contained_element_count', 0): + self.add_field('contained_elements', tuple(SystemEnclosureContainedElement(u, self.contained_element_length) for i in range(self.contained_element_count))) + if self.length > (0x15 + (getattr(self, 'contained_element_count', 0) * getattr(self, 'contained_element_length', 0))): + self.add_field('sku_number', u.unpack_one("B"), self.fmtstr) + except: + self.decode_failure = True + print "Error parsing SystemEnclosure" + import traceback + traceback.print_exc() + self.fini() + +class SystemEnclosureContainedElement(unpack.Struct): + def __init__(self, u, length): + super(SystemEnclosureContainedElement, self).__init__() + self.start_offset = u.offset + self.raw_data = u.unpack_raw(length) + self.u = unpack.Unpackable(self.raw_data) + u = self.u + self.add_field('contained_element_type', u.unpack_one("B")) + type_selections = { + 0: 'SMBIOS baseboard type enumeration', + 1: 'SMBIOS structure type enumeration', + } + self.add_field('type_select', bitfields.getbits(self.contained_element_type, 7), unpack.format_table("contained_element_type[7]={}", type_selections)) + self.add_field('type', bitfields.getbits(self.contained_element_type, 6, 0)) + if self.type_select == 0: + self.add_field('smbios_board_type', self.type, unpack.format_table("{}", _board_types)) + else: + self.add_field('smbios_structure_type', self.type) + self.add_field('minimum', u.unpack_one("B")) + self.add_field('maximum', u.unpack_one("B")) + if not u.at_end(): + self.add_field('data', u.unpack_rest()) + del self.u + +class ProcessorInformation(SmbiosBaseStructure): + smbios_structure_type = 4 + + def __init__(self, u, sm): + super(ProcessorInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('socket_designation', u.unpack_one("B"), self.fmtstr) + processor_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Central Processor', + 0x04: 'Math Processor', + 0x05: 'DSP Processor', + 0x06: 'Video Processor', + } + self.add_field('processor_type', u.unpack_one("B"), unpack.format_table("{}", processor_types)) + self.add_field('processor_family', u.unpack_one("B")) + self.add_field('processor_manufacturer', u.unpack_one("B"), self.fmtstr) + self.add_field('processor_id', u.unpack_one("<Q")) + self.add_field('processor_version', u.unpack_one("B"), self.fmtstr) + self.add_field('voltage', u.unpack_one("B")) + self.add_field('external_clock', u.unpack_one("<H")) + self.add_field('max_speed', u.unpack_one("<H")) + self.add_field('current_speed', u.unpack_one("<H")) + self.add_field('status', u.unpack_one("B")) + processor_upgrades = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Daughter Board', + 0x04: 'ZIF Socket', + 0x05: 'Replaceable Piggy Back', + 0x06: 'None', + 0x07: 'LIF Socket', + 0x08: 'Slot 1', + 0x09: 'Slot 2', + 0x0A: '370-pin socket', + 0x0B: 'Slot A', + 0x0C: 'Slot M', + 0x0D: 'Socket 423', + 0x0E: 'Socket A (Socket 462)', + 0x0F: 'Socket 478', + 0x10: 'Socket 754', + 0x11: 'Socket 940', + 0x12: 'Socket 939', + 0x13: 'Socket mPGA604', + 0x14: 'Socket LGA771', + 0x15: 'Socket LGA775', + 0x16: 'Socket S1', + 0x17: 'Socket AM2', + 0x18: 'Socket F (1207)', + 0x19: 'Socket LGA1366', + 0x1A: 'Socket G34', + 0x1B: 'Socket AM3', + 0x1C: 'Socket C32', + 0x1D: 'Socket LGA1156', + 0x1E: 'Socket LGA1567', + 0x1F: 'Socket PGA988A', + 0x20: 'Socket BGA1288', + 0x21: 'Socket rPGA988B', + 0x22: 'Socket BGA1023', + 0x23: 'Socket BGA1224', + 0x24: 'Socket BGA1155', + 0x25: 'Socket LGA1356', + 0x26: 'Socket LGA2011', + 0x27: 'Socket FS1', + 0x28: 'Socket FS2', + 0x29: 'Socket FM1', + 0x2A: 'Socket FM2', + } + self.add_field('processor_upgrade', u.unpack_one("B"), unpack.format_table("{}", processor_upgrades)) + if self.length > 0x1A: + self.add_field('l1_cache_handle', u.unpack_one("<H")) + self.add_field('l2_cache_handle', u.unpack_one("<H")) + self.add_field('l3_cache_handle', u.unpack_one("<H")) + if self.length > 0x20: + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + self.add_field('asset_tag', u.unpack_one("B"), self.fmtstr) + self.add_field('part_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0x24: + self.add_field('core_count', u.unpack_one("B")) + self.add_field('core_enabled', u.unpack_one("B")) + self.add_field('thread_count', u.unpack_one("B")) + self.add_field('processor_characteristics', u.unpack_one("<H")) + if self.length > 0x28: + self.add_field('processor_family_2', u.unpack_one("<H")) + if self.length > 0x2A: + self.add_field('core_count2', u.unpack_one("<H")) + self.add_field('core_enabled2', u.unpack_one("<H")) + self.add_field('thread_count2', u.unpack_one("<H")) + except: + self.decode_failure = True + print "Error parsing Processor Information" + import traceback + traceback.print_exc() + self.fini() + +class MemoryControllerInformation(SmbiosBaseStructure): #obsolete starting with v2.1 + smbios_structure_type = 5 + + def __init__(self, u, sm): + super(MemoryControllerInformation, self).__init__(u, sm) + u = self.u + try: + _error_detecting_method = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'None', + 0x04: '8-bit Parity', + 0x05: '32-bit ECC', + 0x06: '64-bit ECC', + 0x07: '128-bit ECC', + 0x08: 'CRC' + } + self.add_field('error_detecting_method', u.unpack_one("B"), unpack.format_table("{}", _error_detecting_method)) + self.add_field('error_correcting_capability', u.unpack_one("B")) + _interleaves = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'One-Way Interleave', + 0x04: 'Two-Way Interleave', + 0x05: 'Four-Way Interleave', + 0x06: 'Eight-Way Interleave', + 0x07: 'Sixteen-Way Interleave' + } + self.add_field('supported_interleave', u.unpack_one("B"), unpack.format_table("{}", _interleaves)) + self.add_field('current_interleave', u.unpack_one("B"), unpack.format_table("{}", _interleaves)) + self.add_field('max_memory_module_size', u.unpack_one("B"), self.fmtstr) + self.add_field('supported_speeds', u.unpack_one("<H")) + self.add_field('supported_memory_types', u.unpack_one("<H")) + self.add_field('memory_module_voltage', u.unpack_one("B")) + self.add_field('req_voltage_b2', bitfields.getbits(self.memory_module_voltage, 2), "memory_module_voltage[2]={}") + self.add_field('req_voltage_b1', bitfields.getbits(self.memory_module_voltage, 1), "memory_module_voltage[1]={}") + self.add_field('req_voltage_b0', bitfields.getbits(self.memory_module_voltage, 0), "memory_module_voltage[0]={}") + self.add_field('num_associated_memory_slots', u.unpack_one("B")) + self.add_field('memory_module_configuration_handles', u.unpack_one("<(self.num_associated_memory_slots)H")) + self.add_field('enabled_error_correcting_capabilities', u.unpack_one("B")) + except: + self.decode_failure = True + print "Error parsing MemoryControllerInformation" + import traceback + traceback.print_exc() + self.fini() + +class MemoryModuleInformation(SmbiosBaseStructure): #obsolete starting with v2.1 + smbios_structure_type = 6 + + def __init__(self, u, sm): + super(MemoryModuleInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('socket_designation', u.unpack_one("B"), self.fmtstr) + self.add_field('bank_connections', u.unpack_one("B")) + self.add_field('current_speed', u.unpack_one("B")) + self.add_field('current_memory_type', u.unpack_one("<H")) + _mem_connection = { + 0: 'single', + 1: 'double-bank' + } + self.add_field('installed_mem', u.unpack_one("B")) + self.add_field('installed_size', bitfields.getbits(self.installed_mem, 6, 0), "installed_mem[6:0]={}") + self.add_field('installed_memory_module_connection', bitfields.getbits(self.installed_mem, 7), unpack.format_table("installed_mem[7]={}", _mem_connection)) + self.add_field('enabled_mem', u.unpack_one("B")) + self.add_field('enabled_size', bitfields.getbits(self.installed_mem, 6, 0), "enabled_mem[6:0]={}") + self.add_field('enabled_memory_module_connection', bitfields.getbits(self.installed_mem, 7), unpack.format_table("enabled_mem[7]={}", _mem_connection)) + self.add_field('error_status', u.unpack_one("B")) + self.add_field('error_status_info_obstained_from_event_log', bool(bitfields.getbits(self.error_status, 2)), unpack.format_table("error_status[2]={}", _mem_connection)) + self.add_field('correctable_errors_received', bool(bitfields.getbits(self.error_status, 1)), unpack.format_table("error_status[1]={}", _mem_connection)) + self.add_field('uncorrectable_errors_received', bool(bitfields.getbits(self.error_status, 0)), unpack.format_table("error_status[0]={}", _mem_connection)) + except: + self.decode_failure = True + print "Error parsing MemoryModuleInformation" + import traceback + traceback.print_exc() + self.fini() + +class CacheInformation(SmbiosBaseStructure): + smbios_structure_type = 7 + + def __init__(self, u, sm): + super(CacheInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('socket_designation', u.unpack_one("B"), self.fmtstr) + processor_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Central Processor', + 0x04: 'Math Processor', + 0x05: 'DSP Processor', + 0x06: 'Video Processor', + } + self.add_field('cache_configuration', u.unpack_one("<H")) + _operational_mode = { + 0b00: 'Write Through', + 0b01: 'Write Back', + 0b10: 'Varies with Memory Address', + 0b11: 'Unknown' + } + self.add_field('operational_mode', bitfields.getbits(self.cache_configuration, 9, 8), unpack.format_table("cache_configuration[9:8]={}", _operational_mode)) + self.add_field('enabled_at_boot_time', bool(bitfields.getbits(self.cache_configuration, 7)), "cache_configuration[7]={}") + _location = { + 0b00: 'Internal', + 0b01: 'External', + 0b10: 'Reserved', + 0b11: 'Unknown' + } + self.add_field('location_relative_to_cpu_module', bitfields.getbits(self.cache_configuration, 6, 5), unpack.format_table("cache_configuration[6:5]={}", _location)) + self.add_field('cache_socketed', bool(bitfields.getbits(self.cache_configuration, 3)), "cache_configuration[3]={}") + self.add_field('cache_level', bitfields.getbits(self.cache_configuration, 2, 0), "cache_configuration[2:0]={}") + self.add_field('max_cache_size', u.unpack_one("<H")) + _granularity = { + 0: '1K granularity', + 1: '64K granularity' + } + self.add_field('max_granularity', bitfields.getbits(self.cache_configuration, 15), unpack.format_table("max_cache_size[15]={}", _granularity)) + self.add_field('max_size_in_granularity', bitfields.getbits(self.cache_configuration, 14, 0), "max_cache_size[14, 0]={}") + self.add_field('installed_size', u.unpack_one("<H")) + if self.installed_size != 0: + self.add_field('installed_granularity', bitfields.getbits(self.cache_configuration, 15), unpack.format_table("installed_size[15]={}", _granularity)) + self.add_field('installed_size_in_granularity', bitfields.getbits(self.cache_configuration, 14, 0), "installed_size[14, 0]={}") + self.add_field('supported_sram_type', u.unpack_one("<H")) + self.add_field('current_sram_type', u.unpack_one("<H")) + if self.length > 0x0F: + self.add_field('cache_speed', u.unpack_one("B")) + if self.length > 0x10: + _error_correction = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'None', + 0x04: 'Parity', + 0x05: 'Single-bit ECC', + 0x06: 'Multi-bit ECC' + } + self.add_field('error_correction', u.unpack_one("B"), unpack.format_table("{}", _error_correction)) + if self.length > 0x10: + _system_cache_type = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Instruction', + 0x04: 'Data', + 0x05: 'Unified' + } + self.add_field('system_cache_type', u.unpack_one("B"), unpack.format_table("{}", _system_cache_type)) + if self.length > 0x12: + _associativity = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Direct Mapped', + 0x04: '2-way Set-Associative', + 0x05: '4-way Set-Associative', + 0x06: 'Fully Associative', + 0x07: '8-way Set-Associative', + 0x08: '16-way Set-Associative', + 0x09: '12-way Set-Associative', + 0x0A: '24-way Set-Associative', + 0x0B: '32-way Set-Associative', + 0x0C: '48-way Set-Associative', + 0x0D: '64-way Set-Associative', + 0x0E: '20-way Set-Associative' + } + self.add_field('associativity', u.unpack_one("B"), unpack.format_table("{}", _associativity)) + + except: + self.decode_failure = True + print "Error parsing CacheInformation" + import traceback + traceback.print_exc() + self.fini() + +class PortConnectorInfo(SmbiosBaseStructure): + smbios_structure_type = 8 + + def __init__(self, u, sm): + super(PortConnectorInfo, self).__init__(u, sm) + u = self.u + try: + self.add_field('internal_reference_designator', u.unpack_one("B"), self.fmtstr) + connector_types = { + 0x00: 'None', + 0x01: 'Centronics', + 0x02: 'Mini Centronics', + 0x03: 'Proprietary', + 0x04: 'DB-25 pin male', + 0x05: 'DB-25 pin female', + 0x06: 'DB-15 pin male', + 0x07: 'DB-15 pin female', + 0x08: 'DB-9 pin male', + 0x09: 'DB-9 pin female', + 0x0A: 'RJ-11', + 0x0B: 'RJ-45', + 0x0C: '50-pin MiniSCSI', + 0x0D: 'Mini-DIN', + 0x0E: 'Micro-DIN', + 0x0F: 'PS/2', + 0x10: 'Infrared', + 0x11: 'HP-HIL', + 0x12: 'Access Bus (USB)', + 0x13: 'SSA SCSI', + 0x14: 'Circular DIN-8 male', + 0x15: 'Circular DIN-8 female', + 0x16: 'On Board IDE', + 0x17: 'On Board Floppy', + 0x18: '9-pin Dual Inline (pin 10 cut)', + 0x19: '25-pin Dual Inline (pin 26 cut)', + 0x1A: '50-pin Dual Inline', + 0x1B: '68-pin Dual Inline', + 0x1C: 'On Board Sound Input from CD-ROM', + 0x1D: 'Mini-Centronics Type-14', + 0x1E: 'Mini-Centronics Type-26', + 0x1F: 'Mini-jack (headphones)', + 0x20: 'BNC', + 0x21: '1394', + 0x22: 'SAS/SATA Plug Receptacle', + 0xA0: 'PC-98', + 0xA1: 'PC-98Hireso', + 0xA2: 'PC-H98', + 0xA3: 'PC-98Note', + 0xA4: 'PC-98Full', + 0xFF: 'Other', + } + self.add_field('internal_connector_type', u.unpack_one("B"), unpack.format_table("{}", connector_types)) + self.add_field('external_reference_designator', u.unpack_one("B"), self.fmtstr) + self.add_field('external_connector_type', u.unpack_one("B"), unpack.format_table("{}", connector_types)) + port_types = { + 0x00: 'None', + 0x01: 'Parallel Port XT/AT Compatible', + 0x02: 'Parallel Port PS/2', + 0x03: 'Parallel Port ECP', + 0x04: 'Parallel Port EPP', + 0x05: 'Parallel Port ECP/EPP', + 0x06: 'Serial Port XT/AT Compatible', + 0x07: 'Serial Port 16450 Compatible', + 0x08: 'Serial Port 16550 Compatible', + 0x09: 'Serial Port 16550A Compatible', + 0x0A: 'SCSI Port', + 0x0B: 'MIDI Port', + 0x0C: 'Joy Stick Port', + 0x0D: 'Keyboard Port', + 0x0E: 'Mouse Port', + 0x0F: 'SSA SCSI', + 0x10: 'USB', + 0x11: 'FireWire (IEEE P1394)', + 0x12: 'PCMCIA Type I2', + 0x13: 'PCMCIA Type II', + 0x14: 'PCMCIA Type III', + 0x15: 'Cardbus', + 0x16: 'Access Bus Port', + 0x17: 'SCSI II', + 0x18: 'SCSI Wide', + 0x19: 'PC-98', + 0x1A: 'PC-98-Hireso', + 0x1B: 'PC-H98', + 0x1C: 'Video Port', + 0x1D: 'Audio Port', + 0x1E: 'Modem Port', + 0x1F: 'Network Port', + 0x20: 'SATA', + 0x21: 'SAS', + 0xA0: '8251 Compatible', + 0xA1: '8251 FIFO Compatible', + 0xFF: 'Other', + } + self.add_field('port_type', u.unpack_one("B"), unpack.format_table("{}", port_types)) + except: + self.decodeFailure = True + print "Error parsing PortConnectorInfo" + import traceback + traceback.print_exc() + self.fini() + +class SystemSlots(SmbiosBaseStructure): + smbios_structure_type = 9 + + def __init__(self, u, sm): + super(SystemSlots, self).__init__(u, sm) + u = self.u + try: + self.add_field('designation', u.unpack_one("B"), self.fmtstr) + _slot_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'ISA', + 0x04: 'MCA', + 0x05: 'EISA', + 0x06: 'PCI', + 0x07: 'PC Card (PCMCIA)', + 0x08: 'VL-VESA', + 0x09: 'Proprietary', + 0x0A: 'Processor Card Slot', + 0x0B: 'Proprietary Memory Card Slot', + 0x0C: 'I/O Riser Card Slot', + 0x0D: 'NuBus', + 0x0E: 'PCI 66MHz Capable', + 0x0F: 'AGP', + 0x10: 'AGP 2X', + 0x11: 'AGP 4X', + 0x12: 'PCI-X', + 0x13: 'AGP 8X', + 0xA0: 'PC-98/C20', + 0xA1: 'PC-98/C24', + 0xA2: 'PC-98/E', + 0xA3: 'PC-98/Local Bus', + 0xA4: 'PC-98/Card', + 0xA5: 'PCI Express', + 0xA6: 'PCI Express x1', + 0xA7: 'PCI Express x2', + 0xA8: 'PCI Express x4', + 0xA9: 'PCI Express x8', + 0xAA: 'PCI Express x16', + 0xAB: 'PCI Express Gen 2', + 0xAC: 'PCI Express Gen 2 x1', + 0xAD: 'PCI Express Gen 2 x2', + 0xAE: 'PCI Express Gen 2 x4', + 0xAF: 'PCI Express Gen 2 x8', + 0xB0: 'PCI Express Gen 2 x16', + 0xB1: 'PCI Express Gen 3', + 0xB2: 'PCI Express Gen 3 x1', + 0xB3: 'PCI Express Gen 3 x2', + 0xB4: 'PCI Express Gen 3 x4', + 0xB5: 'PCI Express Gen 3 x8', + 0xB6: 'PCI Express Gen 3 x16', + } + self.add_field('slot_type', u.unpack_one("B"), unpack.format_table("{}", _slot_types)) + _slot_data_bus_widths = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: '8 bit', + 0x04: '16 bit', + 0x05: '32 bit', + 0x06: '64 bit', + 0x07: '128 bit', + 0x08: '1x or x1', + 0x09: '2x or x2', + 0x0A: '4x or x4', + 0x0B: '8x or x8', + 0x0C: '12x or x12', + 0x0D: '16x or x16', + 0x0E: '32x or x32', + } + self.add_field('slot_data_bus_width', u.unpack_one('B'), unpack.format_table("{}", _slot_data_bus_widths)) + _current_usages = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Available', + 0x04: 'In use', + } + self.add_field('current_usage', u.unpack_one('B'), unpack.format_table("{}", _current_usages)) + _slot_lengths = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Short Length', + 0x04: 'Long Length', + } + self.add_field('slot_length', u.unpack_one('B'), unpack.format_table("{}", _slot_lengths)) + self.add_field('slot_id', u.unpack_one('<H')) + self.add_field('characteristics1', u.unpack_one('B')) + self.add_field('characteristics_unknown', bool(bitfields.getbits(self.characteristics1, 0)), "characteristics1[0]={}") + self.add_field('provides_5_0_volts', bool(bitfields.getbits(self.characteristics1, 1)), "characteristics1[1]={}") + self.add_field('provides_3_3_volts', bool(bitfields.getbits(self.characteristics1, 2)), "characteristics1[2]={}") + self.add_field('shared_slot', bool(bitfields.getbits(self.characteristics1, 3)), "characteristics1[3]={}") + self.add_field('supports_pc_card_16', bool(bitfields.getbits(self.characteristics1, 4)), "characteristics1[4]={}") + self.add_field('supports_cardbus', bool(bitfields.getbits(self.characteristics1, 5)), "characteristics1[5]={}") + self.add_field('supports_zoom_video', bool(bitfields.getbits(self.characteristics1, 6)), "characteristics1[6]={}") + self.add_field('supports_modem_ring_resume', bool(bitfields.getbits(self.characteristics1, 7)), "characteristics1[7]={}") + if self.length > 0x0C: + self.add_field('characteristics2', u.unpack_one('B')) + self.add_field('supports_PME', bool(bitfields.getbits(self.characteristics2, 0)), "characteristics2[0]={}") + self.add_field('supports_hot_plug', bool(bitfields.getbits(self.characteristics2, 1)), "characteristics2[1]={}") + self.add_field('supports_smbus', bool(bitfields.getbits(self.characteristics2, 2)), "characteristics2[2]={}") + if self.length > 0x0D: + self.add_field('segment_group_number', u.unpack_one('<H')) + self.add_field('bus_number', u.unpack_one('B')) + self.add_field('device_function_number', u.unpack_one('B')) + self.add_field('device_number', bitfields.getbits(self.device_function_number, 7, 3), "device_function_number[7:3]={}") + self.add_field('function_number', bitfields.getbits(self.device_function_number, 2, 0), "device_function_number[2:0]={}") + except: + self.decodeFailure = True + print "Error parsing SystemSlots" + import traceback + traceback.print_exc() + self.fini() + +class OnBoardDevicesInformation(SmbiosBaseStructure): + smbios_structure_type = 10 + + def __init__(self, u, sm): + super(OnBoardDevicesInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('device_type', u.unpack_one("B")) + self.add_field('device_enabled', bool(bitfields.getbits(self.device_type, 7)), "device_type[7]={}") + _device_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Video', + 0x04: 'SCSI Controller', + 0x05: 'Ethernet', + 0x06: 'Token Ring', + 0x07: 'Sound', + 0x08: 'PATA Controller', + 0x09: 'SATA Controller', + 0x0A: 'SAS Controller' + } + self.add_field('type_of_device', bitfields.getbits(self.device_type, 6, 0), unpack.format_table("device_type[6:0]={}", _device_types)) + self.add_field('description_string', u.unpack_one("B"), self.fmtstr) + except: + self.decodeFailure = True + print "Error parsing OnBoardDevicesInformation" + import traceback + traceback.print_exc() + self.fini() + +class OEMStrings(SmbiosBaseStructure): + smbios_structure_type = 11 + + def __init__(self, u, sm): + super(OEMStrings, self).__init__(u, sm) + u = self.u + try: + self.add_field('count', u.unpack_one("B")) + except: + self.decodeFailure = True + print "Error parsing OEMStrings" + import traceback + traceback.print_exc() + self.fini() + +class SystemConfigOptions(SmbiosBaseStructure): + smbios_structure_type = 12 + + def __init__(self, u, sm): + super(SystemConfigOptions, self).__init__(u, sm) + u = self.u + try: + self.add_field('count', u.unpack_one("B")) + except: + self.decodeFailure = True + print "Error parsing SystemConfigOptions" + import traceback + traceback.print_exc() + self.fini() + +class BIOSLanguageInformation(SmbiosBaseStructure): + smbios_structure_type = 13 + + def __init__(self, u, sm): + super(BIOSLanguageInformation, self).__init__(u, sm) + u = self.u + try: + self.add_field('installable_languages', u.unpack_one("B")) + if self.length > 0x05: + self.add_field('flags', u.unpack_one('B')) + self.add_field('abbreviated_format', bool(bitfields.getbits(self.flags, 0)), "flags[0]={}") + if self.length > 0x6: + u.skip(15) + self.add_field('current_language', u.unpack_one('B'), self.fmtstr) + except: + self.decodeFailure = True + print "Error parsing BIOSLanguageInformation" + import traceback + traceback.print_exc() + self.fini() + +class GroupAssociations(SmbiosBaseStructure): + smbios_structure_type = 14 + + def __init__(self, u, sm): + super(GroupAssociations, self).__init__(u, sm) + u = self.u + try: + self.add_field('group_name', u.unpack_one("B"), self.fmtstr) + self.add_field('item_type', u.unpack_one('B')) + self.add_field('item_handle', u.unpack_one('<H')) + except: + self.decodeFailure = True + print "Error parsing GroupAssociations" + import traceback + traceback.print_exc() + self.fini() + +class SystemEventLog(SmbiosBaseStructure): + smbios_structure_type = 15 + + def __init__(self, u, sm): + super(SystemEventLog, self).__init__(u, sm) + u = self.u + try: + self.add_field('log_area_length', u.unpack_one("<H")) + self.add_field('log_header_start_offset', u.unpack_one('<H')) + self.add_field('log_data_start_offset', u.unpack_one('<H')) + _access_method = { + 0x00: 'Indexed I/O: 1 8-bit index port, 1 8-bit data port', + 0x01: 'Indexed I/O: 2 8-bit index ports, 1 8-bit data port', + 0x02: 'Indexed I/O: 1 16-bit index port, 1 8-bit data port', + 0x03: 'Memory-mapped physical 32-bit address', + 0x04: 'Available through General-Purpose NonVolatile Data functions', + xrange(0x05, 0x07F): 'Available for future assignment', + xrange(0x80, 0xFF): 'BIOS Vendor/OEM-specific' + } + self.add_field('access_method', u.unpack_one('B'), unpack.format_table("{}", _access_method)) + self.add_field('log_status', u.unpack_one('B')) + self.add_field('log_area_full', bool(bitfields.getbits(self.log_status, 1)), "log_status[1]={}") + self.add_field('log_area_valid', bool(bitfields.getbits(self.log_status, 0)), "log_status[0]={}") + self.add_field('log_change_token', u.unpack_one('<I')) + self.add_field('access_method_address', u.unpack_one('<I')) + if self.length > 0x14: + _log_header_formats = { + 0: 'No header', + 1: 'Type 1 log header', + xrange(2, 0x7f): 'Available for future assignment', + xrange(0x80, 0xff): 'BIOS vendor or OEM-specific format' + } + self.add_field('log_header_format', u.unpack_one("B"), unpack.format_table("{}", _log_header_formats)) + if self.length > 0x15: + self.add_field('num_supported_log_type_descriptors', u.unpack_one('B')) + if self.length > 0x16: + self.add_field('length_log_type_descriptor', u.unpack_one('B')) + if self.length != (0x17 + (self.num_supported_log_type_descriptors * self.length_log_type_descriptor)): + print "Error: structure length ({}) != 0x17 + (num_supported_log_type_descriptors ({}) * length_log_type_descriptor({}))".format(self.length, self.num_supported_log_type_descriptors, self.length_log_type_descriptor) + print "structure length = {}".format(self.length) + print "num_supported_log_type_descriptors = {}".format(self.num_supported_log_type_descriptors) + print "length_log_type_descriptor = {}".format(self.length_log_type_descriptor) + self.decodeFailure = True + self.add_field('descriptors', tuple(EventLogDescriptor.unpack(u) for i in range(self.num_supported_log_type_descriptors)), unpack.format_each("\n{!r}")) + except: + self.decodeFailure = True + print "Error parsing SystemEventLog" + import traceback + traceback.print_exc() + self.fini() + +class EventLogDescriptor(unpack.Struct): + @staticmethod + def _unpack(u): + _event_log_type_descriptors = { + 0x00: 'Reserved', + 0x01: 'Single-bit ECC memory error', + 0x02: 'Multi-bit ECC memory error', + 0x03: 'Parity memory error', + 0x04: 'Bus time-out', + 0x05: 'I/O Channel Check', + 0x06: 'Software NMI', + 0x07: 'POST Memory Resize', + 0x08: 'POST Error', + 0x09: 'PCI Parity Error', + 0x0A: 'PCI System Error', + 0x0B: 'CPU Failure', + 0x0C: 'EISA FailSafe Timer time-out', + 0x0D: 'Correctable memory log disabled', + 0x0E: 'Logging disabled for a specific Event Type - too many errors of the same type received in a short amount of time', + 0x0F: 'Reserved', + 0x10: 'System Limit Exceeded', + 0x11: 'Asynchronous hardware timer expired and issued a system reset', + 0x12: 'System configuration information', + 0x13: 'Hard-disk information', + 0x14: 'System reconfigured', + 0x15: 'Uncorrectable CPU-complex error', + 0x16: 'Log Area Reset/Cleared', + 0x17: 'System boot', + xrange(0x18, 0x7F): 'Unused, available for assignment', + xrange(0x80, 0xFE): 'Availalbe for system- and OEM-specific assignments', + 0xFF: 'End of log' + } + yield 'log_type', u.unpack_one('B'), unpack.format_table("{}", _event_log_type_descriptors) + _event_log_format = { + 0x00: 'None', + 0x01: 'Handle', + 0x02: 'Multiple-Event', + 0x03: 'Multiple-Event Handle', + 0x04: 'POST Results Bitmap', + 0x05: 'System Management Type', + 0x06: 'Multiple-Event System Management Type', + xrange(0x80, 0xFF): 'OEM assigned' + } + yield 'variable_data_format_type', u.unpack_one('B'), unpack.format_table("{}", _event_log_format) + +class PhysicalMemoryArray(SmbiosBaseStructure): + smbios_structure_type = 16 + + def __init__(self, u, sm): + super(PhysicalMemoryArray, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + _location_field = { + 0x01: "Other", + 0x02: "Unknown", + 0x03: "System board or motherboard", + 0x04: "ISA add-on card", + 0x05: "EISA add-on card", + 0x06: "PCI add-on card", + 0x07: "MCA add-on card", + 0x08: "PCMCIA add-on card", + 0x09: "Proprietary add-on card", + 0x0A: "NuBus", + 0xA0: "PC-98/C20 add-on card", + 0xA1: "PC-98/C24 add-on card", + 0xA2: "PC-98/E add-on card", + 0xA3: "PC-98/Local bus add-on card" + } + self.add_field('location', u.unpack_one("B"), unpack.format_table("{}", _location_field)) + if self.length > 0x05: + _use = { + 0x01: "Other", + 0x02: "Unknown", + 0x03: "System memory", + 0x04: "Video memory", + 0x05: "Flash memory", + 0x06: "Non-volatile RAM", + 0x07: "Cache memory" + } + self.add_field('use', u.unpack_one('B'), unpack.format_table("{}", _use)) + if self.length > 0x06: + _error_correction = { + 0x01: "Other", + 0x02: "Unknown", + 0x03: "None", + 0x04: "Parity", + 0x05: "Single-bit ECC", + 0x06: "Multi-bit ECC", + 0x07: "CRC" + } + self.add_field('memory_error_correction', u.unpack_one('B'), unpack.format_table("{}", _error_correction)) + if self.length > 0x07: + self.add_field('maximum_capacity', u.unpack_one('<I')) + if self.length > 0x0B: + self.add_field('memory_error_information_handle', u.unpack_one('<H')) + if self.length > 0x0D: + self.add_field('num_memory_devices', u.unpack_one('<H')) + if self.length > 0x0F: + self.add_field('extended_maximum_capacity', u.unpack_one('<Q')) + except: + self.decodeFailure = True + print "Error parsing PhysicalMemoryArray" + import traceback + traceback.print_exc() + self.fini() + +class MemoryDevice(SmbiosBaseStructure): + smbios_structure_type = 17 + + def __init__(self, u, sm): + super(MemoryDevice, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('physical_memory_array_handle', u.unpack_one("<H")) + if self.length > 0x6: + self.add_field('memory_error_information_handle', u.unpack_one("<H")) + if self.length > 0x8: + self.add_field('total_width', u.unpack_one("<H")) + if self.length > 0xA: + self.add_field('data_width', u.unpack_one("<H")) + if self.length > 0xC: + self.add_field('size', u.unpack_one("<H")) + if self.length > 0xE: + _form_factors = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'SIMM', + 0x04: 'SIP', + 0x05: 'Chip', + 0x06: 'DIP', + 0x07: 'ZIP', + 0x08: 'Proprietary Card', + 0x09: 'DIMM', + 0x0A: 'TSOP', + 0x0B: 'Row of chips', + 0x0C: 'RIMM', + 0x0D: 'SODIMM', + 0x0E: 'SRIMM', + 0x0F: 'FB-DIMM' + } + self.add_field('form_factor', u.unpack_one("B"), unpack.format_table("{}", _form_factors)) + if self.length > 0xF: + self.add_field('device_set', u.unpack_one("B")) + if self.length > 0x10: + self.add_field('device_locator', u.unpack_one("B"), self.fmtstr) + if self.length > 0x11: + self.add_field('bank_locator', u.unpack_one("B"), self.fmtstr) + if self.length > 0x12: + _memory_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'DRAM', + 0x04: 'EDRAM', + 0x05: 'VRAM', + 0x06: 'SRAM', + 0x07: 'RAM', + 0x08: 'ROM', + 0x09: 'FLASH', + 0x0A: 'EEPROM', + 0x0B: 'FEPROM', + 0x0C: 'EPROM', + 0x0D: 'CDRAM', + 0x0E: '3DRAM', + 0x0F: 'SDRAM', + 0x10: 'SGRAM', + 0x11: 'RDRAM', + 0x12: 'DDR', + 0x13: 'DDR2', + 0x14: 'DDR2 FB-DIMM', + xrange(0x15, 0x17): 'Reserved', + 0x18: 'DDR3', + 0x19: 'FBD2' + } + self.add_field('memory_type', u.unpack_one("B"), unpack.format_table("{}", _memory_types)) + if self.length > 0x13: + self.add_field('type_detail', u.unpack_one('<H')) + if self.length > 0x15: + self.add_field('speed', u.unpack_one("<H")) + if self.length > 0x17: + self.add_field('manufacturer', u.unpack_one("B"), self.fmtstr) + if self.length > 0x18: + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0x19: + self.add_field('asset_tag', u.unpack_one("B"), self.fmtstr) + if self.length > 0x1A: + self.add_field('part_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0x1B: + self.add_field('attributes', u.unpack_one("B")) + self.add_field('rank', bitfields.getbits(self.attributes, 3, 0), "attributes[3:0]={}") + if self.length > 0x1C: + if self.size == 0x7FFF: + self.add_field('extended_size', u.unpack_one('<I')) + self.add_field('mem_size', bitfields.getbits(self.type_detail, 30, 0), "type_detail[30:0]={}") + else: + u.skip(4) + if self.length > 0x20: + self.add_field('configured_memory_clock_speed', u.unpack_one("<H")) + if self.length > 0x22: + self.add_field('minimum_voltage', u.unpack_one("<H")) + if self.length > 0x24: + self.add_field('maximum_voltage', u.unpack_one("<H")) + if self.length > 0x26: + self.add_field('configured_voltage', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing MemoryDevice" + import traceback + traceback.print_exc() + self.fini() + +class MemoryErrorInfo32Bit(SmbiosBaseStructure): + smbios_structure_type = 18 + + def __init__(self, u, sm): + super(MemoryErrorInfo32Bit, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + _error_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'OK', + 0x04: 'Bad read', + 0x05: 'Parity error', + 0x06: 'Single-bit error', + 0x07: 'Double-bit error', + 0x08: 'Multi-bit error', + 0x09: 'Nibble error', + 0x0A: 'Checksum error', + 0x0B: 'CRC error', + 0x0C: 'Corrected single-bit error', + 0x0D: 'Corrected error', + 0x0E: 'Uncorrectable error' + } + self.add_field('error_type', u.unpack_one("B"), unpack.format_table("{}", _error_types)) + if self.length > 0x5: + _error_granularity_field = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Device level', + 0x04: 'Memory partition level' + } + self.add_field('error_granularity', u.unpack_one("B"), unpack.format_table("{}", _error_granularity_field)) + if self.length > 0x6: + _error_operation_field = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Read', + 0x04: 'Write', + 0x05: 'Partial write' + } + self.add_field('error_operation', u.unpack_one("B"), unpack.format_table("{}", _error_operation_field)) + if self.length > 0x7: + self.add_field('vendor_syndrome', u.unpack_one("<I")) + if self.length > 0xB: + self.add_field('memory_array_error_address', u.unpack_one("<I")) + if self.length > 0xF: + self.add_field('device_error_address', u.unpack_one("<I")) + if self.length > 0x13: + self.add_field('error_resolution', u.unpack_one("<I")) + except: + self.decodeFailure = True + print "Error parsing MemoryErrorInfo32Bit" + import traceback + traceback.print_exc() + self.fini() + +class MemoryArrayMappedAddress(SmbiosBaseStructure): + smbios_structure_type = 19 + + def __init__(self, u, sm): + super(MemoryArrayMappedAddress, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('starting_address', u.unpack_one("<I")) + # if FFFF FFFF: address stored in Extended Starting Address + if self.length > 0x8: + self.add_field('ending_address', u.unpack_one("<I")) + if self.length > 0xC: + self.add_field('memory_array_handle', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('partition_width', u.unpack_one("B")) + if self.length > 0xF: + # valid if starting_address = FFFF FFFF + if self.starting_address == 0xFFFFFFFF: + self.add_field('extended_starting_address', u.unpack_one("<Q")) + if self.length > 0x17: + self.add_field('extended_ending_address', u.unpack_one("<Q")) + else: + u.skip(16) + + except: + self.decodeFailure = True + print "Error parsing MemoryArrayMappedAddress" + import traceback + traceback.print_exc() + self.fini() + +class MemoryDeviceMappedAddress(SmbiosBaseStructure): + smbios_structure_type = 20 + + def __init__(self, u, sm): + super(MemoryDeviceMappedAddress, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('starting_address', u.unpack_one("<I")) + # if FFFF FFFF: address stored in Extended Starting Address + if self.length > 0x8: + self.add_field('ending_address', u.unpack_one("<I")) + if self.length > 0xC: + self.add_field('memory_device_handle', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('memory_array_mapped_address_handle', u.unpack_one("<H")) + if self.length > 0x10: + self.add_field('partition_row_position', u.unpack_one("B")) + if self.length > 0x11: + self.add_field('interleave_position', u.unpack_one("B")) + if self.length > 0x12: + self.add_field('interleave_data_depth', u.unpack_one("B")) + if self.length > 0x13: + # valid if starting_address = FFFF FFFF + if self.starting_address == 0xFFFFFFFF: + self.add_field('extended_starting_address', u.unpack_one("<Q")) + if self.length > 0x1B: + self.add_field('extended_ending_address', u.unpack_one("<Q")) + else: + u.skip(16) + except: + self.decodeFailure = True + print "Error parsing MemoryDeviceMappedAddress" + import traceback + traceback.print_exc() + self.fini() + +class BuiltInPointingDevice(SmbiosBaseStructure): + smbios_structure_type = 21 + + def __init__(self, u, sm): + super(BuiltInPointingDevice, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + _pointing_device_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Mouse', + 0x04: 'Track Ball', + 0x05: 'Track Point', + 0x06: 'Glide Point', + 0x07: 'Touch Pad', + 0x08: 'Touch Screen', + 0x09: 'Optical Sensor' + } + self.add_field('pointing_device_type', u.unpack_one("B"), unpack.format_table("{}", _pointing_device_types)) + if self.length > 0x5: + _interfaces = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Serial', + 0x04: 'PS/2', + 0x05: 'Infared', + 0x06: 'HP-HIL', + 0x07: 'Bus mouse', + 0x08: 'ADB (Apple Desktop Bus)', + 0x09: 'Bus mouse DB-9', + 0x0A: 'Bus mouse micro-DIN', + 0x0B: 'USB' + } + self.add_field('interface', u.unpack_one("B"), unpack.format_table("{}", _interfaces)) + if self.length > 0x6: + self.add_field('num_buttons', u.unpack_one("B")) + except: + self.decodeFailure = True + print "Error parsing BuiltInPointingDevice" + import traceback + traceback.print_exc() + self.fini() + +class PortableBattery(SmbiosBaseStructure): + smbios_structure_type = 22 + + def __init__(self, u, sm): + super(PortableBattery, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('location', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('manufacturer', u.unpack_one("B"), self.fmtstr) + if self.length > 0x6: + self.add_field('manufacturer_date', u.unpack_one("B"), self.fmtstr) + if self.length > 0x7: + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0x8: + self.add_field('device_name', u.unpack_one("B"), self.fmtstr) + if self.length > 0x9: + _device_chemistry = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Lead Acid', + 0x04: 'Nickel Cadmium', + 0x05: 'Nickel metal hydride', + 0x06: 'Lithium-ion', + 0x07: 'Zinc air', + 0x08: 'Lithium Polymer' + } + self.add_field('device_chemistry', u.unpack_one("B"), unpack.format_table("{}", _device_chemistry)) + if self.length > 0xA: + self.add_field('design_capacity', u.unpack_one("<H")) + if self.length > 0xC: + self.add_field('design_voltage', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('sbds_version_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0xF: + self.add_field('max_error_battery_data', u.unpack_one("B"), self.fmtstr) + if self.length > 0x10: + if self.serial_number == 0: + self.add_field('sbds_serial_number', u.unpack_one("<H")) + else: + u.skip(2) + if self.length > 0x12: + if self.manufacturer_date == 0: + self.add_field('sbds_manufacture_date', u.unpack_one("<H")) + self.add_field('year_biased_by_1980', bitfields.getbits(self.sbds_manufacture_date, 15, 9), "sbds_manufacture_date[15:9]={}") + self.add_field('month', bitfields.getbits(self.sbds_manufacture_date, 8, 5), "sbds_manufacture_date[8:5]={}") + self.add_field('date', bitfields.getbits(self.sbds_manufacture_date, 4, 0), "sbds_manufacture_date[4:0]={}") + else: + u.skip(2) + if self.length > 0x14: + if self.device_chemistry == 0x02: + self.add_field('sbds_device_chemistry', u.unpack_one("B"), self.fmtstr) + else: + u.skip(1) + if self.length > 0x15: + self.add_field('design_capacity_multiplier', u.unpack_one("B")) + if self.length > 0x16: + self.add_field('oem_specific', u.unpack_one("<I")) + except: + self.decodeFailure = True + print "Error parsing PortableBattery" + import traceback + traceback.print_exc() + self.fini() + +class SystemReset(SmbiosBaseStructure): + smbios_structure_type = 23 + + def __init__(self, u, sm): + super(SystemReset, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('capabilities', u.unpack_one("B")) + self.add_field('contains_watchdog_timer', bool(bitfields.getbits(self.capabilities, 5)), "capabilities[5]={}") + _boot_option = { + 0b00: 'Reserved, do not use', + 0b01: 'Operating System', + 0b10: 'System utilities', + 0b11: 'Do not reboot' + } + self.add_field('boot_option_on_limit', bitfields.getbits(self.capabilities, 4, 3), unpack.format_table("capabilities[4:3]={}", _boot_option)) + self.add_field('boot_option_after_watchdog_reset', bitfields.getbits(self.capabilities, 2, 1), unpack.format_table("capabilities[2:1]={}", _boot_option)) + self.add_field('system_reset_enabled_by_user', bool(bitfields.getbits(self.capabilities, 0)), "capabilities[0]={}") + if self.length > 0x5: + self.add_field('reset_count', u.unpack_one("<H")) + if self.length > 0x5: + self.add_field('reset_limit', u.unpack_one("<H")) + if self.length > 0x9: + self.add_field('timer_interval', u.unpack_one("<H")) + if self.length > 0xB: + self.add_field('timeout', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing SystemReset" + import traceback + traceback.print_exc() + self.fini() + +class HardwareSecurity(SmbiosBaseStructure): + smbios_structure_type = 24 + + def __init__(self, u, sm): + super(HardwareSecurity, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('hardware_security_settings', u.unpack_one("B")) + _status = { + 0x00: 'Disabled', + 0x01: 'Enabled', + 0x02: 'Not Implemented', + 0x03: 'Unknown' + } + self.add_field('power_on_password_status', bitfields.getbits(self.hardware_security_settings, 7, 6), unpack.format_table("hardware_security_settings[7:6]={}", _status)) + self.add_field('keyboard_password_status', bitfields.getbits(self.hardware_security_settings, 5, 4), unpack.format_table("hardware_security_settings[5:4]={}", _status)) + self.add_field('admin_password_status', bitfields.getbits(self.hardware_security_settings, 3, 2), unpack.format_table("hardware_security_settings0[3:2]={}", _status)) + self.add_field('front_panel_reset_status', bitfields.getbits(self.hardware_security_settings, 1, 0), unpack.format_table("hardware_security_settings[1:0]={}", _status)) + except: + self.decodeFailure = True + print "Error parsing HardwareSecurity" + import traceback + traceback.print_exc() + self.fini() + +class SystemPowerControls(SmbiosBaseStructure): + smbios_structure_type = 25 + + def __init__(self, u, sm): + super(SystemPowerControls, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('next_scheduled_poweron_month', u.unpack_one("B")) + self.add_field('next_scheduled_poweron_day_of_month', u.unpack_one("B")) + self.add_field('next_scheduled_poweron_hour', u.unpack_one("B")) + self.add_field('next_scheduled_poweron_minute', u.unpack_one("B")) + self.add_field('next_scheduled_poweron_second', u.unpack_one("B")) + except: + self.decodeFailure = True + print "Error parsing SystemPowerControls" + import traceback + traceback.print_exc() + self.fini() + +class VoltageProbe(SmbiosBaseStructure): + smbios_structure_type = 26 + + def __init__(self, u, sm): + super(VoltageProbe, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('description', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('location_and_status', u.unpack_one("B")) + _status = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'OK', + 0b100: 'Non-critical', + 0b101: 'Critical', + 0b110: 'Non-recoverable' + } + _location = { + 0b00001: 'Other', + 0b00010: 'Unknown', + 0b00011: 'Processor', + 0b00100: 'Disk', + 0b00101: 'Peripheral Bay', + 0b00110: 'System Management Module', + 0b00111: 'Motherboard', + 0b01000: 'Memory Module', + 0b01001: 'Processor Module', + 0b01010: 'Power Unit', + 0b01011: 'Add-in Card' + } + self.add_field('status', bitfields.getbits(self.location_and_status, 7, 5), unpack.format_table("location_and_status[7:5]={}", _status)) + self.add_field('location', bitfields.getbits(self.location_and_status, 4, 0), unpack.format_table("location_and_status[4:0]={}", _location)) + if self.length > 0x6: + self.add_field('max_value', u.unpack_one("<H")) + if self.length > 0x8: + self.add_field('min_value', u.unpack_one("<H")) + if self.length > 0xA: + self.add_field('resolution', u.unpack_one("<H")) + if self.length > 0xC: + self.add_field('tolerance', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('accuracy', u.unpack_one("<H")) + if self.length > 0x10: + self.add_field('oem_defined', u.unpack_one("<I")) + if self.length > 0x14: + self.add_field('nominal_value', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing VoltageProbe" + import traceback + traceback.print_exc() + self.fini() + +class CoolingDevice(SmbiosBaseStructure): + smbios_structure_type = 27 + + def __init__(self, u, sm): + super(CoolingDevice, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('temperature_probe_handle', u.unpack_one("<H")) + if self.length > 0x6: + self.add_field('device_type_and_status', u.unpack_one("B")) + _status = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'OK', + 0b100: 'Non-critical', + 0b101: 'Critical', + 0b110: 'Non-recoverable' + } + _type = { + 0b00001: 'Other', + 0b00010: 'Unknown', + 0b00011: 'Fan', + 0b00100: 'Centrifugal Blower', + 0b00101: 'Chip Fan', + 0b00110: 'Cabinet Fan', + 0b00111: 'Power Supply Fan', + 0b01000: 'Heat Pipe', + 0b01001: 'Integrated Refrigeration', + 0b10000: 'Active Cooling', + 0b10001: 'Passive Cooling' + } + self.add_field('status', bitfields.getbits(self.device_type_and_status, 7, 5), unpack.format_table("device_type_and_status[7:5]={}", _status)) + self.add_field('device_type', bitfields.getbits(self.device_type_and_status, 4, 0), unpack.format_table("device_type_and_status[4:0]={}", _type)) + if self.length > 0x7: + self.add_field('cooling_unit_group', u.unpack_one("B")) + if self.length > 0x8: + self.add_field('OEM_defined', u.unpack_one("<I")) + if self.length > 0xC: + self.add_field('nominal_speed', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('description', u.unpack_one("B"), self.fmtstr) + except: + self.decodeFailure = True + print "Error parsing CoolingDevice" + import traceback + traceback.print_exc() + self.fini() + +class TemperatureProbe(SmbiosBaseStructure): + smbios_structure_type = 28 + + def __init__(self, u, sm): + super(TemperatureProbe, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('description', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('location_and_status', u.unpack_one("B")) + _status = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'OK', + 0b100: 'Non-critical', + 0b101: 'Critical', + 0b110: 'Non-recoverable' + } + _location = { + 0b00001: 'Other', + 0b00010: 'Unknown', + 0b00011: 'Processor', + 0b00100: 'Disk', + 0b00101: 'Peripheral Bay', + 0b00110: 'System Management Module', + 0b00111: 'Motherboard', + 0b01000: 'Memory Module', + 0b01001: 'Processor Module', + 0b01010: 'Power Unit', + 0b01011: 'Add-in Card', + 0b01100: 'Front Panel Board', + 0b01101: 'Back Panel Board', + 0b01110: 'Power System Board', + 0b01111: 'Drive Back Plane' + } + self.add_field('status', bitfields.getbits(self.location_and_status, 7, 5), unpack.format_table("location_and_status[7:5]={}", _status)) + self.add_field('location', bitfields.getbits(self.location_and_status, 4, 0), unpack.format_table("location_and_status[4:0]={}", _location)) + if self.length > 0x6: + self.add_field('maximum_value', u.unpack_one("<H")) + if self.length > 0x8: + self.add_field('minimum_value', u.unpack_one("<H")) + if self.length > 0xA: + self.add_field('resolution', u.unpack_one("<H")) + if self.length > 0xC: + self.add_field('tolerance', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('accuracy', u.unpack_one("<H")) + if self.length > 0x10: + self.add_field('OEM_defined', u.unpack_one("<I")) + if self.length > 0x14: + self.add_field('nominal_value', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing TemperatureProbe" + import traceback + traceback.print_exc() + self.fini() + +class ElectricalCurrentProbe(SmbiosBaseStructure): + smbios_structure_type = 29 + + def __init__(self, u, sm): + super(ElectricalCurrentProbe, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('description', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('location_and_status', u.unpack_one("B")) + _status = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'OK', + 0b100: 'Non-critical', + 0b101: 'Critical', + 0b110: 'Non-recoverable' + } + _location = { + 0b00001: 'Other', + 0b00010: 'Unknown', + 0b00011: 'Processor', + 0b00100: 'Disk', + 0b00101: 'Peripheral Bay', + 0b00110: 'System Management Module', + 0b00111: 'Motherboard', + 0b01000: 'Memory Module', + 0b01001: 'Processor Module', + 0b01010: 'Power Unit', + 0b01011: 'Add-in Card', + 0b01100: 'Front Panel Board', + 0b01101: 'Back Panel Board', + 0b01110: 'Power System Board', + 0b01111: 'Drive Back Plane' + } + self.add_field('status', bitfields.getbits(self.location_and_status, 7, 5), unpack.format_table("location_and_status[7:5]={}", _status)) + self.add_field('location', bitfields.getbits(self.location_and_status, 4, 0), unpack.format_table("location_and_status[4:0]={}", _location)) + if self.length > 0x6: + self.add_field('maximum_value', u.unpack_one("<H")) + if self.length > 0x8: + self.add_field('minimum_value', u.unpack_one("<H")) + if self.length > 0xA: + self.add_field('resolution', u.unpack_one("<H")) + if self.length > 0xC: + self.add_field('tolerance', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('accuracy', u.unpack_one("<H")) + if self.length > 0x10: + self.add_field('OEM_defined', u.unpack_one("<I")) + if self.length > 0x14: + self.add_field('nominal_value', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing ElectricalCurrentProbe" + import traceback + traceback.print_exc() + self.fini() + +class OutOfBandRemoteAccess(SmbiosBaseStructure): + smbios_structure_type = 30 + + def __init__(self, u, sm): + super(OutOfBandRemoteAccess, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('manufacturer_name', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('connections', u.unpack_one("B")) + self.add_field('outbound_connection_enabled', bool(bitfields.getbits(self.connections, 1)), "connections[1]={}") + self.add_field('inbound_connection_enabled', bool(bitfields.getbits(self.connections, 0)), "connections[0]={}") + except: + self.decodeFailure = True + print "Error parsing OutOfBandRemoteAccess" + import traceback + traceback.print_exc() + self.fini() + +class BootIntegrityServicesEntryPoint(SmbiosBaseStructure): + smbios_structure_type = 31 + +class SystemBootInformation(SmbiosBaseStructure): + smbios_structure_type = 32 + + def __init__(self, u, sm): + super(SystemBootInformation, self).__init__(u, sm) + u = self.u + try: + if self.length > 0xA: + u.skip(6) + _boot_status = { + 0: 'No errors detected', + 1: 'No bootable media', + 2: '"normal" operating system failed to load', + 3: 'Firmware-detected hardware failure, including "unknown" failure types', + 4: 'Operating system-detected hardware failure', + 5: 'User-requested boot, usually through a keystroke', + 6: 'System security violation', + 7: 'Previously-requested image', + 8: 'System watchdog timer expired, causing the system to reboot', + xrange(9,127): 'Reserved for future assignment', + xrange(128, 191): 'Vendor/OEM-specific implementations', + xrange(192, 255): 'Product-specific implementations' + } + self.add_field('boot_status', u.unpack_one("B"), unpack.format_table("{}", _boot_status)) + except: + self.decodeFailure = True + print "Error parsing SystemBootInformation" + import traceback + traceback.print_exc() + self.fini() + +class MemoryErrorInfo64Bit(SmbiosBaseStructure): + smbios_structure_type = 33 + + def __init__(self, u, sm): + super(MemoryErrorInfo64Bit, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + _error_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'OK', + 0x04: 'Bad read', + 0x05: 'Parity error', + 0x06: 'Single-bit error', + 0x07: 'Double-bit error', + 0x08: 'Multi-bit error', + 0x09: 'Nibble error', + 0x0A: 'Checksum error', + 0x0B: 'CRC error', + 0x0C: 'Corrected single-bit error', + 0x0D: 'Corrected error', + 0x0E: 'Uncorrectable error' + } + self.add_field('error_type', u.unpack_one("B"), unpack.format_table("{}", _error_types)) + if self.length > 0x5: + _error_granularity_field = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Device level', + 0x04: 'Memory partition level' + } + self.add_field('error_granularity', u.unpack_one("B"), unpack.format_table("{}", _error_granularity_field)) + if self.length > 0x6: + _error_operation_field = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Read', + 0x04: 'Write', + 0x05: 'Partial write' + } + self.add_field('error_operation', u.unpack_one("B"), unpack.format_table("{}", _error_operation_field)) + if self.length > 0x7: + self.add_field('vendor_syndrome', u.unpack_one("<I")) + if self.length > 0xB: + self.add_field('memory_array_error_address', u.unpack_one("<Q")) + if self.length > 0xF: + self.add_field('device_error_address', u.unpack_one("<Q")) + if self.length > 0x13: + self.add_field('error_resolution', u.unpack_one("<Q")) + except: + self.decodeFailure = True + print "Error parsing MemoryErrorInfo64Bit" + import traceback + traceback.print_exc() + self.fini() + +class ManagementDevice(SmbiosBaseStructure): + smbios_structure_type = 34 + + def __init__(self, u, sm): + super(ManagementDevice, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('description', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + _type = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'National Semiconductor LM75', + 0x04: 'National Semiconductor LM78', + 0x05: 'National Semiconductor LM79', + 0x06: 'National Semiconductor LM80', + 0x07: 'National Semiconductor LM81', + 0x08: 'Analog Devices ADM9240', + 0x09: 'Dallas Semiconductor DS1780', + 0x0A: 'Maxim 1617', + 0x0B: 'Genesys GL518SM', + 0x0C: 'Winbond W83781D', + 0x0D: 'Holtek HT82H791' + } + self.add_field('device_type', u.unpack_one("B"), unpack.format_table("{}", _type)) + if self.length > 0x6: + self.add_field('address', u.unpack_one("<I")) + if self.length > 0xA: + _address_type = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'I/O Port', + 0x04: 'Memory', + 0x05: 'SM Bus' + } + self.add_field('address_type', u.unpack_one("B"), unpack.format_table("{}", _address_type)) + except: + self.decodeFailure = True + print "Error parsing ManagementDevice" + import traceback + traceback.print_exc() + self.fini() + +class ManagementDeviceComponent(SmbiosBaseStructure): + smbios_structure_type = 35 + + def __init__(self, u, sm): + super(ManagementDeviceComponent, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('description', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('management_device_handle', u.unpack_one("<H")) + if self.length > 0x7: + self.add_field('component_handle', u.unpack_one("<H")) + if self.length > 0x9: + self.add_field('threshold_handle', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing ManagementDeviceComponent" + import traceback + traceback.print_exc() + self.fini() + +class ManagementDeviceThresholdData(SmbiosBaseStructure): + smbios_structure_type = 36 + + def __init__(self, u, sm): + super(ManagementDeviceThresholdData, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('lower_threshold_noncritical', u.unpack_one("<H")) + if self.length > 0x6: + self.add_field('upper_threshold_noncritical', u.unpack_one("<H")) + if self.length > 0x8: + self.add_field('lower_threshold_critical', u.unpack_one("<H")) + if self.length > 0xA: + self.add_field('upper_threshold_critical', u.unpack_one("<H")) + if self.length > 0xC: + self.add_field('lower_threshold_nonrecoverable', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('upper_threshold_nonrecoverable', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing ManagementDeviceThresholdData" + import traceback + traceback.print_exc() + self.fini() + +class MemoryChannel(SmbiosBaseStructure): + smbios_structure_type = 37 + + def __init__(self, u, sm): + super(MemoryChannel, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + _channel_type = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'RamBus', + 0x04: 'SyncLink' + } + self.add_field('channel_type', u.unpack_one("B"), unpack.format_table("{}", _channel_type)) + if self.length > 0x6: + self.add_field('max_channel_load', u.unpack_one("B")) + if self.length > 0x8: + self.add_field('memory_device_count', u.unpack_one("B")) + if self.length > 0xA: + self.add_field('memory_device_load', u.unpack_one("B")) + if self.length > 0xC: + self.add_field('memory_device_handle', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing MemoryChannel" + import traceback + traceback.print_exc() + self.fini() + +class IPMIDeviceInformation(SmbiosBaseStructure): + smbios_structure_type = 38 + + def __init__(self, u, sm): + super(IPMIDeviceInformation, self).__init__(u, sm) + u = self.u + try: + _interface_type = { + 0x00: 'Unknown', + 0x01: 'KCS: Keyboard Controller Style', + 0x02: 'SMIC: Server Management Interface Chip', + 0x03: 'BT: Block Transfer', + xrange(0x04, 0xFF): 'Reserved' + } + self.add_field('interface_type', u.unpack_one("B"), unpack.format_table("{}", _interface_type)) + self.add_field('ipmi_specification_revision', u.unpack_one("B")) + self.add_field('msd_revision', bitfields.getbits(self.ipmi_specification_revision, 7, 4), "ipmi_specification_revision[7:4]={}") + self.add_field('lsd_revision', bitfields.getbits(self.ipmi_specification_revision, 3, 0), "ipmi_specification_revision[3:0]={}") + + self.add_field('i2c_slave_address', u.unpack_one("B")) + self.add_field('nv_storage_device_address', u.unpack_one("B")) + self.add_field('base_address', u.unpack_one("<Q")) + # if lsb is 1, address is in IO space. otherwise, memory-mapped + self.add_field('base_address_modifier_interrupt_info', u.unpack_one("B")) + _reg_spacing = { + 0b00: 'Interface registers are on successive byte boundaries', + 0b01: 'Interface registers are on 32-bit boundaries', + 0b10: 'Interface registers are on 16-byte boundaries', + 0b11: 'Reserved' + } + self.add_field('register_spacing', bitfields.getbits(self.base_address_modifier_interrupt_info, 7, 6), unpack.format_table("base_address_modifier_interrupt_info[7:6]={}", _reg_spacing)) + self.add_field('ls_bit_for_addresses', bitfields.getbits(self.base_address_modifier_interrupt_info, 4), "base_address_modifier_interrupt_info[4]={}") + self.add_field('interrupt_info_specified', bool(bitfields.getbits(self.base_address_modifier_interrupt_info, 3)), "base_address_modifier_interrupt_info[3]={}") + _polarity = { + 0: 'active low', + 1: 'active high' + } + self.add_field('interrupt_polarity', bitfields.getbits(self.base_address_modifier_interrupt_info, 1), unpack.format_table("base_address_modifier_interrupt_info[1]={}", _polarity)) + _interrupt_trigger = { + 0: 'edge', + 1: 'level' + } + self.add_field('interrupt_trigger_mode', bitfields.getbits(self.base_address_modifier_interrupt_info, 0), unpack.format_table("base_address_modifier_interrupt_info[0]={}", _interrupt_trigger)) + self.add_field('interrupt_number', u.unpack_one("B")) + except: + self.decodeFailure = True + print "Error parsing IPMIDeviceInformation" + import traceback + traceback.print_exc() + self.fini() + +class SystemPowerSupply(SmbiosBaseStructure): + smbios_structure_type = 39 + + def __init__(self, u, sm): + super(SystemPowerSupply, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('power_unit_group', u.unpack_one("B")) + if self.length > 0x5: + self.add_field('location', u.unpack_one("B"), self.fmtstr) + if self.length > 0x6: + self.add_field('device_name', u.unpack_one("B"), self.fmtstr) + if self.length > 0x7: + self.add_field('manufacturer', u.unpack_one("B"), self.fmtstr) + if self.length > 0x8: + self.add_field('serial_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0x9: + self.add_field('asset_tag', u.unpack_one("B"), self.fmtstr) + if self.length > 0xA: + self.add_field('model_part_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0xB: + self.add_field('revision_level', u.unpack_one("B"), self.fmtstr) + if self.length > 0xC: + self.add_field('max_power_capacity', u.unpack_one("<H")) + if self.length > 0xE: + self.add_field('power_supply_characteristics', u.unpack_one("<H")) + _dmtf_power_supply_type = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'Linear', + 0b100: 'Switching', + 0b101: 'Battery', + 0b110: 'UPS', + 0b111: 'Converter', + 0b1000: 'Regulator', + xrange(0b1001, 0b1111): 'Reserved' + } + self.add_field('dmtf_power_supply_type', bitfields.getbits(self.power_supply_characteristics, 13, 10), unpack.format_table("power_supply_characteristics[13:10]={}", _dmtf_power_supply_type)) + _status = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'OK', + 0b100: 'Non-critical', + 0b101: 'Critical; power supply has failed and has been taken off-line' + } + self.add_field('status', bitfields.getbits(self.power_supply_characteristics, 9, 7), unpack.format_table("power_supply_characteristics[9:7]={}", _status)) + _dmtf_input_voltage_range_switching = { + 0b001: 'Other', + 0b010: 'Unknown', + 0b011: 'Manual', + 0b100: 'Auto-switch', + 0b101: 'Wide range', + 0b110: 'Not applicable', + xrange(0b0111, 0b1111): 'Reserved' + } + self.add_field('dmtf_input_voltage_range_switching', bitfields.getbits(self.power_supply_characteristics, 6, 3), unpack.format_table("power_supply_characteristics[6:3]={}", _dmtf_input_voltage_range_switching)) + self.add_field('power_supply_unplugged', bool(bitfields.getbits(self.power_supply_characteristics, 2)), "power_supply_characteristics[2]={}") + self.add_field('power_supply_present', bool(bitfields.getbits(self.power_supply_characteristics, 1)), "power_supply_characteristics[1]={}") + self.add_field('power_supply_hot_replaceable', bool(bitfields.getbits(self.power_supply_characteristics, 0)), "power_supply_characteristics[0]={}") + if self.length > 0x10: + self.add_field('input_voltage_probe_handle', u.unpack_one("<H")) + if self.length > 0x12: + self.add_field('cooling_device_handle', u.unpack_one("<H")) + if self.length > 0x14: + self.add_field('input_current_probe_handle', u.unpack_one("<H")) + except: + self.decodeFailure = True + print "Error parsing SystemPowerSupply" + import traceback + traceback.print_exc() + self.fini() + +class AdditionalInformation(SmbiosBaseStructure): + smbios_structure_type = 40 + + def __init__(self, u, sm): + super(AdditionalInformation, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('num_additional_information_entries', u.unpack_one("B")) + if self.length > 0x5: + self.add_field('additional_information_entry_length', u.unpack_one("B")) + self.add_field('referenced_handle', u.unpack_one("<H")) + self.add_field('referenced_offset', u.unpack_one("B")) + self.add_field('string', u.unpack_one("B"), self.fmtstr) + self.add_field('value', u.unpack_rest()) + except: + self.decodeFailure = True + print "Error parsing AdditionalInformation" + import traceback + traceback.print_exc() + self.fini() + +class OnboardDevicesExtendedInformation(SmbiosBaseStructure): + smbios_structure_type = 41 + + def __init__(self, u, sm): + super(OnboardDevicesExtendedInformation, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + self.add_field('reference_designation', u.unpack_one("B"), self.fmtstr) + if self.length > 0x5: + self.add_field('device_type', u.unpack_one("B")) + self.add_field('device_enabled', bool(bitfields.getbits(self.device_type, 7)), "device_type[7]={}") + _device_types = { + 0x01: 'Other', + 0x02: 'Unknown', + 0x03: 'Video', + 0x04: 'SCSI Controller', + 0x05: 'Ethernet', + 0x06: 'Token Ring', + 0x07: 'Sound', + 0x08: 'PATA Controller', + 0x09: 'SATA Controller', + 0x0A: 'SAS Controller' + } + self.add_field('type_of_device', bitfields.getbits(self.device_type, 6, 0), unpack.format_table("device_type[6:0]={}", _device_types)) + if self.length > 0x6: + self.add_field('device_type_instance', u.unpack_one("B")) + if self.length > 0x7: + self.add_field('segment_group_number', u.unpack_one("<H")) + if self.length > 0x9: + self.add_field('bus_number', u.unpack_one("B"), self.fmtstr) + if self.length > 0xA: + self.add_field('device_and_function_number', u.unpack_one("B")) + self.add_field('device_number', bitfields.getbits(self.device_type, 7, 3), "device_and_function_number[7:3]={}") + self.add_field('function_number', bitfields.getbits(self.device_type, 2, 0), "device_and_function_number[2:0]={}") + except: + self.decodeFailure = True + print "Error parsing OnboardDevicesExtendedInformation" + import traceback + traceback.print_exc() + self.fini() + +class ManagementControllerHostInterface(SmbiosBaseStructure): + smbios_structure_type = 42 + + def __init__(self, u, sm): + super(ManagementControllerHostInterface, self).__init__(u, sm) + u = self.u + try: + if self.length > 0x4: + _interface_types = { + 0x00: 'Reserved', + 0x01: 'Reserved', + 0x02: 'KCS: Keyboard Controller Style', + 0x03: '8250 UART Register Compatible', + 0x04: '16450 UART Register Compatible', + 0x05: '16550/16550A UART Register Compatible', + 0x06: '16650/16650A UART Register Compatible', + 0x07: '16750/16750A UART Register Compatible', + 0x08: '16850/16850A UART Register Compatible', + 0xF0: 'OEM' + } + self.add_field('interface_type', u.unpack_one("B"), unpack.format_table("{}", _interface_types)) + if self.length > 0x5: + self.add_field('mc_host_interface_data', u.unpack_rest(), self.fmtstr) + except: + self.decodeFailure = True + print "Error parsing ManagementControllerHostInterface" + import traceback + traceback.print_exc() + self.fini() + +class Inactive(SmbiosBaseStructure): + smbios_structure_type = 126 + + def __init__(self, u, sm): + super(Inactive, self).__init__(u, sm) + self.fini() + +class EndOfTable(SmbiosBaseStructure): + smbios_structure_type = 127 + + def __init__(self, u, sm): + super(EndOfTable, self).__init__(u, sm) + self.fini() + +class SmbiosStructureUnknown(SmbiosBaseStructure): + smbios_structure_type = None + + def __init__(self, u, sm): + super(SmbiosStructureUnknown, self).__init__(u, sm) + self.fini() + +_smbios_structures = [ + BIOSInformation, + SystemInformation, + BaseboardInformation, + SystemEnclosure, + ProcessorInformation, + MemoryControllerInformation, + MemoryModuleInformation, + CacheInformation, + PortConnectorInfo, + SystemSlots, + OnBoardDevicesInformation, + OEMStrings, + SystemConfigOptions, + BIOSLanguageInformation, + GroupAssociations, + SystemEventLog, + PhysicalMemoryArray, + MemoryDevice, + MemoryErrorInfo32Bit, + MemoryArrayMappedAddress, + MemoryDeviceMappedAddress, + BuiltInPointingDevice, + PortableBattery, + SystemReset, + HardwareSecurity, + SystemPowerControls, + VoltageProbe, + CoolingDevice, + TemperatureProbe, + ElectricalCurrentProbe, + OutOfBandRemoteAccess, + BootIntegrityServicesEntryPoint, + SystemBootInformation, + MemoryErrorInfo64Bit, + ManagementDevice, + ManagementDeviceComponent, + ManagementDeviceThresholdData, + MemoryChannel, + IPMIDeviceInformation, + SystemPowerSupply, + AdditionalInformation, + OnboardDevicesExtendedInformation, + ManagementControllerHostInterface, + Inactive, + EndOfTable, + SmbiosStructureUnknown, # Must always come last +] + +def log_smbios_info(): + with redirect.logonly(): + try: + sm = SMBIOS() + print + if sm is None: + print "No SMBIOS structures found" + return + output = {} + known_types = (0, 1) + for sm_struct in sm.structures: + if sm_struct.type in known_types: + output.setdefault(sm_struct.type, []).append(sm_struct) + if len(output) == len(known_types): + break + + print "SMBIOS information:" + for key in sorted(known_types): + for s in output.get(key, ["No structure of type {} found".format(key)]): + print ttypager._wrap("{}: {}".format(key, s)) + except: + print "Error parsing SMBIOS information:" + import traceback + traceback.print_exc() + +def dump_raw(): + try: + sm = SMBIOS() + if sm: + s = "SMBIOS -- Raw bytes and structure decode.\n\n" + + s += str(sm.header) + '\n' + s += bits.dumpmem(sm._header_memory) + '\n' + + s += "Raw bytes for the SMBIOS structures\n" + s += bits.dumpmem(sm._structure_memory) + '\n' + + for sm_struct in sm.structures: + s += str(sm_struct) + '\n' + s += bits.dumpmem(sm_struct.raw_data) + + s += "Strings:\n" + for n in range(1, len(getattr(sm_struct, "strings", [])) + 1): + s += str(sm_struct.fmtstr(n)) + '\n' + s += bits.dumpmem(sm_struct.raw_strings) + '\n' + else: + s = "No SMBIOS structures found" + ttypager.ttypager_wrap(s, indent=False) + except: + print "Error parsing SMBIOS information:" + import traceback + traceback.print_exc() + +def dump(): + try: + sm = SMBIOS() + if sm: + s = str(sm) + else: + s = "No SMBIOS structures found" + ttypager.ttypager_wrap(s, indent=False) + except: + print "Error parsing SMBIOS information:" + import traceback + traceback.print_exc() + +def annex_a_conformance(): + try: + sm = SMBIOS() + + # check: 1. The table anchor string "_SM_" is present in the address range 0xF0000 to 0xFFFFF on a 16-byte bound + + def table_entry_point_verification(): + ''' Verify table entry-point''' + if (sm.header.length < 0x1F): + print "Failure: Table entry-point - The entry-point Length must be at least 0x1F" + if sm.header.checksum != 0: + print "Failure: Table entry-point - The entry-point checksum must evaluate to 0" + if ((sm.header.major_version < 2) and (sm.header.minor_version < 4)): + print "Failure: Table entry-point - SMBIOS version must be at least 2.4" + if (sm.header.intermediate_anchor_string == '_DMI_'): + print "Failure: Table entry-point - The Intermediate Anchor String must be '_DMI_'" + if (sm.header.intermediate_checksum != 0): + print "Failure: Table entry-point - The Intermediate checksum must evaluate to 0" + + #check: 3. The structure-table is traversable and conforms to the entry-point specifications: + + def req_structures(): + '''Checks for required structures and corresponding data''' + types_present = [sm.structures[x].smbios_structure_type for x in range(len(sm.structures))] + required = [0, 1, 4, 7, 9, 16, 17, 19, 31, 32] + for s in required: + if s not in set(types_present): + print "Failure: Type {} required but not found".format(s) + + else: + if s == 0: + if types_present.count(s) > 1: + print "Failure: Type {} - One and only one structure of this type must be present.".format(s) + if sm.structure_type(s).length < 0x18: + print "Failure: Type {} - The structure Length field must be at least 0x18".format(s) + if sm.structure_type(s).version is None: + print "Failure: Type {} - BIOS Version string must be present and non-null.".format(s) + if sm.structure_type(s).release_date is None: + print "Failure: Type {} - BIOS Release Date string must be present, non-null, and include a 4-digit year".format(s) + if bitfields.getbits(sm.structure_type(s).characteristics, 3, 0) != 0 or bitfields.getbits(sm.structure_type(s).characteristics, 31, 4) == 0: + print "Failure: Type {} - BIOS Characteristics: bits 3:0 must all be 0, and at least one of bits 31:4 must be set to 1.".format(s) + elif s == 1: + if types_present.count(s) > 1: + print "Failure: Type {} - One and only one structure of this type must be present.".format(s) + if sm.structure_type(s).length < 0x1B: + print "Failure: Type {} - The structure Length field must be at least 0x1B".format(s) + if sm.structure_type(s).manufacturer == None: + print "Failure: Type {} - Manufacturer string must be present and non-null.".format(s) + if sm.structure_type(s).product_name == None: + print "Failure: Type {} - Product Name string must be present and non-null".format(s) + if sm.structure_type(s).uuid == '00000000 00000000' and sm.structure_type(s).uuid == 'FFFFFFFF FFFFFFFF': + print "Failure: Type {} - UUID field must be neither 00000000 00000000 nor FFFFFFFF FFFFFFFF.".format(s) + if sm.structure_type(s).wakeup_type == 00 and sm.structure_type(s).wakeup_type == 0x02: + print "Failure: Type {} - Wake-up Type field must be neither 00h (Reserved) nor 02h (Unknown).".format(s) + # continue for remaining required types + + # check remaining conformance guidelines + + table_entry_point_verification() + req_structures() + except: + print "Error checking ANNEX A conformance guidelines" + import traceback + traceback.print_exc()
tests/avocado/acpi-bits/bits-tests/testacpi.py2 new file +283 -0
283 lines not on this page · raw message
tests/avocado/acpi-bits/bits-tests/testcpuid.py2 new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
MST
[PULL 03/86] tests/acpi: allow SSDT changes
In reply to Michael S. TsirkinFrom: Robert Hoo <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +2 -0
@@ -1 +1,3 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/SSDT.dimmpxm" , +"tests/data/acpi/q35/SSDT.dimmpxm",
Signature · 1 line
MST
[PULL 24/86] acpi: fadt: support revision 6.0 of the ACPI specification
In reply to Michael S. TsirkinFrom: Miguel Luis <[email protected]>
Update the Fixed ACPI Description Table (FADT) to revision 6.0 of the ACPI specification adding the field "Hypervisor Vendor Identity".
This field's description states the following: "64-bit identifier of hypervisor vendor. All bytes in this field are considered part of the vendor identity. These identifiers are defined independently by the vendors themselves, usually following the name of the hypervisor product. Version information should NOT be included in this field - this shall simply denote the vendor's name or identifier. Version information can be communicated through a supplemental vendor-specific hypervisor API. Firmware implementers would place zero bytes into this field, denoting that no hypervisor is present in the actual firmware."
Message-Id: <[email protected]>
--- hw/acpi/aml-build.c | 13 ++++++++++--- hw/arm/virt-acpi-build.c | 10 +++++----- 2 files changed, 15 insertions(+), 8 deletions(-)
hw/acpi/aml-build.c +10 -3
@@ -2070,7 +2070,7 @@ void build_pptt(GArray *table_data, BIOSLinker *linker, MachineState *ms,acpi_table_end (linker, &table); } -/* build rev1/rev3/rev5.1 FADT */ +/* build rev1/rev3/rev5.1/rev6.0 FADT */ void build_fadt (GArray *tbl,BIOSLinker *linker,const AcpiFadtData *f,const char *oem_id,const char *oem_table_id) {
@@ -2193,8 +2193,15 @@ void build_fadt(GArray *tbl, BIOSLinker *linker, const AcpiFadtData *f,/* SLEEP_STATUS_REG */ build_append_gas_from_struct (tbl, &f->sleep_sts); -/* TODO: extra fields need to be added to support revisions above rev5 */ -assert (f->rev ==5 ); +if (f->rev ==5 ) { + goto done; + } + +/* Hypervisor Vendor Identity */ +build_append_padded_str (tbl,"QEMU" ,8 ,'\0' ); + +/* TODO: extra fields need to be added to support revisions above rev6 */ +assert (f->rev ==6 ); done:acpi_table_end (linker, &table);
hw/arm/virt-acpi-build.c +5 -5
@@ -808,13 +808,13 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) }/* FADT */ -static void build_fadt_rev5 (GArray *table_data,BIOSLinker *linker, +static void build_fadt_rev6 (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms,unsigned dsdt_tbl_offset) { -/* ACPI v5.1 */ +/* ACPI v6.0 */ AcpiFadtData fadt = { - .rev =5 , - .minor_ver =1 , + .rev =6 , + .minor_ver =0 , .flags =1 <<ACPI_FADT_F_HW_REDUCED_ACPI , .xdsdt_tbl_offset = &dsdt_tbl_offset, };
@@ -944,7 +944,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)/* FADT MADT PPTT GTDT MCFG SPCR DBG2 pointed to by RSDT */ acpi_add_table (table_offsets, tables_blob); -build_fadt_rev5 (tables_blob, tables->linker, vms, dsdt); +build_fadt_rev6 (tables_blob, tables->linker, vms, dsdt);acpi_add_table (table_offsets, tables_blob);build_madt (tables_blob, tables->linker, vms);
Signature · 1 line
MST
[PULL 57/86] tests: acpi: update expected DSDT after ISA bridge is moved directly under PCI host bridge
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
example of the change for PC machine with hotplug disabled on root buss (no BSEL case):
- Field (PCI0.ISA.P40C, ByteAcc, NoLock, Preserve)
+ Field (S08.P40C, ByteAcc, NoLock, Preserve)
===
- Scope (_SB.PCI0)
- {
- Device (ISA)
- {
- Name (_ADR, 0x00010000) // _ADR: Address
- OperationRegion (P40C, PCI_Config, 0x60, 0x04)
...
- }
- }
-
Scope (_SB)
===
+ Device (S08)
+ {
+ Name (_ADR, 0x00010000) // _ADR: Address
+ OperationRegion (P40C, PCI_Config, 0x60, 0x04)
...
+ }
+
Device (S10)
{
Name (_ADR, 0x00020000) // _ADR: Addresswith hotplug enabled on root bus (i.e. bus has BSEL configured), a following addtional entries will be seen:
+ Name (ASUN, One)
+ Method (_DSM, 4, Serialized) // _DSM: Device-Specific Method
+ { + Local0 = Package (0x02)
+ {
+ BSEL,
+ ASUN
+ }
+ Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0))
+ }
similar changes are expected for Q35 modulo:
- Field (PCI0.ISA.PIRQ, ByteAcc, NoLock, Preserve)
+ Field (SF8.PIRQ, ByteAcc, NoLock, Preserve)
and bridge address
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 34 -------------------- tests/data/acpi/pc/DSDT | Bin 6422 -> 6496 bytes tests/data/acpi/pc/DSDT.acpierst | Bin 6382 -> 6456 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 7747 -> 7821 bytes tests/data/acpi/pc/DSDT.bridge | Bin 9496 -> 9570 bytes tests/data/acpi/pc/DSDT.cphp | Bin 6886 -> 6960 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 8076 -> 8150 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 6382 -> 6456 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3069 -> 3107 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 6494 -> 6568 bytes tests/data/acpi/pc/DSDT.memhp | Bin 7781 -> 7855 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 6280 -> 6354 bytes tests/data/acpi/pc/DSDT.numamem | Bin 6428 -> 6502 bytes tests/data/acpi/pc/DSDT.roothp | Bin 6656 -> 6694 bytes tests/data/acpi/q35/DSDT | Bin 8320 -> 8418 bytes tests/data/acpi/q35/DSDT.acpierst | Bin 8337 -> 8435 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9645 -> 9743 bytes tests/data/acpi/q35/DSDT.applesmc | Bin 8366 -> 8464 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11449 -> 11547 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8784 -> 8882 bytes tests/data/acpi/q35/DSDT.cxl | Bin 9646 -> 9744 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 9974 -> 10072 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8395 -> 8493 bytes tests/data/acpi/q35/DSDT.ipmismbus | Bin 8409 -> 8507 bytes tests/data/acpi/q35/DSDT.ivrs | Bin 8337 -> 8435 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9679 -> 9777 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9450 -> 9548 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8640 -> 8738 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8178 -> 8276 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8326 -> 8424 bytes tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8421 -> 8519 bytes tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8926 -> 9024 bytes tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8952 -> 9050 bytes tests/data/acpi/q35/DSDT.viot | Bin 9429 -> 9527 bytes tests/data/acpi/q35/DSDT.xapic | Bin 35683 -> 35781 bytes 35 files changed, 34 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -34
@@ -1,35 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/DSDT" , -"tests/data/acpi/pc/DSDT.acpierst" , -"tests/data/acpi/pc/DSDT.acpihmat" , -"tests/data/acpi/pc/DSDT.bridge" , -"tests/data/acpi/pc/DSDT.cphp" , -"tests/data/acpi/pc/DSDT.dimmpxm" , -"tests/data/acpi/pc/DSDT.hpbridge" , -"tests/data/acpi/pc/DSDT.hpbrroot" , -"tests/data/acpi/pc/DSDT.ipmikcs" , -"tests/data/acpi/pc/DSDT.memhp" , -"tests/data/acpi/pc/DSDT.nohpet" , -"tests/data/acpi/pc/DSDT.numamem" , -"tests/data/acpi/pc/DSDT.roothp" , -"tests/data/acpi/q35/DSDT" , -"tests/data/acpi/q35/DSDT.acpierst" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/DSDT.applesmc" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/DSDT.cphp" , -"tests/data/acpi/q35/DSDT.cxl" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.ipmismbus" , -"tests/data/acpi/q35/DSDT.ivrs" , -"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/DSDT.multi-bridge" , -"tests/data/acpi/q35/DSDT.nohpet" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.pvpanic-isa" , -"tests/data/acpi/q35/DSDT.tis.tpm12" , -"tests/data/acpi/q35/DSDT.tis.tpm2" , -"tests/data/acpi/q35/DSDT.viot" , -"tests/data/acpi/q35/DSDT.xapic",
tests/data/acpi/pc/DSDT binary +0 -0
tests/data/acpi/pc/DSDT.acpierst binary +0 -0
tests/data/acpi/pc/DSDT.acpihmat binary +0 -0
tests/data/acpi/pc/DSDT.bridge binary +0 -0
tests/data/acpi/pc/DSDT.cphp binary +0 -0
tests/data/acpi/pc/DSDT.dimmpxm binary +0 -0
tests/data/acpi/pc/DSDT.hpbridge binary +0 -0
tests/data/acpi/pc/DSDT.hpbrroot binary +0 -0
tests/data/acpi/pc/DSDT.ipmikcs binary +0 -0
tests/data/acpi/pc/DSDT.memhp binary +0 -0
tests/data/acpi/pc/DSDT.nohpet binary +0 -0
tests/data/acpi/pc/DSDT.numamem binary +0 -0
tests/data/acpi/pc/DSDT.roothp binary +0 -0
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.cxl binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/q35/DSDT.viot binary +0 -0
tests/data/acpi/q35/DSDT.xapic binary +0 -0
Signature · 1 line
MST
[PULL 41/86] virtio-pci: support queue reset
In reply to Michael S. TsirkinFrom: Xuan Zhuo <[email protected]>
PCI devices support vq reset.
Based on this function, the driver can adjust the size of the ring, and quickly recycle the buffer in the ring.
The migration of the virtio devices will not happen during a reset operation. This is becuase the global iothread lock is held. Migration thread also needs the lock. As a result, when migration of virtio devices starts, the 'reset' status of VirtIOPCIQueue will always be 0. Thus, we do not need to add it in vmstate_virtio_pci_modern_queue_state.
Message-Id: <[email protected]>
--- include/hw/virtio/virtio-pci.h | 5 +++++ hw/virtio/virtio-pci.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+)
include/hw/virtio/virtio-pci.h +5 -0
@@ -117,6 +117,11 @@ typedef struct VirtIOPCIRegion { typedef struct VirtIOPCIQueue { uint16_t num; bool enabled; + /* + * No need to migrate the reset status, because it is always 0 + * when the migration starts. + */ + bool reset; uint32_t desc[2]; uint32_t avail[2]; uint32_t used[2];
hw/virtio/virtio-pci.c +15 -0
@@ -1251,6 +1251,9 @@ static uint64_t virtio_pci_common_read(void *opaque, hwaddr addr,case VIRTIO_PCI_COMMON_Q_USEDHI : val = proxy->vqs[vdev->queue_sel].used[1 ];break ; +case VIRTIO_PCI_COMMON_Q_RESET : + val = proxy->vqs[vdev->queue_sel].reset; +break ;default : val =0 ; }
@@ -1338,6 +1341,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr, ((uint64_t )proxy->vqs[vdev->queue_sel].used[1 ]) <<32 | proxy->vqs[vdev->queue_sel].used[0]); proxy->vqs[vdev->queue_sel].enabled =1 ; + proxy->vqs[vdev->queue_sel].reset =0 ; }else {virtio_error (vdev,"wrong value for queue_enable %" PRIx64, val); }
@@ -1360,6 +1364,16 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr,case VIRTIO_PCI_COMMON_Q_USEDHI : proxy->vqs[vdev->queue_sel].used[1 ] = val;break ; +case VIRTIO_PCI_COMMON_Q_RESET : +if (val ==1 ) { + proxy->vqs[vdev->queue_sel].reset =1 ; + +virtio_queue_reset (vdev, vdev->queue_sel); + + proxy->vqs[vdev->queue_sel].reset =0 ; + proxy->vqs[vdev->queue_sel].enabled =0 ; + } +break ;default :break ; }
@@ -1954,6 +1968,7 @@ static void virtio_pci_reset(DeviceState *qdev)for (i =0 ; i <VIRTIO_QUEUE_MAX ; i++) { proxy->vqs[i].enabled =0 ; + proxy->vqs[i].reset =0 ; proxy->vqs[i].num =0 ; proxy->vqs[i].desc[0 ] = proxy->vqs[i].desc[1 ] =0 ; proxy->vqs[i].avail[0 ] = proxy->vqs[i].avail[1 ] =0 ;
Signature · 1 line
MST
[PULL 62/86] tests: acpi: pc/q35 whitelist DSDT before \_GPE cleanup
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +34 -0
@@ -1 +1,35 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/DSDT" , +"tests/data/acpi/pc/DSDT.bridge" , +"tests/data/acpi/pc/DSDT.ipmikcs" , +"tests/data/acpi/pc/DSDT.cphp" , +"tests/data/acpi/pc/DSDT.memhp" , +"tests/data/acpi/pc/DSDT.numamem" , +"tests/data/acpi/pc/DSDT.nohpet" , +"tests/data/acpi/pc/DSDT.dimmpxm" , +"tests/data/acpi/pc/DSDT.acpihmat" , +"tests/data/acpi/pc/DSDT.acpierst" , +"tests/data/acpi/pc/DSDT.roothp" , +"tests/data/acpi/pc/DSDT.hpbridge" , +"tests/data/acpi/pc/DSDT.hpbrroot" , +"tests/data/acpi/q35/DSDT" , +"tests/data/acpi/q35/DSDT.tis.tpm2" , +"tests/data/acpi/q35/DSDT.tis.tpm12" , +"tests/data/acpi/q35/DSDT.bridge" , +"tests/data/acpi/q35/DSDT.multi-bridge" , +"tests/data/acpi/q35/DSDT.mmio64" , +"tests/data/acpi/q35/DSDT.ipmibt" , +"tests/data/acpi/q35/DSDT.cphp" , +"tests/data/acpi/q35/DSDT.memhp" , +"tests/data/acpi/q35/DSDT.numamem" , +"tests/data/acpi/q35/DSDT.nohpet" , +"tests/data/acpi/q35/DSDT.dimmpxm" , +"tests/data/acpi/q35/DSDT.acpihmat" , +"tests/data/acpi/q35/DSDT.acpierst" , +"tests/data/acpi/q35/DSDT.applesmc" , +"tests/data/acpi/q35/DSDT.pvpanic-isa" , +"tests/data/acpi/q35/DSDT.ivrs" , +"tests/data/acpi/q35/DSDT.viot" , +"tests/data/acpi/q35/DSDT.cxl" , +"tests/data/acpi/q35/DSDT.ipmismbus" , +"tests/data/acpi/q35/DSDT.xapic",
Signature · 1 line
MST
[PULL 54/86] acpi: pc: vga: use AcpiDevAmlIf interface to build VGA device descriptors
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Message-Id: <[email protected]>
NB: we do not expect any functional change in
any ACPI tables with this change. It's only a refactoring.
--- hw/display/vga_int.h | 2 ++ hw/display/acpi-vga-stub.c | 7 +++++++ hw/display/acpi-vga.c | 26 ++++++++++++++++++++++++++ hw/display/vga-pci.c | 4 ++++ hw/i386/acpi-build.c | 26 +------------------------- hw/display/meson.build | 17 +++++++++++++++++ 6 files changed, 57 insertions(+), 25 deletions(-) create mode 100644 hw/display/acpi-vga-stub.c create mode 100644 hw/display/acpi-vga.c
hw/display/vga_int.h +2 -0
@@ -30,6 +30,7 @@#include "ui/console.h" #include "hw/display/bochs-vbe.h" +#include "hw/acpi/acpi_aml_interface.h" #define ST01_V_RETRACE 0x08#define ST01_DISP_ENABLE 0x01
@@ -195,4 +196,5 @@ void pci_std_vga_mmio_region_init(VGACommonState *s,MemoryRegion *subs, bool qext, bool edid); +void build_vga_aml (AcpiDevAmlIf *adev,Aml *scope);#endif
hw/display/acpi-vga-stub.c new file +7 -0
@@ -0,0 +1,7 @@ +#include "qemu/osdep.h" +#include "hw/acpi/acpi_aml_interface.h" +#include "vga_int.h" + +void build_vga_aml (AcpiDevAmlIf *adev,Aml *scope) +{ +}
hw/display/acpi-vga.c new file +26 -0
@@ -0,0 +1,26 @@ +#include "qemu/osdep.h" +#include "hw/acpi/acpi_aml_interface.h" +#include "hw/pci/pci.h" +#include "vga_int.h" + +void build_vga_aml (AcpiDevAmlIf *adev,Aml *scope) +{ +int s3d =0 ; +Aml *method; + +if (object_dynamic_cast (OBJECT (adev),"qxl-vga" )) { + s3d =3 ; + } + + method =aml_method ("_S1D" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (0 ))); +aml_append (scope, method); + + method =aml_method ("_S2D" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (0 ))); +aml_append (scope, method); + + method =aml_method ("_S3D" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_return (aml_int (s3d))); +aml_append (scope, method); +}
hw/display/vga-pci.c +4 -0
@@ -35,6 +35,7 @@#include "hw/loader.h" #include "hw/display/edid.h" #include "qom/object.h" +#include "hw/acpi/acpi_aml_interface.h" enum vga_pci_flags {PCI_VGA_FLAG_ENABLE_MMIO =1 ,
@@ -354,11 +355,13 @@ static void vga_pci_class_init(ObjectClass *klass, void *data) {DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); +AcpiDevAmlIfClass *adevc =ACPI_DEV_AML_IF_CLASS (klass); k->vendor_id =PCI_VENDOR_ID_QEMU ; k->device_id =PCI_DEVICE_ID_QEMU_VGA ; dc->vmsd = &vmstate_vga_pci;set_bit (DEVICE_CATEGORY_DISPLAY , dc->categories); + adevc->build_dev_aml = build_vga_aml; }static const TypeInfo vga_pci_type_info = {
@@ -369,6 +372,7 @@ static const TypeInfo vga_pci_type_info = { .class_init = vga_pci_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + {TYPE_ACPI_DEV_AML_IF }, { }, }, };
hw/i386/acpi-build.c +1 -25
@@ -430,7 +430,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,bool hotpluggbale_slot = false;bool bridge_in_acpi = false;bool cold_plugged_bridge = false; -bool is_vga = false;if (pdev) { pc =PCI_DEVICE_GET_CLASS (pdev);
@@ -440,8 +439,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,continue ; } - is_vga = pc->class_id ==PCI_CLASS_DISPLAY_VGA ; -/* * Cold plugged bridges aren't themselves hot-pluggable. * Hotplugged bridges *are* hot-pluggable.
@@ -489,28 +486,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,aml_append (dev,aml_pci_device_dsm ()); } -if (is_vga) { -/* add VGA specific AML methods */ -int s3d; - -if (object_dynamic_cast (OBJECT (pdev),"qxl-vga" )) { - s3d =3 ; - }else { - s3d =0 ; - } - - method =aml_method ("_S1D" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_return (aml_int (0 ))); -aml_append (dev, method); - - method =aml_method ("_S2D" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_return (aml_int (0 ))); -aml_append (dev, method); - - method =aml_method ("_S3D" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_return (aml_int (s3d))); -aml_append (dev, method); - } +call_dev_aml_func (DEVICE (pdev), dev); bridge_in_acpi = cold_plugged_bridge && pcihp_bridge_en;if (bridge_in_acpi) {
hw/display/meson.build +17 -0
@@ -38,10 +38,21 @@ softmmu_ss.add(when: 'CONFIG_NEXTCUBE', if_true: files('next-fb.c')) specific_ss.add(when: 'CONFIG_VGA', if_true: files('vga.c')) +if (config_all_devices.has_key('CONFIG_VGA_CIRRUS') or + config_all_devices.has_key('CONFIG_VGA_PCI') or + config_all_devices.has_key('CONFIG_VMWARE_VGA') or + config_all_devices.has_key('CONFIG_ATI_VGA') + ) + softmmu_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), + if_false: files('acpi-vga-stub.c')) +endif + if config_all_devices.has_key('CONFIG_QXL') qxl_ss = ss.source_set() qxl_ss.add(when: 'CONFIG_QXL', if_true: [files('qxl.c', 'qxl-logger.c', 'qxl-render.c'), pixman, spice]) + qxl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), + if_false: files('acpi-vga-stub.c')) hw_display_modules += {'qxl': qxl_ss} endif
@@ -52,6 +63,7 @@ softmmu_ss.add(when: 'CONFIG_ARTIST', if_true: files('artist.c')) softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true: files('ati.c', 'ati_2d.c', 'ati_dbg.c')) + if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss = ss.source_set() virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU',
@@ -87,14 +99,19 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA') if_true: [files('virtio-vga.c'), pixman]) virtio_vga_ss.add(when: 'CONFIG_VHOST_USER_VGA', if_true: files('vhost-user-vga.c')) + virtio_vga_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), + if_false: files('acpi-vga-stub.c')) hw_display_modules += {'virtio-vga': virtio_vga_ss} virtio_vga_gl_ss = ss.source_set() virtio_vga_gl_ss.add(when: ['CONFIG_VIRTIO_VGA', virgl, opengl], if_true: [files('virtio-vga-gl.c'), pixman]) + virtio_vga_gl_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-vga.c'), + if_false: files('acpi-vga-stub.c')) hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss} endif specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) +softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c')) modules += { 'hw-display': hw_display_modules }
Signature · 1 line
MST
[PULL 70/86] hw/i386/pc.c: CXL Fixed Memory Window should not reserve e820 in bios
In reply to Michael S. TsirkinFrom: Gregory Price <[email protected]>
Early-boot e820 records will be inserted by the bios/efi/early boot software and be reported to the kernel via insert_resource. Later, when CXL drivers iterate through the regions again, they will insert another resource and make the RESERVED memory area a child.
This RESERVED memory area causes the memory region to become unusable, and as a result attempting to create memory regions with
`cxl create-region ...`
Will fail due to the RESERVED area intersecting with the CXL window.
During boot the following traceback is observed:
0xffffffff81101650 in insert_resource_expand_to_fit () 0xffffffff83d964c5 in e820__reserve_resources_late () 0xffffffff83e03210 in pcibios_resource_survey () 0xffffffff83e04f4a in pcibios_init ()
Which produces a call to reserve the CFMWS area:
(gdb) p *new
$54 = {start = 0x290000000, end = 0x2cfffffff, name = "Reserved",
flags = 0x200, desc = 0x7, parent = 0x0, sibling = 0x0,
child = 0x0}Later the Kernel parses ACPI tables and reserves the exact same area as the CXL Fixed Memory Window:
0xffffffff811016a4 in insert_resource_conflict ()
insert_resource ()0xffffffff81a81389 in cxl_parse_cfmws ()0xffffffff818c4a81 in call_handler ()
acpi_parse_entries_array ()
(gdb) p/x *new
$59 = {start = 0x290000000, end = 0x2cfffffff, name = "CXL Window 0",
flags = 0x200, desc = 0x0, parent = 0x0, sibling = 0x0,
child = 0x0}This produces the following output in /proc/iomem:
590000000-68fffffff : CXL Window 0
590000000-68fffffff : Reserved
This reserved area causes get_free_mem_region() to fail due to a check against __region_intersects(). Due to this reserved area, the intersect check will only ever return REGION_INTERSECTS, which causes cxl create-region to always fail.
Message-Id: <[email protected]>
--- hw/i386/pc.c | 2 -- 1 file changed, 2 deletions(-)
hw/i386/pc.c +0 -2
@@ -1062,7 +1062,6 @@ void pc_memory_init(PCMachineState *pcms,hwaddr cxl_size = MiB; cxl_base =pc_get_cxl_range_start (pcms); -e820_add_entry (cxl_base, cxl_size,E820_RESERVED );memory_region_init (mr,OBJECT (machine),"cxl_host_reg" , cxl_size);memory_region_add_subregion (system_memory, cxl_base, mr); cxl_resv_end = cxl_base + cxl_size;
@@ -1078,7 +1077,6 @@ void pc_memory_init(PCMachineState *pcms,memory_region_init_io (&fw->mr,OBJECT (machine), &cfmws_ops, fw,"cxl-fixed-memory-region" , fw->size);memory_region_add_subregion (system_memory, fw->base, &fw->mr); -e820_add_entry (fw->base, fw->size,E820_RESERVED ); cxl_fmw_base += fw->size; cxl_resv_end = cxl_fmw_base; }
Signature · 1 line
MST
[PULL 20/86] tests/acpi: allow changes for core_count2 test
In reply to Michael S. TsirkinFrom: Julia Suvorova <[email protected]>
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 3 +++ tests/data/acpi/q35/APIC.core-count2 | 0 tests/data/acpi/q35/DSDT.core-count2 | 0 tests/data/acpi/q35/FACP.core-count2 | 0 4 files changed, 3 insertions(+) create mode 100644 tests/data/acpi/q35/APIC.core-count2 create mode 100644 tests/data/acpi/q35/DSDT.core-count2 create mode 100644 tests/data/acpi/q35/FACP.core-count2
tests/qtest/bios-tables-test-allowed-diff.h +3 -0
@@ -1 +1,4 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/APIC.core-count2" , +"tests/data/acpi/q35/DSDT.core-count2" , +"tests/data/acpi/q35/FACP.core-count2",
tests/data/acpi/q35/APIC.core-count2 new file +0 -0
tests/data/acpi/q35/DSDT.core-count2 new file +0 -0
tests/data/acpi/q35/FACP.core-count2 new file +0 -0
Signature · 1 line
MST
[PULL 78/86] tests: Add HMAT AArch64/virt empty table files
In reply to Michael S. TsirkinFrom: Hesham Almatary <[email protected]>
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 5 +++++ tests/data/acpi/virt/APIC.acpihmatvirt | 0 tests/data/acpi/virt/DSDT.acpihmatvirt | 0 tests/data/acpi/virt/HMAT.acpihmatvirt | 0 tests/data/acpi/virt/PPTT.acpihmatvirt | 0 tests/data/acpi/virt/SRAT.acpihmatvirt | 0 6 files changed, 5 insertions(+) create mode 100644 tests/data/acpi/virt/APIC.acpihmatvirt create mode 100644 tests/data/acpi/virt/DSDT.acpihmatvirt create mode 100644 tests/data/acpi/virt/HMAT.acpihmatvirt create mode 100644 tests/data/acpi/virt/PPTT.acpihmatvirt create mode 100644 tests/data/acpi/virt/SRAT.acpihmatvirt
tests/qtest/bios-tables-test-allowed-diff.h +5 -0
@@ -1 +1,6 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/APIC.acpihmatvirt" , +"tests/data/acpi/virt/DSDT.acpihmatvirt" , +"tests/data/acpi/virt/HMAT.acpihmatvirt" , +"tests/data/acpi/virt/PPTT.acpihmatvirt" , +"tests/data/acpi/virt/SRAT.acpihmatvirt",
tests/data/acpi/virt/APIC.acpihmatvirt new file +0 -0
tests/data/acpi/virt/DSDT.acpihmatvirt new file +0 -0
tests/data/acpi/virt/HMAT.acpihmatvirt new file +0 -0
tests/data/acpi/virt/PPTT.acpihmatvirt new file +0 -0
tests/data/acpi/virt/SRAT.acpihmatvirt new file +0 -0
Signature · 1 line
MST
[PULL 75/86] tests: acpi: add and whitelist *.hmat-noinitiator expected blobs
In reply to Michael S. TsirkinFrom: Brice Goglin <[email protected]>
.. which will be used by follow up hmat-noinitiator test-case.
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 4 ++++ tests/data/acpi/q35/APIC.acpihmat-noinitiator | 0 tests/data/acpi/q35/DSDT.acpihmat-noinitiator | 0 tests/data/acpi/q35/HMAT.acpihmat-noinitiator | 0 tests/data/acpi/q35/SRAT.acpihmat-noinitiator | 0 5 files changed, 4 insertions(+) create mode 100644 tests/data/acpi/q35/APIC.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/DSDT.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/HMAT.acpihmat-noinitiator create mode 100644 tests/data/acpi/q35/SRAT.acpihmat-noinitiator
tests/qtest/bios-tables-test-allowed-diff.h +4 -0
@@ -1 +1,5 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/q35/APIC.acpihmat-noinitiator" , +"tests/data/acpi/q35/DSDT.acpihmat-noinitiator" , +"tests/data/acpi/q35/HMAT.acpihmat-noinitiator" , +"tests/data/acpi/q35/SRAT.acpihmat-noinitiator",
tests/data/acpi/q35/APIC.acpihmat-noinitiator new file +0 -0
tests/data/acpi/q35/DSDT.acpihmat-noinitiator new file +0 -0
tests/data/acpi/q35/HMAT.acpihmat-noinitiator new file +0 -0
tests/data/acpi/q35/SRAT.acpihmat-noinitiator new file +0 -0
Signature · 1 line
MST
[PULL 27/86] hw/pci: PCIe Data Object Exchange emulation
In reply to Michael S. TsirkinFrom: Huai-Cheng Kuo <[email protected]>
Emulation of PCIe Data Object Exchange (DOE) PCIE Base Specification r6.0 6.3 Data Object Exchange
Supports multiple DOE PCIe Extended Capabilities for a single PCIe device. For each capability, a static array of DOEProtocol should be passed to pcie_doe_init(). The protocols in that array will be registered under the DOE capability structure. For each protocol, vendor ID, type, and corresponding callback function (handle_request()) should be implemented. This callback function represents how the DOE request for corresponding protocol will be handled.
pcie_doe_{read/write}_config() must be appended to corresponding PCI device's config_read/write() handler to enable DOE access. In pcie_doe_read_config(), false will be returned if pci_config_read() offset is not within DOE capability range. In pcie_doe_write_config(), the function will have no affect if the address is not within the related DOE PCIE extended capability.
Message-Id: <[email protected]>
--- include/hw/pci/pci_ids.h | 3 + include/hw/pci/pcie.h | 1 + include/hw/pci/pcie_doe.h | 123 +++++++++++++ include/hw/pci/pcie_regs.h | 4 + hw/pci/pcie_doe.c | 367 +++++++++++++++++++++++++++++++++++++ MAINTAINERS | 7 + hw/pci/meson.build | 1 + 7 files changed, 506 insertions(+) create mode 100644 include/hw/pci/pcie_doe.h create mode 100644 hw/pci/pcie_doe.c
include/hw/pci/pci_ids.h +3 -0
@@ -157,6 +157,9 @@/* Vendors and devices. Sort key: vendor first, device next. */ +/* Ref: PCIe r6.0 Table 6-32 */ +#define PCI_VENDOR_ID_PCI_SIG 0x0001 +#define PCI_VENDOR_ID_LSI_LOGIC 0x1000#define PCI_DEVICE_ID_LSI_53C810 0x0001#define PCI_DEVICE_ID_LSI_53C895A 0x0012
include/hw/pci/pcie.h +1 -0
@@ -26,6 +26,7 @@#include "hw/pci/pcie_aer.h" #include "hw/pci/pcie_sriov.h" #include "hw/hotplug.h" +#include "hw/pci/pcie_doe.h" typedef enum { /* for attention and power indicator */
include/hw/pci/pcie_doe.h new file +123 -0
123 lines not on this page · raw message
include/hw/pci/pcie_regs.h +4 -0
@@ -179,4 +179,8 @@ typedef enum PCIExpLinkWidth {#define PCI_ACS_VER 0x1#define PCI_ACS_SIZEOF 8 +/* DOE Capability Register Fields */ +#define PCI_DOE_VER 0x1 +#define PCI_DOE_SIZEOF 24 +#endif /* QEMU_PCIE_REGS_H */
hw/pci/pcie_doe.c new file +367 -0
367 lines not on this page · raw message
MAINTAINERS +7 -0
@@ -1832,6 +1832,13 @@ F: qapi/pci.json F: docs/pci* F: docs/specs/*pci* +PCIE DOE +M: Huai-Cheng Kuo <[email protected]> +M: Chris Browy <[email protected]> +S: Supported +F: include/hw/pci/pcie_doe.h +F: hw/pci/pcie_doe.c + ACPI/SMBIOS M: Michael S. Tsirkin <[email protected]> M: Igor Mammedov <[email protected]>
hw/pci/meson.build +1 -0
@@ -13,6 +13,7 @@ pci_ss.add(files( # allow plugging PCIe devices into PCI buses, include them even if # CONFIG_PCI_EXPRESS=n. pci_ss.add(files('pcie.c', 'pcie_aer.c')) +pci_ss.add(files('pcie_doe.c')) softmmu_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c')) softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
Signature · 1 line
MST
[PULL 33/86] vhost: Change the sequence of device start
In reply to Michael S. TsirkinFrom: Yajun Wu <[email protected]>
This patch is part of adding vhost-user vhost_dev_start support. The motivation is to improve backend configuration speed and reduce live migration VM downtime.
Moving the device start routines after finishing all the necessary device and VQ configuration, further aligning to the virtio specification for "device initialization sequence".
Following patch will add vhost-user vhost_dev_start support.
Message-Id: <[email protected]>
--- hw/block/vhost-user-blk.c | 18 +++++++++++------- hw/net/vhost_net.c | 12 ++++++------ 2 files changed, 17 insertions(+), 13 deletions(-)
hw/block/vhost-user-blk.c +11 -7
@@ -164,13 +164,6 @@ static int vhost_user_blk_start(VirtIODevice *vdev, Error **errp) goto err_guest_notifiers; } - ret =vhost_dev_start (&s->dev, vdev); -if (ret <0 ) { -error_setg_errno (errp, -ret,"Error starting vhost" ); - goto err_guest_notifiers; - } - s->started_vu = true; -/* guest_notifier_mask/pending not used yet, so just unmask * everything here. virtio-pci will do the right thing by * enabling/disabling irqfd.
@@ -179,9 +172,20 @@ static int vhost_user_blk_start(VirtIODevice *vdev, Error **errp)vhost_virtqueue_mask (&s->dev, vdev, i, false); } + s->dev.vq_index_end = s->dev.nvqs; + ret =vhost_dev_start (&s->dev, vdev); +if (ret <0 ) { +error_setg_errno (errp, -ret,"Error starting vhost" ); + goto err_guest_notifiers; + } + s->started_vu = true; +return ret; err_guest_notifiers: +for (i =0 ; i < s->dev.nvqs; i++) { +vhost_virtqueue_mask (&s->dev, vdev, i, true); + } k->set_guest_notifiers (qbus->parent, s->dev.nvqs, false); err_host_notifiers:vhost_dev_disable_notifiers (&s->dev, vdev);
hw/net/vhost_net.c +6 -6
@@ -387,21 +387,21 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs, }else { peer =qemu_get_peer (ncs, n->max_queue_pairs); } - r =vhost_net_start_one (get_vhost_net (peer), dev); - -if (r <0 ) { - goto err_start; - }if (peer->vring_enable) {/* restore vring enable state */ r =vhost_set_vring_enable (peer, peer->vring_enable);if (r <0 ) { -vhost_net_stop_one (get_vhost_net (peer), dev); goto err_start; } } + + r =vhost_net_start_one (get_vhost_net (peer), dev); +if (r <0 ) { +vhost_net_stop_one (get_vhost_net (peer), dev); + goto err_start; + } }return 0 ;
Signature · 1 line
MST
[PULL 50/86] vhost: vhost-kernel: enable vq reset feature
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Add virtqueue reset feature for vhost-kernel.
Message-Id: <[email protected]>
--- hw/net/vhost_net.c | 1 + 1 file changed, 1 insertion(+)
hw/net/vhost_net.c +1 -0
@@ -47,6 +47,7 @@ static const int kernel_feature_bits[] = {VIRTIO_NET_F_MTU ,VIRTIO_F_IOMMU_PLATFORM ,VIRTIO_F_RING_PACKED , +VIRTIO_F_RING_RESET ,VIRTIO_NET_F_HASH_REPORT , VHOST_INVALID_FEATURE_BIT };
Signature · 1 line
MST
[PULL 38/86] virtio: introduce virtio_queue_reset()
In reply to Michael S. TsirkinFrom: Xuan Zhuo <[email protected]>
Introduce a new interface function virtio_queue_reset() to implement reset for vq.
Add a new callback to VirtioDeviceClass for queue reset operation for each child device.
Message-Id: <[email protected]>
--- include/hw/virtio/virtio.h | 2 ++ hw/virtio/virtio.c | 11 +++++++++++ 2 files changed, 13 insertions(+)
include/hw/virtio/virtio.h +2 -0
@@ -148,6 +148,7 @@ struct VirtioDeviceClass {void (*set_config)(VirtIODevice *vdev,const uint8_t *config);void (*reset)(VirtIODevice *vdev);void (*set_status)(VirtIODevice *vdev,uint8_t val); +void (*queue_reset)(VirtIODevice *vdev,uint32_t queue_index);/* For transitional devices, this is a bitmap of features * that are only exposed on the legacy interface but not * the modern one.
@@ -286,6 +287,7 @@ int virtio_queue_set_host_notifier_mr(VirtIODevice *vdev, int n, MemoryRegion *mr, bool assign);int virtio_set_status (VirtIODevice *vdev,uint8_t val);void virtio_reset (void *opaque); +void virtio_queue_reset (VirtIODevice *vdev,uint32_t queue_index);void virtio_update_irq (VirtIODevice *vdev);int virtio_set_features (VirtIODevice *vdev,uint64_t val);
hw/virtio/virtio.c +11 -0
@@ -2484,6 +2484,17 @@ static void __virtio_queue_reset(VirtIODevice *vdev, uint32_t i)virtio_virtqueue_reset_region_cache (&vdev->vq[i]); } +void virtio_queue_reset (VirtIODevice *vdev,uint32_t queue_index) +{ +VirtioDeviceClass *k =VIRTIO_DEVICE_GET_CLASS (vdev); + +if (k->queue_reset) { + k->queue_reset (vdev, queue_index); + } + +__virtio_queue_reset (vdev, queue_index); +} +void virtio_reset (void *opaque) {VirtIODevice *vdev = opaque;
Signature · 1 line
MST
[PULL 73/86] hw/i386/acpi-build: Resolve north rather than south bridges
In reply to Michael S. TsirkinFrom: Bernhard Beschow <[email protected]>
The code currently assumes Q35 iff ICH9 and i440fx iff PIIX. Now that more AML generation has been moved into the south bridges and since the machines define themselves primarily through their north bridges, let's switch to resolving the north bridges for AML generation instead. This also allows for easier experimentation with different south bridges in the "pc" machine, e.g. with PIIX4 and VT82xx.
Message-Id: <[email protected]>
--- hw/i386/acpi-build.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
hw/i386/acpi-build.c +6 -5
@@ -60,6 +60,7 @@#include "hw/i386/fw_cfg.h" #include "hw/i386/ich9.h" #include "hw/pci/pci_bus.h" +#include "hw/pci-host/i440fx.h" #include "hw/pci-host/q35.h" #include "hw/i386/x86-iommu.h"
@@ -1322,8 +1323,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, AcpiMiscInfo *misc, Range *pci_hole, Range *pci_hole64, MachineState *machine) { -Object *piix =object_resolve_type_unambiguous (TYPE_PIIX4_PM ); -Object *lpc =object_resolve_type_unambiguous (TYPE_ICH9_LPC_DEVICE ); +Object *i440fx =object_resolve_type_unambiguous (TYPE_I440FX_PCI_HOST_BRIDGE ); +Object *q35 =object_resolve_type_unambiguous (TYPE_Q35_HOST_DEVICE );CrsRangeEntry *entry;Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs;CrsRangeSet crs_range_set;
@@ -1344,13 +1345,13 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,AcpiTable table = { .sig ="DSDT" , .rev =1 , .oem_id = x86ms->oem_id, .oem_table_id = x86ms->oem_table_id }; -assert (!!piix != !!lpc); +assert (!!i440fx != !!q35);acpi_table_begin (&table, table_data); dsdt =init_aml_allocator ();build_dbg_aml (dsdt); -if (piix) { +if (i440fx) { sb_scope =aml_scope ("_SB" ); dev =aml_device ("PCI0" );aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0A03" )));
@@ -1363,7 +1364,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }build_piix4_pci0_int (dsdt); - }else if (lpc) { + }else if (q35) { sb_scope =aml_scope ("_SB" ); dev =aml_device ("PCI0" );aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0A08" )));
Signature · 1 line
MST
[PULL 82/86] vfio: move implement of vfio_get_xlat_addr() to memory.c
In reply to Michael S. TsirkinFrom: Cindy Lu <[email protected]>
- Move the implement vfio_get_xlat_addr to softmmu/memory.c, and change the name to memory_get_xlat_addr(). So we can use this function on other devices, such as vDPA device.
- Add a new function vfio_get_xlat_addr in vfio/common.c, and it will check whether the memory is backed by a discard manager. then device can have its own warning.
Message-Id: <[email protected]>
--- include/exec/memory.h | 4 +++ hw/vfio/common.c | 66 +++------------------------------------ softmmu/memory.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 61 deletions(-)
include/exec/memory.h +4 -0
@@ -713,6 +713,10 @@ void ram_discard_manager_register_listener(RamDiscardManager *rdm,void ram_discard_manager_unregister_listener (RamDiscardManager *rdm,RamDiscardListener *rdl); +bool memory_get_xlat_addr (IOMMUTLBEntry *iotlb,void **vaddr, +ram_addr_t *ram_addr,bool *read_only, +bool *mr_has_discard_manager); +typedef struct CoalescedMemoryRange CoalescedMemoryRange ;typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd ;
hw/vfio/common.c +5 -61
79 lines not on this page · raw message
softmmu/memory.c +72 -0
84 lines not on this page · raw message
Signature · 1 line
MST
[PULL 69/86] msix: Assert that specified vector is in range
In reply to Michael S. TsirkinFrom: Akihiko Odaki <[email protected]>
There were several different ways to deal with the situation where the vector specified for a msix function is out of bound:
- early return a function and keep progresssing
- propagate the error to the caller
- mark msix unusable
- assert it is in bound
- just ignore
An out-of-bound vector should not be specified if the device implementation is correct so let msix functions always assert that the specified vector is in range.
An exceptional case is virtio-pci, which allows the guest to configure vectors. For virtio-pci, it is more appropriate to introduce its own checks because it is sometimes too late to check the vector range in msix functions.
Message-Id: <[email protected]>
--- include/hw/pci/msix.h | 4 +-- hw/net/e1000e.c | 15 ++------- hw/net/rocker/rocker.c | 23 ++------------ hw/net/vmxnet3.c | 27 +++------------- hw/nvme/ctrl.c | 5 +-- hw/pci/msix.c | 24 ++++++-------- hw/rdma/vmw/pvrdma_main.c | 7 +--- hw/remote/vfio-user-obj.c | 9 +----- hw/virtio/virtio-pci.c | 67 ++++++++++++++++++++++++++++----------- 9 files changed, 74 insertions(+), 107 deletions(-)
include/hw/pci/msix.h +2 -2
@@ -33,10 +33,10 @@ bool msix_is_masked(PCIDevice *dev, unsigned vector);void msix_set_pending (PCIDevice *dev,unsigned vector);void msix_clr_pending (PCIDevice *dev,int vector); -int msix_vector_use (PCIDevice *dev,unsigned vector); +void msix_vector_use (PCIDevice *dev,unsigned vector);void msix_vector_unuse (PCIDevice *dev,unsigned vector);void msix_unuse_all_vectors (PCIDevice *dev); -void msix_set_mask (PCIDevice *dev,int vector,bool mask,Error **errp); +void msix_set_mask (PCIDevice *dev,int vector,bool mask);void msix_notify (PCIDevice *dev,unsigned vector);
hw/net/e1000e.c +3 -12
@@ -276,25 +276,18 @@ e1000e_unuse_msix_vectors(E1000EState *s, int num_vectors) } } -static bool +static void e1000e_use_msix_vectors (E1000EState *s,int num_vectors) {int i;for (i =0 ; i < num_vectors; i++) { -int res =msix_vector_use (PCI_DEVICE (s), i); -if (res <0 ) { -trace_e1000e_msix_use_vector_fail (i, res); -e1000e_unuse_msix_vectors (s, i); -return false; - } +msix_vector_use (PCI_DEVICE (s), i); } -return true; }static void e1000e_init_msix (E1000EState *s) { -PCIDevice *d =PCI_DEVICE (s); int res = msix_init(PCI_DEVICE(s), E1000E_MSIX_VEC_NUM, &s->msix, E1000E_MSIX_IDX, E1000E_MSIX_TABLE,
@@ -305,9 +298,7 @@ e1000e_init_msix(E1000EState *s)if (res <0 ) {trace_e1000e_msix_init_fail (res); }else { -if (!e1000e_use_msix_vectors (s,E1000E_MSIX_VEC_NUM )) { -msix_uninit (d, &s->msix, &s->msix); - } +e1000e_use_msix_vectors (s,E1000E_MSIX_VEC_NUM ); } }
hw/net/rocker/rocker.c +3 -20
@@ -1212,24 +1212,14 @@ static void rocker_msix_vectors_unuse(Rocker *r, } } -static int rocker_msix_vectors_use (Rocker *r, -unsigned int num_vectors) +static void rocker_msix_vectors_use (Rocker *r,unsigned int num_vectors) {PCIDevice *dev =PCI_DEVICE (r); -int err;int i;for (i =0 ; i < num_vectors; i++) { - err =msix_vector_use (dev, i); -if (err) { - goto rollback; - } +msix_vector_use (dev, i); } -return 0 ; - -rollback: -rocker_msix_vectors_unuse (r, i); -return err; }static int rocker_msix_init (Rocker *r,Error **errp)
@@ -1247,16 +1237,9 @@ static int rocker_msix_init(Rocker *r, Error **errp)return err; } - err =rocker_msix_vectors_use (r,ROCKER_MSIX_VEC_COUNT (r->fp_ports)); -if (err) { - goto err_msix_vectors_use; - } +rocker_msix_vectors_use (r,ROCKER_MSIX_VEC_COUNT (r->fp_ports));return 0 ; - -err_msix_vectors_use: -msix_uninit (dev, &r->msix_bar, &r->msix_bar); -return err; }static void rocker_msix_uninit (Rocker *r)
hw/net/vmxnet3.c +5 -22
@@ -2110,20 +2110,14 @@ vmxnet3_unuse_msix_vectors(VMXNET3State *s, int num_vectors) } } -static bool +static void vmxnet3_use_msix_vectors (VMXNET3State *s,int num_vectors) {PCIDevice *d =PCI_DEVICE (s);int i;for (i =0 ; i < num_vectors; i++) { -int res =msix_vector_use (d, i); -if (0 > res) { -VMW_WRPRN ("Failed to use MSI-X vector %d, error %d" , i, res); -vmxnet3_unuse_msix_vectors (s, i); -return false; - } +msix_vector_use (d, i); } -return true; } static bool
@@ -2141,13 +2135,8 @@ vmxnet3_init_msix(VMXNET3State *s)VMW_WRPRN ("Failed to initialize MSI-X, error %d" , res); s->msix_used = false; }else { -if (!vmxnet3_use_msix_vectors (s,VMXNET3_MAX_INTRS )) { -VMW_WRPRN ("Failed to use MSI-X vectors, error %d" , res); -msix_uninit (d, &s->msix_bar, &s->msix_bar); - s->msix_used = false; - }else { - s->msix_used = true; - } +vmxnet3_use_msix_vectors (s,VMXNET3_MAX_INTRS ); + s->msix_used = true; }return s->msix_used; }
@@ -2412,19 +2401,13 @@ static const VMStateDescription vmstate_vmxnet3_rxq_descr = {static int vmxnet3_post_load (void *opaque,int version_id) {VMXNET3State *s = opaque; -PCIDevice *d =PCI_DEVICE (s);net_tx_pkt_init (&s->tx_pkt,PCI_DEVICE (s), s->max_tx_frags, s->peer_has_vhdr);net_rx_pkt_init (&s->rx_pkt, s->peer_has_vhdr);if (s->msix_used) { -if (!vmxnet3_use_msix_vectors (s,VMXNET3_MAX_INTRS )) { -VMW_WRPRN ("Failed to re-use MSI-X vectors" ); -msix_uninit (d, &s->msix_bar, &s->msix_bar); - s->msix_used = false; -return -1 ; - } +vmxnet3_use_msix_vectors (s,VMXNET3_MAX_INTRS ); }if (!vmxnet3_validate_queues (s)) {
hw/nvme/ctrl.c +1 -4
@@ -4744,11 +4744,8 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr, uint16_t cqid, uint16_t vector, uint16_t size, uint16_t irq_enabled) { - int ret; - if (msix_enabled(&n->parent_obj)) { - ret =msix_vector_use (&n->parent_obj, vector); -assert (ret ==0 ); + msix_vector_use(&n->parent_obj, vector); } cq->ctrl = n; cq->cqid = cqid;
hw/pci/msix.c +9 -15
@@ -136,17 +136,12 @@ static void msix_handle_mask_update(PCIDevice *dev, int vector, bool was_masked) } } -void msix_set_mask (PCIDevice *dev,int vector,bool mask,Error **errp) +void msix_set_mask (PCIDevice *dev,int vector,bool mask) { -ERRP_GUARD ();unsigned offset;bool was_masked; -if (vector > dev->msix_entries_nr) { -error_setg (errp,"msix: vector %d not allocated. max vector is %d" , - vector, dev->msix_entries_nr); -return ; - } +assert (vector < dev->msix_entries_nr); offset = vector *PCI_MSIX_ENTRY_SIZE +PCI_MSIX_ENTRY_VECTOR_CTRL ;
@@ -522,7 +517,9 @@ void msix_notify(PCIDevice *dev, unsigned vector) {MSIMessage msg; -if (vector >= dev->msix_entries_nr || !dev->msix_entry_used[vector]) { +assert (vector < dev->msix_entries_nr); + +if (!dev->msix_entry_used[vector]) {return ; }
@@ -558,20 +555,17 @@ void msix_reset(PCIDevice *dev)* don't want to follow the spec suggestion can declare all vectors as used. */ /* Mark vector as used. */ -int msix_vector_use (PCIDevice *dev,unsigned vector) +void msix_vector_use (PCIDevice *dev,unsigned vector) { -if (vector >= dev->msix_entries_nr) { -return -EINVAL ; - } - +assert (vector < dev->msix_entries_nr); dev->msix_entry_used[vector]++; -return 0 ; }/* Mark vector as unused. */ void msix_vector_unuse (PCIDevice *dev,unsigned vector) { -if (vector >= dev->msix_entries_nr || !dev->msix_entry_used[vector]) { +assert (vector < dev->msix_entries_nr); +if (!dev->msix_entry_used[vector]) {return ; }if (--dev->msix_entry_used[vector]) {
hw/rdma/vmw/pvrdma_main.c +1 -6
@@ -307,12 +307,7 @@ static int init_msix(PCIDevice *pdev) }for (i =0 ; i <RDMA_MAX_INTRS ; i++) { - rc =msix_vector_use (PCI_DEVICE (dev), i); -if (rc <0 ) { -rdma_error_report ("Fail mark MSI-X vector %d" , i); -uninit_msix (pdev, i); -return rc; - } +msix_vector_use (PCI_DEVICE (dev), i); }return 0 ;
hw/remote/vfio-user-obj.c +1 -8
@@ -602,17 +602,10 @@ static void vfu_msix_irq_state(vfu_ctx_t *vfu_ctx, uint32_t start, uint32_t count, bool mask) {VfuObject *o =vfu_get_private (vfu_ctx); -Error *err =NULL ;uint32_t vector;for (vector = start; vector < count; vector++) { -msix_set_mask (o->pci_dev, vector, mask, &err); -if (err) { -VFU_OBJECT_ERROR (o,"vfu: %s: %s" , o->device, -error_get_pretty (err)); -error_free (err); - err =NULL ; - } +msix_set_mask (o->pci_dev, vector, mask); } }
hw/virtio/virtio-pci.c +49 -18
137 lines not on this page · raw message
Signature · 1 line
MST
[PULL 67/86] qpci_device_enable: Allow for command bits hardwired to 0
In reply to Michael S. TsirkinFrom: Lev Kujawski <[email protected]>
Devices like the PIIX3/4 IDE controller do not support certain modes of operation, such as memory space accesses, and indicate this lack of support by hardwiring the applicable bits to zero. Extend the QEMU PCI device testing framework to accommodate such devices.
* tests/qtest/libqos/pci.h: Add the command_disabled word to indicate bits hardwired to 0.
* tests/qtest/libqos/pci.c: Verify that hardwired bits are actually hardwired.
Message-Id: <[email protected]>
--- tests/qtest/libqos/pci.h | 1 + tests/qtest/libqos/pci.c | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-)
tests/qtest/libqos/pci.h +1 -0
@@ -68,6 +68,7 @@ struct QPCIDevicebool msix_enabled;QPCIBar msix_table_bar, msix_pba_bar;uint64_t msix_table_off, msix_pba_off; +uint16_t command_disabled; };struct QPCIAddress {
tests/qtest/libqos/pci.c +7 -6
@@ -220,18 +220,19 @@ int qpci_secondary_buses_init(QPCIBus *bus)void qpci_device_enable (QPCIDevice *dev) { -uint16_t cmd; +const uint16_t enable_bits = +PCI_COMMAND_IO |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; +uint16_t cmd, new_cmd;/* FIXME -- does this need to be a bus callout? */ cmd =qpci_config_readw (dev,PCI_COMMAND ); - cmd |=PCI_COMMAND_IO |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; + cmd |= enable_bits;qpci_config_writew (dev,PCI_COMMAND , cmd);/* Verify the bits are now set. */ - cmd =qpci_config_readw (dev,PCI_COMMAND ); - g_assert_cmphex(cmd & PCI_COMMAND_IO, ==, PCI_COMMAND_IO); - g_assert_cmphex(cmd & PCI_COMMAND_MEMORY, ==, PCI_COMMAND_MEMORY); - g_assert_cmphex(cmd & PCI_COMMAND_MASTER, ==, PCI_COMMAND_MASTER); + new_cmd =qpci_config_readw (dev,PCI_COMMAND ); + new_cmd &= enable_bits; + g_assert_cmphex(new_cmd, ==, enable_bits & ~dev->command_disabled); }/**
Signature · 1 line
MST
[PULL 32/86] tests/qtest/cxl-test: Remove temporary directories after testing
In reply to Michael S. TsirkinFrom: Thomas Huth <[email protected]>
The cxl-test leaves some temporary directories behind. Let's clean them up now!
Message-Id: <[email protected]>
--- tests/qtest/cxl-test.c | 3 +++ 1 file changed, 3 insertions(+)
tests/qtest/cxl-test.c +3 -0
@@ -101,6 +101,7 @@ static void cxl_t3d(void)qtest_start (cmdline->str);qtest_end (); +rmdir (tmpfs); }static void cxl_1pxb_2rp_2t3d (void )
@@ -115,6 +116,7 @@ static void cxl_1pxb_2rp_2t3d(void)qtest_start (cmdline->str);qtest_end (); +rmdir (tmpfs); }static void cxl_2pxb_4rp_4t3d (void )
@@ -130,6 +132,7 @@ static void cxl_2pxb_4rp_4t3d(void)qtest_start (cmdline->str);qtest_end (); + rmdir(tmpfs); }#endif /* CONFIG_POSIX */
Signature · 1 line
MST
[PULL 61/86] tests: acpi: update expected blobs
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Expected change in q35 tests:
@@ -2797,14 +2797,6 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
}
}
- Scope (_SB.PCI0)
- {
- Device (SMB0)
- {
- Name (_ADR, 0x001F0003) // _ADR: Address
- }
- }
-
Scope (_SB)
{
Device (HPET)
@@ -3282,6 +3274,11 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001)
}
}
+ Device (SFB)
+ {
+ Name (_ADR, 0x001F0003) // _ADR: Address
+ }
+
Method (PCNT, 0, NotSerialized)
{
}Also for ipmismbus test, child 'Device (MI1)' of SMB0 will be moved along with it
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 21 -------------------- tests/data/acpi/q35/DSDT | Bin 8418 -> 8407 bytes tests/data/acpi/q35/DSDT.acpierst | Bin 8435 -> 8424 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9743 -> 9732 bytes tests/data/acpi/q35/DSDT.applesmc | Bin 8464 -> 8453 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11547 -> 11536 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8882 -> 8871 bytes tests/data/acpi/q35/DSDT.cxl | Bin 9744 -> 9733 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 10072 -> 10061 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8493 -> 8482 bytes tests/data/acpi/q35/DSDT.ipmismbus | Bin 8507 -> 8495 bytes tests/data/acpi/q35/DSDT.ivrs | Bin 8435 -> 8424 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9777 -> 9766 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9548 -> 9537 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8738 -> 8727 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8276 -> 8265 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8424 -> 8413 bytes tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8519 -> 8508 bytes tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 9024 -> 9013 bytes tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 9050 -> 9039 bytes tests/data/acpi/q35/DSDT.viot | Bin 9527 -> 9516 bytes tests/data/acpi/q35/DSDT.xapic | Bin 35781 -> 35770 bytes 22 files changed, 21 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -21
@@ -1,22 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/DSDT" , -"tests/data/acpi/q35/DSDT.acpierst" , -"tests/data/acpi/q35/DSDT.acpihmat" , -"tests/data/acpi/q35/DSDT.applesmc" , -"tests/data/acpi/q35/DSDT.bridge" , -"tests/data/acpi/q35/DSDT.cphp" , -"tests/data/acpi/q35/DSDT.cxl" , -"tests/data/acpi/q35/DSDT.dimmpxm" , -"tests/data/acpi/q35/DSDT.ipmibt" , -"tests/data/acpi/q35/DSDT.ipmismbus" , -"tests/data/acpi/q35/DSDT.ivrs" , -"tests/data/acpi/q35/DSDT.memhp" , -"tests/data/acpi/q35/DSDT.mmio64" , -"tests/data/acpi/q35/DSDT.multi-bridge" , -"tests/data/acpi/q35/DSDT.nohpet" , -"tests/data/acpi/q35/DSDT.numamem" , -"tests/data/acpi/q35/DSDT.pvpanic-isa" , -"tests/data/acpi/q35/DSDT.tis.tpm12" , -"tests/data/acpi/q35/DSDT.tis.tpm2" , -"tests/data/acpi/q35/DSDT.viot" , -"tests/data/acpi/q35/DSDT.xapic",
tests/data/acpi/q35/DSDT binary +0 -0
tests/data/acpi/q35/DSDT.acpierst binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
tests/data/acpi/q35/DSDT.applesmc binary +0 -0
tests/data/acpi/q35/DSDT.bridge binary +0 -0
tests/data/acpi/q35/DSDT.cphp binary +0 -0
tests/data/acpi/q35/DSDT.cxl binary +0 -0
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
tests/data/acpi/q35/DSDT.ipmismbus binary +0 -0
tests/data/acpi/q35/DSDT.ivrs binary +0 -0
tests/data/acpi/q35/DSDT.memhp binary +0 -0
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
tests/data/acpi/q35/DSDT.multi-bridge binary +0 -0
tests/data/acpi/q35/DSDT.nohpet binary +0 -0
tests/data/acpi/q35/DSDT.numamem binary +0 -0
tests/data/acpi/q35/DSDT.pvpanic-isa binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm12 binary +0 -0
tests/data/acpi/q35/DSDT.tis.tpm2 binary +0 -0
tests/data/acpi/q35/DSDT.viot binary +0 -0
tests/data/acpi/q35/DSDT.xapic binary +0 -0
Signature · 1 line
MST
[PULL 59/86] acpi: add get_dev_aml_func() helper
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
It will be used in followup commits to figure out if device has it's own, device specific AML block.
Message-Id: <[email protected]>
--- include/hw/acpi/acpi_aml_interface.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
include/hw/acpi/acpi_aml_interface.h +11 -2
@@ -29,11 +29,20 @@ struct AcpiDevAmlIfClass {dev_aml_fn build_dev_aml; }; -static inline void call_dev_aml_func (DeviceState *dev,Aml *scope) +static inline dev_aml_fn get_dev_aml_func (DeviceState *dev) {if (object_dynamic_cast (OBJECT (dev),TYPE_ACPI_DEV_AML_IF )) {AcpiDevAmlIfClass *klass =ACPI_DEV_AML_IF_GET_CLASS (dev); - klass->build_dev_aml (ACPI_DEV_AML_IF (dev), scope); +return klass->build_dev_aml; + } +return NULL ; +} + +static inline void call_dev_aml_func (DeviceState *dev,Aml *scope) +{ +dev_aml_fn fn =get_dev_aml_func (dev); +if (fn) { +fn (ACPI_DEV_AML_IF (dev), scope); } }
Signature · 1 line
MST
[PULL 40/86] virtio: core: vq reset feature negotation support
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
A a new command line parameter "queue_reset" is added.
Meanwhile, the vq reset feature is disabled for pre-7.2 machines.
Message-Id: <[email protected]>
--- include/hw/virtio/virtio.h | 4 +++- hw/core/machine.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
include/hw/virtio/virtio.h +3 -1
@@ -313,7 +313,9 @@ typedef struct VirtIORNGConf VirtIORNGConf;DEFINE_PROP_BIT64 ("iommu_platform" , _state, _field, \VIRTIO_F_IOMMU_PLATFORM , false), \DEFINE_PROP_BIT64 ("packed" , _state, _field, \ - VIRTIO_F_RING_PACKED, false) +VIRTIO_F_RING_PACKED , false), \ +DEFINE_PROP_BIT64 ("queue_reset" , _state, _field, \ + VIRTIO_F_RING_RESET, true)hwaddr virtio_queue_get_desc_addr (VirtIODevice *vdev,int n);bool virtio_queue_enabled_legacy (VirtIODevice *vdev,int n);
hw/core/machine.c +3 -1
@@ -40,7 +40,9 @@#include "hw/virtio/virtio-pci.h" #include "qom/object_interfaces.h" -GlobalProperty hw_compat_7_1[] = {}; +GlobalProperty hw_compat_7_1[] = { + {"virtio-device" ,"queue_reset" ,"false" }, +};const size_t hw_compat_7_1_len =G_N_ELEMENTS (hw_compat_7_1);GlobalProperty hw_compat_7_0[] = {
Signature · 1 line
MST
[PULL 49/86] virtio-net: support queue_enable
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Support queue_enable in vhost-kernel scenario. It can be called when a vq reset operation has been performed and the vq is restared.
It should be noted that we can restart the vq when the vhost has already started. When launching a new vhost device, the vhost is not started and all vqs are not initalized until VIRTIO_PCI_COMMON_STATUS is written. Thus, we should use vhost_started to differentiate the two cases: vq reset and device start.
Currently it only supports vhost-kernel.
Message-Id: <[email protected]>
--- hw/net/virtio-net.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
hw/net/virtio-net.c +21 -0
@@ -563,6 +563,26 @@ static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)flush_or_purge_queued_packets (nc); } +static void virtio_net_queue_enable (VirtIODevice *vdev,uint32_t queue_index) +{ +VirtIONet *n =VIRTIO_NET (vdev); +NetClientState *nc =qemu_get_subqueue (n->nic,vq2q (queue_index)); +int r; + +if (!nc->peer || !vdev->vhost_started) { +return ; + } + +if (get_vhost_net (nc->peer) && + nc->peer->info->type ==NET_CLIENT_DRIVER_TAP ) { + r =vhost_net_virtqueue_restart (vdev, nc, queue_index); +if (r <0 ) { +error_report ("unable to restart vhost net virtqueue: %d, " +"when resetting the queue" , queue_index); + } + } +} +static void virtio_net_reset (VirtIODevice *vdev) {VirtIONet *n =VIRTIO_NET (vdev);
@@ -3802,6 +3822,7 @@ static void virtio_net_class_init(ObjectClass *klass, void *data) vdc->bad_features = virtio_net_bad_features; vdc->reset = virtio_net_reset; vdc->queue_reset = virtio_net_queue_reset; + vdc->queue_enable = virtio_net_queue_enable; vdc->set_status = virtio_net_set_status; vdc->guest_notifier_mask = virtio_net_guest_notifier_mask; vdc->guest_notifier_pending = virtio_net_guest_notifier_pending;
Signature · 1 line
MST
[PULL 77/86] tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT:
In reply to Michael S. TsirkinFrom: Brice Goglin <[email protected]>
[000h 0000 4] Signature : "HMAT" [Heterogeneous Memory Attributes Table] [004h 0004 4] Table Length : 00000120 [008h 0008 1] Revision : 02 [009h 0009 1] Checksum : 4F [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] Reserved : 00000000
[028h 0040 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[02Ah 0042 2] Reserved : 0000
[02Ch 0044 4] Length : 00000028
[030h 0048 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[032h 0050 2] Reserved1 : 0000
[034h 0052 4] Attached Initiator Proximity Domain : 00000000
[038h 0056 4] Memory Proximity Domain : 00000000
[03Ch 0060 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000[050h 0080 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Attached Initiator Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000[078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Attached Initiator Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
[098h 0152 8] Reserved4 : 0000000000000000[0A0h 0160 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003[0E0h 0224 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001Raw Table Data: Length 288 (0x120)
0000: 48 4D 41 54 20 01 00 00 02 4F 42 4F 43 48 53 20 // HMAT ....OBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC ....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0050: 00 00 00 00 28 00 00 00 01 00 00 00 01 00 00 00 // ....(...........
0060: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
0070: 00 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 // ............(...
0080: 00 00 00 00 80 00 00 00 02 00 00 00 00 00 00 00 // ................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 // ................
00A0: 01 00 00 00 40 00 00 00 00 00 00 00 02 00 00 00 // ....@...........
00B0: 03 00 00 00 00 00 00 00 10 27 00 00 00 00 00 00 // .........'......
00C0: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
00D0: 02 00 00 00 01 00 02 00 03 00 02 00 01 00 03 00 // ................
00E0: 01 00 00 00 40 00 00 00 00 03 00 00 02 00 00 00 // ....@...........
00F0: 03 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 // ................
0100: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 // ................
0110: 02 00 00 00 0A 00 05 00 01 00 05 00 0A 00 01 00 // ................Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 4 ---- tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 0 -> 144 bytes tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 0 -> 8553 bytes tests/data/acpi/q35/HMAT.acpihmat-noinitiator | Bin 0 -> 288 bytes tests/data/acpi/q35/SRAT.acpihmat-noinitiator | Bin 0 -> 312 bytes 5 files changed, 4 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -4
@@ -1,5 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/q35/APIC.acpihmat-noinitiator" , -"tests/data/acpi/q35/DSDT.acpihmat-noinitiator" , -"tests/data/acpi/q35/HMAT.acpihmat-noinitiator" , -"tests/data/acpi/q35/SRAT.acpihmat-noinitiator",
tests/data/acpi/q35/APIC.acpihmat-noinitiator binary +0 -0
tests/data/acpi/q35/DSDT.acpihmat-noinitiator binary +0 -0
tests/data/acpi/q35/HMAT.acpihmat-noinitiator binary +0 -0
tests/data/acpi/q35/SRAT.acpihmat-noinitiator binary +0 -0
Signature · 1 line
MST
[PULL 84/86] intel-iommu: drop VTDBus
In reply to Michael S. TsirkinFrom: Jason Wang <[email protected]>
We introduce VTDBus structure as an intermediate step for searching the address space. This works well with SID based matching/lookup. But when we want to support SID plus PASID based address space lookup, this intermediate steps turns out to be a burden. So the patch simply drops the VTDBus structure and use the PCIBus and devfn as the key for the g_hash_table(). This simplifies the codes and the future PASID extension.
To prevent being slower for past vtd_find_as_from_bus_num() callers, a vtd_as cache indexed by the bus number is introduced to store the last recent search result of a vtd_as belongs to a specific bus.
Message-Id: <[email protected]>
--- include/hw/i386/intel_iommu.h | 11 +- hw/i386/intel_iommu.c | 234 +++++++++++++++++----------------- 2 files changed, 118 insertions(+), 127 deletions(-)
include/hw/i386/intel_iommu.h +2 -9
@@ -58,7 +58,6 @@ typedef struct VTDContextEntry VTDContextEntry;typedef struct VTDContextCacheEntry VTDContextCacheEntry ;typedef struct VTDAddressSpace VTDAddressSpace ;typedef struct VTDIOTLBEntry VTDIOTLBEntry ; -typedef struct VTDBus VTDBus ;typedef union VTD_IR_TableEntry VTD_IR_TableEntry ;typedef union VTD_IR_MSIAddress VTD_IR_MSIAddress ;typedef struct VTDPASIDDirEntry VTDPASIDDirEntry ;
@@ -111,12 +110,6 @@ struct VTDAddressSpace {IOVATree *iova_tree;/* Traces mapped IOVA ranges */ }; -struct VTDBus { -PCIBus * bus;/* A reference to the bus to provide translation for */ -/* A table of VTDAddressSpace objects indexed by devfn */ -VTDAddressSpace *dev_as[]; -}; -struct VTDIOTLBEntry {uint64_t gfn;uint16_t domain_id;
@@ -253,8 +246,8 @@ struct IntelIOMMUState {uint32_t context_cache_gen;/* Should be in [1,MAX] */ GHashTable *iotlb;/* IOTLB */ -GHashTable *vtd_as_by_busptr;/* VTDBus objects indexed by PCIBus* reference */ -VTDBus *vtd_as_by_bus_num[VTD_PCI_BUS_MAX ];/* VTDBus objects indexed by bus number */ +GHashTable *vtd_address_spaces;/* VTD address spaces */ +VTDAddressSpace *vtd_as_cache[VTD_PCI_BUS_MAX ];/* VTD address space cache */ /* list of registered notifiers */ QLIST_HEAD(, VTDAddressSpace) vtd_as_with_notifiers;
hw/i386/intel_iommu.c +116 -118
354 lines not on this page · raw message
Signature · 1 line
MST
[PULL 48/86] virtio-net: support queue reset
In reply to Michael S. TsirkinFrom: Xuan Zhuo <[email protected]>
virtio-net and vhost-kernel implement queue reset. Queued packets in the corresponding queue pair are flushed or purged.
For virtio-net, userspace datapath will be disabled later in __virtio_queue_reset(). It will set addr of vring to 0 and idx to 0. Thus, virtio_net_receive() and virtio_net_flush_tx() will not receive or send packets.
For vhost-net, the datapath will be disabled in vhost_net_virtqueue_reset().
Message-Id: <[email protected]>
--- hw/net/virtio-net.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
hw/net/virtio-net.c +18 -0
@@ -546,6 +546,23 @@ static RxFilterInfo *virtio_net_query_rxfilter(NetClientState *nc)return info; } +static void virtio_net_queue_reset (VirtIODevice *vdev,uint32_t queue_index) +{ +VirtIONet *n =VIRTIO_NET (vdev); +NetClientState *nc =qemu_get_subqueue (n->nic,vq2q (queue_index)); + +if (!nc->peer) { +return ; + } + +if (get_vhost_net (nc->peer) && + nc->peer->info->type ==NET_CLIENT_DRIVER_TAP ) { +vhost_net_virtqueue_reset (vdev, nc, queue_index); + } + +flush_or_purge_queued_packets (nc); +} +static void virtio_net_reset (VirtIODevice *vdev) {VirtIONet *n =VIRTIO_NET (vdev);
@@ -3784,6 +3801,7 @@ static void virtio_net_class_init(ObjectClass *klass, void *data) vdc->set_features = virtio_net_set_features; vdc->bad_features = virtio_net_bad_features; vdc->reset = virtio_net_reset; + vdc->queue_reset = virtio_net_queue_reset; vdc->set_status = virtio_net_set_status; vdc->guest_notifier_mask = virtio_net_guest_notifier_mask; vdc->guest_notifier_pending = virtio_net_guest_notifier_pending;
Signature · 1 line
MST
[PULL 42/86] virtio-pci: support queue enable
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
PCI devices support device specific vq enable.
Based on this function, the driver can re-enable the virtqueue after the virtqueue is reset.
Message-Id: <[email protected]>
--- hw/virtio/virtio-pci.c | 1 + 1 file changed, 1 insertion(+)
hw/virtio/virtio-pci.c +1 -0
@@ -1342,6 +1342,7 @@ static void virtio_pci_common_write(void *opaque, hwaddr addr, proxy->vqs[vdev->queue_sel].used[0]); proxy->vqs[vdev->queue_sel].enabled =1 ; proxy->vqs[vdev->queue_sel].reset =0 ; +virtio_queue_enable (vdev, vdev->queue_sel); }else {virtio_error (vdev,"wrong value for queue_enable %" PRIx64, val); }
Signature · 1 line
MST
[PULL 34/86] vhost-user: Support vhost_dev_start
In reply to Michael S. TsirkinFrom: Yajun Wu <[email protected]>
The motivation of adding vhost-user vhost_dev_start support is to improve backend configuration speed and reduce live migration VM downtime.
Today VQ configuration is issued one by one. For virtio net with multi-queue support, backend needs to update RSS (Receive side scaling) on every rx queue enable. Updating RSS is time-consuming (typical time like 7ms).
Implement already defined vhost status and message in the vhost specification [1].
(a) VHOST_USER_PROTOCOL_F_STATUS
(b) VHOST_USER_SET_STATUS
(c) VHOST_USER_GET_STATUS
Send message VHOST_USER_SET_STATUS with VIRTIO_CONFIG_S_DRIVER_OK for device start and reset(0) for device stop.
On reception of the DRIVER_OK message, backend can apply the needed setting only once (instead of incremental) and also utilize parallelism on enabling queues.
This improves QEMU's live migration downtime with vhost user backend implementation by great margin, specially for the large number of VQs of 64 from 800 msec to 250 msec.
[1] https://qemu-project.gitlab.io/qemu/interop/vhost-user.html
Message-Id: <[email protected]>
--- hw/virtio/vhost-user.c | 74 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-)
hw/virtio/vhost-user.c +73 -1
@@ -81,6 +81,7 @@ enum VhostUserProtocolFeature {VHOST_USER_PROTOCOL_F_RESET_DEVICE =13 ,/* Feature 14 reserved for VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS. */ VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS =15 , +VHOST_USER_PROTOCOL_F_STATUS =16 , VHOST_USER_PROTOCOL_F_MAX };
@@ -126,6 +127,8 @@ typedef enum VhostUserRequest {VHOST_USER_GET_MAX_MEM_SLOTS =36 ,VHOST_USER_ADD_MEM_REG =37 ,VHOST_USER_REM_MEM_REG =38 , +VHOST_USER_SET_STATUS =39 , +VHOST_USER_GET_STATUS =40 , VHOST_USER_MAX } VhostUserRequest;
@@ -1452,6 +1455,43 @@ static int vhost_user_set_u64(struct vhost_dev *dev, int request, uint64_t u64,return 0 ; } +static int vhost_user_set_status (struct vhost_dev *dev,uint8_t status) +{ +return vhost_user_set_u64 (dev,VHOST_USER_SET_STATUS , status, false); +} + +static int vhost_user_get_status (struct vhost_dev *dev,uint8_t *status) +{ +uint64_t value; +int ret; + + ret =vhost_user_get_u64 (dev,VHOST_USER_GET_STATUS , &value); +if (ret <0 ) { +return ret; + } + *status = value; + +return 0 ; +} + +static int vhost_user_add_status (struct vhost_dev *dev,uint8_t status) +{ +uint8_t s; +int ret; + + ret =vhost_user_get_status (dev, &s); +if (ret <0 ) { +return ret; + } + +if ((s & status) == status) { +return 0 ; + } + s |= status; + +return vhost_user_set_status (dev, s); +} +static int vhost_user_set_features (struct vhost_dev *dev,uint64_t features) {
@@ -1460,6 +1500,7 @@ static int vhost_user_set_features(struct vhost_dev *dev,* backend is actually logging changes */ bool log_enabled = features & (0x1ULL <<VHOST_F_LOG_ALL ); +int ret;/* * We need to include any extra backend only feature bits that
@@ -1467,9 +1508,18 @@ static int vhost_user_set_features(struct vhost_dev *dev,* VHOST_USER_F_PROTOCOL_FEATURES bit for enabling protocol * features. */ -return vhost_user_set_u64 (dev,VHOST_USER_SET_FEATURES , + ret =vhost_user_set_u64 (dev,VHOST_USER_SET_FEATURES , features | dev->backend_features, log_enabled); + +if (virtio_has_feature (dev->protocol_features, +VHOST_USER_PROTOCOL_F_STATUS )) { +if (!ret) { +return vhost_user_add_status (dev,VIRTIO_CONFIG_S_FEATURES_OK ); + } + } + +return ret; } static int vhost_user_set_protocol_features(struct vhost_dev *dev,
@@ -2615,6 +2665,27 @@ void vhost_user_cleanup(VhostUserState *user) user->chr =NULL ; } +static int vhost_user_dev_start (struct vhost_dev *dev,bool started) +{ +if (!virtio_has_feature (dev->protocol_features, +VHOST_USER_PROTOCOL_F_STATUS )) { +return 0 ; + } + +/* Set device status only for last queue pair */ +if (dev->vq_index + dev->nvqs != dev->vq_index_end) { +return 0 ; + } + +if (started) { +return vhost_user_add_status (dev,VIRTIO_CONFIG_S_ACKNOWLEDGE | +VIRTIO_CONFIG_S_DRIVER | +VIRTIO_CONFIG_S_DRIVER_OK ); + }else { +return vhost_user_set_status (dev,0 ); + } +} +const VhostOps user_ops = { .backend_type =VHOST_BACKEND_TYPE_USER , .vhost_backend_init = vhost_user_backend_init,
@@ -2649,4 +2720,5 @@ const VhostOps user_ops = { .vhost_backend_mem_section_filter = vhost_user_mem_section_filter, .vhost_get_inflight_fd = vhost_user_get_inflight_fd, .vhost_set_inflight_fd = vhost_user_set_inflight_fd, + .vhost_dev_start = vhost_user_dev_start, };
Signature · 1 line
MST
[PULL 72/86] hw/i386/acpi-build: Resolve redundant attribute
In reply to Michael S. TsirkinFrom: Bernhard Beschow <[email protected]>
The is_piix4 attribute is set once in one location and read once in another. Doing both in one location allows for removing the attribute altogether.
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- hw/i386/acpi-build.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
hw/i386/acpi-build.c +6 -14
@@ -112,7 +112,6 @@ typedef struct AcpiPmInfo { } AcpiPmInfo; typedef struct AcpiMiscInfo { - bool is_piix4; bool has_hpet; #ifdef CONFIG_TPM TPMVersion tpm_version;
@@ -281,17 +280,6 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)static void acpi_get_misc_info (AcpiMiscInfo *info) { -Object *piix =object_resolve_type_unambiguous (TYPE_PIIX4_PM ); -Object *lpc =object_resolve_type_unambiguous (TYPE_ICH9_LPC_DEVICE ); -assert (!!piix != !!lpc); - -if (piix) { - info->is_piix4 = true; - } -if (lpc) { - info->is_piix4 = false; - } - info->has_hpet =hpet_find ();#ifdef CONFIG_TPM info->tpm_version =tpm_get_version (tpm_find ());
@@ -1334,6 +1322,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, AcpiPmInfo *pm, AcpiMiscInfo *misc, Range *pci_hole, Range *pci_hole64, MachineState *machine) { +Object *piix =object_resolve_type_unambiguous (TYPE_PIIX4_PM ); +Object *lpc =object_resolve_type_unambiguous (TYPE_ICH9_LPC_DEVICE );CrsRangeEntry *entry;Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs;CrsRangeSet crs_range_set;
@@ -1354,11 +1344,13 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,AcpiTable table = { .sig ="DSDT" , .rev =1 , .oem_id = x86ms->oem_id, .oem_table_id = x86ms->oem_table_id }; +assert (!!piix != !!lpc); +acpi_table_begin (&table, table_data); dsdt =init_aml_allocator ();build_dbg_aml (dsdt); -if (misc->is_piix4) { +if (piix) { sb_scope =aml_scope ("_SB" ); dev =aml_device ("PCI0" );aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0A03" )));
@@ -1371,7 +1363,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }build_piix4_pci0_int (dsdt); - }else { + }else if (lpc) { sb_scope =aml_scope ("_SB" ); dev =aml_device ("PCI0" );aml_append (dev,aml_name_decl ("_HID" ,aml_eisaid ("PNP0A08" )));
Signature · 1 line
MST
[PULL 74/86] hmat acpi: Don't require initiator value in -numa
In reply to Michael S. TsirkinFrom: Brice Goglin <[email protected]>
The "Memory Proximity Domain Attributes" structure of the ACPI HMAT has a "Processor Proximity Domain Valid" flag that is currently always set because Qemu -numa requires an initiator=X value when hmat=on. Unsetting this flag allows to create more complex memory topologies by having multiple best initiators for a single memory target.
This patch allows -numa without initiator=X when hmat=on by keeping the default value MAX_NODES in numa_state->nodes[i].initiator. All places reading numa_state->nodes[i].initiator already check whether it's different from MAX_NODES before using it.
Tested with
qemu-system-x86_64 -accel kvm \
-machine pc,hmat=on \
-drive if=pflash,format=raw,file=./OVMF.fd \
-drive media=disk,format=qcow2,file=efi.qcow2 \
-smp 4 \
-m 3G \
-object memory-backend-ram,size=1G,id=ram0 \
-object memory-backend-ram,size=1G,id=ram1 \
-object memory-backend-ram,size=1G,id=ram2 \
-numa node,nodeid=0,memdev=ram0,cpus=0-1 \
-numa node,nodeid=1,memdev=ram1,cpus=2-3 \
-numa node,nodeid=2,memdev=ram2 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=0,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-latency,latency=20 \
-numa hmat-lb,initiator=1,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=5242880 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-latency,latency=10 \
-numa hmat-lb,initiator=1,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=10485760 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-latency,latency=30 \
-numa hmat-lb,initiator=1,target=2,hierarchy=memory,data-type=access-bandwidth,bandwidth=1048576
which reports NUMA node2 at same distance from both node0 and node1 as seen in lstopo:
Machine (2966MB total) + Package P#0
NUMANode P#2 (979MB)
Group0
NUMANode P#0 (980MB)
Core P#0 + PU P#0
Core P#1 + PU P#1
Group0
NUMANode P#1 (1007MB)
Core P#2 + PU P#2
Core P#3 + PU P#3Before this patch, we had to add ",initiator=X" to "-numa node,nodeid=2,memdev=ram2". The lstopo output difference between initiator=1 and no initiator is:
@@ -1,10 +1,10 @@
Machine (2966MB total) + Package P#0
+ NUMANode P#2 (979MB)
Group0
NUMANode P#0 (980MB)
Core P#0 + PU P#0
Core P#1 + PU P#1
Group0
NUMANode P#1 (1007MB)
- NUMANode P#2 (979MB)
Core P#2 + PU P#2
Core P#3 + PU P#3Corresponding changes in the HMAT MPDA structure:
@@ -49,10 +49,10 @@
[078h 0120 2] Structure Type : 0000 [Memory Proximity Domain Attributes] [07Ah 0122 2] Reserved : 0000 [07Ch 0124 4] Length : 00000028 -[080h 0128 2] Flags (decoded below) : 0001 - Processor Proximity Domain Valid : 1 +[080h 0128 2] Flags (decoded below) : 0000 + Processor Proximity Domain Valid : 0 [082h 0130 2] Reserved1 : 0000 -[084h 0132 4] Attached Initiator Proximity Domain : 00000001 +[084h 0132 4] Attached Initiator Proximity Domain : 00000080 [088h 0136 4] Memory Proximity Domain : 00000002 [08Ch 0140 4] Reserved2 : 00000000 [090h 0144 8] Reserved3 : 0000000000000000
Final HMAT SLLB structures:
[0A0h 0160 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003[0E0h 0224 2] Structure Type : 0001 [System Locality Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001Message-Id: <[email protected]>
--- hw/core/machine.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
hw/core/machine.c +1 -3
@@ -1180,9 +1180,7 @@ static void numa_validate_initiator(NumaState *numa_state)for (i =0 ; i < numa_state->num_nodes; i++) {if (numa_info[i].initiator ==MAX_NODES ) { -error_report ("The initiator of NUMA node %d is missing, use " -"'-numa node,initiator' option to declare it" , i); -exit (1 ); +continue ; }if (!numa_info[numa_info[i].initiator].present) {
Signature · 1 line
MST
[PULL 37/86] virtio: introduce __virtio_queue_reset()
In reply to Michael S. TsirkinFrom: Xuan Zhuo <[email protected]>
Separate the logic of vq reset. This logic will be called directly later.
Message-Id: <[email protected]>
--- hw/virtio/virtio.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
hw/virtio/virtio.c +21 -16
@@ -2464,6 +2464,26 @@ static enum virtio_device_endian virtio_current_cpu_endian(void) } } +static void __virtio_queue_reset (VirtIODevice *vdev,uint32_t i) +{ + vdev->vq[i].vring.desc =0 ; + vdev->vq[i].vring.avail =0 ; + vdev->vq[i].vring.used =0 ; + vdev->vq[i].last_avail_idx =0 ; + vdev->vq[i].shadow_avail_idx =0 ; + vdev->vq[i].used_idx =0 ; + vdev->vq[i].last_avail_wrap_counter = true; + vdev->vq[i].shadow_avail_wrap_counter = true; + vdev->vq[i].used_wrap_counter = true; +virtio_queue_set_vector (vdev, i,VIRTIO_NO_VECTOR ); + vdev->vq[i].signalled_used =0 ; + vdev->vq[i].signalled_used_valid = false; + vdev->vq[i].notification = true; + vdev->vq[i].vring.num = vdev->vq[i].vring.num_default; + vdev->vq[i].inuse =0 ; +virtio_virtqueue_reset_region_cache (&vdev->vq[i]); +} +void virtio_reset (void *opaque) {VirtIODevice *vdev = opaque;
@@ -2495,22 +2515,7 @@ void virtio_reset(void *opaque)virtio_notify_vector (vdev, vdev->config_vector);for (i =0 ; i <VIRTIO_QUEUE_MAX ; i++) { - vdev->vq[i].vring.desc =0 ; - vdev->vq[i].vring.avail =0 ; - vdev->vq[i].vring.used =0 ; - vdev->vq[i].last_avail_idx =0 ; - vdev->vq[i].shadow_avail_idx =0 ; - vdev->vq[i].used_idx =0 ; - vdev->vq[i].last_avail_wrap_counter = true; - vdev->vq[i].shadow_avail_wrap_counter = true; - vdev->vq[i].used_wrap_counter = true; -virtio_queue_set_vector (vdev, i,VIRTIO_NO_VECTOR ); - vdev->vq[i].signalled_used =0 ; - vdev->vq[i].signalled_used_valid = false; - vdev->vq[i].notification = true; - vdev->vq[i].vring.num = vdev->vq[i].vring.num_default; - vdev->vq[i].inuse =0 ; -virtio_virtqueue_reset_region_cache (&vdev->vq[i]); +__virtio_queue_reset (vdev, i); } }
Signature · 1 line
MST
[PULL 39/86] virtio: introduce virtio_queue_enable()
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Introduce the interface queue_enable() in VirtioDeviceClass and the fucntion virtio_queue_enable() in virtio, it can be called when VIRTIO_PCI_COMMON_Q_ENABLE is written and related virtqueue can be started. It only supports the devices of virtio 1 or later. The not-supported devices can only start the virtqueue when DRIVER_OK.
Message-Id: <[email protected]>
--- include/hw/virtio/virtio.h | 2 ++ hw/virtio/virtio.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
include/hw/virtio/virtio.h +2 -0
@@ -149,6 +149,7 @@ struct VirtioDeviceClass {void (*reset)(VirtIODevice *vdev);void (*set_status)(VirtIODevice *vdev,uint8_t val);void (*queue_reset)(VirtIODevice *vdev,uint32_t queue_index); +void (*queue_enable)(VirtIODevice *vdev,uint32_t queue_index);/* For transitional devices, this is a bitmap of features * that are only exposed on the legacy interface but not * the modern one.
@@ -288,6 +289,7 @@ int virtio_queue_set_host_notifier_mr(VirtIODevice *vdev, int n,int virtio_set_status (VirtIODevice *vdev,uint8_t val);void virtio_reset (void *opaque);void virtio_queue_reset (VirtIODevice *vdev,uint32_t queue_index); +void virtio_queue_enable (VirtIODevice *vdev,uint32_t queue_index);void virtio_update_irq (VirtIODevice *vdev);int virtio_set_features (VirtIODevice *vdev,uint64_t val);
hw/virtio/virtio.c +14 -0
@@ -2495,6 +2495,20 @@ void virtio_queue_reset(VirtIODevice *vdev, uint32_t queue_index)__virtio_queue_reset (vdev, queue_index); } +void virtio_queue_enable (VirtIODevice *vdev,uint32_t queue_index) +{ +VirtioDeviceClass *k =VIRTIO_DEVICE_GET_CLASS (vdev); + +if (!virtio_vdev_has_feature (vdev,VIRTIO_F_VERSION_1 )) { +error_report ("queue_enable is only suppported in devices of virtio " +"1.0 or later." ); + } + +if (k->queue_enable) { + k->queue_enable (vdev, queue_index); + } +} +void virtio_reset (void *opaque) {VirtIODevice *vdev = opaque;
Signature · 1 line
MST
[PULL 63/86] acpi: pc/35: sanitize _GPE declaration order
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
Move _GPE block declaration before it gets referenced by other hotplug handlers. While at it move PCI hotplug (_E01) handler after PCI tree description to avoid forward reference to to not yet declared methods/devices.
PS:
Forward 'usage' usualy is fine as long as it's hidden within method, however 'iasl' may print warnings. So be nice to iasl/guest OS and do things in proper order.
PS2: Also follow up patches will move some of hotplug code from PCI tree to _E01 and that also requires PCI Device nodes build first, before Scope can reuse that from global context.
Message-Id: <[email protected]>
--- hw/i386/acpi-build.c | 47 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-)
hw/i386/acpi-build.c +25 -22
@@ -1434,6 +1434,18 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dsdt, sb_scope); } + scope =aml_scope ("_GPE" ); + { +aml_append (scope,aml_name_decl ("_HID" ,aml_string ("ACPI0006" ))); +if (machine->nvdimms_state->is_enabled) { + method =aml_method ("_E04" ,0 ,AML_NOTSERIALIZED ); +aml_append (method,aml_notify (aml_name ("\\_SB.NVDR" ), +aml_int (0x80 ))); +aml_append (scope, method); + } + } +aml_append (dsdt, scope); +if (pcmc->legacy_cpu_hotplug) {build_legacy_cpu_hotplug_aml (dsdt, machine, pm->cpu_hp_io_base); }else {
@@ -1452,28 +1464,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, pcms->memhp_io_base); } - scope =aml_scope ("_GPE" ); - { -aml_append (scope,aml_name_decl ("_HID" ,aml_string ("ACPI0006" ))); - -if (pm->pcihp_bridge_en || pm->pcihp_root_en) { - method =aml_method ("_E01" ,0 ,AML_NOTSERIALIZED ); -aml_append (method, -aml_acquire (aml_name ("\\_SB.PCI0.BLCK" ),0xFFFF )); -aml_append (method,aml_call0 ("\\_SB.PCI0.PCNT" )); -aml_append (method,aml_release (aml_name ("\\_SB.PCI0.BLCK" ))); -aml_append (scope, method); - } - -if (machine->nvdimms_state->is_enabled) { - method =aml_method ("_E04" ,0 ,AML_NOTSERIALIZED ); -aml_append (method,aml_notify (aml_name ("\\_SB.NVDR" ), -aml_int (0x80 ))); -aml_append (scope, method); - } - } -aml_append (dsdt, scope); -crs_range_set_init (&crs_range_set); bus =PC_MACHINE (machine)->bus;if (bus) {
@@ -1752,6 +1742,19 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, }aml_append (dsdt, sb_scope); +if (pm->pcihp_bridge_en || pm->pcihp_root_en) { + scope =aml_scope ("_GPE" ); + { + method =aml_method ("_E01" ,0 ,AML_NOTSERIALIZED ); +aml_append (method, +aml_acquire (aml_name ("\\_SB.PCI0.BLCK" ),0xFFFF )); +aml_append (method,aml_call0 ("\\_SB.PCI0.PCNT" )); +aml_append (method,aml_release (aml_name ("\\_SB.PCI0.BLCK" ))); +aml_append (scope, method); + } +aml_append (dsdt, scope); + } +/* copy AML table into ACPI tables blob and patch header there */ g_array_append_vals (table_data, dsdt->buf->data, dsdt->buf->len);acpi_table_end (linker, &table);
Signature · 1 line
MST
[PULL 60/86] acpi: enumerate SMB bridge automatically along with other PCI devices
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
to make that happen (bridge sits at _ADR: 0x001F0003), relax PCI enumeration logic to include devices with *function* > 0 if device has something to say about itself (i.e. has build_dev_aml callback set).
Message-Id: <[email protected]>
--- hw/i386/acpi-build.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-)
hw/i386/acpi-build.c +3 -24
@@ -448,9 +448,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,/* * allow describing coldplugged bridges in ACPI even if they are not * on function 0, as they are not unpluggable, for all other devices -* generate description only for function 0 per slot +* generate description only for function 0 per slot, and for other +* functions if device on function provides its own AML */ -if (func && !bridge_in_acpi) { +if (func && !bridge_in_acpi && !get_dev_aml_func (DEVICE (pdev))) {continue ; } }else {
@@ -1319,25 +1320,6 @@ static Aml *build_q35_osc_method(bool enable_native_pcie_hotplug)return method; } -static void build_smb0 (Aml *table,int devnr,int func) -{ -Aml *scope =aml_scope ("_SB.PCI0" ); -Aml *dev =aml_device ("SMB0" ); -bool ambiguous; -Object *obj; -/* -* temporarily fish out device hosting SMBUS, build_smb0 will be gone once -* PCI enumeration will be switched to call_dev_aml_func() -*/ - obj =object_resolve_path_type ("" ,TYPE_ICH9_SMB_DEVICE , &ambiguous); -assert (obj && !ambiguous); - -aml_append (dev,aml_name_decl ("_ADR" ,aml_int (devnr <<16 | func))); -call_dev_aml_func (DEVICE (obj), dev); -aml_append (scope, dev); -aml_append (table, scope); -} -static void build_acpi0017 (Aml *table) {Aml *dev, *scope, *method;
@@ -1440,9 +1422,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }build_q35_pci0_int (dsdt); -if (pcms->smbus) { -build_smb0 (dsdt,ICH9_SMB_DEV ,ICH9_SMB_FUNC ); - } }if (misc->has_hpet) {
Signature · 1 line
MST
[PULL 66/86] MAINTAINERS: Add qapi/virtio.json to section "virtio"
In reply to Michael S. TsirkinFrom: Markus Armbruster <[email protected]>
Message-Id: <[email protected]>
--- MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -2014,6 +2014,7 @@ S: Supported F: hw/*/virtio* F: hw/virtio/Makefile.objs F: hw/virtio/trace-events +F: qapi/virtio.json F: net/vhost-user.c F: include/hw/virtio/
Signature · 1 line
MST
[PULL 29/86] hw/cxl/cdat: CXL CDAT Data Object Exchange implementation
In reply to Michael S. TsirkinFrom: Huai-Cheng Kuo <[email protected]>
The Data Object Exchange implementation of CXL Coherent Device Attribute Table (CDAT). This implementation is referring to "Coherent Device Attribute Table Specification, Rev. 1.03, July. 2022" and "Compute Express Link Specification, Rev. 3.0, July. 2022"
This patch adds core support that will be shared by both end-points and switch port emulation.
Message-Id: <[email protected]>
--- include/hw/cxl/cxl_cdat.h | 165 ++++++++++++++++++++++++ include/hw/cxl/cxl_component.h | 7 ++ include/hw/cxl/cxl_device.h | 3 + include/hw/cxl/cxl_pci.h | 1 + hw/cxl/cxl-cdat.c | 224 +++++++++++++++++++++++++++++++++ hw/cxl/meson.build | 1 + 6 files changed, 401 insertions(+) create mode 100644 include/hw/cxl/cxl_cdat.h create mode 100644 hw/cxl/cxl-cdat.c
include/hw/cxl/cxl_cdat.h new file +165 -0
@@ -0,0 +1,165 @@ +/* +* CXL CDAT Structure +* +* Copyright (C) 2021 Avery Design Systems, Inc. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifndef CXL_CDAT_H +#define CXL_CDAT_H + +#include "hw/cxl/cxl_pci.h" + +/* +* Reference: +* Coherent Device Attribute Table (CDAT) Specification, Rev. 1.03, July. 2022 +* Compute Express Link (CXL) Specification, Rev. 3.0, Aug. 2022 +*/ +/* Table Access DOE - CXL r3.0 8.1.11 */ +#define CXL_DOE_TABLE_ACCESS 2 +#define CXL_DOE_PROTOCOL_CDAT ((CXL_DOE_TABLE_ACCESS << 16) | CXL_VENDOR_ID) + +/* Read Entry - CXL r3.0 8.1.11.1 */ +#define CXL_DOE_TAB_TYPE_CDAT 0 +#define CXL_DOE_TAB_ENT_MAX 0xFFFF + +/* Read Entry Request - CXL r3.0 8.1.11.1 Table 8-13 */ +#define CXL_DOE_TAB_REQ 0 +typedef struct CDATReq { +DOEHeader header; +uint8_t req_code; +uint8_t table_type; +uint16_t entry_handle; +} QEMU_PACKED CDATReq; + +/* Read Entry Response - CXL r3.0 8.1.11.1 Table 8-14 */ +#define CXL_DOE_TAB_RSP 0 +typedef struct CDATRsp { +DOEHeader header; +uint8_t rsp_code; +uint8_t table_type; +uint16_t entry_handle; +} QEMU_PACKED CDATRsp; + +/* CDAT Table Format - CDAT Table 1 */ +#define CXL_CDAT_REV 2 +typedef struct CDATTableHeader { +uint32_t length; +uint8_t revision; +uint8_t checksum; +uint8_t reserved[6 ]; +uint32_t sequence; +} QEMU_PACKED CDATTableHeader; + +/* CDAT Structure Types - CDAT Table 2 */ +typedef enum { +CDAT_TYPE_DSMAS =0 , +CDAT_TYPE_DSLBIS =1 , +CDAT_TYPE_DSMSCIS =2 , +CDAT_TYPE_DSIS =3 , +CDAT_TYPE_DSEMTS =4 , +CDAT_TYPE_SSLBIS =5 , +}CDATType ; + +typedef struct CDATSubHeader { +uint8_t type; +uint8_t reserved; +uint16_t length; +}CDATSubHeader ; + +/* Device Scoped Memory Affinity Structure - CDAT Table 3 */ +typedef struct CDATDsmas { +CDATSubHeader header; +uint8_t DSMADhandle; +uint8_t flags; +#define CDAT_DSMAS_FLAG_NV (1 << 2) +#define CDAT_DSMAS_FLAG_SHAREABLE (1 << 3) +#define CDAT_DSMAS_FLAG_HW_COHERENT (1 << 4) +#define CDAT_DSMAS_FLAG_DYNAMIC_CAP (1 << 5) +uint16_t reserved; +uint64_t DPA_base; +uint64_t DPA_length; +} QEMU_PACKED CDATDsmas; + +/* Device Scoped Latency and Bandwidth Information Structure - CDAT Table 5 */ +typedef struct CDATDslbis { +CDATSubHeader header; +uint8_t handle; +/* Definitions of these fields refer directly to HMAT fields */ +uint8_t flags; +uint8_t data_type; +uint8_t reserved; +uint64_t entry_base_unit; +uint16_t entry[3 ]; +uint16_t reserved2; +} QEMU_PACKED CDATDslbis; + +/* Device Scoped Memory Side Cache Information Structure - CDAT Table 6 */ +typedef struct CDATDsmscis { +CDATSubHeader header; +uint8_t DSMAS_handle; +uint8_t reserved[3 ]; +uint64_t memory_side_cache_size; +uint32_t cache_attributes; +} QEMU_PACKED CDATDsmscis; + +/* Device Scoped Initiator Structure - CDAT Table 7 */ +typedef struct CDATDsis { +CDATSubHeader header; +uint8_t flags; +uint8_t handle; +uint16_t reserved; +} QEMU_PACKED CDATDsis; + +/* Device Scoped EFI Memory Type Structure - CDAT Table 8 */ +typedef struct CDATDsemts { +CDATSubHeader header; +uint8_t DSMAS_handle; +uint8_t EFI_memory_type_attr; +uint16_t reserved; +uint64_t DPA_offset; +uint64_t DPA_length; +} QEMU_PACKED CDATDsemts; + +/* Switch Scoped Latency and Bandwidth Information Structure - CDAT Table 9 */ +typedef struct CDATSslbisHeader { +CDATSubHeader header; +uint8_t data_type; +uint8_t reserved[3 ]; +uint64_t entry_base_unit; +} QEMU_PACKED CDATSslbisHeader; + +/* Switch Scoped Latency and Bandwidth Entry - CDAT Table 10 */ +typedef struct CDATSslbe { +uint16_t port_x_id; +uint16_t port_y_id; +uint16_t latency_bandwidth; +uint16_t reserved; +} QEMU_PACKED CDATSslbe; + +typedef struct CDATSslbis { +CDATSslbisHeader sslbis_header; +CDATSslbe sslbe[]; +} QEMU_PACKED CDATSslbis; + +typedef struct CDATEntry { +void *base; +uint32_t length; +}CDATEntry ; + +typedef struct CDATObject { +CDATEntry *entry; +int entry_len; + +int (*build_cdat_table)(CDATSubHeader ***cdat_table,void *priv); +void (*free_cdat_table)(CDATSubHeader **cdat_table,int num,void *priv); +bool to_update; +void *private; +char *filename; +uint8_t *buf; +struct CDATSubHeader **built_buf; +int built_buf_len; +}CDATObject ; +#endif /* CXL_CDAT_H */
include/hw/cxl/cxl_component.h +7 -0
@@ -19,6 +19,7 @@#include "qemu/range.h" #include "qemu/typedefs.h" #include "hw/register.h" +#include "qapi/error.h" enum reg_type {CXL2_DEVICE ,
@@ -184,6 +185,8 @@ typedef struct cxl_component {struct PCIDevice *pdev; }; }; + +CDATObject cdat; } CXLComponentState; void cxl_component_register_block_init(Object *obj,
@@ -220,4 +223,8 @@ static inline hwaddr cxl_decode_ig(int ig)CXLComponentState *cxl_get_hb_cstate (PCIHostState *hb); +void cxl_doe_cdat_init (CXLComponentState *cxl_cstate,Error **errp); +void cxl_doe_cdat_release (CXLComponentState *cxl_cstate); +void cxl_doe_cdat_update (CXLComponentState *cxl_cstate,Error **errp); +#endif
include/hw/cxl/cxl_device.h +3 -0
@@ -243,6 +243,9 @@ struct CXLType3Dev {AddressSpace hostmem_as;CXLComponentState cxl_cstate;CXLDeviceState cxl_dstate; + +/* DOE */ +DOECap doe_cdat; };#define TYPE_CXL_TYPE3 "cxl-type3"
include/hw/cxl/cxl_pci.h +1 -0
@@ -13,6 +13,7 @@#include "qemu/compiler.h" #include "hw/pci/pci.h" #include "hw/pci/pcie.h" +#include "hw/cxl/cxl_cdat.h" #define CXL_VENDOR_ID 0x1e98
hw/cxl/cxl-cdat.c new file +224 -0
224 lines not on this page · raw message
hw/cxl/meson.build +1 -0
@@ -4,6 +4,7 @@ softmmu_ss.add(when: 'CONFIG_CXL', 'cxl-device-utils.c', 'cxl-mailbox-utils.c', 'cxl-host.c', + 'cxl-cdat.c', ), if_false: files( 'cxl-host-stubs.c',
Signature · 1 line
MST
[PULL 56/86] acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML
In reply to Michael S. TsirkinFrom: Igor Mammedov <[email protected]>
PCI-ISA bridges that are built in PIIX/Q35 are building its own AML using AcpiDevAmlIf interface. Now build_append_pci_bus_devices() gained AcpiDevAmlIf interface support to get AML of devices atached to PCI slots.
So drop ad-hoc build_q35_isa_bridge()/build_piix4_isa_bridge() and let PCI bus enumeration to include PCI-ISA bridge AML when it's enumerated by build_append_pci_bus_devices().
AML change is mostly contextual, which moves whole ISA hierarchy directly under PCI host bridge instead of it being described as separate \SB.PCI0.ISA block.
Note:
If bus/slot that hosts ISA bridge has BSEL set, it will gain new ASUN and _DMS entries (i.e. acpi-index support, but it should not cause any functional change and that is fine from PCI Firmware spec point of view), potentially it's possible to suppress that by adding a flag to PCIDevice but I don't see a reason to do that yet, I'd rather treat bridge just as any other PCI device if it's possible.
Message-Id: <[email protected]>
--- hw/i386/acpi-build.c | 75 -------------------------------------------- hw/isa/lpc_ich9.c | 23 ++++++++++++++ hw/isa/piix3.c | 17 +++++++++- 3 files changed, 39 insertions(+), 76 deletions(-)
hw/i386/acpi-build.c +0 -75
@@ -435,10 +435,6 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, pc =PCI_DEVICE_GET_CLASS (pdev); dc =DEVICE_GET_CLASS (pdev); -if (pc->class_id ==PCI_CLASS_BRIDGE_ISA ) { -continue ; - } -/* * Cold plugged bridges aren't themselves hot-pluggable. * Hotplugged bridges *are* hot-pluggable.
@@ -1006,7 +1002,6 @@ static void build_piix4_pci0_int(Aml *table) {Aml *dev;Aml *crs; -Aml *field;Aml *method;uint32_t irqs;Aml *sb_scope =aml_scope ("_SB" );
@@ -1015,13 +1010,6 @@ static void build_piix4_pci0_int(Aml *table)aml_append (pci0_scope,build_prt (true));aml_append (sb_scope, pci0_scope); - field =aml_field ("PCI0.ISA.P40C" ,AML_BYTE_ACC ,AML_NOLOCK ,AML_PRESERVE ); -aml_append (field,aml_named_field ("PRQ0" ,8 )); -aml_append (field,aml_named_field ("PRQ1" ,8 )); -aml_append (field,aml_named_field ("PRQ2" ,8 )); -aml_append (field,aml_named_field ("PRQ3" ,8 )); -aml_append (sb_scope, field); -aml_append (sb_scope,build_irq_status_method ());aml_append (sb_scope,build_iqcr_method (true));
@@ -1125,7 +1113,6 @@ static Aml *build_q35_routing_table(const char *str)static void build_q35_pci0_int (Aml *table) { -Aml *field;Aml *method;Aml *sb_scope =aml_scope ("_SB" );Aml *pci0_scope =aml_scope ("PCI0" );
@@ -1162,18 +1149,6 @@ static void build_q35_pci0_int(Aml *table)aml_append (pci0_scope, method);aml_append (sb_scope, pci0_scope); - field =aml_field ("PCI0.ISA.PIRQ" ,AML_BYTE_ACC ,AML_NOLOCK ,AML_PRESERVE ); -aml_append (field,aml_named_field ("PRQA" ,8 )); -aml_append (field,aml_named_field ("PRQB" ,8 )); -aml_append (field,aml_named_field ("PRQC" ,8 )); -aml_append (field,aml_named_field ("PRQD" ,8 )); -aml_append (field,aml_reserved_field (0x20 )); -aml_append (field,aml_named_field ("PRQE" ,8 )); -aml_append (field,aml_named_field ("PRQF" ,8 )); -aml_append (field,aml_named_field ("PRQG" ,8 )); -aml_append (field,aml_named_field ("PRQH" ,8 )); -aml_append (sb_scope, field); -aml_append (sb_scope,build_irq_status_method ());aml_append (sb_scope,build_iqcr_method (false));
@@ -1238,54 +1213,6 @@ static Aml *build_q35_dram_controller(const AcpiMcfgInfo *mcfg)return dev; } -static void build_q35_isa_bridge (Aml *table) -{ -Aml *dev; -Aml *scope; -Object *obj; -bool ambiguous; - -/* -* temporarily fish out isa bridge, build_q35_isa_bridge() will be dropped -* once PCI is converted to AcpiDevAmlIf and would be ble to generate -* AML for bridge itself -*/ - obj =object_resolve_path_type ("" ,TYPE_ICH9_LPC_DEVICE , &ambiguous); -assert (obj && !ambiguous); - - scope =aml_scope ("_SB.PCI0" ); - dev =aml_device ("ISA" ); -aml_append (dev,aml_name_decl ("_ADR" ,aml_int (0x001F0000 ))); - -call_dev_aml_func (DEVICE (obj), dev); -aml_append (scope, dev); -aml_append (table, scope); -} - -static void build_piix4_isa_bridge (Aml *table) -{ -Aml *dev; -Aml *scope; -Object *obj; -bool ambiguous; - -/* -* temporarily fish out isa bridge, build_piix4_isa_bridge() will be dropped -* once PCI is converted to AcpiDevAmlIf and would be ble to generate -* AML for bridge itself -*/ - obj =object_resolve_path_type ("" ,TYPE_PIIX3_PCI_DEVICE , &ambiguous); -assert (obj && !ambiguous); - - scope =aml_scope ("_SB.PCI0" ); - dev =aml_device ("ISA" ); -aml_append (dev,aml_name_decl ("_ADR" ,aml_int (0x00010000 ))); - -call_dev_aml_func (DEVICE (obj), dev); -aml_append (scope, dev); -aml_append (table, scope); -} -static void build_x86_acpi_pci_hotplug (Aml *table,uint64_t pcihp_addr) {Aml *scope;
@@ -1465,7 +1392,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (sb_scope, dev);aml_append (dsdt, sb_scope); -build_piix4_isa_bridge (dsdt);if (pm->pcihp_bridge_en || pm->pcihp_root_en) {build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }
@@ -1510,7 +1436,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,aml_append (dsdt, sb_scope); -build_q35_isa_bridge (dsdt);if (pm->pcihp_bridge_en) {build_x86_acpi_pci_hotplug (dsdt, pm->pcihp_io_base); }
hw/isa/lpc_ich9.c +23 -0
@@ -806,6 +806,7 @@ static void ich9_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)static void build_ich9_isa_aml (AcpiDevAmlIf *adev,Aml *scope) { +Aml *field;BusChild *kid;ICH9LPCState *s =ICH9_LPC_DEVICE (adev);BusState *bus =BUS (s->isa_bus);
@@ -813,6 +814,28 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope)/* ICH9 PCI to ISA irq remapping */ aml_append (scope,aml_operation_region ("PIRQ" ,AML_PCI_CONFIG ,aml_int (0x60 ),0x0C )); +/* Fields declarion has to happen *after* operation region */ + field =aml_field ("PIRQ" ,AML_BYTE_ACC ,AML_NOLOCK ,AML_PRESERVE ); +aml_append (field,aml_named_field ("PRQA" ,8 )); +aml_append (field,aml_named_field ("PRQB" ,8 )); +aml_append (field,aml_named_field ("PRQC" ,8 )); +aml_append (field,aml_named_field ("PRQD" ,8 )); +aml_append (field,aml_reserved_field (0x20 )); +aml_append (field,aml_named_field ("PRQE" ,8 )); +aml_append (field,aml_named_field ("PRQF" ,8 )); +aml_append (field,aml_named_field ("PRQG" ,8 )); +aml_append (field,aml_named_field ("PRQH" ,8 )); +aml_append (scope, field); + +/* hack: put fields into _SB scope for LNKx to find them */ +aml_append (scope,aml_alias ("PRQA" ,"\\_SB.PRQA" )); +aml_append (scope,aml_alias ("PRQB" ,"\\_SB.PRQB" )); +aml_append (scope,aml_alias ("PRQC" ,"\\_SB.PRQC" )); +aml_append (scope,aml_alias ("PRQD" ,"\\_SB.PRQD" )); +aml_append (scope,aml_alias ("PRQE" ,"\\_SB.PRQE" )); +aml_append (scope,aml_alias ("PRQF" ,"\\_SB.PRQF" )); +aml_append (scope,aml_alias ("PRQG" ,"\\_SB.PRQG" )); +aml_append (scope,aml_alias ("PRQH" ,"\\_SB.PRQH" )); QTAILQ_FOREACH(kid, &bus->children, sibling) {call_dev_aml_func (DEVICE (kid->child), scope);
hw/isa/piix3.c +16 -1
@@ -311,12 +311,27 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)static void build_pci_isa_aml (AcpiDevAmlIf *adev,Aml *scope) { +Aml *field;BusChild *kid;BusState *bus =qdev_get_child_bus (DEVICE (adev),"isa.0" );/* PIIX PCI to ISA irq remapping */ aml_append (scope,aml_operation_region ("P40C" ,AML_PCI_CONFIG , -aml_int (0x60 ),0x04 )); +aml_int (0x60 ),0x04 )); +/* Fields declarion has to happen *after* operation region */ + field =aml_field ("P40C" ,AML_BYTE_ACC ,AML_NOLOCK ,AML_PRESERVE ); +aml_append (field,aml_named_field ("PRQ0" ,8 )); +aml_append (field,aml_named_field ("PRQ1" ,8 )); +aml_append (field,aml_named_field ("PRQ2" ,8 )); +aml_append (field,aml_named_field ("PRQ3" ,8 )); +aml_append (scope, field); + +/* hack: put fields into _SB scope for LNKx to find them */ +aml_append (scope,aml_alias ("PRQ0" ,"\\_SB.PRQ0" )); +aml_append (scope,aml_alias ("PRQ1" ,"\\_SB.PRQ1" )); +aml_append (scope,aml_alias ("PRQ2" ,"\\_SB.PRQ2" )); +aml_append (scope,aml_alias ("PRQ3" ,"\\_SB.PRQ3" )); + QTAILQ_FOREACH(kid, &bus->children, sibling) {call_dev_aml_func (DEVICE (kid->child), scope); }
Signature · 1 line
MST
[PULL 52/86] virtio-rng-pci: Allow setting nvectors, so we can use MSI-X
In reply to Michael S. TsirkinFrom: David Daney <[email protected]>
Most other virtio-pci devices allow MSI-X, let's have it for rng too.
Message-Id: <[email protected]>
--- hw/virtio/virtio-rng-pci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
hw/virtio/virtio-rng-pci.c +14 -0
@@ -13,6 +13,7 @@#include "hw/virtio/virtio-pci.h" #include "hw/virtio/virtio-rng.h" +#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qemu/module.h" #include "qom/object.h"
@@ -31,11 +32,23 @@ struct VirtIORngPCI {VirtIORNG vdev; }; +static Property virtio_rng_properties[] = { +DEFINE_PROP_BIT ("ioeventfd" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT , true), +DEFINE_PROP_UINT32 ("vectors" , VirtIOPCIProxy, nvectors, +DEV_NVECTORS_UNSPECIFIED ), +DEFINE_PROP_END_OF_LIST (), +}; +static void virtio_rng_pci_realize (VirtIOPCIProxy *vpci_dev,Error **errp) {VirtIORngPCI *vrng =VIRTIO_RNG_PCI (vpci_dev);DeviceState *vdev =DEVICE (&vrng->vdev); +if (vpci_dev->nvectors ==DEV_NVECTORS_UNSPECIFIED ) { + vpci_dev->nvectors =2 ; + } +if (!qdev_realize (vdev,BUS (&vpci_dev->bus), errp)) {return ; }
@@ -54,6 +67,7 @@ static void virtio_rng_pci_class_init(ObjectClass *klass, void *data) pcidev_k->device_id =PCI_DEVICE_ID_VIRTIO_RNG ; pcidev_k->revision =VIRTIO_PCI_ABI_VERSION ; pcidev_k->class_id =PCI_CLASS_OTHERS ; +device_class_set_props (dc, virtio_rng_properties); }static void virtio_rng_initfn (Object *obj)
Signature · 1 line
MST
[PULL 47/86] virtio-net: introduce flush_or_purge_queued_packets()
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Introduce the fucntion flush_or_purge_queued_packets(), it will be used in device reset and virtqueue reset. Therefore, we extract the common logic as a new function.
Message-Id: <[email protected]>
--- hw/net/virtio-net.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
hw/net/virtio-net.c +11 -6
@@ -124,6 +124,16 @@ static int vq2q(int queue_index)return queue_index /2 ; } +static void flush_or_purge_queued_packets (NetClientState *nc) +{ +if (!nc->peer) { +return ; + } + +qemu_flush_or_purge_queued_packets (nc->peer, true); +assert (!virtio_net_get_subqueue (nc)->async_tx.elem); +} +/* TODO * - we could suppress RX interrupt if we were so inclined. */
@@ -566,12 +576,7 @@ static void virtio_net_reset(VirtIODevice *vdev)/* Flush any async TX */ for (i =0 ; i < n->max_queue_pairs; i++) { -NetClientState *nc =qemu_get_subqueue (n->nic, i); - -if (nc->peer) { -qemu_flush_or_purge_queued_packets (nc->peer, true); -assert (!virtio_net_get_subqueue (nc)->async_tx.elem); - } +flush_or_purge_queued_packets (qemu_get_subqueue (n->nic, i)); } }
Signature · 1 line
MST
[PULL 44/86] vhost: expose vhost_virtqueue_stop()
In reply to Michael S. TsirkinFrom: Kangjie Xu <[email protected]>
Expose vhost_virtqueue_stop(), we need to use it when resetting a virtqueue.
Message-Id: <[email protected]>
--- include/hw/virtio/vhost.h | 2 ++ hw/virtio/vhost.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-)
include/hw/virtio/vhost.h +2 -0
@@ -299,6 +299,8 @@ int vhost_device_iotlb_miss(struct vhost_dev *dev, uint64_t iova, int write);int vhost_virtqueue_start (struct vhost_dev *dev,struct VirtIODevice *vdev,struct vhost_virtqueue *vq,unsigned idx); +void vhost_virtqueue_stop (struct vhost_dev *dev,struct VirtIODevice *vdev, +struct vhost_virtqueue *vq,unsigned idx);void vhost_dev_reset_inflight (struct vhost_inflight *inflight);void vhost_dev_free_inflight (struct vhost_inflight *inflight);
hw/virtio/vhost.c +4 -4
@@ -1201,10 +1201,10 @@ fail_alloc_desc:return r; } -static void vhost_virtqueue_stop (struct vhost_dev *dev, -struct VirtIODevice *vdev, -struct vhost_virtqueue *vq, -unsigned idx) +void vhost_virtqueue_stop (struct vhost_dev *dev, +struct VirtIODevice *vdev, +struct vhost_virtqueue *vq, +unsigned idx) {int vhost_vq_index = dev->vhost_ops->vhost_get_vq_index (dev, idx);struct vhost_vring_state state = {
Signature · 1 line
MST
[PULL 68/86] hw/ide/piix: Ignore writes of hardwired PCI command register bits
In reply to Michael S. TsirkinFrom: Lev Kujawski <[email protected]>
One method to enable PCI bus mastering for IDE controllers, often used by x86 firmware, is to write 0x7 to the PCI command register. Neither the PIIX 3/4 specifications nor actual PIIX 3 hardware (a Tyan S1686D system) permit setting the Memory Space Enable (MSE) bit, thus the command register would be left in an unspecified state without this patch.
* hw/core/machine.c
Facilitate migration by not masking writes to the PIIX 3/4 PCICMD register for machine states of QEMU versions prior to 7.2.
* hw/ide/piix.c
a) Add a reference to the PIIX 4 data sheet.
b) Mask the MSE bit using the QEMU PCI device wmask field.
c) Define a new boolean property, x-filter-pcicmd, to control whether the write mask is enabled and enable it by default for both the PIIX 3 and PIIX 4 IDE controllers.
* include/hw/ide/pci.h
Add the boolean filter_pcicmd field to the PCIIDEState structure, because the PIIX IDE controllers do not define their own state.
* tests/qtest/ide-test.c
Use the command_disabled field of the QPCIDevice testing model to indicate that PCI_COMMAND_MEMORY is hardwired within PIIX 3/4 IDE controllers.
Message-Id: <[email protected]>
--- include/hw/ide/pci.h | 1 + hw/core/machine.c | 2 ++ hw/ide/piix.c | 24 ++++++++++++++++++++++++ tests/qtest/ide-test.c | 1 + 4 files changed, 28 insertions(+)
include/hw/ide/pci.h +1 -0
@@ -53,6 +53,7 @@ struct PCIIDEState {MemoryRegion bmdma_bar;MemoryRegion cmd_bar[2 ];MemoryRegion data_bar[2 ]; +bool filter_pcicmd;/* used only for piix3/4 */ };static inline IDEState *bmdma_active_if (BMDMAState *bmdma)
hw/core/machine.c +2 -0
@@ -42,6 +42,8 @@GlobalProperty hw_compat_7_1[] = { {"virtio-device" ,"queue_reset" ,"false" }, + {"piix3-ide" ,"x-filter-pcicmd" ,"false" }, + {"piix4-ide" ,"x-filter-pcicmd" ,"false" }, };const size_t hw_compat_7_1_len =G_N_ELEMENTS (hw_compat_7_1);
hw/ide/piix.c +24 -0
@@ -25,6 +25,8 @@* References: * [1] 82371FB (PIIX) AND 82371SB (PIIX3) PCI ISA IDE XCELERATOR, * 290550-002, Intel Corporation, April 1997. +* [2] 82371AB PCI-TO-ISA / IDE XCELERATOR (PIIX4), 290562-001, +* Intel Corporation, April 1997. */ #include "qemu/osdep.h"
@@ -160,6 +162,21 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp)uint8_t *pci_conf = dev->config;int rc; +/* +* Mask all IDE PCI command register bits except for Bus Master +* Function Enable (bit 2) and I/O Space Enable (bit 0), as the +* remainder are hardwired to 0 [1, p.48] [2, p.89-90]. +* +* NOTE: According to the PIIX3 datasheet [1], the Memory Space +* Enable (MSE, bit 1) is hardwired to 1, but this is contradicted +* by actual PIIX3 hardware, the datasheet itself (viz., Default +* Value: 0000h), and the PIIX4 datasheet [2]. +*/ +if (d->filter_pcicmd) { +pci_set_word (dev->wmask +PCI_COMMAND , +PCI_COMMAND_MASTER |PCI_COMMAND_IO ); + } + pci_conf[PCI_CLASS_PROG ] =0x80 ;// legacy ATA mode bmdma_setup_bar (d);
@@ -185,6 +202,11 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } +static Property pci_piix_ide_properties[] = { +DEFINE_PROP_BOOL ("x-filter-pcicmd" , PCIIDEState, filter_pcicmd, TRUE), +DEFINE_PROP_END_OF_LIST (), +}; +/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {
@@ -198,6 +220,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_INTEL_82371SB_1 ; k->class_id =PCI_CLASS_STORAGE_IDE ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); +device_class_set_props (dc, pci_piix_ide_properties); dc->hotpluggable = false; }
@@ -220,6 +243,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_INTEL_82371AB ; k->class_id =PCI_CLASS_STORAGE_IDE ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); +device_class_set_props (dc, pci_piix_ide_properties); dc->hotpluggable = false; }
tests/qtest/ide-test.c +1 -0
@@ -174,6 +174,7 @@ static QPCIDevice *get_pci_device(QTestState *qts, QPCIBar *bmdma_bar, *ide_bar =qpci_legacy_iomap (dev,IDE_BASE ); + dev->command_disabled =PCI_COMMAND_MEMORY ;qpci_device_enable (dev);return dev;
Signature · 1 line
MST
Re: [PULL 68/86] hw/ide/piix: Ignore writes of hardwired PCI command register bits
Quoted 26 lines · Michael S. Tsirkin
From: Lev Kujawski <[email protected]>
One method to enable PCI bus mastering for IDE controllers, often used by x86 firmware, is to write
0x7to the PCI command register. Neither the PIIX 3/4 specifications nor actual PIIX 3 hardware (a Tyan S1686D system) permit setting the Memory Space Enable (MSE) bit, thus the command register would be left in an unspecified state without this patch.*
hw/core/machine.c
Facilitate migration by not masking writes to the PIIX 3/4 PCICMD register for machine states of QEMU versions prior to 7.2.
*hw/ide/piix.c
a) Add a reference to the PIIX 4 data sheet.
b) Mask the MSE bit using the QEMU PCI device wmask field.
c) Define a new boolean property, x-filter-pcicmd, to control whether the write mask is enabled and enable it by default for both the PIIX 3 and PIIX 4 IDE controllers.
*include/hw/ide/pci.h
Add the booleanfilter_pcicmdfield to the PCIIDEState structure, because the PIIX IDE controllers do not define their own state.
*tests/qtest/ide-test.c
Use thecommand_disabledfield of the QPCIDevice testing model to indicate thatPCI_COMMAND_MEMORYis hardwired within PIIX 3/4 IDE controllers.
Quoted 4 lines
Signed-off-by Lev Kujawski <[email protected]>Message-Id: <[email protected]>
Reviewed-by Michael S. Tsirkin <[email protected]>Signed-off-by Michael S. Tsirkin <[email protected]>
Caused test asserts reported by Stefan. Dropped for now, pls figure the issue out and resubmit. Thanks!
Quoted 110 lines
--- include/hw/ide/pci.h | 1 + hw/core/machine.c | 2 ++ hw/ide/piix.c | 24 ++++++++++++++++++++++++ tests/qtest/ide-test.c | 1 + 4 files changed, 28 insertions(+)include/hw/ide/pci.h +1
-0@@ -53,6 +53,7 @@ struct PCIIDEState {MemoryRegion bmdma_bar;MemoryRegion cmd_bar[2 ];MemoryRegion data_bar[2 ]; +bool filter_pcicmd;/* used only for piix3/4 */ };static inline IDEState *bmdma_active_if (BMDMAState *bmdma)hw/core/machine.c +2
-0@@ -42,6 +42,8 @@GlobalProperty hw_compat_7_1[] = { {"virtio-device" ,"queue_reset" ,"false" }, + {"piix3-ide" ,"x-filter-pcicmd" ,"false" }, + {"piix4-ide" ,"x-filter-pcicmd" ,"false" }, };const size_t hw_compat_7_1_len =G_N_ELEMENTS (hw_compat_7_1);hw/ide/piix.c +24
-0@@ -25,6 +25,8 @@* References: * [1] 82371FB (PIIX) AND 82371SB (PIIX3) PCI ISA IDE XCELERATOR, * 290550-002, Intel Corporation, April 1997. +* [2] 82371AB PCI-TO-ISA / IDE XCELERATOR (PIIX4), 290562-001, +* Intel Corporation, April 1997. */ #include "qemu/osdep.h" @@ -160,6 +162,21 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp)uint8_t *pci_conf = dev->config;int rc; +/* +* Mask all IDE PCI command register bits except for Bus Master +* Function Enable (bit 2) and I/O Space Enable (bit 0), as the +* remainder are hardwired to 0 [1, p.48] [2, p.89-90]. +* +* NOTE: According to the PIIX3 datasheet [1], the Memory Space +* Enable (MSE, bit 1) is hardwired to 1, but this is contradicted +* by actual PIIX3 hardware, the datasheet itself (viz., Default +* Value: 0000h), and the PIIX4 datasheet [2]. +*/ +if (d->filter_pcicmd) { +pci_set_word (dev->wmask +PCI_COMMAND , +PCI_COMMAND_MASTER |PCI_COMMAND_IO ); + } + pci_conf[PCI_CLASS_PROG ] =0x80 ;// legacy ATA mode bmdma_setup_bar (d);@@ -185,6 +202,11 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } +static Property pci_piix_ide_properties[] = { +DEFINE_PROP_BOOL ("x-filter-pcicmd" , PCIIDEState, filter_pcicmd, TRUE), +DEFINE_PROP_END_OF_LIST (), +}; +/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init (ObjectClass *klass,void *data) {@@ -198,6 +220,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_INTEL_82371SB_1 ; k->class_id =PCI_CLASS_STORAGE_IDE ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); +device_class_set_props (dc, pci_piix_ide_properties); dc->hotpluggable = false; }@@ -220,6 +243,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_INTEL_82371AB ; k->class_id =PCI_CLASS_STORAGE_IDE ;set_bit (DEVICE_CATEGORY_STORAGE , dc->categories); +device_class_set_props (dc, pci_piix_ide_properties); dc->hotpluggable = false; }tests/qtest/ide-test.c +1
-0@@ -174,6 +174,7 @@ static QPCIDevice *get_pci_device(QTestState *qts, QPCIBar *bmdma_bar, *ide_bar =qpci_legacy_iomap (dev,IDE_BASE ); + dev->command_disabled =PCI_COMMAND_MEMORY ;qpci_device_enable (dev);return dev;Signature · 1 line
MST
[PULL 23/86] tests/acpi: virt: allow acpi MADT and FADT changes
In reply to Michael S. TsirkinFrom: Miguel Luis <[email protected]>
Step 3 from bios-tables-test.c documented procedure.
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 6 ++++++ 1 file changed, 6 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +6 -0
@@ -1 +1,7 @@/* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/virt/FACP" , +"tests/data/acpi/virt/FACP.numamem" , +"tests/data/acpi/virt/FACP.memhp" , +"tests/data/acpi/virt/APIC" , +"tests/data/acpi/virt/APIC.memhp" , +"tests/data/acpi/virt/APIC.numamem",
Signature · 1 line
MST
[PULL 81/86] tests: virt: Update expected *.acpihmatvirt tables
In reply to Michael S. TsirkinFrom: Hesham Almatary <[email protected]>
* Expected ACPI Data Table [HMAT]
[000h 0000 4] Signature : "HMAT" [Heterogeneous
Memory Attributes Table]
[004h 0004 4] Table Length : 00000120 [008h 0008 1] Revision : 02 [009h 0009 1] Checksum : 4F [00Ah 0010 6] Oem ID : "BOCHS " [010h 0016 8] Oem Table ID : "BXPC " [018h 0024 4] Oem Revision : 00000001 [01Ch 0028 4] Asl Compiler ID : "BXPC" [020h 0032 4] Asl Compiler Revision : 00000001
[024h 0036 4] Reserved : 00000000
[028h 0040 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[02Ah 0042 2] Reserved : 0000
[02Ch 0044 4] Length : 00000028
[030h 0048 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[032h 0050 2] Reserved1 : 0000
[034h 0052 4] Processor Proximity Domain : 00000000
[038h 0056 4] Memory Proximity Domain : 00000000
[03Ch 0060 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000[050h 0080 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Processor Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000[078h 0120 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Processor Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[040h 0064 8] Reserved3 : 0000000000000000
[048h 0072 8] Reserved4 : 0000000000000000[050h 0080 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[052h 0082 2] Reserved : 0000
[054h 0084 4] Length : 00000028
[058h 0088 2] Flags (decoded below) : 0001
Processor Proximity Domain Valid : 1
[05Ah 0090 2] Reserved1 : 0000
[05Ch 0092 4] Processor Proximity Domain : 00000001
[060h 0096 4] Memory Proximity Domain : 00000001
[064h 0100 4] Reserved2 : 00000000
[068h 0104 8] Reserved3 : 0000000000000000
[070h 0112 8] Reserved4 : 0000000000000000[078h 0120 2] Structure Type : 0000 [Memory Proximity
Domain Attributes]
[07Ah 0122 2] Reserved : 0000
[07Ch 0124 4] Length : 00000028
[080h 0128 2] Flags (decoded below) : 0000
Processor Proximity Domain Valid : 0
[082h 0130 2] Reserved1 : 0000
[084h 0132 4] Processor Proximity Domain : 00000080
[088h 0136 4] Memory Proximity Domain : 00000002
[08Ch 0140 4] Reserved2 : 00000000
[090h 0144 8] Reserved3 : 0000000000000000
[098h 0152 8] Reserved4 : 0000000000000000[0A0h 0160 2] Structure Type : 0001 [System Locality
Latency and Bandwidth Information]
[0A2h 0162 2] Reserved : 0000
[0A4h 0164 4] Length : 00000040
[0A8h 0168 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0A9h 0169 1] Data Type : 00
[0AAh 0170 2] Reserved1 : 0000
[0ACh 0172 4] Initiator Proximity Domains # : 00000002
[0B0h 0176 4] Target Proximity Domains # : 00000003
[0B4h 0180 4] Reserved2 : 00000000
[0B8h 0184 8] Entry Base Unit : 0000000000002710
[0C0h 0192 4] Initiator Proximity Domain List : 00000000
[0C4h 0196 4] Initiator Proximity Domain List : 00000001
[0C8h 0200 4] Target Proximity Domain List : 00000000
[0CCh 0204 4] Target Proximity Domain List : 00000001
[0D0h 0208 4] Target Proximity Domain List : 00000002
[0D4h 0212 2] Entry : 0001
[0D6h 0214 2] Entry : 0002
[0D8h 0216 2] Entry : 0003
[0DAh 0218 2] Entry : 0002
[0DCh 0220 2] Entry : 0001
[0DEh 0222 2] Entry : 0003[0E0h 0224 2] Structure Type : 0001 [System Locality
Latency and Bandwidth Information]
[0E2h 0226 2] Reserved : 0000
[0E4h 0228 4] Length : 00000040
[0E8h 0232 1] Flags (decoded below) : 00
Memory Hierarchy : 0
[0E9h 0233 1] Data Type : 03
[0EAh 0234 2] Reserved1 : 0000
[0ECh 0236 4] Initiator Proximity Domains # : 00000002
[0F0h 0240 4] Target Proximity Domains # : 00000003
[0F4h 0244 4] Reserved2 : 00000000
[0F8h 0248 8] Entry Base Unit : 0000000000000001
[100h 0256 4] Initiator Proximity Domain List : 00000000
[104h 0260 4] Initiator Proximity Domain List : 00000001
[108h 0264 4] Target Proximity Domain List : 00000000
[10Ch 0268 4] Target Proximity Domain List : 00000001
[110h 0272 4] Target Proximity Domain List : 00000002
[114h 0276 2] Entry : 000A
[116h 0278 2] Entry : 0005
[118h 0280 2] Entry : 0001
[11Ah 0282 2] Entry : 0005
[11Ch 0284 2] Entry : 000A
[11Eh 0286 2] Entry : 0001Raw Table Data: Length 288 (0x120)
0000: 48 4D 41 54 20 01 00 00 02 4F 42 4F 43 48 53 20 // HMAT
....OBOCHS
0010: 42 58 50 43 20 20 20 20 01 00 00 00 42 58 50 43 // BXPC
....BXPC
0020: 01 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 //
............(...
0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
0050: 00 00 00 00 28 00 00 00 01 00 00 00 01 00 00 00 //
....(...........
0060: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
0070: 00 00 00 00 00 00 00 00 00 00 00 00 28 00 00 00 //
............(...
0080: 00 00 00 00 80 00 00 00 02 00 00 00 00 00 00 00 //
................
0090: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 //
................
00A0: 01 00 00 00 40 00 00 00 00 00 00 00 02 00 00 00 //
....@...........
00B0: 03 00 00 00 00 00 00 00 10 27 00 00 00 00 00 00 //
.........'......
00C0: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 //
................
00D0: 02 00 00 00 01 00 02 00 03 00 02 00 01 00 03 00 //
................
00E0: 01 00 00 00 40 00 00 00 00 03 00 00 02 00 00 00 //
....@...........
00F0: 03 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 //
................
0100: 00 00 00 00 01 00 00 00 00 00 00 00 01 00 00 00 //
................
0110: 02 00 00 00 0A 00 05 00 01 00 05 00 0A 00 01 00 //................
Message-Id: <[email protected]>
--- tests/qtest/bios-tables-test-allowed-diff.h | 5 ----- tests/data/acpi/virt/APIC.acpihmatvirt | Bin 0 -> 396 bytes tests/data/acpi/virt/DSDT.acpihmatvirt | Bin 0 -> 5282 bytes tests/data/acpi/virt/HMAT.acpihmatvirt | Bin 0 -> 288 bytes tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 0 -> 196 bytes tests/data/acpi/virt/SRAT.acpihmatvirt | Bin 0 -> 240 bytes 6 files changed, 5 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -5
@@ -1,6 +1 @@/* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/virt/APIC.acpihmatvirt" , -"tests/data/acpi/virt/DSDT.acpihmatvirt" , -"tests/data/acpi/virt/HMAT.acpihmatvirt" , -"tests/data/acpi/virt/PPTT.acpihmatvirt" , -"tests/data/acpi/virt/SRAT.acpihmatvirt",
tests/data/acpi/virt/APIC.acpihmatvirt binary +0 -0
tests/data/acpi/virt/DSDT.acpihmatvirt binary +0 -0
tests/data/acpi/virt/HMAT.acpihmatvirt binary +0 -0
tests/data/acpi/virt/PPTT.acpihmatvirt binary +0 -0
tests/data/acpi/virt/SRAT.acpihmatvirt binary +0 -0
Signature · 1 line
MST