From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGIAE-00004y-0U for qemu-devel@nongnu.org; Wed, 09 May 2018 02:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGIAC-0005cL-IN for qemu-devel@nongnu.org; Wed, 09 May 2018 02:01:22 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:45975) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGIAC-0005b0-Cq for qemu-devel@nongnu.org; Wed, 09 May 2018 02:01:20 -0400 Received: by mail-qt0-x241.google.com with SMTP id j42-v6so44200191qtj.12 for ; Tue, 08 May 2018 23:01:20 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 9 May 2018 03:01:03 -0300 Message-Id: <20180509060104.4458-4-f4bug@amsat.org> In-Reply-To: <20180509060104.4458-1-f4bug@amsat.org> References: <20180509060104.4458-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 3/4] sdcard: Implement the UHS-I SWITCH_FUNCTION entries (Spec v3) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , "Edgar E . Iglesias" , Alistair Francis Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org [based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2015.2] Signed-off-by: Edgar E. Iglesias [PMD: rebased, changed magic by definitions, use stw_be_p, add tracing, check all functions in group are correct before setting the values] Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 186 +++++++++++++++++++++++++++++++++++++++------ hw/sd/trace-events | 1 + 2 files changed, 165 insertions(+), 22 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 24aaf0c767..d8dd88f872 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -128,6 +128,11 @@ struct SDState { bool enable; uint8_t dat_lines; bool cmd_line; + /** + * Whether the card entered the UHS mode with voltage level adjusted + * (use by soft-reset) + */ + bool uhs_activated; }; static const char *sd_state_name(enum SDCardStates state) @@ -567,6 +572,7 @@ static void sd_reset(DeviceState *dev) sd->expecting_acmd = false; sd->dat_lines = 0xf; sd->cmd_line = true; + sd->uhs_activated = false; sd->multi_blk_cnt = 0; } @@ -765,32 +771,168 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr) return ret; } +/* Function Group */ +enum { + SD_FG_MIN = 1, + SD_FG_ACCESS_MODE = 1, + SD_FG_COMMAND_SYSTEM = 2, + SD_FG_DRIVER_STRENGTH = 3, + SD_FG_CURRENT_LIMIT = 4, + SD_FG_RSVD_5 = 5, + SD_FG_RSVD_6 = 6, + SD_FG_MAX = 6, + SD_FG_COUNT +}; + +static const char *sd_fn_grp_name[SD_FG_COUNT] = { + [SD_FG_ACCESS_MODE] = "ACCESS_MODE", + [SD_FG_COMMAND_SYSTEM] = "COMMAND_SYSTEM", + [SD_FG_DRIVER_STRENGTH] = "DRIVER_STRENGTH", + [SD_FG_CURRENT_LIMIT] = "CURRENT_LIMIT", + [SD_FG_RSVD_5] = "RSVD5", + [SD_FG_RSVD_6] = "RSVD6", +}; + +/* Function name */ +enum { + SD_FN_NO_INFLUENCE = 0xf, + SD_FN_COUNT = 16 +}; + +typedef struct sd_fn_support { + const char *name; + bool uhs_only; + bool unimp; +} sd_fn_support; + +static const sd_fn_support *sd_fn_support_defs[SD_FG_COUNT] = { + [SD_FG_ACCESS_MODE] = (sd_fn_support [SD_FN_COUNT]) { + [0] = { .name = "default/SDR12" }, + [1] = { .name = "high-speed/SDR25" }, + [2] = { .name = "SDR50", .uhs_only = true }, + [3] = { .name = "SDR104", .uhs_only = true }, + [4] = { .name = "DDR50", .uhs_only = true }, + }, + [SD_FG_COMMAND_SYSTEM] = (sd_fn_support [SD_FN_COUNT]) { + [0] = { .name = "default" }, + [1] = { .name = "For eC" }, + [3] = { .name = "OTP", .unimp = true }, + [4] = { .name = "ASSD", .unimp = true }, + }, + [SD_FG_DRIVER_STRENGTH] = (sd_fn_support [SD_FN_COUNT]) { + [0] = { .name = "default/Type B" }, + [1] = { .name = "Type A", .uhs_only = true }, + [2] = { .name = "Type C", .uhs_only = true }, + [3] = { .name = "Type D", .uhs_only = true }, + }, + [SD_FG_CURRENT_LIMIT] = (sd_fn_support [SD_FN_COUNT]) { + [0] = { .name = "default/200mA" }, + [1] = { .name = "400mA", .uhs_only = true }, + [2] = { .name = "600mA", .uhs_only = true }, + [3] = { .name = "800mA", .uhs_only = true }, + }, + [SD_FG_RSVD_5] = (sd_fn_support [SD_FN_COUNT]) { + [0] = { .name = "default" }, + }, + [SD_FG_RSVD_6] = (sd_fn_support [SD_FN_COUNT]) { + [0] = { .name = "default" }, + }, +}; + +#define SD_FN_BUFSZ (SD_FG_MAX * 4 / BITS_PER_BYTE) + static void sd_function_switch(SDState *sd, uint32_t arg) { - int i, mode, new_func; - mode = !!(arg & 0x80000000); - - sd->data[0] = 0x00; /* Maximum current consumption */ - sd->data[1] = 0x01; - sd->data[2] = 0x80; /* Supported group 6 functions */ - sd->data[3] = 0x01; - sd->data[4] = 0x80; /* Supported group 5 functions */ - sd->data[5] = 0x01; - sd->data[6] = 0x80; /* Supported group 4 functions */ - sd->data[7] = 0x01; - sd->data[8] = 0x80; /* Supported group 3 functions */ - sd->data[9] = 0x01; - sd->data[10] = 0x80; /* Supported group 2 functions */ - sd->data[11] = 0x43; - sd->data[12] = 0x80; /* Supported group 1 functions */ - sd->data[13] = 0x03; - for (i = 0; i < 6; i ++) { - new_func = (arg >> (i * 4)) & 0x0f; - if (mode && new_func != 0x0f) - sd->function_group[i] = new_func; - sd->data[14 + (i >> 1)] = new_func << ((i * 4) & 4); + bool invalid_function_selected = false; + int fn_grp, new_func, i; + uint8_t *data_p, tmpbuf[SD_FN_BUFSZ]; + uint16_t max_current_mA = 1; + bool mode = extract32(arg, 31, 1); /* 0: check only, 1: do switch */ + + /* Bits 400-495: information (16 bits each group) */ + data_p = &sd->data[2]; + for (fn_grp = SD_FG_MAX; fn_grp >= SD_FG_MIN; fn_grp--) { + uint16_t supported_fns = 1 << SD_FN_NO_INFLUENCE; + for (i = 0; i < SD_FN_COUNT; ++i) { + const sd_fn_support *def = &sd_fn_support_defs[fn_grp][i]; + + if (def->name && !def->unimp && + !(def->uhs_only && !sd->uhs_activated)) { + supported_fns |= 1 << i; + } + } + stw_be_p(data_p, supported_fns); + data_p += 2; } + + /* Bits 376-399: function (4 bits each group) + * + * Do not write the values back directly: + * Check everything first writing to 'tmpbuf' + */ + data_p = tmpbuf; + for (fn_grp = SD_FG_MAX; fn_grp >= SD_FG_MIN; fn_grp--) { + new_func = (arg >> ((fn_grp - 1) * 4)) & 0x0f; + if (new_func == SD_FN_NO_INFLUENCE) { + /* Guest requested no influence, so this function group + * stays the same. + */ + new_func = sd->function_group[fn_grp - 1]; + } else { + const sd_fn_support *def = &sd_fn_support_defs[fn_grp][new_func]; + if (mode) { + if (!def->name) { + qemu_log_mask(LOG_GUEST_ERROR, + "Function %d not valid for " + "function group %d\n", + new_func, fn_grp); + invalid_function_selected = true; + new_func = SD_FN_NO_INFLUENCE; + } else if (def->unimp) { + qemu_log_mask(LOG_UNIMP, + "Function %s (fn grp %d) not implemented\n", + def->name, fn_grp); + invalid_function_selected = true; + new_func = SD_FN_NO_INFLUENCE; + } else if (def->uhs_only && !sd->uhs_activated) { + qemu_log_mask(LOG_GUEST_ERROR, + "Function %s (fn grp %d) only " + "valid in UHS mode\n", + def->name, fn_grp); + invalid_function_selected = true; + new_func = SD_FN_NO_INFLUENCE; + } else { + sd->function_group[fn_grp - 1] = new_func; + } + } + trace_sdcard_function_select(def->name, sd_fn_grp_name[fn_grp], + mode); + } + if (!(fn_grp & 0x1)) { /* evens go in high nibble */ + *data_p = new_func << 4; + } else { /* odds go in low nibble */ + *(data_p++) |= new_func; + } + } + if (invalid_function_selected) { + /* Ignore all the set values */ + memset(&sd->data[14], 0, SD_FN_BUFSZ); + } else { + /* Write back if all functions in the group are correct. */ + memcpy(&sd->data[14], tmpbuf, SD_FN_BUFSZ); + } + + /* Data Structure Version = 0x00: 376 bits reserved (undefined) */ memset(&sd->data[17], 0, 47); + + if (invalid_function_selected) { + /* Maximum current consumption: If one of the selected functions + * was wrong, the return value will be 0. + */ + max_current_mA = 0; + } + stw_be_p(sd->data, max_current_mA); + stw_be_p(sd->data + 64, sd_crc16(sd->data, 64)); } diff --git a/hw/sd/trace-events b/hw/sd/trace-events index bfd1d62efc..eba5ab7b90 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -48,6 +48,7 @@ sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x" sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint8_t value) "%s %20s/ CMD%02d value 0x%02x" sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, int length) "%s %20s/ CMD%02d len %d" sdcard_set_voltage(uint16_t millivolts) "%u mV" +sdcard_function_select(const char *fn_name, const char *grp_name, bool do_switch) "Function %s (group: %s, sw: %u)" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" -- 2.17.0