[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 14/17] hw/sd/sdcard: Extract sd_blk_len() helper
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 14/17] hw/sd/sdcard: Extract sd_blk_len() helper |
Date: |
Thu, 27 Jun 2024 18:22:29 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Extract sd_blk_len() helper, use definitions instead
of magic values.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index aaa50ab2c5..5997e13107 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -603,6 +603,14 @@ static void sd_response_r7_make(SDState *sd, uint8_t
*response)
stl_be_p(response, sd->vhs);
}
+static uint32_t sd_blk_len(SDState *sd)
+{
+ if (FIELD_EX32(sd->ocr, OCR, CARD_CAPACITY)) {
+ return 1 << HWBLOCK_SHIFT;
+ }
+ return sd->blk_len;
+}
+
static uint64_t sd_req_get_address(SDState *sd, SDRequest req)
{
uint64_t addr;
@@ -2076,7 +2084,7 @@ uint8_t sd_read_byte(SDState *sd)
if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION))
return 0x00;
- io_len = (sd->ocr & (1 << 30)) ? 512 : sd->blk_len;
+ io_len = sd_blk_len(sd);
trace_sdcard_read_data(sd->proto->name,
sd->last_cmd_name,
--
2.41.0
- [PATCH v3 03/17] hw/sd/sdcard: Track last command used to help logging, (continued)
- [PATCH v3 03/17] hw/sd/sdcard: Track last command used to help logging, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 05/17] hw/sd/sdcard: Trace requested address computed by sd_req_get_address(), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 06/17] hw/sd/sdcard: Do not store vendor data on block drive (CMD56), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 07/17] hw/sd/sdcard: Send WRITE_PROT bits MSB first (CMD30), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 08/17] hw/sd/sdcard: Send NUM_WR_BLOCKS bits MSB first (ACMD22), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 09/17] hw/sd/sdcard: Use READY_FOR_DATA definition instead of magic value, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 10/17] hw/sd/sdcard: Assign SDCardStates enum values, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 11/17] hw/sd/sdcard: Simplify sd_inactive_state handling, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 12/17] hw/sd/sdcard: Restrict SWITCH_FUNCTION to sd_transfer_state (CMD6), Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 13/17] hw/sd/sdcard: Add direct reference to SDProto in SDState, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 14/17] hw/sd/sdcard: Extract sd_blk_len() helper,
Philippe Mathieu-Daudé <=
- [PATCH v3 15/17] tests/qtest: Disable npcm7xx_sdhci tests using hardcoded RCA, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 16/17] hw/sd/sdcard: Generate random RCA value, Philippe Mathieu-Daudé, 2024/06/27
- [PATCH v3 17/17] hw/sd/sdcard: Introduce definitions for EXT_CSD register, Philippe Mathieu-Daudé, 2024/06/27