On Monday 02 November 2020 16:54:35 Toke Høiland-Jørgensen wrote: > Pali Rohár <pali@xxxxxxxxxx> writes: > > > On Saturday 31 October 2020 13:49:49 Toke Høiland-Jørgensen wrote: > >> "™֟☻̭҇ Ѽ ҉ ®" <vtolkm@xxxxxxxxxxxxxx> writes: > >> > >> > On 30/10/2020 15:23, Pali Rohár wrote: > >> >> On Friday 30 October 2020 14:02:22 Toke Høiland-Jørgensen wrote: > >> >>> Pali Rohár <pali@xxxxxxxxxx> writes: > >> >>>> My experience with that WLE900VX card, aardvark driver and aspm code: > >> >>>> > >> >>>> Link training in GEN2 mode for this card succeed only once after reset. > >> >>>> Repeated link retraining fails and it fails even when aardvark is > >> >>>> reconfigured to GEN1 mode. Reset via PERST# signal is required to have > >> >>>> working link training. > >> >>>> > >> >>>> What I did in aardvark driver: Set mode to GEN2, do link training. If > >> >>>> success read "negotiated link speed" from "Link Control Status Register" > >> >>>> (for WLE900VX it is 0x1 - GEN1) and set it into aardvark. And then > >> >>>> retrain link again (for WLE900VX now it would be at GEN1). After that > >> >>>> card is stable and all future retraining (e.g. from aspm.c) also passes. > >> >>>> > >> >>>> If I do not change aardvark mode from GEN2 to GEN1 the second link > >> >>>> training fails. And if I change mode to GEN1 after this failed link > >> >>>> training then nothing happen, link training do not success. > >> >>>> > >> >>>> So just speculation now... In current setup initialization of card does > >> >>>> one link training at GEN2. Then aspm.c is called which is doing second > >> >>>> link retraining at GEN2. And if it fails then below patch issue third > >> >>>> link retraining at GEN1. If A38x/pci-mvebu has same problem as aardvark > >> >>>> then second link retraining must be at GEN1 (not GEN2) to workaround > >> >>>> this issue. > >> >>>> > >> >>>> Bjorn, Toke: what about trying to hack aspm.c code to never do link > >> >>>> retraining at GEN2 speed? And always force GEN1 speed prior link > >> >>>> training? > >> >>> Sounds like a plan. I poked around in aspm.c and must confess to being a > >> >>> bit lost in the soup of registers ;) > >> >>> > >> >>> So if one of you can cook up a patch, that would be most helpful! > >> >> I modified Bjorn's patch, explicitly set tls to 1 and added debug info > >> >> about cls (current link speed, that what is used by aardvark). It is > >> >> untested, I just tried to compile it. > >> >> > >> >> Can try it? > >> >> > >> >> diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c > >> >> index 253c30cc1967..f934c0b52f41 100644 > >> >> --- a/drivers/pci/pcie/aspm.c > >> >> +++ b/drivers/pci/pcie/aspm.c > >> >> @@ -206,6 +206,27 @@ static bool pcie_retrain_link(struct pcie_link_state *link) > >> >> unsigned long end_jiffies; > >> >> u16 reg16; > >> >> > >> >> + u32 lnkcap2; > >> >> + u16 lnksta, lnkctl2, cls, tls; > >> >> + > >> >> + pcie_capability_read_dword(parent, PCI_EXP_LNKCAP2, &lnkcap2); > >> >> + pcie_capability_read_word(parent, PCI_EXP_LNKSTA, &lnksta); > >> >> + pcie_capability_read_word(parent, PCI_EXP_LNKCTL2, &lnkctl2); > >> >> + cls = lnksta & PCI_EXP_LNKSTA_CLS; > >> >> + tls = lnkctl2 & PCI_EXP_LNKCTL2_TLS; > >> >> + > >> >> + pci_info(parent, "lnkcap2 %#010x sls %#04x lnksta %#06x cls %#03x lnkctl2 %#06x tls %#03x\n", > >> >> + lnkcap2, (lnkcap2 & 0x3F) >> 1, > >> >> + lnksta, cls, > >> >> + lnkctl2, tls); > >> >> + > >> >> + tls = 1; > >> >> + pcie_capability_clear_and_set_word(parent, PCI_EXP_LNKCTL2, > >> >> + PCI_EXP_LNKCTL2_TLS, tls); > >> >> + pcie_capability_read_word(parent, PCI_EXP_LNKCTL2, &lnkctl2); > >> >> + pci_info(parent, "lnkctl2 %#010x new tls %#03x\n", > >> >> + lnkctl2, tls); > >> >> + > >> >> pcie_capability_read_word(parent, PCI_EXP_LNKCTL, ®16); > >> >> reg16 |= PCI_EXP_LNKCTL_RL; > >> >> pcie_capability_write_word(parent, PCI_EXP_LNKCTL, reg16); > >> >> @@ -227,6 +248,8 @@ static bool pcie_retrain_link(struct pcie_link_state *link) > >> >> break; > >> >> msleep(1); > >> >> } while (time_before(jiffies, end_jiffies)); > >> >> + pci_info(parent, "lnksta %#06x new cls %#03x\n", > >> >> + lnksta, (cls & PCI_EXP_LNKSTA_CLS)); > >> >> return !(reg16 & PCI_EXP_LNKSTA_LT); > >> >> } > >> >> > >> > > >> > Still exhibiting the BAR update error, run tested with next--20201030 > >> > >> Yup, same for me :( I'm answering my own question. This code does not work on Omnia because A38x pci-mvebu.c driver is using emulator for PCIe root bridge and it does not implement PCI_EXP_LNKCTL2 and PCI_EXP_LNKCTL2 registers. So code for forcing link speed has no effect on Omnia... > > So then it is different issue and not similar to aardvark one. ... and therefore it can be still same issue which I have debugged on aardvark. > > Anyway, was ASPM working on some previous kernel version? Or was it > > always broken on Turris Omnia? > > I tried bisecting and couldn't find a commit that worked. And OpenWrt by > default builds with ASPM off, so my best guess is that it was always > broken. I see and it makes sense that it does not work in any version. > However, the two other PCI slots *do* work with ASPM on, as long as > they're both occupied when booting. If I only have one card installed > apart from the dodge WLE900, both of them fail... > > > And has somebody other Armada 385 device with mPCIe slots to test if > > ASPM is working? Or any other 32bit Marvell Armada SOC? > > > > I would like to know if this is issue only on Turris Omnia or also on > > other Armada 385 SOC device or even on any other device which uses > > pci-mvebu.c driver. > > See above: It does partly work on my Omnia. Is it possible to define a > quirk to just disable it on a per-slot basis for the WLE900 card? Maybe > just doing that and calling it a day would be enough... > > -Toke > Toke, can you try to put this WLE900 card into some x86 computer and check if this card works? With ASPM enabled and also with ASPM disabled? Or into any other device which does not have Marvell PCIe controller? I need to know if problem is with this WLE900 card or with Marvell's PCIe controllers. And based on it I can prepare quirk / hook for either WLE900 card or for Marvell PCIe drivers (or both, based on how it is broken). PS for all: Please do not put fancy unicode characters into email From: header as such email would be marked as spam and automatically filtered.
