From patchwork Wed May 9 03:46:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10388067 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D34A560153 for ; Wed, 9 May 2018 03:53:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEEF228F4E for ; Wed, 9 May 2018 03:53:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A3F1F28F70; Wed, 9 May 2018 03:53:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 16BA628F4E for ; Wed, 9 May 2018 03:53:52 +0000 (UTC) Received: from localhost ([::1]:54300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGGAp-0001u2-9n for patchwork-qemu-devel@patchwork.kernel.org; Tue, 08 May 2018 23:53:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGG4Z-0004SU-NB for qemu-devel@nongnu.org; Tue, 08 May 2018 23:47:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGG4Y-0002fr-LE for qemu-devel@nongnu.org; Tue, 08 May 2018 23:47:23 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:45682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGG4Y-0002eo-Fl for qemu-devel@nongnu.org; Tue, 08 May 2018 23:47:22 -0400 Received: by mail-qt0-x242.google.com with SMTP id j42-v6so43940189qtj.12 for ; Tue, 08 May 2018 20:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XQVkZhXQT7LoEiMqOvwIc2YKRhTidGNAJtT9g0xgaV4=; b=vAMglr0eX/8mStXf1JYdOqLCtoV8rPZ6Wd/n1JdfvO4uyBHE88eMJ0sZg5FmxIZxJ9 7+sXutcCEtAvHy69wP/JiG1hPffOxnP/XwKEuifyNiBb+D6YzWnAJgAF2vAIBnsD+U/R DD04gv0sbiqZ5OCkCL15ES9vHkqhcX0TIJs+YXrYkE/xZNRJFOvSWEPfWbD0jd2PnKYb ZYB8eMDDG0uJp/GPnnpPK8li8QeVC3aNlCdrXz0urKpUAB3vKEP/20Oj0Xwgrwb62Hl/ oy4Kb0XQjMHgVFqnMV9v8KjI1PbkyQm4M9biHOBpIfN4j3b5fGLlJJoKBCxUN1PXNIVz grcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XQVkZhXQT7LoEiMqOvwIc2YKRhTidGNAJtT9g0xgaV4=; b=lbCht65BS+F39+74KK/sriwpIlYsk2FclYxRIlBo6kgMOFIDThnur9kwgkkDtRRgAI ofluVuTSYGfq93KhrIjKjFChluIBn6mBfUJYESHX2zJ/G2Ruslewkty04cQlNnBVGdHJ dFhHMWjyUdLfXlW3nW5xFgCG6K07IgqjxU8hQ2Gf70xL+p7Em/7bf9GMkeyvqwPTJ3Vq Ntvt9Y4Zb4x78p3Z2CQMJCbfhjx09hi9qc9FJuV19nTsFOhE5/QVEdXw12Y1Spq+BEC5 1zDCIuSnjJ9aJHt3LMd/jeq2aID7erwNFsaueSqHy715GMtMebHUXA7GT2RKKZOp9X4g mQyw== X-Gm-Message-State: ALQs6tCepeKEXxg6z9Q4otkM89+Ks/l/6uqKY++sr48mrKzgrOirFsEq jpwEeiIuYSlz9Py+ntJ1sq4= X-Google-Smtp-Source: AB8JxZqkNn7IviA7aVOA1xsvIbQlTTdSCMp2yjdlYeFWsVARnYfkY26saFrswKuM66Fy1n1tRU6YwQ== X-Received: by 2002:a0c:aa5c:: with SMTP id e28-v6mr39868794qvb.42.1525837641756; Tue, 08 May 2018 20:47:21 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id w12-v6sm14497002qtb.80.2018.05.08.20.47.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 20:47:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" Date: Wed, 9 May 2018 00:46:49 -0300 Message-Id: <20180509034658.26455-6-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509034658.26455-1-f4bug@amsat.org> References: <20180509034658.26455-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v2 05/14] sdcard: Move sd_crc7() and calc_checksum() out for qtesting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move the calc_checksum() functions out so we will able to write qtests for them. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/sd/sd.h | 20 ++++++++++++++++++++ hw/sd/sd.c | 33 --------------------------------- hw/sd/sdmmc-internal.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 33 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 9bdb3c9285..c854ed6a14 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -130,6 +130,26 @@ typedef struct { void (*set_readonly)(DeviceState *dev, bool readonly); } SDBusClass; +/** + * sd_frame48_calc_checksum: + * @content: pointer to the frame content + * + * Calculate the 7-bit CRC of a 48-bit SD frame. + * + * Returns: The frame CRC. + */ +uint8_t sd_frame48_calc_checksum(const void *content); + +/** + * sd_frame136_calc_checksum: + * @content: pointer to the frame content + * + * Calculate the 7-bit CRC of a 136-bit SD frame. + * + * Returns: The frame CRC. + */ +uint8_t sd_frame136_calc_checksum(const void *content); + /* Legacy functions to be used only by non-qdevified callers */ SDState *sd_init(BlockBackend *bs, bool is_spi); int sd_do_command(SDState *sd, SDRequest *req, diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 06607115a7..d8dad94fc4 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -236,24 +236,6 @@ static const int sd_cmd_class[SDMMC_CMD_MAX] = { 7, 7, 10, 7, 9, 9, 9, 8, 8, 10, 8, 8, 8, 8, 8, 8, }; -static uint8_t sd_crc7(const void *message, size_t width) -{ - int i, bit; - uint8_t shift_reg = 0x00; - const uint8_t *msg = (const uint8_t *)message; - - for (i = 0; i < width; i++, msg++) { - for (bit = 7; bit >= 0; bit--) { - shift_reg <<= 1; - if ((shift_reg >> 7) ^ ((*msg >> bit) & 1)) { - shift_reg ^= 0x89; - } - } - } - - return shift_reg; -} - static uint16_t sd_crc16(const void *message, size_t width) { int i, bit; @@ -273,21 +255,6 @@ 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) diff --git a/hw/sd/sdmmc-internal.c b/hw/sd/sdmmc-internal.c index 2053def3f1..a94d65b756 100644 --- a/hw/sd/sdmmc-internal.c +++ b/hw/sd/sdmmc-internal.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "hw/sd/sd.h" #include "sdmmc-internal.h" const char *sd_cmd_name(uint8_t cmd) @@ -70,3 +71,37 @@ const char *sd_acmd_name(uint8_t cmd) return acmd_abbrev[cmd] ? acmd_abbrev[cmd] : "UNKNOWN_ACMD"; } + +/* 7 bit CRC with polynomial x^7 + x^3 + 1 */ +static uint8_t sd_crc7(const void *message, size_t width) +{ + int i, bit; + uint8_t shift_reg = 0x00; + const uint8_t *msg = (const uint8_t *)message; + + for (i = 0; i < width; i++, msg++) { + for (bit = 7; bit >= 0; bit--) { + shift_reg <<= 1; + if ((shift_reg >> 7) ^ ((*msg >> bit) & 1)) { + shift_reg ^= 0x89; + } + } + } + + return shift_reg; +} + +enum { + F48_CONTENT_LENGTH = 1 /* command */ + 4 /* argument */, + F136_CONTENT_LENGTH = 15, +}; + +uint8_t sd_frame48_calc_checksum(const void *content) +{ + return sd_crc7(content, F48_CONTENT_LENGTH); +} + +uint8_t sd_frame136_calc_checksum(const void *content) +{ + return (sd_crc7(content, F136_CONTENT_LENGTH) << 1) | 1; +}