| Message ID | 20180209145430.26007-1-f4bug@amsat.org |
|---|---|
| Headers | show |
| Series | SDHCI: clean v1/2 Specs, UHS-I cards tuning sequence | expand |
On Fri, 02/09 11:54, Philippe Mathieu-Daudé wrote: > This series is expected to be taken by Paolo. > > It includes the last versions of both series: > - SDHCI: clean v1/v2 Specs (part 2) > - SDHCI: add tuning sequence for UHS-I cards (part 3) > > Since v11: > - rebased due to conflict (IMX_USDHC fd1e5c817964) > - QSDHCI uses union (Paolo) > - do not enable UNIMP logging when running qtests > > Since v10: > - rebased > - add Paolo's R-b in patch 2 > - rename patch 11 subject (Alistair) > - add Alistair's R-b in "UHS-I cards tuning sequence" patches Hi Phil, About the patchew confusion: I'm not sure why patch 11 never hit the archive, so it was not picked up by patchew as well: https://lists.gnu.org/archive/html/qemu-devel/2018-02/threads.html Fam
On Mon, 02/12 15:00, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Hmm.. Something is going weird here. It's still not in the archive https://lists.gnu.org/archive/html/qemu-devel/2018-02/threads.html So I manually bounced it to importer@patchew.org and then it is seen there. But git apply failed: https://patchew.org/QEMU/20180209145430.26007-1-f4bug@amsat.org/ > Switched to a new branch '20180209145430.26007-1-f4bug@amsat.org' > Applying: sdhci: use error_propagate(local_err) in realize() > Applying: sdhci: add qtest to check the SD capabilities register > Applying: sdhci: add check_capab_readonly() qtest > Applying: sdhci: add a check_capab_baseclock() qtest > Applying: sdhci: add a check_capab_sdma() qtest > Applying: sdhci: add qtest to check the SD Spec version > Applying: sdhci: add a 'spec_version property' (default to v2) > Applying: sdhci: use a numeric value for the default CAPAB register > Applying: sdhci: simplify sdhci_get_fifolen() > Applying: sdhci: check the Spec v1 capabilities correctness > Applying: sdhci: replace DMA magic value by BLOCK_SIZE_MASK > error: sha1 information is lacking or useless (hw/sd/sdhci.c). > error: could not build fake ancestor > Patch failed at 0001 sdhci: replace DMA magic value by BLOCK_SIZE_MASK > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > Failed to apply patch: > [PATCH RESEND v12 11/30] sdhci: replace DMA magic value by BLOCK_SIZE_MASK Fam
This series is expected to be taken by Paolo. It includes the last versions of both series: - SDHCI: clean v1/v2 Specs (part 2) - SDHCI: add tuning sequence for UHS-I cards (part 3) Since v11: - rebased due to conflict (IMX_USDHC fd1e5c817964) - QSDHCI uses union (Paolo) - do not enable UNIMP logging when running qtests Since v10: - rebased - add Paolo's R-b in patch 2 - rename patch 11 subject (Alistair) - add Alistair's R-b in "UHS-I cards tuning sequence" patches Thanks Paolo :) Phil. $ git backport-diff with v11 001/30:[----] [--] 'sdhci: use error_propagate(local_err) in realize()' 002/30:[0028] [FC] 'sdhci: add qtest to check the SD capabilities register' 003/30:[0016] [FC] 'sdhci: add check_capab_readonly() qtest' 004/30:[0010] [FC] 'sdhci: add a check_capab_baseclock() qtest' 005/30:[0006] [FC] 'sdhci: add a check_capab_sdma() qtest' 006/30:[0012] [FC] 'sdhci: add qtest to check the SD Spec version' 007/30:[----] [-C] 'sdhci: add a 'spec_version property' (default to v2)' 008/30:[----] [--] 'sdhci: use a numeric value for the default CAPAB register' 009/30:[----] [--] 'sdhci: simplify sdhci_get_fifolen()' 010/30:[0029] [FC] 'sdhci: check the Spec v1 capabilities correctness' 011/30:[----] [--] 'sdhci: replace DMA magic value by BLOCK_SIZE_MASK' 012/30:[----] [--] 'sdhci: Fix 64-bit ADMA2' 013/30:[0006] [FC] 'sdhci: check Spec v2 capabilities (DMA and 64-bit bus)' 014/30:[----] [--] 'hw/arm/exynos4210: access the 64-bit capareg with qdev_prop_set_uint64()' 015/30:[----] [--] 'hw/arm/exynos4210: add a comment about a very similar SDHCI (Spec. v2)' 016/30:[----] [--] 'hw/arm/xilinx_zynq: fix the capabilities register to match the datasheet' 017/30:[----] [-C] 'sdhci: add support for v3 capabilities' 018/30:[0006] [FC] 'sdhci: rename the hostctl1 register' 019/30:[----] [--] 'sdhci: implement the Host Control 2 register (tuning sequence)' 020/30:[----] [--] 'sdbus: add trace events' 021/30:[----] [-C] 'sdhci: implement UHS-I voltage switch' 022/30:[----] [--] 'sdhci: implement CMD/DAT[] fields in the Present State register' 023/30:[----] [--] 'hw/arm/bcm2835_peripherals: implement SDHCI Spec v3' 024/30:[----] [--] 'hw/arm/bcm2835_peripherals: change maximum block size to 1kB' 025/30:[----] [--] 'hw/arm/fsl-imx6: implement SDHCI Spec. v3' 026/30:[----] [--] 'hw/arm/xilinx_zynqmp: fix the capabilities/spec version to match the datasheet' 027/30:[----] [--] 'hw/arm/xilinx_zynqmp: enable the UHS-I mode' 028/30:[----] [--] 'sdhci: check Spec v3 capabilities qtest' 029/30:[0006] [FC] 'sdhci: add a check_capab_v3() qtest' 030/30:[0008] [FC] 'sdhci: add Spec v4.2 register definitions' Philippe Mathieu-Daudé (29): sdhci: use error_propagate(local_err) in realize() sdhci: add qtest to check the SD capabilities register sdhci: add check_capab_readonly() qtest sdhci: add a check_capab_baseclock() qtest sdhci: add a check_capab_sdma() qtest sdhci: add qtest to check the SD Spec version sdhci: add a 'spec_version property' (default to v2) sdhci: use a numeric value for the default CAPAB register sdhci: simplify sdhci_get_fifolen() sdhci: check the Spec v1 capabilities correctness sdhci: replace DMA magic value by BLOCK_SIZE_MASK sdhci: check Spec v2 capabilities (DMA and 64-bit bus) hw/arm/exynos4210: access the 64-bit capareg with qdev_prop_set_uint64() hw/arm/exynos4210: add a comment about a very similar SDHCI (Spec. v2) hw/arm/xilinx_zynq: fix the capabilities register to match the datasheet sdhci: add support for v3 capabilities sdhci: rename the hostctl1 register sdhci: implement the Host Control 2 register (tuning sequence) sdbus: add trace events sdhci: implement UHS-I voltage switch sdhci: implement CMD/DAT[] fields in the Present State register hw/arm/bcm2835_peripherals: implement SDHCI Spec v3 hw/arm/bcm2835_peripherals: change maximum block size to 1kB hw/arm/fsl-imx6: implement SDHCI Spec. v3 hw/arm/xilinx_zynqmp: fix the capabilities/spec version to match the datasheet hw/arm/xilinx_zynqmp: enable the UHS-I mode sdhci: check Spec v3 capabilities qtest sdhci: add a check_capab_v3() qtest sdhci: add Spec v4.2 register definitions Sai Pavan Boddu (1): sdhci: Fix 64-bit ADMA2 hw/sd/sdhci-internal.h | 78 +++++++-- include/hw/sd/sd.h | 20 +++ include/hw/sd/sdhci.h | 6 +- hw/arm/bcm2835_peripherals.c | 23 +-- hw/arm/exynos4210.c | 14 +- hw/arm/fsl-imx6.c | 7 + hw/arm/xilinx_zynq.c | 53 +++--- hw/arm/xlnx-zynqmp.c | 30 ++-- hw/sd/core.c | 61 ++++++- hw/sd/sd.c | 29 ++++ hw/sd/sdhci.c | 375 +++++++++++++++++++++++++++++++------------ tests/sdhci-test.c | 252 +++++++++++++++++++++++++++++ hw/sd/trace-events | 9 ++ tests/Makefile.include | 4 + 14 files changed, 800 insertions(+), 161 deletions(-) create mode 100644 tests/sdhci-test.c