Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275929
b: refs/heads/master
c: 0027cb3
h: refs/heads/master
i:
  275927: 70cc357
v: v3
  • Loading branch information
Kenji Kaneshige authored and Jesse Barnes committed Nov 11, 2011
1 parent fa57bca commit 39c1bb4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fdbd3ce9efb3a045266f2f6b2f1b6047882ff092
refs/heads/master: 0027cb3e1947d0f453fece40ed16764fb362bac6
3 changes: 0 additions & 3 deletions trunk/drivers/pci/hotplug/pciehp_ctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,6 @@ static int board_added(struct slot *p_slot)
goto err_exit;
}

/* Wait for 1 second after checking link training status */
msleep(1000);

/* Check for a power fault */
if (ctrl->power_fault_detected || pciehp_query_power_fault(p_slot)) {
ctrl_err(ctrl, "Power fault on slot %s\n", slot_name(p_slot));
Expand Down
8 changes: 8 additions & 0 deletions trunk/drivers/pci/hotplug/pciehp_hpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,14 @@ int pciehp_check_link_status(struct controller *ctrl)
else
msleep(1000);

/*
* Need to wait for 1000 ms after Data Link Layer Link Active
* (DLLLA) bit reads 1b before sending configuration request.
* We need it before checking Link Training (LT) bit becuase
* LT is still set even after DLLLA bit is set on some platform.
*/
msleep(1000);

retval = pciehp_readw(ctrl, PCI_EXP_LNKSTA, &lnk_status);
if (retval) {
ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
Expand Down

0 comments on commit 39c1bb4

Please sign in to comment.