aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2015-07-01 14:04:12 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2015-07-01 14:04:12 +1000
commitf469c1f4df925f207fea4b727e5c0561af88bd9b (patch)
tree961b00fecde50be803dd5d62960b09faf66c4510
parent6be837c7ef0da5407d523c746e8a35da31e53f08 (diff)
downloadskiboot-f469c1f4df925f207fea4b727e5c0561af88bd9b.zip
skiboot-f469c1f4df925f207fea4b727e5c0561af88bd9b.tar.gz
skiboot-f469c1f4df925f207fea4b727e5c0561af88bd9b.tar.bz2
PHB3: Wait 2s for electrical link to come up
We have problem with some Mellanox cards Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--hw/phb3.c4
-rw-r--r--include/phb3.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/phb3.c b/hw/phb3.c
index 9ffb449..6259e24 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -2026,12 +2026,12 @@ static int64_t phb3_start_link_poll(struct phb3 *p)
{
/*
* Wait for link up to 10s. However, we give up after
- * only a second if the electrical connection isn't
+ * only two seconds if the electrical connection isn't
* stablished according to the DLP link control register
*/
p->retries = PHB3_LINK_ELECTRICAL_RETRIES;
p->state = PHB3_STATE_WAIT_LINK_ELECTRICAL;
- return phb3_set_sm_timeout(p, msecs_to_tb(1000));
+ return phb3_set_sm_timeout(p, msecs_to_tb(100));
}
static int64_t phb3_sm_hot_reset(struct phb3 *p)
diff --git a/include/phb3.h b/include/phb3.h
index f785916..ea3ad87 100644
--- a/include/phb3.h
+++ b/include/phb3.h
@@ -251,7 +251,7 @@ struct phb3_err {
/* Link timeouts, increments of 100ms */
#define PHB3_LINK_WAIT_RETRIES 20
-#define PHB3_LINK_ELECTRICAL_RETRIES 10
+#define PHB3_LINK_ELECTRICAL_RETRIES 20
/* PHB3 flags */
#define PHB3_AIB_FENCED 0x00000001