From 308423515ab9a7213fee7f6992eb9f675caef128 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 29 Aug 2014 06:03:00 +1000 Subject: 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 --- platforms/ibm-fsp/firenze.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'platforms') 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, } ; -- cgit v1.1