hw/sd/ssi-sd: Return noise (dummy byte) when no card connected
Subsystems (2)
cover hw/sd/ssi-sd: Return noise (dummy byte) when no card connected
Trivial fix for the issue reported by Guenter here:
https://lore.kernel.org/qemu-devel/[email protected]/
- Return dummy byte when no card is connected
- Add a test
Philippe Mathieu-Daudé (2):
hw/sd/ssi-sd: Return noise (dummy byte) when no card connected tests/functional: Test SPI-SD adapter without SD card connected
hw/sd/ssi-sd.c | 4 ++++ tests/functional/test_riscv64_sifive_u.py | 22 +++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-)
Signature · 1 line
2.49.0
PATCH 1/2 hw/sd/ssi-sd: Return noise (dummy byte) when no card connected
Commit 1585ab9f1ba ("hw/sd/sdcard: Fill SPI response bits in card code") exposed a bug in the SPI adapter: if no SD card is plugged, we shouldn't return any particular packet response, but the noise shifted on the MISO line. Return the dummy byte, otherwise we get:
qemu-system-riscv64: ../hw/sd/ssi-sd.c:160: ssi_sd_transfer: Assertion `s->arglen > 0' failed.
--- hw/sd/ssi-sd.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/sd/ssi-sd.c +4 -0
@@ -89,6 +89,10 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val)SDRequest request;uint8_t longresp[5 ]; +if (!sdbus_get_inserted (&s->sdbus)) { +return SSI_DUMMY ; + } +/* * Special case: allow CMD12 (STOP TRANSMISSION) while reading data. *
Signature · 1 line
2.49.0
Quoted 10 lines · Philippe Mathieu-Daudé
Commit
1585ab9f1ba("hw/sd/sdcard: Fill SPI response bits in card code") exposed a bug in the SPI adapter: if no SD card is plugged, we shouldn't return any particular packet response, but the noise shifted on the MISO line. Return the dummy byte, otherwise we get:qemu-system-riscv64: ../hw/sd/ssi-sd.c:160: ssi_sd_transfer: Assertion `s->arglen > 0' failed.Reported-by Guenter Roeck <[email protected]>Fixes 775616c3ae8 ("Partial SD card SPI mode support")Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Guenter
Quoted 19 lines
--- hw/sd/ssi-sd.c | 4 ++++ 1 file changed, 4 insertions(+)hw/sd/ssi-sd.c +4
-0@@ -89,6 +89,10 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val)SDRequest request;uint8_t longresp[5 ]; +if (!sdbus_get_inserted (&s->sdbus)) { +return SSI_DUMMY ; + } +/* * Special case: allow CMD12 (STOP TRANSMISSION) while reading data. *
Quoted 19 lines · Philippe Mathieu-Daudé
Commit
1585ab9f1ba("hw/sd/sdcard: Fill SPI response bits in card code") exposed a bug in the SPI adapter: if no SD card is plugged, we shouldn't return any particular packet response, but the noise shifted on the MISO line. Return the dummy byte, otherwise we get:qemu-system-riscv64:
../hw/sd/ssi-sd.c:160:ssi_sd_transfer: Assertion `s->arglen > 0' failed.Reported-by Guenter Roeck <[email protected]>Fixes 775616c3ae8 ("Partial SD card SPI mode support")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/sd/ssi-sd.c | 4 ++++ 1 file changed, 4 insertions(+)hw/sd/ssi-sd.c +0
-0
hw/sd/ssi-sd.c static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val) · line 95
Quoted 7 lines
hw/sd/ssi-sd.c +4
-0@@ -89,6 +89,10 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val)SDRequest request;uint8_t longresp[5 ]; +if (!sdbus_get_inserted (&s->sdbus)) { +return SSI_DUMMY ; + } +
Seems fair although it's hard to track what is consuming this value. I think we end up in ssi_transfer() which a surprising number of calls don't even bother checking the return value, other just seem to | the result when iterating across devices.
We should probably improve on the definitions of transfer/transfer_raw and explain what the return value is.
Anyway:
Quoted 3 lines
hw/sd/ssi-sd.c +0
-0/* * Special case: allow CMD12 (STOP TRANSMISSION) while reading data. *
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
Quoted 24 lines · Alex Bennée
Quoted 22 lines · Philippe Mathieu-Daudé
Commit
1585ab9f1ba("hw/sd/sdcard: Fill SPI response bits in card code") exposed a bug in the SPI adapter: if no SD card is plugged, we shouldn't return any particular packet response, but the noise shifted on the MISO line. Return the dummy byte, otherwise we get:qemu-system-riscv64: ../hw/sd/ssi-sd.c:160: ssi_sd_transfer: Assertion `s->arglen > 0' failed.Reported-by Guenter Roeck <[email protected]>Fixes 775616c3ae8 ("Partial SD card SPI mode support")Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/sd/ssi-sd.c | 4 ++++ 1 file changed, 4 insertions(+)hw/sd/ssi-sd.c +0
-0@@ -89,6 +89,10 @@ static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val)SDRequest request;uint8_t longresp[5 ];
Quoted 9 lines
hw/sd/ssi-sd.c static uint32_t ssi_sd_transfer(SSIPeripheral *dev, uint32_t val) · line 95
Quoted 4 lines
hw/sd/ssi-sd.c +4
-0+if (!sdbus_get_inserted (&s->sdbus)) { +return SSI_DUMMY ; + } +Seems fair although it's hard to track what is consuming this value. I think we end up in
ssi_transfer()which a surprising number of calls don't even bother checking the return value, other just seem to | the result when iterating across devices.
A SPI transaction consists of shifting bit in sync the CLK line, writing on the MOSI (output) line / and reading MISO (input) line.
IOW, each time you write a word, you also read it at the same time.
When a driver just wants to write, it is OK to ignore the returned values.
In this case, we don't want to return "There is a card with error" because there is no card. We shift the request on the MOSI line, but nothing replies on the MISO line.
Should I reword the commit description?
Quoted 3 lines
We should probably improve on the definitions of transfer/transfer_raw and explain what the return value is.
Agreed.
Quoted 4 lines
Anyway:
Reviewed-by Alex Bennée <[email protected]>
Thanks!
PATCH 2/2 tests/functional: Test SPI-SD adapter without SD card connected
In reply to Philippe Mathieu-DaudéSPI-SD adapter should be usable, even without any SD card wired. Refactor test_riscv64_sifive_u_mmc_spi() to make it more generic and add another test, inspired by this report:
https://lore.kernel.org/qemu-devel/[email protected]/
--- tests/functional/test_riscv64_sifive_u.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
tests/functional/test_riscv64_sifive_u.py +17 -5
@@ -27,25 +27,37 @@ class SifiveU(LinuxKernelTest): 'rootfs.ext2.gz'), 'b6ed95610310b7956f9bf20c4c9c0c05fea647900df441da9dfe767d24e8b28b') - def test_riscv64_sifive_u_mmc_spi(self): + def do_test_riscv64_sifive_u_mmc_spi(self, connect_card): self.set_machine('sifive_u') kernel_path = self.ASSET_KERNEL.fetch() rootfs_path = self.uncompress(self.ASSET_ROOTFS) self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'root=/dev/mmcblk0 rootwait ' 'earlycon=sbi console=ttySIF0 ' - 'panic=-1 noreboot') + 'root=/dev/mmcblk0 ') self.vm.add_args('-kernel', kernel_path, - '-drive', f'file={rootfs_path},if=sd,format=raw', '-append', kernel_command_line, '-no-reboot') + if connect_card: + self.vm.add_args('-drive', f'file={rootfs_path},if=sd,format=raw') + kernel_command_line += 'panic=-1 noreboot rootwait ' + pattern = 'Boot successful.' + else: + kernel_command_line += 'panic=0 noreboot ' + pattern = 'Cannot open root device "mmcblk0" or unknown-block(0,0)' + self.vm.launch() - self.wait_for_console_pattern('Boot successful.') + self.wait_for_console_pattern(pattern) os.remove(rootfs_path) + def _test_riscv64_sifive_u_nommc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(False) + + def test_riscv64_sifive_u_mmc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(True) + if __name__ == '__main__': LinuxKernelTest.main()
Signature · 1 line
2.49.0
Re: [PATCH-for-10.1 2/2] tests/functional: Test SPI-SD adapter without SD card connected
Quoted 41 lines · Philippe Mathieu-Daudé
SPI-SD adapter should be usable, even without any SD card wired. Refactor
test_riscv64_sifive_u_mmc_spi()to make it more generic and add another test, inspired by this report:
https://lore.kernel.org/qemu-devel/[email protected]/Inspired-by Guenter Roeck <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/functional/test_riscv64_sifive_u.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)tests/functional/test_riscv64_sifive_u.py +8
-4@@ -27,25 +27,37 @@ class SifiveU(LinuxKernelTest): 'rootfs.ext2.gz'), 'b6ed95610310b7956f9bf20c4c9c0c05fea647900df441da9dfe767d24e8b28b') - def test_riscv64_sifive_u_mmc_spi(self): + def do_test_riscv64_sifive_u_mmc_spi(self, connect_card): self.set_machine('sifive_u') kernel_path = self.ASSET_KERNEL.fetch() rootfs_path = self.uncompress(self.ASSET_ROOTFS) self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'root=/dev/mmcblk0 rootwait ' 'earlycon=sbi console=ttySIF0 ' - 'panic=-1 noreboot') + 'root=/dev/mmcblk0 ') self.vm.add_args('-kernel', kernel_path, - '-drive', f'file={rootfs_path},if=sd,format=raw', '-append', kernel_command_line, '-no-reboot') + if connect_card: + self.vm.add_args('-drive', f'file={rootfs_path},if=sd,format=raw') + kernel_command_line += 'panic=-1 noreboot rootwait ' + pattern = 'Boot successful.' + else: + kernel_command_line += 'panic=0 noreboot '
tests/functional/test_riscv64_sifive_u.py class SifiveU(LinuxKernelTest): · line 56
Quoted 10 lines
tests/functional/test_riscv64_sifive_u.py +5
-1+ pattern = 'Cannot open root device "mmcblk0" or unknown-block(0,0)' + self.vm.launch() - self.wait_for_console_pattern('Boot successful.') + self.wait_for_console_pattern(pattern) os.remove(rootfs_path) + def _test_riscv64_sifive_u_nommc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(False)
This test won't run because of the leading _
Quoted 7 lines
tests/functional/test_riscv64_sifive_u.py +4
-0+ + def test_riscv64_sifive_u_mmc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(True) + if __name__ == '__main__': LinuxKernelTest.main()
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
Re: [PATCH-for-10.1 2/2] tests/functional: Test SPI-SD adapter without SD card connected
Quoted 49 lines · Alex Bennée
Quoted 47 lines · Philippe Mathieu-Daudé
SPI-SD adapter should be usable, even without any SD card wired. Refactor
test_riscv64_sifive_u_mmc_spi()to make it more generic and add another test, inspired by this report:
https://lore.kernel.org/qemu-devel/[email protected]/Inspired-by Guenter Roeck <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/functional/test_riscv64_sifive_u.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)tests/functional/test_riscv64_sifive_u.py +11
-5@@ -27,25 +27,37 @@ class SifiveU(LinuxKernelTest): 'rootfs.ext2.gz'), 'b6ed95610310b7956f9bf20c4c9c0c05fea647900df441da9dfe767d24e8b28b') - def test_riscv64_sifive_u_mmc_spi(self): + def do_test_riscv64_sifive_u_mmc_spi(self, connect_card): self.set_machine('sifive_u') kernel_path = self.ASSET_KERNEL.fetch() rootfs_path = self.uncompress(self.ASSET_ROOTFS) self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + - 'root=/dev/mmcblk0 rootwait ' 'earlycon=sbi console=ttySIF0 ' - 'panic=-1 noreboot') + 'root=/dev/mmcblk0 ') self.vm.add_args('-kernel', kernel_path, - '-drive', f'file={rootfs_path},if=sd,format=raw', '-append', kernel_command_line, '-no-reboot') + if connect_card: + self.vm.add_args('-drive', f'file={rootfs_path},if=sd,format=raw') + kernel_command_line += 'panic=-1 noreboot rootwait ' + pattern = 'Boot successful.' + else: + kernel_command_line += 'panic=0 noreboot ' + pattern = 'Cannot open root device "mmcblk0" or unknown-block(0,0)' + self.vm.launch() - self.wait_for_console_pattern('Boot successful.') + self.wait_for_console_pattern(pattern)
Quoted 6 lines
tests/functional/test_riscv64_sifive_u.py class SifiveU(LinuxKernelTest): · line 56
Quoted 4 lines
tests/functional/test_riscv64_sifive_u.py +2
-0os.remove(rootfs_path) + def _test_riscv64_sifive_u_nommc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(False)This test won't run because of the leading _
Oops, I was carefully testing one case after each other and missed to remove this leading char!
Quoted 9 lines
Quoted 8 lines
tests/functional/test_riscv64_sifive_u.py +4
-0+ + def test_riscv64_sifive_u_mmc_spi(self): + self.do_test_riscv64_sifive_u_mmc_spi(True) + if __name__ == '__main__': LinuxKernelTest.main()