* [PATCH] virtio-pci: don't touch pci on virtio reset
@ 2022-07-27 16:14 Michael S. Tsirkin
2022-07-27 17:14 ` Claudio Fontana
0 siblings, 1 reply; 3+ messages in thread
From: Michael S. Tsirkin @ 2022-07-27 16:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Marcel Apfelbaum
virtio level reset should not affect pci express
registers such as PM, error or link.
Fixes: 27ce0f3afc ("hw/virtio: fix Power Management Control Register for PCI Express virtio devices")
Fixes: d584f1b9ca ("hw/virtio: fix Link Control Register for PCI Express virtio devices")
Fixes: c2cabb3422 ("hw/virtio: fix error enabling flags in Device Control register")
Cc: "Marcel Apfelbaum" <marcel@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 45327f0b31..3189ec014d 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1955,6 +1955,13 @@ static void virtio_pci_reset(DeviceState *qdev)
proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;
}
+}
+
+static void virtio_pci_bus_reset(DeviceState *qdev)
+{
+ PCIDevice *dev = PCI_DEVICE(qdev);
+
+ virtio_pci_reset(qdev);
if (pci_is_express(dev)) {
pcie_cap_deverr_reset(dev);
@@ -2022,7 +2029,7 @@ static void virtio_pci_class_init(ObjectClass *klass, void *data)
k->class_id = PCI_CLASS_OTHERS;
device_class_set_parent_realize(dc, virtio_pci_dc_realize,
&vpciklass->parent_dc_realize);
- dc->reset = virtio_pci_reset;
+ dc->reset = virtio_pci_bus_reset;
}
static const TypeInfo virtio_pci_info = {
--
MST
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] virtio-pci: don't touch pci on virtio reset
2022-07-27 16:14 [PATCH] virtio-pci: don't touch pci on virtio reset Michael S. Tsirkin
@ 2022-07-27 17:14 ` Claudio Fontana
2022-07-27 17:32 ` Claudio Fontana
0 siblings, 1 reply; 3+ messages in thread
From: Claudio Fontana @ 2022-07-27 17:14 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel; +Cc: Marcel Apfelbaum
testing it now...
Thanks!
C
On 7/27/22 18:14, Michael S. Tsirkin wrote:
> virtio level reset should not affect pci express
> registers such as PM, error or link.
>
> Fixes: 27ce0f3afc ("hw/virtio: fix Power Management Control Register for PCI Express virtio devices")
> Fixes: d584f1b9ca ("hw/virtio: fix Link Control Register for PCI Express virtio devices")
> Fixes: c2cabb3422 ("hw/virtio: fix error enabling flags in Device Control register")
> Cc: "Marcel Apfelbaum" <marcel@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/virtio/virtio-pci.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
> index 45327f0b31..3189ec014d 100644
> --- a/hw/virtio/virtio-pci.c
> +++ b/hw/virtio/virtio-pci.c
> @@ -1955,6 +1955,13 @@ static void virtio_pci_reset(DeviceState *qdev)
> proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
> proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;
> }
> +}
> +
> +static void virtio_pci_bus_reset(DeviceState *qdev)
> +{
> + PCIDevice *dev = PCI_DEVICE(qdev);
> +
> + virtio_pci_reset(qdev);
>
> if (pci_is_express(dev)) {
> pcie_cap_deverr_reset(dev);
> @@ -2022,7 +2029,7 @@ static void virtio_pci_class_init(ObjectClass *klass, void *data)
> k->class_id = PCI_CLASS_OTHERS;
> device_class_set_parent_realize(dc, virtio_pci_dc_realize,
> &vpciklass->parent_dc_realize);
> - dc->reset = virtio_pci_reset;
> + dc->reset = virtio_pci_bus_reset;
> }
>
> static const TypeInfo virtio_pci_info = {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] virtio-pci: don't touch pci on virtio reset
2022-07-27 17:14 ` Claudio Fontana
@ 2022-07-27 17:32 ` Claudio Fontana
0 siblings, 0 replies; 3+ messages in thread
From: Claudio Fontana @ 2022-07-27 17:32 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel; +Cc: Marcel Apfelbaum, Alex Bennée
Hmm, no that's not it,
still segfault in ovs, but I'll try to see if I can merge that and the workaround I am currently using...
On 7/27/22 19:14, Claudio Fontana wrote:
> testing it now...
>
> Thanks!
>
> C
>
>
> On 7/27/22 18:14, Michael S. Tsirkin wrote:
>> virtio level reset should not affect pci express
>> registers such as PM, error or link.
>>
>> Fixes: 27ce0f3afc ("hw/virtio: fix Power Management Control Register for PCI Express virtio devices")
>> Fixes: d584f1b9ca ("hw/virtio: fix Link Control Register for PCI Express virtio devices")
>> Fixes: c2cabb3422 ("hw/virtio: fix error enabling flags in Device Control register")
>> Cc: "Marcel Apfelbaum" <marcel@redhat.com>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> ---
>> hw/virtio/virtio-pci.c | 9 ++++++++-
>> 1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
>> index 45327f0b31..3189ec014d 100644
>> --- a/hw/virtio/virtio-pci.c
>> +++ b/hw/virtio/virtio-pci.c
>> @@ -1955,6 +1955,13 @@ static void virtio_pci_reset(DeviceState *qdev)
>> proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
>> proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;
>> }
>> +}
>> +
>> +static void virtio_pci_bus_reset(DeviceState *qdev)
>> +{
>> + PCIDevice *dev = PCI_DEVICE(qdev);
>> +
>> + virtio_pci_reset(qdev);
>>
>> if (pci_is_express(dev)) {
>> pcie_cap_deverr_reset(dev);
>> @@ -2022,7 +2029,7 @@ static void virtio_pci_class_init(ObjectClass *klass, void *data)
>> k->class_id = PCI_CLASS_OTHERS;
>> device_class_set_parent_realize(dc, virtio_pci_dc_realize,
>> &vpciklass->parent_dc_realize);
>> - dc->reset = virtio_pci_reset;
>> + dc->reset = virtio_pci_bus_reset;
>> }
>>
>> static const TypeInfo virtio_pci_info = {
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-27 17:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-27 16:14 [PATCH] virtio-pci: don't touch pci on virtio reset Michael S. Tsirkin
2022-07-27 17:14 ` Claudio Fontana
2022-07-27 17:32 ` Claudio Fontana
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.