@@ -524,9 +524,9 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu,
target_ulong rets)
{
sPAPRPHBState *sphb;
- sPAPRPHBClass *spc;
+ VFIOGroup *group;
uint64_t buid;
- int state, ret;
+ int ret;
if ((nargs != 3) || (nret != 4 && nret != 5)) {
goto param_error_exit;
@@ -538,18 +538,20 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU *cpu,
goto param_error_exit;
}
- spc = SPAPR_PCI_HOST_BRIDGE_GET_CLASS(sphb);
- if (!spc->eeh_get_state) {
- goto param_error_exit;
+ ret = spapr_phb_check_vfio_group(sphb, &group);
+ if (ret != RTAS_OUT_SUCCESS) {
+ rtas_st(rets, 0, ret);
+ return;
}
- ret = spc->eeh_get_state(sphb, &state);
- rtas_st(rets, 0, ret);
- if (ret != RTAS_OUT_SUCCESS) {
+ ret = vfio_eeh_op(group, VFIO_EEH_PE_GET_STATE);
+ if (ret < 0) {
+ rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR);
return;
}
- 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) {
@@ -167,25 +167,6 @@ static int spapr_phb_vfio_eeh_set_option(sPAPRPHBState *sphb,
return RTAS_OUT_SUCCESS;
}
-static int spapr_phb_vfio_eeh_get_state(sPAPRPHBState *sphb, int *state)
-{
- VFIOGroup *group;
- int ret;
-
- ret = spapr_phb_check_vfio_group(sphb, &group);
- if (ret != RTAS_OUT_SUCCESS) {
- return ret;
- }
-
- ret = vfio_eeh_op(group, 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);
@@ -195,7 +176,6 @@ static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data)
dc->reset = spapr_phb_vfio_reset;
spc->finish_realize = spapr_phb_vfio_finish_realize;
spc->eeh_set_option = spapr_phb_vfio_eeh_set_option;
- spc->eeh_get_state = spapr_phb_vfio_eeh_get_state;
}
static const TypeInfo spapr_phb_vfio_info = {
@@ -51,7 +51,6 @@ struct sPAPRPHBClass {
void (*finish_realize)(sPAPRPHBState *sphb, Error **errp);
int (*eeh_set_option)(sPAPRPHBState *sphb, unsigned int addr, int option);
- int (*eeh_get_state)(sPAPRPHBState *sphb, int *state);
};
typedef struct spapr_pci_msi {
Because spapr_phb_check_vfio_group() now safely returns an error on a non VFIO papr host bridge, it becomes safe to call spapr_phb_vfio_eeh_get_state() on any host bridge, not just the special VFIO host bridges. So fold its code into rtas_ibm_read_slot_reset_state2(), instead of only calling it via a class method. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr_pci.c | 20 +++++++++++--------- hw/ppc/spapr_pci_vfio.c | 20 -------------------- include/hw/pci-host/spapr.h | 1 - 3 files changed, 11 insertions(+), 30 deletions(-)