From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGUZI-0002ym-DZ for qemu-devel@nongnu.org; Wed, 09 May 2018 15:16:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGUZF-00017c-3e for qemu-devel@nongnu.org; Wed, 09 May 2018 15:16:04 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33212) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGUZE-00017R-VO for qemu-devel@nongnu.org; Wed, 09 May 2018 15:16:01 -0400 Received: by mail-qt0-x243.google.com with SMTP id e8-v6so42243146qth.0 for ; Wed, 09 May 2018 12:16:00 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= References: <20180509034658.26455-1-f4bug@amsat.org> <20180509034658.26455-5-f4bug@amsat.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Wed, 9 May 2018 16:15:51 -0300 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 04/14] sdcard: Extract sd_frame48/136_calc_checksum() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis Cc: Peter Maydell , "Edgar E . Iglesias" , Paolo Bonzini , Alistair Francis , Stefan Hajnoczi , "qemu-devel@nongnu.org Developers" Hi Alistair, On 05/09/2018 03:00 PM, Alistair Francis wrote: > On Tue, May 8, 2018 at 8:46 PM, Philippe Mathieu-Daudé wrote: >> It will help when moving this around for qtesting in the next commit. >> >> Signed-off-by: Philippe Mathieu-Daudé >> --- >> hw/sd/sd.c | 21 ++++++++++++++++++--- >> 1 file changed, 18 insertions(+), 3 deletions(-) >> >> diff --git a/hw/sd/sd.c b/hw/sd/sd.c >> index 27a70896cd..06607115a7 100644 >> --- a/hw/sd/sd.c >> +++ b/hw/sd/sd.c >> @@ -273,6 +273,21 @@ static uint16_t sd_crc16(const void *message, size_t width) >> return shift_reg; >> } >> >> +enum { >> + F48_CONTENT_LENGTH = 1 /* command */ + 4 /* argument */, >> + F136_CONTENT_LENGTH = 15, >> +}; >> + >> +static uint8_t sd_frame48_calc_checksum(const void *content) >> +{ >> + return sd_crc7(content, F48_CONTENT_LENGTH); >> +} >> + >> +static uint8_t sd_frame136_calc_checksum(const void *content) >> +{ >> + return (sd_crc7(content, F136_CONTENT_LENGTH) << 1) | 1; >> +} >> + >> #define OCR_POWER_DELAY_NS 500000 /* 0.5ms */ >> >> FIELD(OCR, VDD_VOLTAGE_WINDOW, 0, 24) >> @@ -352,7 +367,7 @@ static void sd_set_cid(SDState *sd) >> sd->cid[13] = 0x00 | /* Manufacture date (MDT) */ >> ((MDT_YR - 2000) / 10); >> sd->cid[14] = ((MDT_YR % 10) << 4) | MDT_MON; >> - sd->cid[15] = (sd_crc7(sd->cid, 15) << 1) | 1; >> + sd->cid[15] = sd_frame136_calc_checksum(sd->cid); >> } >> >> #define HWBLOCK_SHIFT 9 /* 512 bytes */ >> @@ -416,7 +431,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) >> sd->csd[13] = 0x40; >> sd->csd[14] = 0x00; >> } >> - sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1; >> + sd->csd[15] = sd_frame136_calc_checksum(sd->csd); >> } >> >> static void sd_set_rca(SDState *sd) >> @@ -491,7 +506,7 @@ static int sd_req_crc_validate(SDRequest *req) >> buffer[0] = 0x40 | req->cmd; >> stl_be_p(&buffer[1], req->arg); >> return 0; >> - return sd_crc7(buffer, 5) != req->crc; /* TODO */ >> + return sd_frame48_calc_checksum(buffer) != req->crc; /* TODO */ > > This 5 has changed to a 15. Is that on purpose? It should be mentioned > in the commit message if it is. I just extracted this function: static uint8_t sd_frame48_calc_checksum(const void *content) { return sd_crc7(content, F48_CONTENT_LENGTH); } Having: enum { F48_CONTENT_LENGTH = 1 /* command */ + 4 /* argument */, So F48_CONTENT_LENGTH = 5 as previous. This function is later verified with tests from patch 12 of this series. > > Alistair > >> } >> >> static void sd_response_r1_make(SDState *sd, uint8_t *response) >> -- >> 2.17.0 >> >>