xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/powernv: Sync OpalPciResetScope with firmware

Browse Source 
The names of PCI reset scopes aren't sychronized with firmware.
The patch fixes it.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Gavin Shan
2014-09-30 12:39:05 +10:00
committed by Michael Ellerman
parent 4ba5a0fc64
commit d1a85eee35
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/include/asm/opal.h
View File

@@ -387,9 +387,12 @@ enum OpalM64EnableAction {
}; };
enum OpalPciResetScope { enum OpalPciResetScope {
OPAL_PHB_COMPLETE = 1, OPAL_PCI_LINK = 2, OPAL_PHB_ERROR = 3, OPAL_RESET_PHB_COMPLETE = 1,
OPAL_PCI_HOT_RESET = 4, OPAL_PCI_FUNDAMENTAL_RESET = 5, OPAL_RESET_PCI_LINK = 2,
OPAL_PCI_IODA_TABLE_RESET = 6, OPAL_RESET_PHB_ERROR = 3,
OPAL_RESET_PCI_HOT = 4,
OPAL_RESET_PCI_FUNDAMENTAL = 5,
OPAL_RESET_PCI_IODA_TABLE = 6
}; };
enum OpalPciReinitScope { enum OpalPciReinitScope {

12
arch/powerpc/platforms/powernv/eeh-ioda.c
View File

@@ -514,11 +514,11 @@ int ioda_eeh_phb_reset(struct pci_controller *hose, int option)
if (option == EEH_RESET_FUNDAMENTAL || if (option == EEH_RESET_FUNDAMENTAL ||
option == EEH_RESET_HOT) option == EEH_RESET_HOT)
rc = opal_pci_reset(phb->opal_id, rc = opal_pci_reset(phb->opal_id,
OPAL_PHB_COMPLETE, OPAL_RESET_PHB_COMPLETE,
OPAL_ASSERT_RESET); OPAL_ASSERT_RESET);
else if (option == EEH_RESET_DEACTIVATE) else if (option == EEH_RESET_DEACTIVATE)
rc = opal_pci_reset(phb->opal_id, rc = opal_pci_reset(phb->opal_id,
OPAL_PHB_COMPLETE, OPAL_RESET_PHB_COMPLETE,
OPAL_DEASSERT_RESET); OPAL_DEASSERT_RESET);
if (rc < 0) if (rc < 0)
goto out; goto out;
@@ -558,15 +558,15 @@ static int ioda_eeh_root_reset(struct pci_controller *hose, int option)
*/ */
if (option == EEH_RESET_FUNDAMENTAL) if (option == EEH_RESET_FUNDAMENTAL)
rc = opal_pci_reset(phb->opal_id, rc = opal_pci_reset(phb->opal_id,
OPAL_PCI_FUNDAMENTAL_RESET, OPAL_RESET_PCI_FUNDAMENTAL,
OPAL_ASSERT_RESET); OPAL_ASSERT_RESET);
else if (option == EEH_RESET_HOT) else if (option == EEH_RESET_HOT)
rc = opal_pci_reset(phb->opal_id, rc = opal_pci_reset(phb->opal_id,
OPAL_PCI_HOT_RESET, OPAL_RESET_PCI_HOT,
OPAL_ASSERT_RESET); OPAL_ASSERT_RESET);
else if (option == EEH_RESET_DEACTIVATE) else if (option == EEH_RESET_DEACTIVATE)
rc = opal_pci_reset(phb->opal_id, rc = opal_pci_reset(phb->opal_id,
OPAL_PCI_HOT_RESET, OPAL_RESET_PCI_HOT,
OPAL_DEASSERT_RESET); OPAL_DEASSERT_RESET);
if (rc < 0) if (rc < 0)
goto out; goto out;
@@ -697,7 +697,7 @@ static int ioda_eeh_reset(struct eeh_pe *pe, int option)
(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_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 "

4
arch/powerpc/platforms/powernv/pci-ioda.c
View File

@@ -1626,7 +1626,7 @@ static u32 pnv_ioda_bdfn_to_pe(struct pnv_phb *phb, struct pci_bus *bus,
static void pnv_pci_ioda_shutdown(struct pnv_phb *phb) static void pnv_pci_ioda_shutdown(struct pnv_phb *phb)
{ {
opal_pci_reset(phb->opal_id, OPAL_PCI_IODA_TABLE_RESET, opal_pci_reset(phb->opal_id, OPAL_RESET_PCI_IODA_TABLE,
OPAL_ASSERT_RESET); OPAL_ASSERT_RESET);
} }
@@ -1802,7 +1802,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
pci_add_flags(PCI_REASSIGN_ALL_RSRC); pci_add_flags(PCI_REASSIGN_ALL_RSRC);
/* Reset IODA tables to a clean state */ /* Reset IODA tables to a clean state */
rc = opal_pci_reset(phb_id, OPAL_PCI_IODA_TABLE_RESET, OPAL_ASSERT_RESET); rc = opal_pci_reset(phb_id, OPAL_RESET_PCI_IODA_TABLE, OPAL_ASSERT_RESET);
if (rc) if (rc)
pr_warning(" OPAL Error %ld performing IODA table reset !\n", rc); pr_warning(" OPAL Error %ld performing IODA table reset !\n", rc);