[Qemu-commits] [qemu/qemu] 6947fe: hw/sd/sdcard: Rename Write Protect Group variables

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 6947feca588670a0443d3e8892e6e20c6acb491c
      
https://github.com/qemu/qemu/commit/6947feca588670a0443d3e8892e6e20c6acb491c
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M hw/sd/sd.c

  Log Message:
  -----------
  hw/sd/sdcard: Rename Write Protect Group variables

'wp_groups' holds a bitmap, rename it as 'wp_group_bmap'.
'wpgrps_size' is the bitmap size (in bits), rename it as
'wp_group_bits'.

Patch created mechanically using:

  $ sed -i -e s/wp_groups/wp_group_bmap/ \
           -e s/wpgrps_size/wp_group_bits/ hw/sd/sd.c

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210728181728.2012952-4-f4bug@amsat.org>
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>


  Commit: b66f73a0cb312c81470433dfd5275d2824bb89de
      
https://github.com/qemu/qemu/commit/b66f73a0cb312c81470433dfd5275d2824bb89de
  Author: Frank Chang <frank.chang@sifive.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M hw/sd/sd.c

  Log Message:
  -----------
  hw/sd: Add SDHC support for SD card SPI-mode

In SPI-mode, SD card's OCR register: Card Capacity Status (CCS) bit
is not set to 1 correclty when the assigned SD image size is larger
than 2GB (SDHC). This will cause the SD card to be indentified as SDSC
incorrectly. CCS bit should be set to 1 if we are using SDHC.

Also, as there's no power up emulation in SPI-mode.
The OCR register: Card power up status bit bit (busy) should also
be set to 1 when reset. (busy bit is set to LOW if the card has not
finished the power up routine.)

Signed-off-by: Frank Chang <frank.chang@sifive.com>
Reviewed-by: Jim Shu <jim.shu@sifive.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211228125719.14712-1-frank.chang@sifive.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 64c01c7da449bcafc614b27ecf1325bb08031c84
      
https://github.com/qemu/qemu/commit/64c01c7da449bcafc614b27ecf1325bb08031c84
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-11 (Tue, 11 Jan 2022)

  Changed paths:
    M hw/sd/sd.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/philmd/tags/sdmmc-20220108' into staging

SD/MMC patches queue

- Add SDHC support for SD card SPI-mode (Frank Chang)

# gpg: Signature made Sat 08 Jan 2022 21:56:02 GMT
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd/tags/sdmmc-20220108:
  hw/sd: Add SDHC support for SD card SPI-mode
  hw/sd/sdcard: Rename Write Protect Group variables

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/bf99e0ec9a51...64c01c7da449