Skip to contentSkip to conversation

pci-bridge/i82801b11: clear bridge registers on platform reset

PATCH In review Laszlo Ersek 2 participants 4 messages Feb 7, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pci-bridge/i82801b11: clear bridge registers on platform reset

The "i82801b11-bridge" device model is a descendant of "base-pci-bridge" (TYPE_PCI_BRIDGE). However, unlike other similar devices, such as

- pci-bridge,
- pcie-pci-bridge,
- PCIE Root Port,
- xio3130 switch upstream and downstream ports,
- dec-21154-p2p-bridge,
- pbm-bridge,
- xilinx-pcie-root,

"i82801b11-bridge" does not clear the bridge specific registers at platform reset.

This is a problem because devices on "i82801b11-bridge" continue to respond to config space cycles after platform reset, when addressed with the bus number that was previously programmed into the secondary bus number register of "i82801b11-bridge". This error breaks OVMF's search for extra (PXB) root buses, for example.

The device class reset method for "i82801b11-bridge" is currently NULL; set it directly to pci_bridge_reset(), like the last three bridge models in the above listing do.

Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: [email protected]
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1541839

---
 hw/pci-bridge/i82801b11.c | 1 +
 1 file changed, 1 insertion(+)
hw/pci-bridge/i82801b11.c +1 -0
index cb522bf30c31..ebf7f5f0e81c 100644
@@ -98,6 +98,7 @@ static void i82801b11_bridge_class_init(ObjectClass *klass, void *data)
     k->realize = i82801b11_bridge_realize;
     k->config_write = pci_bridge_write_config;
     dc->vmsd = &i82801b11_bridge_dev_vmstate;
+    dc->reset = pci_bridge_reset;
     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
Signature · 1 line
2.14.1.3.gb7cf6e02401b
Reviewed-by on v1 1/1
#1 lore raw

Hi Laszlo,

Quoted 11 lines · Laszlo Ersek

The "i82801b11-bridge" device model is a descendant of "base-pci-bridge" (TYPE_PCI_BRIDGE). However, unlike other similar devices, such as

- pci-bridge,
- pcie-pci-bridge,
- PCIE Root Port,
- xio3130 switch upstream and downstream ports,
- dec-21154-p2p-bridge,
- pbm-bridge,
- xilinx-pcie-root,

Quoted 9 lines

"i82801b11-bridge" does not clear the bridge specific registers at platform reset.

This is a problem because devices on "i82801b11-bridge" continue to respond to config space cycles after platform reset, when addressed with the bus number that was previously programmed into the secondary bus number register of "i82801b11-bridge". This error breaks OVMF's search for extra (PXB) root buses, for example.

Now I understand why we didn't catch the error until now. Nobody tried to use the pxb device with the dmi-pci bridge.

Quoted 1 line

The device class reset method for "i82801b11-bridge" is currently NULL;

This is sad, the device was always broken.

Quoted 3 lines

set it directly to pci_bridge_reset(), like the last three bridge models in the above listing do.

Thanks for catching it!

Thanks,
Marcel

Quoted 22 lines

Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: [email protected]
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1541839

---
 hw/pci-bridge/i82801b11.c | 1 +
 1 file changed, 1 insertion(+)
hw/pci-bridge/i82801b11.c +1 -0
index cb522bf30c31..ebf7f5f0e81c 100644
@@ -98,6 +98,7 @@ static void i82801b11_bridge_class_init(ObjectClass *klass, void *data)
     k->realize = i82801b11_bridge_realize;
     k->config_write = pci_bridge_write_config;
     dc->vmsd = &i82801b11_bridge_dev_vmstate;
+    dc->reset = pci_bridge_reset;
     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
#2 lore raw
Quoted 24 lines · Marcel Apfelbaum

Hi Laszlo,

Quoted 11 lines · Laszlo Ersek

The "i82801b11-bridge" device model is a descendant of "base-pci-bridge" (TYPE_PCI_BRIDGE). However, unlike other similar devices, such as

- pci-bridge,
- pcie-pci-bridge,
- PCIE Root Port,
- xio3130 switch upstream and downstream ports,
- dec-21154-p2p-bridge,
- pbm-bridge,
- xilinx-pcie-root,

Quoted 9 lines

"i82801b11-bridge" does not clear the bridge specific registers at platform reset.

This is a problem because devices on "i82801b11-bridge" continue to respond to config space cycles after platform reset, when addressed with the bus number that was previously programmed into the secondary bus number register of "i82801b11-bridge". This error breaks OVMF's search for extra (PXB) root buses, for example.

Quoted 2 lines

Now I understand why we didn't catch the error until now. Nobody tried to use the pxb device with the dmi-pci bridge.

No, that's not correct:

- first, it's not about using pxb and dmi-pci in a *hierarchical* (superordinate / subordinate) fashion,

- second, the reason the symptom has not been witnessed with SeaBIOS is that SeaBIOS *suppresses* the issue.

In more detail:

(1) The setup where the problem shows up (with OVMF) is that dmi-pci and pxb are *siblings*. (They both live on the root complex.) The breakage is that OVMF scans for any device on any pxb's secondary bus -- in order to deduce the pxbs' existence --, but, *before* reaching such a device, a device that lives on the secondary bus of dmi-pci responds (because the dmi-pci bridge remembers its 2ndary busnr from before the reboot, and that bus number is *lower* than a real pxb's 2ndary bus number). Under the circumstances of the scanning, *only* pxb-hosted devices should respond, therefore OVMF mistakes dmi-pci for a pxb.

(2) The reason SeaBIOS does not tickle this QEMU issue is that the pci_bios_init_bus_rec() function, in "src/fw/pciinit.c", preventatively overwrites, as first step, the secondary and subordinate busnr registers of all bridge devices (including dmi-pci) that are on the currently processed bus:

Quoted 8 lines
    /* prevent accidental access to unintended devices */
    foreachbdf(bdf, bus) {
        class = pci_config_readw(bdf, PCI_CLASS_DEVICE);
        if (class == PCI_CLASS_BRIDGE_PCI) {
            pci_config_writeb(bdf, PCI_SECONDARY_BUS, 255);
            pci_config_writeb(bdf, PCI_SUBORDINATE_BUS, 0);
        }
    }

While this is not a bad idea in SeaBIOS, I honestly think the error should be fixed in QEMU.

(And, the SeaBIOS approach is not viable in OVMF. When SeaBIOS does the above, the bus being processed (i.e. the one on which dmi-pci lives) is already "live"; its parent bridge already has the 2ndary bus number / subordinate bus number registers set correctly. This is not the case when OVMF scans for PXB extra root buses -- that search is not hierarchical and entirely precedes enumeration / resource assignment. The recursive traversal occurs much later, in a different UEFI driver.)

Quoted 3 lines
Quoted 1 line

The device class reset method for "i82801b11-bridge" is currently NULL;

This is sad, the device was always broken.

Well, not extremely sad :) , given that we've encountered this issue only now (and with OVMF reboot only).

Nonetheless, I did CC "qemu-stable" on the patch; I think it should be applied to all currently supported stable releases.

Quoted 8 lines
Quoted 4 lines

set it directly to pci_bridge_reset(), like the last three bridge models in the above listing do.

Thanks for catching it!

I hope that the details I added now don't make you retract your R-b :)

Thanks!
Laszlo

Quoted 23 lines
Quoted 22 lines

Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: [email protected]
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1541839

---
 hw/pci-bridge/i82801b11.c | 1 +
 1 file changed, 1 insertion(+)
hw/pci-bridge/i82801b11.c +1 -0
index cb522bf30c31..ebf7f5f0e81c 100644
@@ -98,6 +98,7 @@ static void i82801b11_bridge_class_init(ObjectClass *klass, void *data)
     k->realize = i82801b11_bridge_realize;
     k->config_write = pci_bridge_write_config;
     dc->vmsd = &i82801b11_bridge_dev_vmstate;
+    dc->reset = pci_bridge_reset;
     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }
 
#3 lore raw
Quoted 25 lines · Laszlo Ersek
Quoted 24 lines · Marcel Apfelbaum

Hi Laszlo,

Quoted 20 lines · Laszlo Ersek

The "i82801b11-bridge" device model is a descendant of "base-pci-bridge" (TYPE_PCI_BRIDGE). However, unlike other similar devices, such as

- pci-bridge,
- pcie-pci-bridge,
- PCIE Root Port,
- xio3130 switch upstream and downstream ports,
- dec-21154-p2p-bridge,
- pbm-bridge,
- xilinx-pcie-root,

"i82801b11-bridge" does not clear the bridge specific registers at platform reset.

This is a problem because devices on "i82801b11-bridge" continue to respond to config space cycles after platform reset, when addressed with the bus number that was previously programmed into the secondary bus number register of "i82801b11-bridge". This error breaks OVMF's search for extra (PXB) root buses, for example.

Quoted 8 lines
Quoted 2 lines

Now I understand why we didn't catch the error until now. Nobody tried to use the pxb device with the dmi-pci bridge.

No, that's not correct:

- first, it's not about using pxb and dmi-pci in a *hierarchical* (superordinate / subordinate) fashion,

That's what I meant, sorry for the misunderstanding.

Quoted 30 lines

- second, the reason the symptom has not been witnessed with SeaBIOS is that SeaBIOS *suppresses* the issue.

In more detail:

(1) The setup where the problem shows up (with OVMF) is that dmi-pci and pxb are *siblings*. (They both live on the root complex.) The breakage is that OVMF scans for any device on any pxb's secondary bus -- in order to deduce the pxbs' existence --, but, *before* reaching such a device, a device that lives on the secondary bus of dmi-pci responds (because the dmi-pci bridge remembers its 2ndary busnr from before the reboot, and that bus number is *lower* than a real pxb's 2ndary bus number). Under the circumstances of the scanning, *only* pxb-hosted devices should respond, therefore OVMF mistakes dmi-pci for a pxb.

(2) The reason SeaBIOS does not tickle this QEMU issue is that the pci_bios_init_bus_rec() function, in "src/fw/pciinit.c", preventatively overwrites, as first step, the secondary and subordinate busnr registers of all bridge devices (including dmi-pci) that are on the currently processed bus:

Quoted 8 lines
    /* prevent accidental access to unintended devices */
    foreachbdf(bdf, bus) {
        class = pci_config_readw(bdf, PCI_CLASS_DEVICE);
        if (class == PCI_CLASS_BRIDGE_PCI) {
            pci_config_writeb(bdf, PCI_SECONDARY_BUS, 255);
            pci_config_writeb(bdf, PCI_SUBORDINATE_BUS, 0);
        }
    }
Quoted 3 lines

While this is not a bad idea in SeaBIOS, I honestly think the error should be fixed in QEMU.

Agreed, SeaBIOS intends to fix broken hardware, that doesn't mean we should have it on QEMU.

Quoted 10 lines

(And, the SeaBIOS approach is not viable in OVMF. When SeaBIOS does the above, the bus being processed (i.e. the one on which dmi-pci lives) is already "live"; its parent bridge already has the 2ndary bus number / subordinate bus number registers set correctly. This is not the case when OVMF scans for PXB extra root buses -- that search is not hierarchical and entirely precedes enumeration / resource assignment. The recursive traversal occurs much later, in a different UEFI driver.)

Quoted 2 lines
Quoted 1 line

The device class reset method for "i82801b11-bridge" is currently NULL;

Quoted 8 lines
Quoted 1 line

This is sad, the device was always broken.

Well, not extremely sad :) , given that we've encountered this issue only now (and with OVMF reboot only).

Nonetheless, I did CC "qemu-stable" on the patch; I think it should be applied to all currently supported stable releases.

Agreed

Quoted 11 lines
Quoted 8 lines
Quoted 4 lines

set it directly to pci_bridge_reset(), like the last three bridge models in the above listing do.

Thanks for catching it!

I hope that the details I added now don't make you retract your R-b :)

Of course it stands, the call to reset should be there.

Thanks,
Marcel

Quoted 27 lines

Thanks!
Laszlo

Quoted 23 lines
Quoted 22 lines

Cc: "Michael S. Tsirkin" <[email protected]>
Cc: Marcel Apfelbaum <[email protected]>
Cc: [email protected]
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1541839

---
 hw/pci-bridge/i82801b11.c | 1 +
 1 file changed, 1 insertion(+)
hw/pci-bridge/i82801b11.c +1 -0
index cb522bf30c31..ebf7f5f0e81c 100644
@@ -98,6 +98,7 @@ static void i82801b11_bridge_class_init(ObjectClass *klass, void *data)
     k->realize = i82801b11_bridge_realize;
     k->config_write = pci_bridge_write_config;
     dc->vmsd = &i82801b11_bridge_dev_vmstate;
+    dc->reset = pci_bridge_reset;
     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 }