david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sPAPR: Revert don't enable EEH on emulated PCI devices

Browse Source 
This reverts commit 7cb18007 ("sPAPR: Don't enable EEH on emulated
PCI devices") as rtas_ibm_set_eeh_option() isn't the right place
to check if there has the corresponding PCI device for the input
address, which can be PE address, not PCI device address.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Gavin Shan 2015-09-18 17:30:43 +10:00 committed by David Gibson
parent 4d9392be6c
commit 47445c80fb
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc/spapr_pci.c
View File

@ -431,7 +431,6 @@ static void rtas_ibm_set_eeh_option(PowerPCCPU *cpu,
{ {
sPAPRPHBState *sphb; sPAPRPHBState *sphb;
sPAPRPHBClass *spc; sPAPRPHBClass *spc;
PCIDevice *pdev;
uint32_t addr, option; uint32_t addr, option;
uint64_t buid; uint64_t buid;
int ret; int ret;
@ -449,12 +448,6 @@ static void rtas_ibm_set_eeh_option(PowerPCCPU *cpu,
goto param_error_exit; goto param_error_exit;
} }
pdev = pci_find_device(PCI_HOST_BRIDGE(sphb)->bus,
(addr >> 16) & 0xFF, (addr >> 8) & 0xFF);
if (!pdev || !object_dynamic_cast(OBJECT(pdev), "vfio-pci")) {
goto param_error_exit;
}
spc = SPAPR_PCI_HOST_BRIDGE_GET_CLASS(sphb); spc = SPAPR_PCI_HOST_BRIDGE_GET_CLASS(sphb);
if (!spc->eeh_set_option) { if (!spc->eeh_set_option) {
goto param_error_exit; goto param_error_exit;