Commit ecd219f7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Since omap_mmc 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 would mean that
migration fails because it's only in sd_reset() that we
set up the wpgrps_size field.

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-5-git-send-email-peter.maydell@linaro.org
parent 8046d44f

hw/sd/omap_mmc.c

+10 −4
Original line number Diff line number Diff line
@@ -305,6 +305,12 @@ void omap_mmc_reset(struct omap_mmc_s *host) 
    host->cdet_enable = 0;

    qemu_set_irq(host->coverswitch, host->cdet_state);

    host->clkdiv = 0;



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

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

     * QOMified this must move into the QOM reset function.

     */

    device_reset(DEVICE(host->card));

}



static uint64_t omap_mmc_read(void *opaque, hwaddr offset,
@@ -587,8 +593,6 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base, 
    s->lines = 1;	/* TODO: needs to be settable per-board */

    s->rev = 1;



    omap_mmc_reset(s);



    memory_region_init_io(&s->iomem, NULL, &omap_mmc_ops, s, "omap.mmc", 0x800);

    memory_region_add_subregion(sysmem, base, &s->iomem);
@@ -598,6 +602,8 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base, 
        exit(1);

    }



    omap_mmc_reset(s);



    return s;

}
@@ -613,8 +619,6 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta, 
    s->lines = 4;

    s->rev = 2;



    omap_mmc_reset(s);



    memory_region_init_io(&s->iomem, NULL, &omap_mmc_ops, s, "omap.mmc",

                          omap_l4_region_size(ta, 0));

    omap_l4_attach(ta, 0, &s->iomem);
@@ -628,6 +632,8 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta, 
    s->cdet = qemu_allocate_irq(omap_mmc_cover_cb, s, 0);

    sd_set_cb(s->card, NULL, s->cdet);



    omap_mmc_reset(s);



    return s;

}