If an emulated PCIe endpoint has higher link speed or width capabilities than the upstream port it is connected to, ensure that the link status on both ends is consistent by using the link status computed for the upstream port.
If the PCIe endpoint is a passthrough device, the link status continues to match the real status and consistent values requires the emulated upstream port to be at least as capable as the endpoint. Signed-off-by: David Vrabel <[email protected]> --- hw/pci/pcie.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 4622c75e48..66d778413d 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -169,18 +169,36 @@ void pcie_cap_fill_link_ep_usp(PCIDevice *dev, PCIExpLinkWidth width, PCIExpLinkSpeed speed, bool flitmode) { uint8_t *exp_cap = dev->config + dev->exp.exp_cap; + PCIDevice *upstream; /* - * For an end point or USP need to set the current status as well - * as the capabilities. + * For an endpoint or USP, set Link Status as well as capabilities. + * Provisionally use this device's width/speed, then adopt the upstream + * port's values so both ends of an emulated link agree. The upstream + * LNKSTA is already clamped to the negotiated link capabilities via + * pcie_sync_bridge_lnk(). */ - pci_long_test_and_clear_mask(exp_cap + PCI_EXP_LNKSTA, + pci_word_test_and_clear_mask(exp_cap + PCI_EXP_LNKSTA, PCI_EXP_LNKSTA_CLS | PCI_EXP_LNKSTA_NLW); - pci_long_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, + pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, QEMU_PCI_EXP_LNKSTA_NLW(width) | QEMU_PCI_EXP_LNKSTA_CLS(speed)); pcie_cap_fill_lnk(exp_cap, width, speed, flitmode); + + upstream = pci_bridge_get_device(pci_get_bus(dev)); + if (upstream && pci_is_express_downstream_port(upstream)) { + uint8_t *up_exp = upstream->config + upstream->exp.exp_cap; + uint16_t lnksta; + + pcie_sync_bridge_lnk(upstream); + lnksta = pci_get_word(up_exp + PCI_EXP_LNKSTA); + pci_word_test_and_clear_mask(exp_cap + PCI_EXP_LNKSTA, + PCI_EXP_LNKSTA_CLS | PCI_EXP_LNKSTA_NLW); + pci_word_test_and_set_mask(exp_cap + PCI_EXP_LNKSTA, + lnksta & (PCI_EXP_LNKSTA_CLS | + PCI_EXP_LNKSTA_NLW)); + } } static void pcie_cap_fill_slot_lnk(PCIDevice *dev) -- 2.43.0
