@samitouri / QOSamiQemu / commits / c477e32b64

hw/sd/sdcard: Fix error case for CMD18

In commit 468fa450a7e0 ("hw/sd: Switch read/write primitive to buf+len"), `sd_read_byte()` changed its contract to return the read size rather than the read value (and was renamed to `sd_read_data()` accordingly). In an error case, however, `sd_read_data()` returns 0 by means of `dummy_byte` which is the code for the old contract. Moreover, `sdbus_read_data()` asserts the virtual method `read_data()` (and thus `sd_read_data()`) to return a non-zero size, i.e. to make progress and not loop forever. Fix the code to behave like the "DAT read illegal for command" case. Fixes: 468fa450a7e0 ("hw/sd: Switch read/write primitive to buf+len") Reviewed-by: Bin Meng <bin.meng@processmission.com> Signed-off-by: Bernhard Beschow <shentey@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Message-ID: <20260720201133.24796-2-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Bernhard Beschow committed Jul 20, 2026 at 22:11 UTC c477e32b645df6f72fe64f59615fd2195faa64c8
1 file changed +2 -1
hw/sd/sd.c
+2 -1
@@ -2860,7 +2860,8 @@ static size_t sd_read_data(SDState *sd, void *buf, size_t length)
2860 if (sd->data_offset == 0) {
2861 if (!address_in_range(sd, "READ_MULTIPLE_BLOCK",
2862 sd->data_start, io_len)) {
2863 - return dummy_byte;
2863 + *value = dummy_byte;
2864 + return length;
2865 }
2866 partition_access = sd->ext_csd[EXT_CSD_PART_CONFIG]
2867 & EXT_CSD_PART_CONFIG_ACC_MASK;