UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/powernv: Use EEH PCI config accessors 

For EEH PowerNV backends, they need use their own PCI config
accesors as the normal one could be blocked during PE reset.
The patch also removes necessary parameter "hose" for the
function ioda_eeh_bridge_reset().

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Gavin Shan 2014-04-24 18:00:13 +10:00 committed by Benjamin Herrenschmidt
parent d0914f503f
commit 1d9a544646
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -478,26 +478,27 @@ out:
return 0; return 0;
} }
static int ioda_eeh_bridge_reset(struct pci_controller *hose, static int ioda_eeh_bridge_reset(struct pci_dev *dev, int option)
struct pci_dev *dev, int option)
{
u16 ctrl;
pr_debug("%s: Reset device %04x:%02x:%02x.%01x with option %d\n", {
__func__, hose->global_number, dev->bus->number, struct device_node *dn = pci_device_to_OF_node(dev);
PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn), option); u32 ctrl;
pr_debug("%s: Reset PCI bus %04x:%02x with option %d\n",
__func__, pci_domain_nr(dev->bus),
dev->bus->number, option);
switch (option) { switch (option) {
case EEH_RESET_FUNDAMENTAL: case EEH_RESET_FUNDAMENTAL:
case EEH_RESET_HOT: case EEH_RESET_HOT:
pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &ctrl); eeh_ops->read_config(dn, PCI_BRIDGE_CONTROL, 2, &ctrl);
ctrl |= PCI_BRIDGE_CTL_BUS_RESET; ctrl |= PCI_BRIDGE_CTL_BUS_RESET;
pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); eeh_ops->write_config(dn, PCI_BRIDGE_CONTROL, 2, ctrl);
break; break;
case EEH_RESET_DEACTIVATE: case EEH_RESET_DEACTIVATE:
pci_read_config_word(dev, PCI_BRIDGE_CONTROL, &ctrl); eeh_ops->read_config(dn, PCI_BRIDGE_CONTROL, 2, &ctrl);
ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET;
pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); eeh_ops->write_config(dn, PCI_BRIDGE_CONTROL, 2, ctrl);
break; break;
} }
@ -552,7 +553,7 @@ static int ioda_eeh_reset(struct eeh_pe *pe, int option)
if (pci_is_root_bus(bus)) if (pci_is_root_bus(bus))
ret = ioda_eeh_root_reset(hose, option); ret = ioda_eeh_root_reset(hose, option);
else else
ret = ioda_eeh_bridge_reset(hose, bus->self, option); ret = ioda_eeh_bridge_reset(bus->self, option);
} }
return ret; return ret;