diff mbox series

[v3] FSP: Disable PSI link whenever FSP tells OPAL about impending R/R

Message ID 20171010043228.30339-1-hegdevasant@linux.vnet.ibm.com
State Accepted
Headers show
Series [v3] FSP: Disable PSI link whenever FSP tells OPAL about impending R/R | expand

Commit Message

Vasant Hegde Oct. 10, 2017, 4:32 a.m. UTC
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>
---
 hw/fsp/fsp.c  | 25 ++++++++-----------------
 include/fsp.h |  1 -
 2 files changed, 8 insertions(+), 18 deletions(-)

Comments

Stewart Smith Oct. 11, 2017, 9 a.m. UTC | #1
Vasant Hegde <hegdevasant@linux.vnet.ibm.com> writes:
> 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>
> ---
>  hw/fsp/fsp.c  | 25 ++++++++-----------------
>  include/fsp.h |  1 -
>  2 files changed, 8 insertions(+), 18 deletions(-)

Merged to master as of a4788a49f004a91bb8ca015336abf9ae119fbc52
5.4.x as of ad64cfb5ce4acdf1be3b13d8fb97c0262c3a49c5
and made it to 5.4.8
diff mbox series

Patch

diff --git a/hw/fsp/fsp.c b/hw/fsp/fsp.c
index 4d17397..56674ca 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 1d877d8..36802a1 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);