| Message ID | 1456486323-8047-7-git-send-email-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/26/2016 10:31 PM, David Gibson wrote: > Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_get_state9) > into rtas_ibm_read_slot_reset_state2(). > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > hw/ppc/spapr_pci.c | 12 ++++++------ > hw/ppc/spapr_pci_vfio.c | 13 ------------- > include/hw/pci-host/spapr.h | 1 - > 3 files changed, 6 insertions(+), 20 deletions(-) > > diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > index 96cdca2..eaae7e2 100644 > --- a/hw/ppc/spapr_pci.c > +++ b/hw/ppc/spapr_pci.c > @@ -539,7 +539,7 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu, > { > sPAPRPHBState *sphb; > uint64_t buid; > - int state, ret; > + int ret; > > if ((nargs != 3) || (nret != 4 && nret != 5)) { > goto param_error_exit; > @@ -555,13 +555,13 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu, > goto param_error_exit; > } > > - ret = spapr_phb_vfio_eeh_get_state(sphb, &state); > - rtas_st(rets, 0, ret); > - if (ret != RTAS_OUT_SUCCESS) { > - return; > + ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); > + if (ret < 0) { > + goto param_error_exit; > } > > - rtas_st(rets, 1, state); > + rtas_st(rets, 0, RTAS_OUT_SUCCESS); > + rtas_st(rets, 1, ret); > rtas_st(rets, 2, RTAS_EEH_SUPPORT); > rtas_st(rets, 3, RTAS_EEH_PE_UNAVAIL_INFO); > if (nret >= 5) { > diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c > index 54075e0..c87f2e4 100644 > --- a/hw/ppc/spapr_pci_vfio.c > +++ b/hw/ppc/spapr_pci_vfio.c > @@ -136,19 +136,6 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, > return RTAS_OUT_SUCCESS; > } > > -int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state) > -{ > - int ret; > - > - ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); > - if (ret < 0) { > - return RTAS_OUT_PARAM_ERROR; > - } > - > - *state = ret; > - return RTAS_OUT_SUCCESS; > -} > - > static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) > { > DeviceClass *dc = DEVICE_CLASS(klass); > diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h > index d31162b..55237fc 100644 > --- a/include/hw/pci-host/spapr.h > +++ b/include/hw/pci-host/spapr.h > @@ -138,6 +138,5 @@ void spapr_phb_vfio_reset(DeviceState *qdev); > /* VFIO EEH hooks */ > int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, > unsigned int addr, int option); > -int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state); > > #endif /* __HW_SPAPR_PCI_H__ */ >
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 96cdca2..eaae7e2 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -539,7 +539,7 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu, { sPAPRPHBState *sphb; uint64_t buid; - int state, ret; + int ret; if ((nargs != 3) || (nret != 4 && nret != 5)) { goto param_error_exit; @@ -555,13 +555,13 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu, goto param_error_exit; } - ret = spapr_phb_vfio_eeh_get_state(sphb, &state); - rtas_st(rets, 0, ret); - if (ret != RTAS_OUT_SUCCESS) { - return; + ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); + if (ret < 0) { + goto param_error_exit; } - rtas_st(rets, 1, state); + rtas_st(rets, 0, RTAS_OUT_SUCCESS); + rtas_st(rets, 1, ret); rtas_st(rets, 2, RTAS_EEH_SUPPORT); rtas_st(rets, 3, RTAS_EEH_PE_UNAVAIL_INFO); if (nret >= 5) { diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index 54075e0..c87f2e4 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -136,19 +136,6 @@ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, return RTAS_OUT_SUCCESS; } -int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state) -{ - int ret; - - ret = vfio_eeh_as_op(&sphb->iommu_as, VFIO_EEH_PE_GET_STATE); - if (ret < 0) { - return RTAS_OUT_PARAM_ERROR; - } - - *state = ret; - return RTAS_OUT_SUCCESS; -} - static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index d31162b..55237fc 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -138,6 +138,5 @@ void spapr_phb_vfio_reset(DeviceState *qdev); /* VFIO EEH hooks */ int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb, unsigned int addr, int option); -int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state); #endif /* __HW_SPAPR_PCI_H__ */
Simplify the sPAPR PCI code by folding spapr_phb_vfio_eeh_get_state9) into rtas_ibm_read_slot_reset_state2(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr_pci.c | 12 ++++++------ hw/ppc/spapr_pci_vfio.c | 13 ------------- include/hw/pci-host/spapr.h | 1 - 3 files changed, 6 insertions(+), 20 deletions(-)