[PATCH 3/3 v4] [ARM] Kirkwood: add support for PCIe1

[Benjamin Zores]

On 08/06/2010 14:20, saeed bishara wrote:
> On Tue, Jun 8, 2010 at 2:43 PM, Benjamin Zores
> <benjamin.zores at alcatel-lucent.com>  wrote:
>    
>> On 08/06/2010 13:21, Saeed Bishara wrote:
>>      
>>> @@ -106,17 +108,21 @@ void __init kirkwood_setup_cpu_mbus(void)
>>>                       TARGET_PCIE, ATTR_PCIE_IO,
>>> KIRKWOOD_PCIE_IO_BUS_BASE);
>>>         setup_cpu_win(1, KIRKWOOD_PCIE_MEM_PHYS_BASE,
>>> KIRKWOOD_PCIE_MEM_SIZE,
>>>                       TARGET_PCIE, ATTR_PCIE_MEM,
>>> KIRKWOOD_PCIE_MEM_BUS_BASE);
>>> +       setup_cpu_win(2, KIRKWOOD_PCIE1_IO_PHYS_BASE,
>>> KIRKWOOD_PCIE1_IO_SIZE,
>>> +                     TARGET_PCIE, ATTR_PCIE1_IO,
>>> KIRKWOOD_PCIE1_IO_BUS_BASE);
>>> +       setup_cpu_win(3, KIRKWOOD_PCIE1_MEM_PHYS_BASE,
>>> KIRKWOOD_PCIE1_MEM_SIZE,
>>> +                     TARGET_PCIE, ATTR_PCIE1_MEM,
>>> KIRKWOOD_PCIE1_MEM_BUS_BASE);
>>>
>>>
>>>        
>> I'd have used an id, and incremented it at each setup_cpu_win() call.
>> Also only doing the last 2 calls on 6282.
>>
>>      
>>>         /* Make sure those units are accessible */
>>> -       writel(curr | CGC_SATA0 | CGC_SATA1 | CGC_PEX0,
>>> CLOCK_GATING_CTRL);
>>> +       writel(curr | CGC_SATA0 | CGC_SATA1 | CGC_PEX0 | CGC_PEX1,
>>> CLOCK_GATING_CTRL);
>>>
>>>
>>>        
>> Why not (pseudo code):
>>
>> int flags = curr | CGC_SATA0 | CGC_SATA1 | CGC_PEX0;
>> if (6282) flags |= CGC_PEX1;
>> writel(flags, ...);
>>
>>      
>>> +       /* For PCIe 1: first shutdown the phy */
>>> +       if (dev == MV88F6282_DEV_ID) {
>>> +               if (!(kirkwood_clk_ctrl&    CGC_PEX1)) {
>>> +                       writel(readl(PCIE1_LINK_CTRL) | 0x10,
>>> PCIE1_LINK_CTRL);
>>> +                       while (1)
>>> +                               if (readl(PCIE1_STATUS)&    0x1)
>>> +                                       break;
>>> +                       writel(readl(PCIE1_LINK_CTRL)&    ~0x10,
>>> PCIE1_LINK_CTRL);
>>> +               }
>>> +       } else  /* keep this bit set for devices that don't have PCIe1 */
>>> +               kirkwood_clk_ctrl |= CGC_PEX1;
>>>
>>>
>>>        
>> the else part is useless with the proposal above i guess.
>>
>> Except from that, when using your patch I was unable to boot kernel anymore
>> on 6281 boards.
>>      
> can you try the patch I send regarding nand mpps?
>    

Unfortunately no, I'm running on OpenRD currently.

Ben