Re: [PATCH] pciehp: Retrieve link speed after link is trained

[Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>]

(2011/11/03 16:07), Kenji Kaneshige wrote:
> (2011/11/03 6:05), Jesse Barnes wrote:
>> On Sun, 09 Oct 2011 00:06:06 -0700
>> Yinghai Lu<yinghai.lu@oracle.com> wrote:
>>
>>>
>>> During hot plug, board_added will call pciehp_power_on_slot().
>>> But link speed is updated in pciehp_power_on_slot().
>>>
>>> We should not update link speed there, because that is too early.
>>>
>>> Move updating to pciehp_check_link_status() after making sure link is trained.
>>>
>>> Signed-off-by: Yinghai Lu<yinghai.lu@oracle.com>
>>>
>>> ---
>>> drivers/pci/hotplug/pciehp_hpc.c | 10 ++--------
>>> 1 file changed, 2 insertions(+), 8 deletions(-)
>>>
>>> Index: linux-2.6/drivers/pci/hotplug/pciehp_hpc.c
>>> ===================================================================
>>> --- linux-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c
>>> +++ linux-2.6/drivers/pci/hotplug/pciehp_hpc.c
>>> @@ -294,6 +294,8 @@ int pciehp_check_link_status(struct cont
>>> return retval;
>>> }
>>>
>>> + pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
>>> +
>>> return retval;
>>> }
>>>
>>> @@ -516,14 +518,6 @@ int pciehp_power_on_slot(struct slot * s
>>> ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
>>> pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);
>>>
>>> - retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA,&lnk_status);
>>> - if (retval) {
>>> - ctrl_err(ctrl, "%s: Cannot read LNKSTA register\n",
>>> - __func__);
>>> - return retval;
>>> - }
>>> - pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
>>> -
>>> return retval;
>>> }
>>
>> Kenji-san or Hidetoshi-san, would it be possible to get tested-bys and
>> reviewed-bys from you on this patch?
>>
>> Thanks,
>
> Looks good to me.
> Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
>
> Unfortunately, I don't have test environment right now. Maybe
> I will be able to test it early next week.
>

I got the following warning messages on kernel compile. I'm using 3.1.
Yinghai, please fix this.

   CC      drivers/pci/hotplug/pciehp_hpc.o
drivers/pci/hotplug/pciehp_hpc.c: In function 'pciehp_power_on_slot':
drivers/pci/hotplug/pciehp_hpc.c:489: warning: unused variable 'lnk_status'

Looks good to me, other than this.

Tested-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>

Regards,
Kenji Kaneshige