mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

powerpc/powernv: Use PCI slot reset infrastructure 

The (OPAL) firmware might provide the PCI slot reset capability
which is identified by property "ibm,reset-by-firmware" on the
PCI slot associated device node.

This routes the reset request to firmware if "ibm,reset-by-firmware"
exists in the PCI slot device node. Otherwise, the reset is done
inside kernel as before.

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 2016-05-20 16:41:39 +10:00 committed by Michael Ellerman
parent ebe2253127
commit 9c0e1ecbe1
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,7 @@
#include <asm/msi_bitmap.h>
#include <asm/opal.h>
#include <asm/ppc-pci.h>
#include <asm/pnv-pci.h>
#include "powernv.h"
#include "pci.h"
@ -815,7 +816,7 @@ out:
return 0;
}
static int pnv_eeh_bridge_reset(struct pci_dev *dev, int option)
static int __pnv_eeh_bridge_reset(struct pci_dev *dev, int option)
{
struct pci_dn *pdn = pci_get_pdn_by_devfn(dev->bus, dev->devfn);
struct eeh_dev *edev = pdn_to_eeh_dev(pdn);
@ -866,6 +867,44 @@ static int pnv_eeh_bridge_reset(struct pci_dev *dev, int option)
return 0;
}
static int pnv_eeh_bridge_reset(struct pci_dev *pdev, int option)
{
struct pci_controller *hose = pci_bus_to_host(pdev->bus);
struct pnv_phb *phb = hose->private_data;
struct device_node *dn = pci_device_to_OF_node(pdev);
uint64_t id = PCI_SLOT_ID(phb->opal_id,
(pdev->bus->number << 8) | pdev->devfn);
uint8_t scope;
int64_t rc;
/* Hot reset to the bus if firmware cannot handle */
if (!dn || !of_get_property(dn, "ibm,reset-by-firmware", NULL))
return __pnv_eeh_bridge_reset(pdev, option);
switch (option) {
case EEH_RESET_FUNDAMENTAL:
scope = OPAL_RESET_PCI_FUNDAMENTAL;
break;
case EEH_RESET_HOT:
scope = OPAL_RESET_PCI_HOT;
break;
case EEH_RESET_DEACTIVATE:
return 0;
default:
dev_dbg(&pdev->dev, "%s: Unsupported reset %d\n",
__func__, option);
return -EINVAL;
}
rc = opal_pci_reset(id, scope, OPAL_ASSERT_RESET);
if (rc <= OPAL_SUCCESS)
goto out;
rc = pnv_eeh_poll(id);
out:
return (rc == OPAL_SUCCESS) ? 0 : -EIO;
}
void pnv_pci_reset_secondary_bus(struct pci_dev *dev)
{
struct pci_controller *hose;