aboutsummaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-29 06:03:00 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-29 06:03:00 +1000
commit308423515ab9a7213fee7f6992eb9f675caef128 (patch)
tree5cd62624c128f3fa5a2ae316f38b1c969c2fcff3 /platforms
parentc34c4ef8c660e3e439365c8f5c06143ff00bc6bc (diff)
downloadskiboot-308423515ab9a7213fee7f6992eb9f675caef128.zip
skiboot-308423515ab9a7213fee7f6992eb9f675caef128.tar.gz
skiboot-308423515ab9a7213fee7f6992eb9f675caef128.tar.bz2
occ: Make timeout platform dependent
Keep it 0 for open-power platforms where OCC is going to be preloaded, also avoids a annoying 1mn delay on early openpower and bml when there is no OCC firmware to wait for. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'platforms')
-rw-r--r--platforms/ibm-fsp/firenze.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/platforms/ibm-fsp/firenze.c b/platforms/ibm-fsp/firenze.c
index ae72e21..c0a13c0 100644
--- a/platforms/ibm-fsp/firenze.c
+++ b/platforms/ibm-fsp/firenze.c
@@ -232,6 +232,12 @@ static void firenze_setup_phb(struct phb *phb, unsigned int index)
lxvpd_process_slot_entries(phb, dt_root, hub_id, index);
}
+static uint32_t ibm_fsp_occ_timeout(void)
+{
+ /* Use a fixed 60s value for now */
+ return 60;
+}
+
DECLARE_PLATFORM(firenze) = {
.name = "Firenze",
.probe = firenze_probe,
@@ -244,4 +250,5 @@ DECLARE_PLATFORM(firenze) = {
.nvram_info = fsp_nvram_info,
.nvram_start_read = fsp_nvram_start_read,
.nvram_write = fsp_nvram_write,
+ .occ_timeout = ibm_fsp_occ_timeout,
} ;