| Message ID | 20190729145654.14644-20-damien.hedde@greensocs.com |
|---|---|
| State | New |
| Headers | show |
| Series | Multi-phase reset mechanism | expand |
On 7/29/19 4:56 PM, Damien Hedde wrote: > Replace legacy's reset call by device_reset_warm. > > The new function propagates also the reset to the sub-buses tree but this has > no impact since SDState has no child bus. > > Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> > --- > hw/sd/omap_mmc.c | 2 +- > hw/sd/pl181.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c > index 24a1edc149..3021e54b8d 100644 > --- a/hw/sd/omap_mmc.c > +++ b/hw/sd/omap_mmc.c > @@ -317,7 +317,7 @@ void omap_mmc_reset(struct omap_mmc_s *host) > * into any bus, and we must reset it manually. When omap_mmc is > * QOMified this must move into the QOM reset function. > */ > - device_legacy_reset(DEVICE(host->card)); > + device_reset_warm(DEVICE(host->card)); > } > > static uint64_t omap_mmc_read(void *opaque, hwaddr offset, > diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c > index 15b4aaa67f..a59ef7eb2a 100644 > --- a/hw/sd/pl181.c > +++ b/hw/sd/pl181.c > @@ -480,7 +480,7 @@ static void pl181_reset(DeviceState *d) > /* Since we're still using the legacy SD API the card is not plugged > * into any bus, and we must reset it manually. > */ > - device_legacy_reset(DEVICE(s->card)); > + device_reset_warm(DEVICE(s->card)); We need to define what is a sdcard 'warm' reset. > } > > static void pl181_init(Object *obj) >
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 24a1edc149..3021e54b8d 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -317,7 +317,7 @@ void omap_mmc_reset(struct omap_mmc_s *host) * into any bus, and we must reset it manually. When omap_mmc is * QOMified this must move into the QOM reset function. */ - device_legacy_reset(DEVICE(host->card)); + device_reset_warm(DEVICE(host->card)); } static uint64_t omap_mmc_read(void *opaque, hwaddr offset, diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 15b4aaa67f..a59ef7eb2a 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -480,7 +480,7 @@ static void pl181_reset(DeviceState *d) /* Since we're still using the legacy SD API the card is not plugged * into any bus, and we must reset it manually. */ - device_legacy_reset(DEVICE(s->card)); + device_reset_warm(DEVICE(s->card)); } static void pl181_init(Object *obj)
Replace legacy's reset call by device_reset_warm. The new function propagates also the reset to the sub-buses tree but this has no impact since SDState has no child bus. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> --- hw/sd/omap_mmc.c | 2 +- hw/sd/pl181.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)