hw/virtio-pci Added counter for pcie capabilities offsets.
PATCH 1/2 hw/virtio-pci Added counter for pcie capabilities offsets.
From: Andrew <[email protected]>
Removed hardcoded offset for ats. Added cap offset counter for future capabilities like AER.
--- hw/virtio/virtio-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/virtio/virtio-pci.c +3 -1
@@ -1787,6 +1787,7 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)if (pcie_port &&pci_is_express (pci_dev)) {int pos; +uint16_t last_pcie_cap_offset =PCI_CONFIG_SPACE_SIZE ; pos =pcie_endpoint_cap_init (pci_dev,0 );assert (pos >0 );
@@ -1822,7 +1823,8 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp) }if (proxy->flags &VIRTIO_PCI_FLAG_ATS ) { -pcie_ats_init (pci_dev,256 ); +pcie_ats_init (pci_dev, last_pcie_cap_offset); + last_pcie_cap_offset +=PCI_EXT_CAP_ATS_SIZEOF ; }if (proxy->flags &VIRTIO_PCI_FLAG_INIT_FLR ) {
Signature · 1 line
2.27.0
PATCH 2/2 hw/virtio-pci Added AER capability.
From: Andrew <[email protected]>
Added AER capability for virtio-pci devices.
Also added property for devices, by default AER is enabled.
--- hw/virtio/virtio-pci.c | 16 ++++++++++++++++ hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 20 insertions(+)
hw/virtio/virtio-pci.c +16 -0
@@ -1806,6 +1806,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)*/ pci_set_word (pci_dev->config + pos +PCI_PM_PMC ,0x3 ); +if (proxy->flags &VIRTIO_PCI_FLAG_AER ) { +pcie_aer_init (pci_dev,PCI_ERR_VER , last_pcie_cap_offset, +PCI_ERR_SIZEOF ,NULL ); + last_pcie_cap_offset +=PCI_ERR_SIZEOF ; + } +if (proxy->flags &VIRTIO_PCI_FLAG_INIT_DEVERR ) {/* Init error enabling flags */ pcie_cap_deverr_init (pci_dev);
@@ -1847,7 +1853,15 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)static void virtio_pci_exit (PCIDevice *pci_dev) { +VirtIOPCIProxy *proxy =VIRTIO_PCI (pci_dev); +bool pcie_port =pci_bus_is_express (pci_get_bus (pci_dev)) && + !pci_bus_is_root (pci_get_bus (pci_dev)); +msix_uninit_exclusive_bar (pci_dev); +if (proxy->flags &VIRTIO_PCI_FLAG_AER && pcie_port && +pci_is_express (pci_dev)) { +pcie_aer_exit (pci_dev); + } }static void virtio_pci_reset (DeviceState *qdev)
@@ -1900,6 +1914,8 @@ static Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_INIT_PM_BIT, true),DEFINE_PROP_BIT ("x-pcie-flr-init" , VirtIOPCIProxy, flags,VIRTIO_PCI_FLAG_INIT_FLR_BIT , true), +DEFINE_PROP_BIT ("aer" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_AER_BIT , true), DEFINE_PROP_END_OF_LIST(), };
hw/virtio/virtio-pci.h +4 -0
@@ -45,6 +45,7 @@ enum {VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT ,VIRTIO_PCI_FLAG_INIT_PM_BIT ,VIRTIO_PCI_FLAG_INIT_FLR_BIT , + VIRTIO_PCI_FLAG_AER_BIT, };/* Need to activate work-arounds for buggy guests at vmstate load. */
@@ -84,6 +85,9 @@ enum {/* Init Function Level Reset capability */ #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT) +/* Advanced Error Reporting capability */ +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) + typedef struct { MSIMessage msg; int virq;
Signature · 1 line
2.27.0
Re: [PATCH 2/2] hw/virtio-pci Added AER capability.
Ping.
Quoted 82 lines · On 13 Aug 2020, at 10:19 AM, [email protected] wrote:
From: Andrew <[email protected]>
Added AER capability for virtio-pci devices.
Also added property for devices, by default AER is enabled.Signed-off-by Andrew Melnychenko <[email protected]>---
hw/virtio/virtio-pci.c| 16 ++++++++++++++++hw/virtio/virtio-pci.h| 4 ++++2 files changed, 20 insertions(+)hw/virtio/virtio-pci.c +16
-0@@ -1806,6 +1806,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)*/ pci_set_word (pci_dev->config + pos +PCI_PM_PMC ,0x3 ); +if (proxy->flags &VIRTIO_PCI_FLAG_AER ) { +pcie_aer_init (pci_dev,PCI_ERR_VER , last_pcie_cap_offset, +PCI_ERR_SIZEOF ,NULL ); + last_pcie_cap_offset +=PCI_ERR_SIZEOF ; + } +if (proxy->flags &VIRTIO_PCI_FLAG_INIT_DEVERR ) {/* Init error enabling flags */ pcie_cap_deverr_init (pci_dev);@@ -1847,7 +1853,15 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)static void virtio_pci_exit (PCIDevice *pci_dev) { +VirtIOPCIProxy *proxy =VIRTIO_PCI (pci_dev); +bool pcie_port =pci_bus_is_express (pci_get_bus (pci_dev)) && + !pci_bus_is_root (pci_get_bus (pci_dev)); +msix_uninit_exclusive_bar (pci_dev); +if (proxy->flags &VIRTIO_PCI_FLAG_AER && pcie_port && +pci_is_express (pci_dev)) { +pcie_aer_exit (pci_dev); + } }static void virtio_pci_reset (DeviceState *qdev)@@ -1900,6 +1914,8 @@ static Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_INIT_PM_BIT, true),DEFINE_PROP_BIT ("x-pcie-flr-init" , VirtIOPCIProxy, flags,VIRTIO_PCI_FLAG_INIT_FLR_BIT , true), +DEFINE_PROP_BIT ("aer" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_AER_BIT , true), DEFINE_PROP_END_OF_LIST(), };hw/virtio/virtio-pci.h +4
-0@@ -45,6 +45,7 @@ enum {VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT ,VIRTIO_PCI_FLAG_INIT_PM_BIT ,VIRTIO_PCI_FLAG_INIT_FLR_BIT , + VIRTIO_PCI_FLAG_AER_BIT, };/* Need to activate work-arounds for buggy guests at vmstate load. */ @@ -84,6 +85,9 @@ enum {/* Init Function Level Reset capability */ #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT) +/* Advanced Error Reporting capability */ +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) + typedef struct { MSIMessage msg; int virq;Signature · 1 line
2.27.0
Re: [PATCH 2/2] hw/virtio-pci Added AER capability.
In reply to [email protected]Quoted 7 lines · On Thu, Aug 13, 2020 at 10:19:31AM +0300, [email protected] wrote:
From: Andrew <[email protected]>
Added AER capability for virtio-pci devices.
Also added property for devices, by default AER is enabled.Signed-off-by Andrew Melnychenko <[email protected]>
Well AER is pci express only. I suspect you need to limit this to express, fail on pci.
Quoted 39 lines
--- hw/virtio/virtio-pci.c | 16 ++++++++++++++++ hw/virtio/virtio-pci.h | 4 ++++ 2 files changed, 20 insertions(+)hw/virtio/virtio-pci.c +14
-0@@ -1806,6 +1806,12 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)*/ pci_set_word (pci_dev->config + pos +PCI_PM_PMC ,0x3 ); +if (proxy->flags &VIRTIO_PCI_FLAG_AER ) { +pcie_aer_init (pci_dev,PCI_ERR_VER , last_pcie_cap_offset, +PCI_ERR_SIZEOF ,NULL ); + last_pcie_cap_offset +=PCI_ERR_SIZEOF ; + } +if (proxy->flags &VIRTIO_PCI_FLAG_INIT_DEVERR ) {/* Init error enabling flags */ pcie_cap_deverr_init (pci_dev);@@ -1847,7 +1853,15 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)static void virtio_pci_exit (PCIDevice *pci_dev) { +VirtIOPCIProxy *proxy =VIRTIO_PCI (pci_dev); +bool pcie_port =pci_bus_is_express (pci_get_bus (pci_dev)) && + !pci_bus_is_root (pci_get_bus (pci_dev)); +msix_uninit_exclusive_bar (pci_dev); +if (proxy->flags &VIRTIO_PCI_FLAG_AER && pcie_port && +pci_is_express (pci_dev)) { +pcie_aer_exit (pci_dev); + } }static void virtio_pci_reset (DeviceState *qdev)
hw/virtio/virtio-pci.c static Property virtio_pci_properties[] = { · line 1921
Quoted 8 lines
hw/virtio/virtio-pci.c +2
-0@@ -1900,6 +1914,8 @@ static Property virtio_pci_properties[] = { VIRTIO_PCI_FLAG_INIT_PM_BIT, true),DEFINE_PROP_BIT ("x-pcie-flr-init" , VirtIOPCIProxy, flags,VIRTIO_PCI_FLAG_INIT_FLR_BIT , true), +DEFINE_PROP_BIT ("aer" , VirtIOPCIProxy, flags, +VIRTIO_PCI_FLAG_AER_BIT , true), DEFINE_PROP_END_OF_LIST(), };
This will break cross version migration. Please disable this for old machine types.
I am also unsure why it's on by default generally. It is optional in express spec.
Quoted 24 lines
hw/virtio/virtio-pci.h +4
-0@@ -45,6 +45,7 @@ enum {VIRTIO_PCI_FLAG_INIT_LNKCTL_BIT ,VIRTIO_PCI_FLAG_INIT_PM_BIT ,VIRTIO_PCI_FLAG_INIT_FLR_BIT , + VIRTIO_PCI_FLAG_AER_BIT, };/* Need to activate work-arounds for buggy guests at vmstate load. */ @@ -84,6 +85,9 @@ enum {/* Init Function Level Reset capability */ #define VIRTIO_PCI_FLAG_INIT_FLR (1 << VIRTIO_PCI_FLAG_INIT_FLR_BIT) +/* Advanced Error Reporting capability */ +#define VIRTIO_PCI_FLAG_AER (1 << VIRTIO_PCI_FLAG_AER_BIT) + typedef struct { MSIMessage msg; int virq;Signature · 1 line
2.27.0