staging: mt7621-pci: factor out 'mt7621_pcie_enable_port' function

Greg Ungerer gerg at kernel.org
Thu May 23 02:11:51 UTC 2019


Hi Sergio,

On 22/5/19 4:27 pm, Sergio Paracuellos wrote:
[snip]
> There are some big changes between 4.20 and 5.x. One is the use of PERST_N
> instead of using gpio. This PERT_N stuff is used now on enable ports
> assuming the
> link of PCI is properly detected after enabling the phy. And it seems
> it is not according to
> your dmesg traces. The previous 4.20 code used gpio before this was done.
> 
> This code is the one I am referring:
> 
> /* Use GPIO control instead of PERST_N */
> *(unsigned int *)(0xbe000620) |= BIT(19) | BIT(8) | BIT(7); // set DATA
> mdelay(1000);

I have been looking closely at those, wondering why the old code
drove that PERST line as a GPIO instead of using the built-in behavior.
(I have ignored bits 7 and 8 here since they are control of UART 3)


> I assume reset lines on your device tree are properly set up which is
> other of the big changes here: use
> reset lines instead of that hardcoding stuff. Also, the
> mt7621_reset_port routine is also using msleep(100)
> but maybe you can try a bigger value and change it into a mdelay, to
> see if that changes anything.

I see the reset line configuration in the pcie section of mt7621.dtsi,
is there any others absolutely required here?  I couldn't see the
gbpc1.dts devicetree do anything else with pcie - othe than enable it.
My device tree for the EX15 is similar in that regard.

I tried a couple of things with interesting results.

1. I made sure that the PERST_N line is set for PCIe operation (not GPIO).
    I forced it with:

        *(unsigned int *)(0xbe000060) &= ~(0x3 << 10);

    I checked bits 10 and 11 at kernel PCI init and they were 00 anyway.
    So PERST_N was definitely in PCIe reset mode. No change in behavior,
    

2. I forced a GPIO style reset of that PERST line (using GPIO19) and got
    the following result on kernel boot:

     mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 0
     mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
     mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 1
     mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)
     mt7621-pci 1e140000.pcie: Initiating port 1 failed
     mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 2
     mt7621-pci-phy 1e14a000.pcie-phy: Xtal is 40MHz
     mt7621-pci 1e140000.pcie: pcie2 no card, disable it (RST & CLK)
     mt7621-pci 1e140000.pcie: Initiating port 2 failed
     mt7621-pci 1e140000.pcie: de-assert port 0 PERST_N
     mt7621-pci 1e140000.pcie: PCI coherence region base: 0x60000000, mask/settings: 0xf0000002
     mt7621-pci 1e140000.pcie: PCI host bridge to bus 0000:00
     pci_bus 0000:00: root bus resource [io  0xffffffff]
     pci_bus 0000:00: root bus resource [mem 0x60000000-0x6fffffff]
     pci_bus 0000:00: root bus resource [bus 00-ff]

And the system continued on to fully boot. So it looks like it thinks
pcie0 is active. Better, but the PCI bus probe didn't find any of the
devices it should have.

I inserted the quick hack code to do this at the top of mt7621_pcie_init_ports()
and it looked like this:

         /* Force PERST PCIe line into GPIO mode */
         *(unsigned int *)(0xbe000060) &= ~(0x3 << 10);
         *(unsigned int *)(0xbe000060) |=  BIT(10);
         mdelay(100);

         *(unsigned int *)(0xbe000600) |= BIT(19); // use GPIO19 (PERST_N/)
         mdelay(100);
         *(unsigned int *)(0xbe000620) &= ~(BIT(19)); // clear DATA
         mdelay(1000);

         /* Use GPIO control instead of PERST_N */
         *(unsigned int *)(0xbe000620) |= BIT(19); // set DATA
         mdelay(1000);


Regards
Greg


> Other big change is to use the new phy driver but I think the problem
> seems to be related with resets.
> 
>>
>> Regards
>> Greg
> 
> Please, don't hesitate to ask me whatever you need to.
> 
> Hope this helps.
> 
> Best regards,
>      Sergio Paracuellos
> 


More information about the devel mailing list