| Message ID | 20211202164110.326947-4-mjrosato@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x/pci: some small fixes | expand |
On Thu, 2021-12-02 at 11:41 -0500, Matthew Rosato wrote: > 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> > --- > 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:
On 12/2/21 17:41, Matthew Rosato wrote: > 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> > --- > 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: > Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
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:
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> --- hw/s390x/s390-pci-inst.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)