[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/12] hw/sd/sdcard: Restrict SWITCH_FUNCTION to sd_transfer_s
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 11/12] hw/sd/sdcard: Restrict SWITCH_FUNCTION to sd_transfer_state (CMD6) |
Date: |
Tue, 25 Jun 2024 07:53:52 +0200 |
SWITCH_FUNCTION is only allowed in TRANSFER state
(See 4.8 "Card State Transition Table).
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index fce99d655d..3b885ba8a0 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -1196,6 +1196,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
SDRequest req)
if (sd->mode != sd_data_transfer_mode) {
return sd_invalid_mode_for_cmd(sd, req);
}
+ if (sd->state != sd_transfer_state) {
+ return sd_invalid_state_for_cmd(sd, req);
+ }
+
sd_function_switch(sd, req.arg);
sd->state = sd_sendingdata_state;
sd->data_start = 0;
--
2.41.0
- [PATCH v2 01/12] tests/qtest: Disable npcm7xx_sdhci tests using hardcoded RCA, (continued)
- [PATCH v2 01/12] tests/qtest: Disable npcm7xx_sdhci tests using hardcoded RCA, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 02/12] hw/sd/sdcard: Generate random RCA value, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 03/12] hw/sd/sdcard: Track last command used to help logging, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 04/12] hw/sd/sdcard: Trace block offset in READ/WRITE data accesses, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 05/12] hw/sd/sdcard: Do not store vendor data on block drive (CMD56), Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 06/12] hw/sd/sdcard: Send WRITE_PROT bits MSB first (CMD30), Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 07/12] hw/sd/sdcard: Send NUM_WR_BLOCKS bits MSB first (ACMD22), Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 08/12] hw/sd/sdcard: Use READY_FOR_DATA definition instead of magic value, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 09/12] hw/sd/sdcard: Assign SDCardStates enum values, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 10/12] hw/sd/sdcard: Simplify sd_inactive_state handling, Philippe Mathieu-Daudé, 2024/06/25
- [PATCH v2 11/12] hw/sd/sdcard: Restrict SWITCH_FUNCTION to sd_transfer_state (CMD6),
Philippe Mathieu-Daudé <=
- [PATCH v2 12/12] hw/sd/sdcard: Add direct reference to SDProto in SDState, Philippe Mathieu-Daudé, 2024/06/25
- Re: [PATCH v2 00/12] hw/sd/sdcard: Accumulation of cleanups and fixes, Cédric Le Goater, 2024/06/25