Since v1: - addressed Alistair Francis review comments, added some R-b - only move register defines to "sd-internal.h" - fixed deposit64() arguments - dropped unuseful s->fifo_buffer = NULL - use a qemu_irq for the LED, restrict the logging to ON/OFF - fixed a trace format string error - included Andrey Smirnov ACMD12ERRSTS write patch - dropped few unuseful patches, and separate the Python polemical ones for later
>From the "SDHCI housekeeping" series: - 1: we restrict part of "sd/sd.h" into local "sd-internal.h", - 2,3: we somehow beautiful the code, no logical changes, - 4-7: we refactor the common sysbus/pci qdev code, - 8-10: we add plenty of trace events which will result useful later, - 11: we finally expose a "dma-memory" property. >From the "SDHCI: add a qtest and fix few issues" series: - 12,13: fix registers - 14,15: boards can specify which SDHCI Spec to use (v2 and v3 so far) - 15-20: HCI qtest Regards, Phil. $ git backport-diff [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/20:[----] [-C] 'sdhci: clean up includes' 002/20:[0004] [FC] 'sdhci: use deposit64()' 003/20:[----] [--] 'sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h"' 004/20:[----] [--] 'sdhci: refactor same sysbus/pci properties into a common one' 005/20:[----] [--] 'sdhci: refactor common sysbus/pci realize() into sdhci_realizefn()' 006/20:[----] [--] 'sdhci: refactor common sysbus/pci class_init() into sdhci_class_init()' 007/20:[0001] [FC] 'sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn()' 008/20:[----] [--] 'sdhci: use qemu_log_mask(UNIMP) instead of fprintf()' 009/20:[0004] [FC] 'sdhci: convert the DPRINT() calls into trace events' 010/20:[down] 'sdhci: add a GPIO for the access control LED' 011/20:[0032] [FC] 'sdhci: add a "dma-memory" property' 012/20:[0006] [FC] 'sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only' 013/20:[down] 'sdhci: Implement write method of ACMD12ERRSTS register' 014/20:[----] [-C] 'sdhci: add a "sd-spec-version" property' 015/20:[----] [-C] 'sdhci: some ARM boards do support SD_HOST_SPECv3_VERS' 016/20:[0001] [FC] 'sdhci: add qtest to check the SD Spec version' 017/20:[----] [--] 'sdhci: add check_capab_readonly() qtest' 018/20:[----] [--] 'sdhci: add a check_capab_baseclock() qtest' 019/20:[----] [--] 'sdhci: add a check_capab_sdma() qtest' 020/20:[----] [--] 'sdhci: add a check_capab_v3() qtest' Based-on: 20171213051736.17755-5-f4...@amsat.org (Trivial changes in "registerfields.h") Andrey Smirnov (1): sdhci: Implement write method of ACMD12ERRSTS register Philippe Mathieu-Daudé (19): sdhci: clean up includes sdhci: use deposit64() sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" sdhci: refactor same sysbus/pci properties into a common one sdhci: refactor common sysbus/pci realize() into sdhci_realizefn() sdhci: refactor common sysbus/pci class_init() into sdhci_class_init() sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() sdhci: use qemu_log_mask(UNIMP) instead of fprintf() sdhci: convert the DPRINT() calls into trace events sdhci: add a GPIO for the access control LED sdhci: add a "dma-memory" property sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only sdhci: add a "sd-spec-version" property sdhci: some ARM boards do support SD_HOST_SPECv3_VERS sdhci: add qtest to check the SD Spec version sdhci: add check_capab_readonly() qtest sdhci: add a check_capab_baseclock() qtest sdhci: add a check_capab_sdma() qtest sdhci: add a check_capab_v3() qtest include/hw/sd/sdhci.h | 22 +++- hw/sd/sdhci-internal.h | 9 +- hw/arm/bcm2835_peripherals.c | 7 ++ hw/arm/fsl-imx6.c | 6 + hw/arm/xilinx_zynq.c | 2 + hw/sd/sdhci.c | 267 +++++++++++++++++++++++++------------------ hw/sd/trace-events | 15 +++ tests/sdhci-test.c | 152 ++++++++++++++++++++++++ tests/Makefile.include | 2 + 9 files changed, 359 insertions(+), 123 deletions(-) create mode 100644 tests/sdhci-test.c -- 2.15.1