Commit 47445c80 authored by Gavin Shan's avatar Gavin Shan Committed by David Gibson
Browse files

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



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: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 4d9392be

hw/ppc/spapr_pci.c

+0 −7
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ static void rtas_ibm_set_eeh_option(PowerPCCPU *cpu, 
{

    sPAPRPHBState *sphb;

    sPAPRPHBClass *spc;

    PCIDevice *pdev;

    uint32_t addr, option;

    uint64_t buid;

    int ret;
@@ -449,12 +448,6 @@ static void rtas_ibm_set_eeh_option(PowerPCCPU *cpu, 
        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);

    if (!spc->eeh_set_option) {

        goto param_error_exit;