diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2017-10-10 10:02:28 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-10-11 19:14:10 +1100 |
| commit | a4788a49f004a91bb8ca015336abf9ae119fbc52 (patch) | |
| tree | 40432ad66507e8c0c88a7c56f028cd09663ac921 | |
| parent | 296ca2acf00fde764e3ea6436f46468c6caef174 (diff) | |
| download | talos-skiboot-a4788a49f004a91bb8ca015336abf9ae119fbc52.tar.gz talos-skiboot-a4788a49f004a91bb8ca015336abf9ae119fbc52.zip | |
FSP: Disable PSI link whenever FSP tells OPAL about impending R/R
Commit 42d5d047 fixed scenario where DPO has been initiated, but FSP went
into reset before the CEC power down came in. But this is generic issue
that can happen in normal shutdown path as well.
Hence disable PSI link as soon as we detect FSP impending R/R.
CC: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
CC: Stewart Smith <stewart@linux.vnet.ibm.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | hw/fsp/fsp.c | 25 | ||||
| -rw-r--r-- | include/fsp.h | 1 |
2 files changed, 8 insertions, 18 deletions
diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c index 724c7f73..1179283c 100644 --- a/hw/fsp/fsp.c +++ b/hw/fsp/fsp.c @@ -720,23 +720,14 @@ static void fsp_handle_errors(struct fsp *fsp) if (fsp->state == fsp_mbx_rr) return; - if (fsp_dpo_pending) { - /* - * If we are about to process a reset when DPO - * is pending, its possible that the host has - * gone down, and OPAL is on its way down and - * hence will not see the subsequent PSI interrupt. - * So, just give up the link here. - */ - prlog(PR_NOTICE, "FSP #%d: FSP reset with DPO pending." - " Giving up PSI link\n", - fsp->index); - psi_disable_link(psi); - } else { - prlog(PR_NOTICE, "FSP #%d: FSP in Reset." - " Waiting for PSI interrupt\n", - fsp->index); - } + /* + * Its possible that the host has gone down, and OPAL is on + * its way down and hence will not see the subsequent PSI + * interrupt. So, just give up the link here. + */ + psi_disable_link(psi); + prlog(PR_NOTICE, "FSP #%d: FSP in reset." + " Giving up PSI link\n", fsp->index); fsp_start_rr(fsp); } diff --git a/include/fsp.h b/include/fsp.h index 1d877d81..36802a1d 100644 --- a/include/fsp.h +++ b/include/fsp.h @@ -837,7 +837,6 @@ extern void fsp_epow_init(void); /* DPO */ extern void fsp_dpo_init(void); -extern bool fsp_dpo_pending; /* Chiptod */ extern void fsp_chiptod_init(void); |
