On Mon, Feb 22, 2021 at 04:45:27PM -0300, Daniel Henrique Barboza wrote: > When moving a physical DRC to "Available", drc_isolate_physical() will > move the DRC state to STATE_PHYSICAL_POWERON and, if the DRC is marked > for unplug, call spapr_drc_detach(). For physical DRCs, > drck->empty_state is STATE_PHYSICAL_POWERON, meaning that we're sure > that spapr_drc_detach() will end up calling spapr_drc_release() in the > end. > > Likewise, for logical DRCs, drc_set_unusable will move the DRC to > "Unusable" state, setting drc->state to STATE_LOGICAL_UNUSABLE, which is > the drck->empty_state for logical DRCs. spapr_drc_detach() will call > spapr_drc_release() in this case as well. > > In both scenarios, spapr_drc_detach() is being used as a > spapr_drc_release(), wrapper, where we also set unplug_requested (which > is already true, otherwise spapr_drc_detach() wouldn't be called in the > first place) and check if drc->state == drck->empty_state, which we also > know it's guaranteed to be true because we just set it. > > Just use spapr_drc_release() in these functions to be clear of our > intentions in both these functions. > > Reviewed-by: Greg Kurz <[email protected]> > Reviewed-by: David Gibson <[email protected]> > Signed-off-by: Daniel Henrique Barboza <[email protected]>
Applied to ppc-for-6.0, thanks.
> ---
> hw/ppc/spapr_drc.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
> index 84bd3c881f..555a25517d 100644
> --- a/hw/ppc/spapr_drc.c
> +++ b/hw/ppc/spapr_drc.c
> @@ -50,6 +50,20 @@ uint32_t spapr_drc_index(SpaprDrc *drc)
> | (drc->id & DRC_INDEX_ID_MASK);
> }
>
> +static void spapr_drc_release(SpaprDrc *drc)
> +{
> + SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
> +
> + drck->release(drc->dev);
> +
> + drc->unplug_requested = false;
> + g_free(drc->fdt);
> + drc->fdt = NULL;
> + drc->fdt_start_offset = 0;
> + object_property_del(OBJECT(drc), "device");
> + drc->dev = NULL;
> +}
> +
> static uint32_t drc_isolate_physical(SpaprDrc *drc)
> {
> switch (drc->state) {
> @@ -68,7 +82,7 @@ static uint32_t drc_isolate_physical(SpaprDrc *drc)
> if (drc->unplug_requested) {
> uint32_t drc_index = spapr_drc_index(drc);
> trace_spapr_drc_set_isolation_state_finalizing(drc_index);
> - spapr_drc_detach(drc);
> + spapr_drc_release(drc);
> }
>
> return RTAS_OUT_SUCCESS;
> @@ -209,7 +223,7 @@ static uint32_t drc_set_unusable(SpaprDrc *drc)
> if (drc->unplug_requested) {
> uint32_t drc_index = spapr_drc_index(drc);
> trace_spapr_drc_set_allocation_state_finalizing(drc_index);
> - spapr_drc_detach(drc);
> + spapr_drc_release(drc);
> }
>
> return RTAS_OUT_SUCCESS;
> @@ -372,20 +386,6 @@ void spapr_drc_attach(SpaprDrc *drc, DeviceState *d)
> NULL, 0);
> }
>
> -static void spapr_drc_release(SpaprDrc *drc)
> -{
> - SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
> -
> - drck->release(drc->dev);
> -
> - drc->unplug_requested = false;
> - g_free(drc->fdt);
> - drc->fdt = NULL;
> - drc->fdt_start_offset = 0;
> - object_property_del(OBJECT(drc), "device");
> - drc->dev = NULL;
> -}
> -
> void spapr_drc_detach(SpaprDrc *drc)
> {
> SpaprDrcClass *drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
