From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eric Farman <farman@linux.ibm.com>,
Richard Henderson <richard.henderson@linaro.org>,
Pierre Morel <pmorel@linux.ibm.com>,
Matthew Rosato <mjrosato@linux.ibm.com>
Subject: [PULL 5/8] s390x/pci: use the passthrough measurement update interval
Date: Thu, 16 Dec 2021 10:44:44 +0100 [thread overview]
Message-ID: <20211216094447.58496-6-thuth@redhat.com> (raw)
In-Reply-To: <20211216094447.58496-1-thuth@redhat.com>
From: Matthew Rosato <mjrosato@linux.ibm.com>
We may have gotten a measurement update interval from the underlying host
via vfio -- Use it to set the interval via which we update the function
measurement block.
Fixes: 28dc86a072 ("s390x/pci: use a PCI Group structure")
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Message-Id: <20211203142706.427279-4-mjrosato@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/s390-pci-inst.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 11b7f6bfa1..07bab85ce5 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -1046,7 +1046,7 @@ static void fmb_update(void *opaque)
sizeof(pbdev->fmb.last_update))) {
return;
}
- timer_mod(pbdev->fmb_timer, t + DEFAULT_MUI);
+ timer_mod(pbdev->fmb_timer, t + pbdev->pci_group->zpci_group.mui);
}
int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,
@@ -1204,7 +1204,8 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,
}
pbdev->fmb_addr = fmb_addr;
timer_mod(pbdev->fmb_timer,
- qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + DEFAULT_MUI);
+ qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +
+ pbdev->pci_group->zpci_group.mui);
break;
}
default:
--
2.27.0
next prev parent reply other threads:[~2021-12-16 9:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-16 9:44 [PULL 0/8] s390x patches (and one gitlab-CI fix) Thomas Huth
2021-12-16 9:44 ` [PULL 1/8] s390: kvm: adjust diag318 resets to retain data Thomas Huth
2021-12-16 9:44 ` [PULL 2/8] MAINTAINERS: update email address of Christian Borntraeger Thomas Huth
2021-12-16 9:44 ` [PULL 3/8] s390x/pci: use a reserved ID for the default PCI group Thomas Huth
2021-12-16 9:44 ` [PULL 4/8] s390x/pci: don't use hard-coded dma range in reg_ioat Thomas Huth
2021-12-16 9:44 ` Thomas Huth [this message]
2021-12-16 9:44 ` [PULL 6/8] s390x/pci: add supported DT information to clp response Thomas Huth
2021-12-16 9:44 ` [PULL 7/8] hw: Add compat machines for 7.0 Thomas Huth
2021-12-16 9:44 ` [PULL 8/8] gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices Thomas Huth
2021-12-16 16:38 ` [PULL 0/8] s390x patches (and one gitlab-CI fix) Richard Henderson
2021-12-17 7:57 ` Thomas Huth
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=20211216094447.58496-6-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=farman@linux.ibm.com \
--cc=mjrosato@linux.ibm.com \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).