From patchwork Mon Jul 25 23:19:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Palatin X-Patchwork-Id: 106763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D2FFB700E for ; Tue, 26 Jul 2011 09:19:51 +1000 (EST) Received: from localhost ([::1]:36811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlURA-0004s2-JW for incoming@patchwork.ozlabs.org; Mon, 25 Jul 2011 19:19:48 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53490) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlUQn-0004d8-AL for qemu-devel@nongnu.org; Mon, 25 Jul 2011 19:19:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlUQk-0000oj-Tw for qemu-devel@nongnu.org; Mon, 25 Jul 2011 19:19:25 -0400 Received: from smtp-out.google.com ([216.239.44.51]:20615) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlUQk-0000od-QB for qemu-devel@nongnu.org; Mon, 25 Jul 2011 19:19:22 -0400 Received: from hpaq6.eem.corp.google.com (hpaq6.eem.corp.google.com [172.25.149.6]) by smtp-out.google.com with ESMTP id p6PNJLCA023661; Mon, 25 Jul 2011 16:19:22 -0700 Received: from vpa.mtv.corp.google.com (vpa.mtv.corp.google.com [172.22.72.27]) by hpaq6.eem.corp.google.com with ESMTP id p6PNJJ0r026160; Mon, 25 Jul 2011 16:19:20 -0700 Received: by vpa.mtv.corp.google.com (Postfix, from userid 125455) id 9A8C7160A58; Mon, 25 Jul 2011 16:19:19 -0700 (PDT) From: Vincent Palatin To: Qemu devel Date: Mon, 25 Jul 2011 16:19:08 -0700 Message-Id: <1311635951-11047-5-git-send-email-vpalatin@chromium.org> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1311635951-11047-1-git-send-email-vpalatin@chromium.org> References: <1311635951-11047-1-git-send-email-vpalatin@chromium.org> X-System-Of-Record: true X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 216.239.44.51 Cc: Vincent Palatin Subject: [Qemu-devel] [PATCH 4/7] sd: add eMMC support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The parameters mimick a real 4GB eMMC, but it can be set to various sizes. Signed-off-by: Vincent Palatin --- hw/sd.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 136 insertions(+), 19 deletions(-) diff --git a/hw/sd.c b/hw/sd.c index de477fe..0db8d78 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -91,11 +91,13 @@ struct SDState { int function_group[6]; int spi; + int emmc; int current_cmd; int blk_written; uint64_t data_start; uint32_t data_offset; uint8_t data[512]; + uint8_t ext_csd[512]; qemu_irq readonly_cb; qemu_irq inserted_cb; BlockDriverState *bdrv; @@ -196,7 +198,7 @@ static uint16_t sd_crc16(void *message, size_t width) static void sd_set_ocr(SDState *sd) { /* All voltages OK, card power-up OK, Standard Capacity SD Memory Card */ - sd->ocr = 0x80ffff00; + sd->ocr = 0x80ffff80; } static void sd_set_scr(SDState *sd) @@ -250,13 +252,85 @@ static const uint8_t sd_csd_rw_mask[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, }; +static void mmc_set_ext_csd(SDState *sd, uint64_t size) +{ + uint32_t sectcount = size >> HWBLOCK_SHIFT; + + memset(sd->ext_csd, 0, 512); + sd->ext_csd[504] = 0x1; /* supported command sets */ + sd->ext_csd[503] = 0x1; /* HPI features */ + sd->ext_csd[502] = 0x1; /* Background operations support */ + sd->ext_csd[241] = 0xA; /* 1st initialization time after partitioning */ + sd->ext_csd[232] = 0x1; /* Trim multiplier */ + sd->ext_csd[231] = 0x15; /* Secure feature support */ + sd->ext_csd[230] = 0x96; /* Secure erase support */ + sd->ext_csd[229] = 0x96; /* Secure TRIM multiplier */ + sd->ext_csd[228] = 0x7; /* Boot information */ + sd->ext_csd[226] = 0x8; /* Boot partition size */ + sd->ext_csd[225] = 0x6; /* Access size */ + sd->ext_csd[224] = 0x4; /* HC Erase unit size */ + sd->ext_csd[223] = 0x1; /* HC erase timeout */ + sd->ext_csd[222] = 0x1; /* Reliable write sector count */ + sd->ext_csd[221] = 0x4; /* HC write protect group size */ + sd->ext_csd[220] = 0x8; /* Sleep current VCC */ + sd->ext_csd[219] = 0x7; /* Sleep current VCCQ */ + sd->ext_csd[217] = 0x11; /* Sleep/Awake timeout */ + sd->ext_csd[215] = (sectcount >> 24) & 0xff; /* Sector count */ + sd->ext_csd[214] = (sectcount >> 16) & 0xff; /* ... */ + sd->ext_csd[213] = (sectcount >> 8) & 0xff; /* ... */ + sd->ext_csd[212] = (sectcount & 0xff); /* ... */ + sd->ext_csd[210] = 0xa; /* Min write perf for 8bit@52Mhz */ + sd->ext_csd[209] = 0xa; /* Min read perf for 8bit@52Mhz */ + sd->ext_csd[208] = 0xa; /* Min write perf for 4bit@52Mhz */ + sd->ext_csd[207] = 0xa; /* Min read perf for 4bit@52Mhz */ + sd->ext_csd[206] = 0xa; /* Min write perf for 4bit@26Mhz */ + sd->ext_csd[205] = 0xa; /* Min read perf for 4bit@26Mhz */ + sd->ext_csd[199] = 0x1; /* Partition switching timing */ + sd->ext_csd[198] = 0x1; /* Out-of-interrupt busy timing */ + sd->ext_csd[196] = 0x7; /* Card type */ + sd->ext_csd[194] = 0x2; /* CSD Structure version */ + sd->ext_csd[192] = 0x5; /* Extended CSD revision */ + sd->ext_csd[168] = 0x1; /* RPMB size */ + sd->ext_csd[160] = 0x3; /* Partinioning support */ + sd->ext_csd[159] = 0x00; /* Max enhanced area size */ + sd->ext_csd[158] = 0x00; /* ... */ + sd->ext_csd[157] = 0xEC; /* ... */ +} + static void sd_set_csd(SDState *sd, uint64_t size) { uint32_t csize = (size >> (CMULT_SHIFT + HWBLOCK_SHIFT)) - 1; uint32_t sectsize = (1 << (SECTOR_SHIFT + 1)) - 1; uint32_t wpsize = (1 << (WPGROUP_SHIFT + 1)) - 1; - if (size <= 0x40000000) { /* Standard Capacity SD */ + if (sd->emmc) { /* eMMC */ + sd->csd[0] = 0xd0; + sd->csd[1] = 0x0f; + sd->csd[2] = 0x00; + sd->csd[3] = 0x32; + sd->csd[4] = 0x0f; + if (size <= 0x80000000ULL) { + /* use 1k blocks */ + uint32_t csize1k = (size >> (CMULT_SHIFT + 10)) - 1; + sd->csd[5] = 0x5a; + sd->csd[6] = 0x80 | ((csize1k >> 10) & 0xf); + sd->csd[7] = (csize1k >> 2) & 0xff; + } else { /* >= 2GB : size stored in ext CSD, block addressing */ + sd->csd[5] = 0x59; + sd->csd[6] = 0x8f; + sd->csd[7] = 0xff; + sd->ocr |= 1 << 30; + } + sd->csd[8] = 0xff; + sd->csd[9] = 0xff; + sd->csd[10] = 0xf7; + sd->csd[11] = 0xfe; + sd->csd[12] = 0x49; + sd->csd[13] = 0x10; + sd->csd[14] = 0x00; + sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1; + mmc_set_ext_csd(sd, size); + } else if (size <= 0x40000000) { /* Standard Capacity SD */ sd->csd[0] = 0x00; /* CSD structure */ sd->csd[1] = 0x26; /* Data read access-time-1 */ sd->csd[2] = 0x00; /* Data read access-time-2 */ @@ -305,9 +379,13 @@ static void sd_set_csd(SDState *sd, uint64_t size) } } -static void sd_set_rca(SDState *sd) +static void sd_set_rca(SDState *sd, uint16_t value) { - sd->rca += 0x4567; + if (sd->emmc) { + sd->rca = value; + } else { + sd->rca += 0x4567; + } } #define CARD_STATUS_A 0x02004100 @@ -343,6 +421,8 @@ static void sd_response_r1_make(SDState *sd, uint32_t status; status = (sd->card_status & ~mask) | (last_status & mask); + status &= ~CURRENT_STATE; + status |= sd->state << 9; sd->card_status &= ~CARD_STATUS_C | APP_CMD; response[0] = (status >> 24) & 0xff; @@ -446,6 +526,7 @@ SDState *sd_init(BlockDriverState *bs, int is_spi) sd = (SDState *) qemu_mallocz(sizeof(SDState)); sd->buf = qemu_blockalign(bs, 512); sd->spi = is_spi; + sd->emmc = !bdrv_is_removable(bs); sd->enable = 1; sd_reset(sd, bs); if (sd->bdrv) { @@ -627,6 +708,11 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, break; case 1: /* CMD1: SEND_OP_CMD */ + if (sd->emmc) { + sd->state = sd_ready_state; + return sd_r3; + } + if (!sd->spi) goto bad_cmd; @@ -653,8 +739,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, case sd_identification_state: case sd_standby_state: sd->state = sd_standby_state; - sd_set_rca(sd); - return sd_r6; + sd_set_rca(sd, req.arg >> 16); + return sd->emmc ? sd_r1 : sd_r6; default: break; @@ -678,6 +764,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, return sd_r0; case 6: /* CMD6: SWITCH_FUNCTION */ + if (sd->emmc) { + return sd_r1b; + } else { if (sd->spi) goto bad_cmd; switch (sd->mode) { @@ -691,6 +780,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, default: break; } + } break; case 7: /* CMD7: SELECT/DESELECT_CARD */ @@ -731,22 +821,36 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, } break; - case 8: /* CMD8: SEND_IF_COND */ - /* Physical Layer Specification Version 2.00 command */ - switch (sd->state) { - case sd_idle_state: - sd->vhs = 0; + case 8: /* CMD8: SEND_IF_COND / SEND_EXT_CSD */ + if (sd->emmc) { + switch (sd->state) { + case sd_transfer_state: + /* MMC : Sends the EXT_CSD register as a Block of data */ + sd->state = sd_sendingdata_state; + memcpy(sd->data, sd->ext_csd, 512); + sd->data_start = addr; + sd->data_offset = 0; + return sd_r1; + default: + break; + } + } else { + /* SD Physical Layer Specification Version 2.00 command */ + switch (sd->state) { + case sd_idle_state: + sd->vhs = 0; - /* No response if not exactly one VHS bit is set. */ - if (!(req.arg >> 8) || (req.arg >> ffs(req.arg & ~0xff))) - return sd->spi ? sd_r7 : sd_r0; + /* No response if not exactly one VHS bit is set. */ + if (!(req.arg >> 8) || (req.arg >> ffs(req.arg & ~0xff))) + return sd->spi ? sd_r7 : sd_r0; - /* Accept. */ - sd->vhs = req.arg; - return sd_r7; + /* Accept. */ + sd->vhs = req.arg; + return sd_r7; - default: - break; + default: + break; + } } break; @@ -1115,6 +1219,11 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, /* Application specific commands (Class 8) */ case 55: /* CMD55: APP_CMD */ + /* Not supported by MMC */ + if (sd->emmc) { + return sd_r0; + } + if (sd->rca != rca) return sd_r0; @@ -1566,6 +1675,14 @@ uint8_t sd_read_data(SDState *sd) sd->state = sd_transfer_state; break; + case 8: /* CMD8: SEND_EXT_CSD on MMC */ + ret = sd->data[sd->data_offset++]; + + if (sd->data_offset >= 512) { + sd->state = sd_transfer_state; + } + break; + case 9: /* CMD9: SEND_CSD */ case 10: /* CMD10: SEND_CID */ ret = sd->data[sd->data_offset ++];