[PATCH v6 0/7] pci: Work around ASMedia ASM2824 PCIe link training failures

From: Maciej W. Rozycki
Date: Sun Feb 05 2023 - 10:49:06 EST


Hi,

This is v6 of the change to work around a PCIe link training phenomenon
where a pair of devices both capable of operating at a link speed above
2.5GT/s seems unable to negotiate the link speed and continues training
indefinitely with the Link Training bit switching on and off repeatedly
and the data link layer never reaching the active state.

Following Bjorn's suggestion from the previous iteration:
<https://lore.kernel.org/lkml/20221109050418.GA529724@bhelgaas/> I have
moved the workaround into the PCI core. I have kept the part specific to
ASMedia (to lift the speed restriction after a successful retrain) within,
although I find it a good candidate for a standalone quirk. It seems to
me we'd have to add additional classes of fixups however to move this part
to drivers/pci/quirks.c, which I think would be an overkill. So I've only
made it explicitly guarded by CONFIG_PCI_QUIRKS; I can see there's prior
art with this approach.

In the course of the update I have realised that commit 6b2f1351af56
("PCI: Wait for device to become ready after secondary bus reset") makes
no sense and was about to figure out what to do here about it, but then
found Lukas's recent patch series addressing this issue (thanks, Lukas,
you made my life easier!), so I have rebased my patch set on top of
Lukas's:
<https://lore.kernel.org/all/da77c92796b99ec568bd070cbe4725074a117038.1673769517.git.lukas@xxxxxxxxx/>.

This has resulted in mild ugliness in that `pcie_downstream_link_retrain'
may be called from `pci_bridge_wait_for_secondary_bus' twice, first time
via `pcie_wait_for_link_delay' and second time via `pci_dev_wait'. This
second call to `pcie_downstream_link_retrain' will do nothing, because for
`link_active_reporting' devices `pcie_wait_for_link_delay' will have
ensured the link has gone up or the second call won't have been reached.

I have also decided to move the initialisation of `link_active_reporting'
earlier on, so as to have a single way to check for the feature. This has
brought an extra patch and its 3 clean-up dependencies into the series.

This was originally observed in a configuration featuring a downstream
port of the ASMedia ASM2824 Gen 3 switch wired to the upstream port of the
Pericom PI7C9X2G304 Gen 2 switch. However in the course of review I have
come to the conclusion that similarly to the earlier similar change to
U-Boot it is indeed expected to be safe to apply this workaround to any
downstream port that has failed link negotiation provided that:

1. the port is capable of reporting the data link layer link active
status (because unlike U-Boot we cannot busy-loop continuously polling
the link training bit),

and:

2. we don't attempt to lift the 2.5GT/s speed restriction, imposed as the
basis of the workaround, for devices not explicitly known to continue
working in that case.

It is expected to be safe because the workaround is applied to a failed
link, that is one that does not (at the time this code is executed) work
anyway, so trying to bring it up cannot make the situation worse.

This has been verified with a SiFive HiFive unmatched board, with and
without CONFIG_PCI_QUIRKS enabled, booting with or without the workaround
activated in U-Boot, which covered both the link retraining part of the
quirk and the lifting of speed restriction already imposed by U-Boot.

I have also issued resets via sysfs to see how this change behaves. For
the problematic link this required a hack to remove a `dev->subordinate'
check from `pci_parent_bus_reset', which in turn triggered the workaround
as expected and brought the link up (but otherwise clobbered downstream
devices as one would inevitably expect).

I have no way to verify these patches with power management or hot-plug
events, but owing to Lukas's effort they get into the same infrastructure,
so I expect the workaround to do its job as expected. I note that there
is an extra call to `pcie_wait_for_link' from `pciehp_check_link_status',
but I expect it to work too. For `link_active_reporting' devices it will
call `pcie_downstream_link_retrain' and for`!link_active_reporting' ones
we have no means to do anything anyway.

The 3 extra clean-ups were only compile-tested (with PowerPC and x86-64
configurations, as appropriate), because I have no suitable hardware
available.

Please see individual change descriptions for further details.

Let me know if this is going in the right direction.

Maciej