diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-12-17 08:36:25 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-12-17 08:36:25 -0800 |
| commit | 48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3 (patch) | |
| tree | 7ad955513c3c890b18f34b53d3f8845049eb6aea /include | |
| parent | 29eb5c2c86f935b0e9700fad2ecfe8a32b011d57 (diff) | |
| parent | 9f8e6cad65a66b27e797defe639a4a4fd4330f23 (diff) | |
| download | qemu-48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3.zip qemu-48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3.tar.gz qemu-48c03a0e13f49e8dff9a8ac37fff43e00a0a9bb3.tar.bz2 | |
Merge tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu into staging
* Small fixes for the s390x PCI code
* Fix reset handling of the diag318 data
* Ease timeout problem of the new msys2-64bit job
# gpg: Signature made Fri 17 Dec 2021 02:01:45 AM PST
# gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg: issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [unknown]
# gpg: aka "Thomas Huth <thuth@redhat.com>" [unknown]
# gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# gpg: aka "Thomas Huth <huth@tuxfamily.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* tag 's390x-2021-12-17' of https://gitlab.com/thuth/qemu:
gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices
s390x/pci: add supported DT information to clp response
s390x/pci: use the passthrough measurement update interval
s390x/pci: don't use hard-coded dma range in reg_ioat
s390x/pci: use a reserved ID for the default PCI group
MAINTAINERS: update email address of Christian Borntraeger
s390: kvm: adjust diag318 resets to retain data
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/s390x/s390-pci-bus.h | 3 | ||||
| -rw-r--r-- | include/hw/s390x/s390-pci-clp.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h index aa891c1..da3cde2 100644 --- a/include/hw/s390x/s390-pci-bus.h +++ b/include/hw/s390x/s390-pci-bus.h @@ -37,6 +37,7 @@ #define ZPCI_MAX_UID 0xffff #define UID_UNDEFINED 0 #define UID_CHECKING_ENABLED 0x01 +#define ZPCI_DTSM 0x40 OBJECT_DECLARE_SIMPLE_TYPE(S390pciState, S390_PCI_HOST_BRIDGE) OBJECT_DECLARE_SIMPLE_TYPE(S390PCIBus, S390_PCI_BUS) @@ -313,7 +314,7 @@ typedef struct ZpciFmb { } ZpciFmb; QEMU_BUILD_BUG_MSG(offsetof(ZpciFmb, fmt0) != 48, "padding in ZpciFmb"); -#define ZPCI_DEFAULT_FN_GRP 0x20 +#define ZPCI_DEFAULT_FN_GRP 0xFF typedef struct S390PCIGroup { ClpRspQueryPciGrp zpci_group; int id; diff --git a/include/hw/s390x/s390-pci-clp.h b/include/hw/s390x/s390-pci-clp.h index 96b8e3f..cc8c866 100644 --- a/include/hw/s390x/s390-pci-clp.h +++ b/include/hw/s390x/s390-pci-clp.h @@ -163,7 +163,8 @@ typedef struct ClpRspQueryPciGrp { uint8_t fr; uint16_t maxstbl; uint16_t mui; - uint64_t reserved3; + uint8_t dtsm; + uint8_t reserved3[7]; uint64_t dasm; /* dma address space mask */ uint64_t msia; /* MSI address */ uint64_t reserved4; |