[Qemu-devel] [PATCH v2 0/6] SDHCI: convert legacy devices to the SDBus API (part 6)

Philippe Mathieu-Daudé posted 6 patches 6 years, 3 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
include/hw/sd/sd.h            | 17 ---------
include/hw/sd/sdcard_legacy.h | 51 +++++++++++++++++++++++++++
hw/sd/milkymist-memcard.c     | 81 ++++++++++++++++++++++++-------------------
hw/sd/omap_mmc.c              |  2 +-
hw/sd/pl181.c                 | 32 +++++++++++------
hw/sd/sd.c                    |  1 +
hw/sd/ssi-sd.c                | 32 ++++++++++-------
7 files changed, 139 insertions(+), 77 deletions(-)
create mode 100644 include/hw/sd/sdcard_legacy.h
[Qemu-devel] [PATCH v2 0/6] SDHCI: convert legacy devices to the SDBus API (part 6)
Posted by Philippe Mathieu-Daudé 6 years, 3 months ago
Hi,

Since v1:
- rebased on /master (Peter sdcard reset() patches)
- fix milkymist-mmc from previous seris using instance_init (Michael Walle)

This series convert 3 devices using the legacy SDCard API to the SDBus API:
- milkymist-mmc
- pl181
- ssi-sd

Then move the legacy API to a separate header "sdcard_legacy.h".

Now the OMAP MMC is the last device using the legacy API, but need to get
QOM'ified first.

Having a common sdbus interface simplify qtesting (next series)

Regards,

Phil.

$ git backport-diff
001/6:[----] [--] 'hw/sd/milkymist-memcard: use qemu_log_mask()'
002/6:[0014] [FC] 'hw/sd/milkymist-memcard: split realize() out of SysBusDevice init()'
003/6:[0004] [FC] 'hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it'
004/6:[0006] [FC] 'hw/sd/pl181: expose a SDBus and connect the SDCard to it'
005/6:[down] 'hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus'
006/6:[----] [-C] 'hw/sd: move sdcard legacy API to "hw/sd/sdcard_legacy.h"'

Based-on: 20180123033034.29493-19-f4bug@amsat.org
          (or /master)

Philippe Mathieu-Daudé (6):
  hw/sd/milkymist-memcard: use qemu_log_mask()
  hw/sd/milkymist-memcard: split realize() out of SysBusDevice init()
  hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it
  hw/sd/pl181: expose a SDBus and connect the SDCard to it
  hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus
  hw/sd: move sdcard legacy API to "hw/sd/sdcard_legacy.h"

 include/hw/sd/sd.h            | 17 ---------
 include/hw/sd/sdcard_legacy.h | 51 +++++++++++++++++++++++++++
 hw/sd/milkymist-memcard.c     | 81 ++++++++++++++++++++++++-------------------
 hw/sd/omap_mmc.c              |  2 +-
 hw/sd/pl181.c                 | 32 +++++++++++------
 hw/sd/sd.c                    |  1 +
 hw/sd/ssi-sd.c                | 32 ++++++++++-------
 7 files changed, 139 insertions(+), 77 deletions(-)
 create mode 100644 include/hw/sd/sdcard_legacy.h

-- 
2.15.1


Re: [Qemu-devel] [PATCH v2 0/6] SDHCI: convert legacy devices to the SDBus API (part 6)
Posted by Philippe Mathieu-Daudé 6 years, 2 months ago
Hi,

On 01/23/2018 12:58 AM, Philippe Mathieu-Daudé wrote:
> Since v1:
> - rebased on /master (Peter sdcard reset() patches)
> - fix milkymist-mmc from previous seris using instance_init (Michael Walle)
> 
> This series convert 3 devices using the legacy SDCard API to the SDBus API:
> - milkymist-mmc
> - pl181
> - ssi-sd
> 
> Then move the legacy API to a separate header "sdcard_legacy.h".

This series is not related to the previous set (2/3/4/5) and can be
applied independently.

> 
> Now the OMAP MMC is the last device using the legacy API, but need to get
> QOM'ified first.
> 
> Having a common sdbus interface simplify qtesting (next series)
> 
> Regards,
> 
> Phil.
> 
> $ git backport-diff
> 001/6:[----] [--] 'hw/sd/milkymist-memcard: use qemu_log_mask()'
> 002/6:[0014] [FC] 'hw/sd/milkymist-memcard: split realize() out of SysBusDevice init()'
> 003/6:[0004] [FC] 'hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it'
> 004/6:[0006] [FC] 'hw/sd/pl181: expose a SDBus and connect the SDCard to it'
> 005/6:[down] 'hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus'
> 006/6:[----] [-C] 'hw/sd: move sdcard legacy API to "hw/sd/sdcard_legacy.h"'
> 
> Based-on: 20180123033034.29493-19-f4bug@amsat.org
>           (or /master)
> 
> Philippe Mathieu-Daudé (6):
>   hw/sd/milkymist-memcard: use qemu_log_mask()
>   hw/sd/milkymist-memcard: split realize() out of SysBusDevice init()
>   hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it
>   hw/sd/pl181: expose a SDBus and connect the SDCard to it
>   hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus
>   hw/sd: move sdcard legacy API to "hw/sd/sdcard_legacy.h"
> 
>  include/hw/sd/sd.h            | 17 ---------
>  include/hw/sd/sdcard_legacy.h | 51 +++++++++++++++++++++++++++
>  hw/sd/milkymist-memcard.c     | 81 ++++++++++++++++++++++++-------------------
>  hw/sd/omap_mmc.c              |  2 +-
>  hw/sd/pl181.c                 | 32 +++++++++++------
>  hw/sd/sd.c                    |  1 +
>  hw/sd/ssi-sd.c                | 32 ++++++++++-------
>  7 files changed, 139 insertions(+), 77 deletions(-)
>  create mode 100644 include/hw/sd/sdcard_legacy.h
>