openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/powernv: Simplify pnv_eeh_reset() 

This drops unnecessary nested if statements in pnv_eeh_reset() to
improve the code readability. After the changes, the unused local
variable "ret" is dropped as well. No logical changes introduced.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Gavin Shan 2016-05-03 15:41:44 +10:00 committed by Michael Ellerman
parent 4a5954ed77
commit 4fad494321
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
arch/powerpc/platforms/powernv/eeh-powernv.c
View File

@ -1009,8 +1009,9 @@ static int pnv_eeh_reset_vf_pe(struct eeh_pe *pe, int option)
static int pnv_eeh_reset(struct eeh_pe *pe, int option) static int pnv_eeh_reset(struct eeh_pe *pe, int option)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
struct pnv_phb *phb;
struct pci_bus *bus; struct pci_bus *bus;
int ret; int64_t rc;
/* /*
* For PHB reset, we always have complete reset. For those PEs whose * For PHB reset, we always have complete reset. For those PEs whose
@ -1026,45 +1027,39 @@ static int pnv_eeh_reset(struct eeh_pe *pe, int option)
* reset. The side effect is that EEH core has to clear the frozen * reset. The side effect is that EEH core has to clear the frozen
* state explicitly after BAR restore. * state explicitly after BAR restore.
*/ */
if (pe->type & EEH_PE_PHB) { if (pe->type & EEH_PE_PHB)
ret = pnv_eeh_phb_reset(hose, option); return pnv_eeh_phb_reset(hose, option);
} else {
struct pnv_phb *phb;
s64 rc;
/* /*
* The frozen PE might be caused by PAPR error injection * The frozen PE might be caused by PAPR error injection
* registers, which are expected to be cleared after hitting * registers, which are expected to be cleared after hitting
* frozen PE as stated in the hardware spec. Unfortunately, * frozen PE as stated in the hardware spec. Unfortunately,
* that's not true on P7IOC. So we have to clear it manually * that's not true on P7IOC. So we have to clear it manually
* to avoid recursive EEH errors during recovery. * to avoid recursive EEH errors during recovery.
*/ */
phb = hose->private_data; phb = hose->private_data;
if (phb->model == PNV_PHB_MODEL_P7IOC && if (phb->model == PNV_PHB_MODEL_P7IOC &&
(option == EEH_RESET_HOT || (option == EEH_RESET_HOT ||
option == EEH_RESET_FUNDAMENTAL)) { option == EEH_RESET_FUNDAMENTAL)) {
rc = opal_pci_reset(phb->opal_id, rc = opal_pci_reset(phb->opal_id,
OPAL_RESET_PHB_ERROR, OPAL_RESET_PHB_ERROR,
OPAL_ASSERT_RESET); OPAL_ASSERT_RESET);
if (rc != OPAL_SUCCESS) { if (rc != OPAL_SUCCESS) {
pr_warn("%s: Failure %lld clearing " pr_warn("%s: Failure %lld clearing error injection registers\n",
"error injection registers\n", __func__, rc);
__func__, rc); return -EIO;
return -EIO;
}
} }
bus = eeh_pe_bus_get(pe);
if (pe->type & EEH_PE_VF)
ret = pnv_eeh_reset_vf_pe(pe, option);
else if (pci_is_root_bus(bus) ||
pci_is_root_bus(bus->parent))
ret = pnv_eeh_root_reset(hose, option);
else
ret = pnv_eeh_bridge_reset(bus->self, option);
} }
return ret; bus = eeh_pe_bus_get(pe);
if (pe->type & EEH_PE_VF)
return pnv_eeh_reset_vf_pe(pe, option);
if (pci_is_root_bus(bus) ||
pci_is_root_bus(bus->parent))
return pnv_eeh_root_reset(hose, option);
return pnv_eeh_bridge_reset(bus->self, option);
} }
/** /**