| Message ID | 1511530238-18318-5-git-send-email-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vITS Reset | expand |
On 24 November 2017 at 13:30, Eric Auger <eric.auger@redhat.com> wrote: > Voiding the ITS caches is not supposed to happen via > individual register writes. So we introduced a dedicated > ITS KVM device ioctl to perform a cold reset of the ITS: > KVM_DEV_ARM_VGIC_GRP_CTRL/KVM_DEV_ARM_ITS_CTRL_RESET. Let's > use this latter if the kernel supports it. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > --- > hw/intc/arm_gicv3_its_kvm.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c > index 83e5268..bad593f 100644 > --- a/hw/intc/arm_gicv3_its_kvm.c > +++ b/hw/intc/arm_gicv3_its_kvm.c > @@ -204,6 +204,13 @@ static void kvm_arm_its_reset(DeviceState *dev) > > c->parent_reset(dev); > > + if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, > + KVM_DEV_ARM_ITS_CTRL_RESET)) { > + kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, > + KVM_DEV_ARM_ITS_CTRL_RESET, NULL, true, &error_abort); > + return; > + } > + > error_report("ITS KVM: full reset is not supported by the host kernel"); > > if (!kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS, > -- > 2.5.5 Ah, here's the check that makes the error message correct. If we're applying the whole series at once, no big deal; but if we want to put the earlier patches in 2.11 but not this one we need the error message to be correct for the situation at that release. thanks -- PMM
diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c index 83e5268..bad593f 100644 --- a/hw/intc/arm_gicv3_its_kvm.c +++ b/hw/intc/arm_gicv3_its_kvm.c @@ -204,6 +204,13 @@ static void kvm_arm_its_reset(DeviceState *dev) c->parent_reset(dev); + if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_ITS_CTRL_RESET)) { + kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_ITS_CTRL_RESET, NULL, true, &error_abort); + return; + } + error_report("ITS KVM: full reset is not supported by the host kernel"); if (!kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
Voiding the ITS caches is not supposed to happen via individual register writes. So we introduced a dedicated ITS KVM device ioctl to perform a cold reset of the ITS: KVM_DEV_ARM_VGIC_GRP_CTRL/KVM_DEV_ARM_ITS_CTRL_RESET. Let's use this latter if the kernel supports it. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- hw/intc/arm_gicv3_its_kvm.c | 7 +++++++ 1 file changed, 7 insertions(+)