[Skiboot] [PATCH] hw/phb3: phb3_set_capi_mode(): remove duplicated code

Andrew Donnellan andrew.donnellan at au1.ibm.com
Wed Oct 14 16:12:19 AEDT 2015


Remove duplicated code block for checking CAPP_ERR_STATUS_CTRL in
phb3_set_capi_mode(), which appears to have been inadvertently added as a
result of a merge/rebase issue. No functional change.

Fixes: 5aa2331ff590 ("phb3/capi: Add capp recovery to phb3")
Signed-off-by: Andrew Donnellan <andrew.donnellan at au1.ibm.com>

---

This patch has been compile-tested only.
---
 hw/phb3.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/hw/phb3.c b/hw/phb3.c
index ddb237e..411c6e5 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -3359,15 +3359,6 @@ static int64_t phb3_set_capi_mode(struct phb *phb, uint64_t mode,
 		return OPAL_BUSY;
 	}
 
-	xscom_read(p->chip_id, CAPP_ERR_STATUS_CTRL, &reg);
-	if ((reg & PPC_BIT(5))) {
-		PHBERR(p, "CAPP: recovery failed (%016llx)\n", reg);
-		return OPAL_HARDWARE;
-	} else if ((reg & PPC_BIT(0)) && (!(reg & PPC_BIT(1)))) {
-		PHBDBG(p, "CAPP: recovery in progress\n");
-		return OPAL_BUSY;
-	}
-
 	if (mode == OPAL_PHB_CAPI_MODE_PCIE)
 		return OPAL_UNSUPPORTED;
 
-- 
Andrew Donnellan              Software Engineer, OzLabs
andrew.donnellan at au1.ibm.com  Australia Development Lab, Canberra
+61 2 6201 8874 (work)        IBM Australia Limited



More information about the Skiboot mailing list