qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] d7ebca: hw/sd/pxa2xx_mmci: Do not create SD c

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] d7ebca: hw/sd/pxa2xx_mmci: Do not create SD card within th...
Date: Sun, 23 Aug 2020 03:45:25 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d7ebca748e33176ede1a8675cea82271d2c0dac4
      
https://github.com/qemu/qemu/commit/d7ebca748e33176ede1a8675cea82271d2c0dac4
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/arm/pxa2xx.c
    M hw/sd/pxa2xx_mmci.c
    M include/hw/arm/pxa.h

  Log Message:
  -----------
  hw/sd/pxa2xx_mmci: Do not create SD card within the SD host controller

SD/MMC host controllers provide a SD Bus to plug SD cards,
but don't come with SD card plugged in :)

The machine/board object is where the SD cards are created.
Since the PXA2xx is not qdevified, for now create the cards
in pxa270_init() which is the SoC model.
In the future we will move this to the board model.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705213350.24725-2-f4bug@amsat.org>


  Commit: a0e63983a646338c06a146d0d9d52f9a06a88ec4
      
https://github.com/qemu/qemu/commit/a0e63983a646338c06a146d0d9d52f9a06a88ec4
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/pxa2xx_mmci.c

  Log Message:
  -----------
  hw/sd/pxa2xx_mmci: Trivial simplification

Avoid declaring PXA2xxMMCIState local variable, return it directly.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705213350.24725-3-f4bug@amsat.org>


  Commit: 3dce5842416bd0460d3e6e19f29fb8db44b7e668
      
https://github.com/qemu/qemu/commit/3dce5842416bd0460d3e6e19f29fb8db44b7e668
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/lm32/milkymist-hw.h
    M hw/lm32/milkymist.c

  Log Message:
  -----------
  hw/lm32/milkymist: Un-inline milkymist_memcard_create()

As we will modify milkymist_memcard_create(), move it first
to the source file where it is used.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20200705211016.15241-2-f4bug@amsat.org>


  Commit: ae7ba8e04a4faccfb515c9e6a72892307c4bab1e
      
https://github.com/qemu/qemu/commit/ae7ba8e04a4faccfb515c9e6a72892307c4bab1e
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/milkymist-memcard.c

  Log Message:
  -----------
  hw/sd/milkymist: Create the SDBus at init()

We don't need to wait until realize() to create the SDBus,
create it in init() directly.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20200705211016.15241-4-f4bug@amsat.org>


  Commit: a8c73ca21a6f86daa53c2dbeeb8abf06dd1aeec9
      
https://github.com/qemu/qemu/commit/a8c73ca21a6f86daa53c2dbeeb8abf06dd1aeec9
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/lm32/milkymist.c
    M hw/sd/milkymist-memcard.c

  Log Message:
  -----------
  hw/sd/milkymist: Do not create SD card within the SD host controller

SD/MMC host controllers provide a SD Bus to plug SD cards,
but don't come with SD card plugged in :) Let the machine/board
model create and plug the SD cards when required.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20200705211016.15241-5-f4bug@amsat.org>


  Commit: 4858e256bd475cdb68f61daa1083a562ecf9faec
      
https://github.com/qemu/qemu/commit/4858e256bd475cdb68f61daa1083a562ecf9faec
  Author: Alistair Francis <alistair.francis@xilinx.com>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Replace fprintf(stderr, "*\n") with error_report()

Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.

find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N; {s|fprintf(stderr, 
"\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' 
\
    {} +
find ./* -type f -exec sed -i \
    'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +

Some lines where then manually tweaked to pass checkpatch.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: 
<488ba8d4c562ea44119de8ea0f385a898bd8fa1e.1513790495.git.alistair.francis@xilinx.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: b67cd8f55bff74ed004b86072dc0a4dc2ac07fc3
      
https://github.com/qemu/qemu/commit/b67cd8f55bff74ed004b86072dc0a4dc2ac07fc3
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Rename pl181_send_command() as pl181_do_command()

pl181_send_command() do a bus transaction (send or receive),
rename it as pl181_do_command().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-3-f4bug@amsat.org>


  Commit: 0e33730c8924032eda53de6ebb7ecba232abb01d
      
https://github.com/qemu/qemu/commit/0e33730c8924032eda53de6ebb7ecba232abb01d
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Add TODO to use Fifo32 API

Add TODO to use Fifo32 API from "qemu/fifo32.h".

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-4-f4bug@amsat.org>


  Commit: 26c5b0f4cbe19ad87d3aaba22cd1a8edc25f7ceb
      
https://github.com/qemu/qemu/commit/26c5b0f4cbe19ad87d3aaba22cd1a8edc25f7ceb
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/arm/integratorcp.c
    M hw/arm/realview.c
    M hw/arm/vexpress.c
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Use named GPIOs

To make the code easier to manage/review/use, rename the
cardstatus[0] variable as 'card_readonly' and name the GPIO
"card-read-only".
Similarly with cardstatus[1], renamed as 'card_inserted' and
name its GPIO "card-inserted".

Adapt the users accordingly by using the qdev_init_gpio_out_named()
function.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-6-f4bug@amsat.org>


  Commit: 2762eed1f5534074fcce703bdda8702905dc4c61
      
https://github.com/qemu/qemu/commit/2762eed1f5534074fcce703bdda8702905dc4c61
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Expose a SDBus and connect the SDCard to it

Convert the controller to the SDBus API:
- add the a TYPE_PL181_BUS object of type TYPE_SD_BUS,
- adapt the SDBusClass set_inserted/set_readonly handlers
- create the bus in the PL181 controller
- switch legacy sd_*() API to the sdbus_*() API.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-7-f4bug@amsat.org>


  Commit: 26c607b86b7bb90ad75a15bc6172c28aa48c768c
      
https://github.com/qemu/qemu/commit/26c607b86b7bb90ad75a15bc6172c28aa48c768c
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/arm/integratorcp.c
    M hw/arm/realview.c
    M hw/arm/versatilepb.c
    M hw/arm/vexpress.c
    M hw/sd/pl181.c

  Log Message:
  -----------
  hw/sd/pl181: Do not create SD card within the SD host controller

SD/MMC host controllers provide a SD Bus to plug SD cards,
but don't come with SD card plugged in :) Let the machine/board
model create and plug the SD cards when required.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-8-f4bug@amsat.org>


  Commit: 583d09f078c54862cd57f230a01e61b376bcde8a
      
https://github.com/qemu/qemu/commit/583d09f078c54862cd57f230a01e61b376bcde8a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/pl181.c
    M hw/sd/trace-events

  Log Message:
  -----------
  hw/sd/pl181: Replace disabled fprintf()s by trace events

Convert disabled DPRINTF() to trace events and remove ifdef'ry.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705204630.4133-9-f4bug@amsat.org>


  Commit: 38626a33145aa71b38e728ed0f178571fb49c1f7
      
https://github.com/qemu/qemu/commit/38626a33145aa71b38e728ed0f178571fb49c1f7
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/sd.c
    M include/hw/sd/sd.h

  Log Message:
  -----------
  hw/sd/sdcard: Make sd_data_ready() static

sd_data_ready() belongs to the legacy API. As its last user has
been converted to the SDBus API, make it static.

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <20180216022933.10945-7-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 9006f1e706e0f41efdb62556cefe88d746add88a
      
https://github.com/qemu/qemu/commit/9006f1e706e0f41efdb62556cefe88d746add88a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/omap_mmc.c
    M hw/sd/sd.c
    M include/hw/sd/sd.h
    A include/hw/sd/sdcard_legacy.h

  Log Message:
  -----------
  hw/sd: Move sdcard legacy API to 'hw/sd/sdcard_legacy.h'

omap_mmc.c is the last device left using the legacy sdcard API.
Move the prototype declarations into a separate header, to
make it clear this is a legacy API.

Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <20180216022933.10945-8-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: c769a88d4475f648595c6a270d9d0b0f3f7f3740
      
https://github.com/qemu/qemu/commit/c769a88d4475f648595c6a270d9d0b0f3f7f3740
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/core.c
    M hw/sd/omap_mmc.c
    M hw/sd/sd.c
    M include/hw/sd/sd.h
    M include/hw/sd/sdcard_legacy.h

  Log Message:
  -----------
  hw/sd: Rename read/write_data() as read/write_byte()

The read/write_data() methods write do a single byte access
on the data line of a SD card. Rename them as read/write_byte().
Add some documentation (not in "hw/sd/sdcard_legacy.h" which we
are going to remove soon).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-2-f4bug@amsat.org>


  Commit: 39017143d6d7a068573da272528d7df71d0d31b4
      
https://github.com/qemu/qemu/commit/39017143d6d7a068573da272528d7df71d0d31b4
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/allwinner-sdhost.c
    M hw/sd/bcm2835_sdhost.c
    M hw/sd/core.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/pl181.c
    M hw/sd/pxa2xx_mmci.c
    M hw/sd/sdhci.c
    M include/hw/sd/sd.h

  Log Message:
  -----------
  hw/sd: Rename sdbus_write_data() as sdbus_write_byte()

The sdbus_write_data() method do a single byte access on the data
line of a SD bus. Rename it as sdbus_write_byte() and document it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-3-f4bug@amsat.org>


  Commit: 8467f62201fd2383d553702f9f9441e2493ece75
      
https://github.com/qemu/qemu/commit/8467f62201fd2383d553702f9f9441e2493ece75
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/allwinner-sdhost.c
    M hw/sd/bcm2835_sdhost.c
    M hw/sd/core.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/pl181.c
    M hw/sd/pxa2xx_mmci.c
    M hw/sd/sdhci.c
    M hw/sd/ssi-sd.c
    M include/hw/sd/sd.h

  Log Message:
  -----------
  hw/sd: Rename sdbus_read_data() as sdbus_read_byte()

The sdbus_read_data() method do a single byte access on the data
line of a SD bus. Rename it as sdbus_read_byte() and document it.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-4-f4bug@amsat.org>


  Commit: e35c343dd9c18d4d3e6424e2fab38f08085875d6
      
https://github.com/qemu/qemu/commit/e35c343dd9c18d4d3e6424e2fab38f08085875d6
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/core.c
    M include/hw/sd/sd.h

  Log Message:
  -----------
  hw/sd: Add sdbus_write_data() to write multiples bytes on the data line

Add a sdbus_write_data() method to write multiple bytes on the
data line of a SD bus.
We might improve the tracing later, for now keep logging each
byte individually.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-5-f4bug@amsat.org>


  Commit: 62a21be60f8fdf0223fa099fb4e7a495eaf55cf9
      
https://github.com/qemu/qemu/commit/62a21be60f8fdf0223fa099fb4e7a495eaf55cf9
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/allwinner-sdhost.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/sdhci.c

  Log Message:
  -----------
  hw/sd: Use sdbus_write_data() instead of sdbus_write_byte when possible

Use the recently added sdbus_write_data() to write multiple
bytes at once, instead of looping calling sdbus_write_byte().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-6-f4bug@amsat.org>


  Commit: 6505a91a77d4efcc6d54b35851abcb137cdca30a
      
https://github.com/qemu/qemu/commit/6505a91a77d4efcc6d54b35851abcb137cdca30a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/core.c
    M include/hw/sd/sd.h

  Log Message:
  -----------
  hw/sd: Add sdbus_read_data() to read multiples bytes on the data line

Add a sdbus_read_data() method to read multiple bytes on the
data line of a SD bus.
We might improve the tracing later, for now keep logging each
byte individually.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-7-f4bug@amsat.org>


  Commit: 618e0be1bac7ffe794242b422f7a9767f2a8be79
      
https://github.com/qemu/qemu/commit/618e0be1bac7ffe794242b422f7a9767f2a8be79
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/allwinner-sdhost.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/sdhci.c

  Log Message:
  -----------
  hw/sd: Use sdbus_read_data() instead of sdbus_read_byte() when possible

Use the recently added sdbus_read_data() to read multiple
bytes at once, instead of looping calling sdbus_read_byte().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200814092346.21825-8-f4bug@amsat.org>


  Commit: b638627c723a8d0d2bb73489bc6bf9ff09b8d53a
      
https://github.com/qemu/qemu/commit/b638627c723a8d0d2bb73489bc6bf9ff09b8d53a
  Author: Bin Meng <bin.meng@windriver.com>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/sd.c

  Log Message:
  -----------
  hw/sd: Fix incorrect populated function switch status data structure

At present the function switch status data structure bit [399:376]
are wrongly pupulated. These 3 bytes encode function switch status
for the 6 function groups, with 4 bits per group, starting from
function group 6 at bit 399, then followed by function group 5 at
bit 395, and so on.

However the codes mistakenly fills in the function group 1 status
at bit 399. This fixes the code logic.

Fixes: a1bb27b1e9 ("SD card emulation (initial implementation)")
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Message-Id: <1598021136-49525-1-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 6d2d4069c47e23b9e3913f9c8204fd0edcb99fb3
      
https://github.com/qemu/qemu/commit/6d2d4069c47e23b9e3913f9c8204fd0edcb99fb3
  Author: Bin Meng <bin.meng@windriver.com>
  Date:   2020-08-21 (Fri, 21 Aug 2020)

  Changed paths:
    M hw/sd/sd.c

  Log Message:
  -----------
  hw/sd: Correct the maximum size of a Standard Capacity SD Memory Card

Per the SD spec, Standard Capacity SD Memory Card (SDSC) supports
capacity up to and including 2 GiB.

Fixes: 2d7adea4fe ("hw/sd: Support SDHC size cards")
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Message-Id: <1598021136-49525-2-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: d7df0ceee0fd2e512cd214a9074ebeeb40da3099
      
https://github.com/qemu/qemu/commit/d7df0ceee0fd2e512cd214a9074ebeeb40da3099
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-08-22 (Sat, 22 Aug 2020)

  Changed paths:
    M hw/arm/integratorcp.c
    M hw/arm/pxa2xx.c
    M hw/arm/realview.c
    M hw/arm/versatilepb.c
    M hw/arm/vexpress.c
    M hw/lm32/milkymist-hw.h
    M hw/lm32/milkymist.c
    M hw/sd/allwinner-sdhost.c
    M hw/sd/bcm2835_sdhost.c
    M hw/sd/core.c
    M hw/sd/milkymist-memcard.c
    M hw/sd/omap_mmc.c
    M hw/sd/pl181.c
    M hw/sd/pxa2xx_mmci.c
    M hw/sd/sd.c
    M hw/sd/sdhci.c
    M hw/sd/ssi-sd.c
    M hw/sd/trace-events
    M include/hw/arm/pxa.h
    M include/hw/sd/sd.h
    A include/hw/sd/sdcard_legacy.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/sd-next-20200821' 
into staging

SD/MMC patches

- Convert legacy SD host controller to the SDBus API
- Move legacy API to a separate "sdcard_legacy.h" header
- Introduce methods to access multiple bytes on SDBus data lines
- Fix 'switch function' group location
- Fix SDSC maximum card size (2GB)

CI jobs result:
  https://gitlab.com/philmd/qemu/-/pipelines/180605963

# gpg: Signature made Fri 21 Aug 2020 18:27:50 BST
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" 
[full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/sd-next-20200821: (23 commits)
  hw/sd: Correct the maximum size of a Standard Capacity SD Memory Card
  hw/sd: Fix incorrect populated function switch status data structure
  hw/sd: Use sdbus_read_data() instead of sdbus_read_byte() when possible
  hw/sd: Add sdbus_read_data() to read multiples bytes on the data line
  hw/sd: Use sdbus_write_data() instead of sdbus_write_byte when possible
  hw/sd: Add sdbus_write_data() to write multiples bytes on the data line
  hw/sd: Rename sdbus_read_data() as sdbus_read_byte()
  hw/sd: Rename sdbus_write_data() as sdbus_write_byte()
  hw/sd: Rename read/write_data() as read/write_byte()
  hw/sd: Move sdcard legacy API to 'hw/sd/sdcard_legacy.h'
  hw/sd/sdcard: Make sd_data_ready() static
  hw/sd/pl181: Replace disabled fprintf()s by trace events
  hw/sd/pl181: Do not create SD card within the SD host controller
  hw/sd/pl181: Expose a SDBus and connect the SDCard to it
  hw/sd/pl181: Use named GPIOs
  hw/sd/pl181: Add TODO to use Fifo32 API
  hw/sd/pl181: Rename pl181_send_command() as pl181_do_command()
  hw/sd/pl181: Replace fprintf(stderr, "*\n") with error_report()
  hw/sd/milkymist: Do not create SD card within the SD host controller
  hw/sd/milkymist: Create the SDBus at init()
  ...

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


Compare: https://github.com/qemu/qemu/compare/3a52b42c949d...d7df0ceee0fd
reply via email to
[Prev in Thread] Current Thread [Next in Thread]