Commit 0cb57cc7 authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/sd/pl181: Reset SD card on controller reset 

Since pl181 is still using the legacy SD card API, the SD
card created by sd_init() is not plugged into any bus. This
means that the controller has to reset it manually.

Failing to do this mostly didn't affect the guest since the
guest typically does a programmed SD card reset as part of
its SD controller driver initialization, but meant that
migration failed because it's only in sd_reset() that we
set up the wpgrps_size field.

Cc: qemu-stable@nongnu.org
Fixes: https://bugs.launchpad.net/qemu/+bug/1739378


Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1515506513-31961-2-git-send-email-peter.maydell@linaro.org
parent 3b39d734

hw/sd/pl181.c

+4 −0
Original line number Diff line number Diff line
@@ -480,6 +480,10 @@ static void pl181_reset(DeviceState *d) 


    /* We can assume our GPIO outputs have been wired up now */

    sd_set_cb(s->card, s->cardstatus[0], s->cardstatus[1]);

    /* Since we're still using the legacy SD API the card is not plugged

     * into any bus, and we must reset it manually.

     */

    device_reset(DEVICE(s->card));

}



static void pl181_init(Object *obj)