From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-s390x@nongnu.org, Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org, Matthew Rosato <mjrosato@linux.ibm.com>
Subject: [PULL 4/8] s390x/pci: restore missing Query PCI Function CLP data
Date: Fri, 5 Mar 2021 16:55:13 +0100 [thread overview]
Message-ID: <20210305155517.1604547-5-cohuck@redhat.com> (raw)
In-Reply-To: <20210305155517.1604547-1-cohuck@redhat.com>
From: Matthew Rosato <mjrosato@linux.ibm.com>
Some CLP response data was accidentally dropped when fixing endianness
issues with the Query PCI Function CLP response. All of these values are
sent as 0s to the guest for emulated devices, so the impact is only
observed on passthrough devices.
Fixes: a4e2fff1b104 ("s390x/pci: fix endianness issues")
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Message-Id: <1613681609-9349-1-git-send-email-mjrosato@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/s390x/s390-pci-inst.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 654fac6c0a5b..4b8326afa4f2 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -284,10 +284,15 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra)
stq_p(&resquery->sdma, pbdev->zpci_fn.sdma);
stq_p(&resquery->edma, pbdev->zpci_fn.edma);
stw_p(&resquery->pchid, pbdev->zpci_fn.pchid);
+ stw_p(&resquery->vfn, pbdev->zpci_fn.vfn);
resquery->flags = pbdev->zpci_fn.flags;
resquery->pfgid = pbdev->zpci_fn.pfgid;
+ resquery->pft = pbdev->zpci_fn.pft;
+ resquery->fmbl = pbdev->zpci_fn.fmbl;
stl_p(&resquery->fid, pbdev->zpci_fn.fid);
stl_p(&resquery->uid, pbdev->zpci_fn.uid);
+ memcpy(resquery->pfip, pbdev->zpci_fn.pfip, CLP_PFIP_NR_SEGMENTS);
+ memcpy(resquery->util_str, pbdev->zpci_fn.util_str, CLP_UTIL_STR_LEN);
for (i = 0; i < PCI_BAR_COUNT; i++) {
uint32_t data = pci_get_long(pbdev->pdev->config +
--
2.26.2
next prev parent reply other threads:[~2021-03-05 15:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 15:55 [PULL 0/8] s390x update Cornelia Huck
2021-03-05 15:55 ` [PULL 1/8] s390x/cpu_model: disallow unpack for --only-migratable Cornelia Huck
2021-03-05 15:55 ` [PULL 2/8] target/s390x/arch_dump: Fix warning for the name field in the PT_NOTE section Cornelia Huck
2021-03-05 15:55 ` [PULL 3/8] hw/s390x: fix build for virtio-9p-ccw Cornelia Huck
2021-03-05 15:55 ` Cornelia Huck [this message]
2021-03-05 15:55 ` [PULL 5/8] virtio-ccw: commands on revision-less devices Cornelia Huck
2021-03-05 15:55 ` [PULL 6/8] css: SCHIB measurement block origin must be aligned Cornelia Huck
2021-03-05 15:55 ` [PULL 7/8] vfio-ccw: Do not read region ret_code after write Cornelia Huck
2021-03-05 15:55 ` [PULL 8/8] target/s390x/kvm: Simplify debug code Cornelia Huck
2021-03-05 22:52 ` [PULL 0/8] s390x update Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210305155517.1604547-5-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=mjrosato@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).