summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorAndrew Donnellan <andrew.donnellan@au1.ibm.com>2015-10-14 16:12:19 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-10-23 14:23:55 +1100
commit7dd85992fbc4c8b309f255225613160e2e8c4722 (patch)
tree9a04a3357f71300a0008daff40b38b26b5490a05 /hw
parent97a94d98f0e567f2244ab6794dde540250098fe5 (diff)
downloadtalos-skiboot-7dd85992fbc4c8b309f255225613160e2e8c4722.tar.gz
talos-skiboot-7dd85992fbc4c8b309f255225613160e2e8c4722.zip
hw/phb3: phb3_set_capi_mode(): remove duplicated code
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@au1.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/phb3.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/hw/phb3.c b/hw/phb3.c
index ddb237e0..411c6e52 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;
OpenPOWER on IntegriCloud