iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tile PCI RC: tweak the the pcie_rc_delay support

Browse Source 
Allow longer delays if requested, and print the info messages
as we are performing the delay, not when parsing the arguments.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
This commit is contained in:
Chris Metcalf 2013-08-02 11:47:29 -04:00
parent 2be705523f
commit b3ad73a33e
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
arch/tile/kernel/pci_gx.c
View File

@ -69,17 +69,14 @@ static int pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
* a HW PCIe link-training bug. The exact delay is specified with
* a kernel boot argument in the form of "pcie_rc_delay=T,P,S",
* where T is the TRIO instance number, P is the port number and S is
* the delay in seconds. If the delay is not provided, the value
* will be DEFAULT_RC_DELAY.
* the delay in seconds. If the argument is specified, but the delay is
* not provided, the value will be DEFAULT_RC_DELAY.
*/
static int rc_delay[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
/* Default number of seconds that the PCIe RC port probe can be delayed. */
#define DEFAULT_RC_DELAY 10
/* Max number of seconds that the PCIe RC port probe can be delayed. */
#define MAX_RC_DELAY 20
/* Array of the PCIe ports configuration info obtained from the BIB. */
struct pcie_port_property pcie_ports[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
@ -570,14 +567,9 @@ static int setup_pcie_rc_delay(char *str)
if (!isdigit(*str))
return -EINVAL;
delay = simple_strtoul(str, (char **)&str, 10);
if (delay > MAX_RC_DELAY)
return -EINVAL;
}
rc_delay[trio_index][mac] = delay ? : DEFAULT_RC_DELAY;
pr_info("Delaying PCIe RC link training for %u sec"
" on MAC %lu on TRIO %lu\n", rc_delay[trio_index][mac],
mac, trio_index);
return 0;
}
early_param("pcie_rc_delay", setup_pcie_rc_delay);
@ -682,12 +674,6 @@ int __init pcibios_init(void)
continue;
}
/*
* Delay the RC link training if needed.
*/
if (rc_delay[trio_index][mac])
msleep(rc_delay[trio_index][mac] * 1000);
ret = gxio_trio_force_rc_link_up(trio_context, mac);
if (ret < 0)
pr_err("PCI: PCIE_FORCE_LINK_UP failure, "
@ -697,10 +683,21 @@ int __init pcibios_init(void)
trio_index, controller->mac);
/*
* Wait a bit here because some EP devices take longer
* to come up.
* Delay the bus probe if needed.
*/
msleep(1000);
if (rc_delay[trio_index][mac]) {
pr_info("Delaying PCIe RC bus enumerating %d sec"
" on MAC %d on TRIO %d\n",
rc_delay[trio_index][mac], mac,
trio_index);
msleep(rc_delay[trio_index][mac] * 1000);
} else {
/*
* Wait a bit here because some EP devices
* take longer to come up.
*/
msleep(1000);
}
/*
* Check for PCIe link-up status.