From patchwork Fri May 4 15:59:16 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: 10381043 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 F1FF86038F for ; Fri, 4 May 2018 16:21:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB3D523F88 for ; Fri, 4 May 2018 16:21:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCC05294D9; Fri, 4 May 2018 16:21:41 +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 257D723F88 for ; Fri, 4 May 2018 16:21:40 +0000 (UTC) Received: from localhost ([::1]:35230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEdSm-00051p-4j for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 May 2018 12:21:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEd8E-0003NR-3M for qemu-devel@nongnu.org; Fri, 04 May 2018 12:00:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEd88-0001r7-C0 for qemu-devel@nongnu.org; Fri, 04 May 2018 12:00:26 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:44545) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEd88-0001r0-7b for qemu-devel@nongnu.org; Fri, 04 May 2018 12:00:20 -0400 Received: by mail-qk0-x241.google.com with SMTP id z8so16989932qki.11 for ; Fri, 04 May 2018 09:00:20 -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=LXw6Y46Gbl1DJe7pGpYk8xOwyPzlejaO/V3ePgy56BY=; b=I87c/fjeS/6KtR6EJerga7pvZQL81yh832csfvXlekAfkD5IXQbgYoIDPCm7Dw/CEZ krWDdpWy+2KgMN5GFqjWIlr8J7PtSZCynXJHvHTE4agosRPOM09LQvgRKkwis+N19yIe 0ybtczTlXGfY++J3siz6Z9/ceZgFhuTSln4/h0WQZyl+h+egN9X2mfw/0gVDLGyq5Ia5 5fl2/bOHEXWCiWGTXP6JCgplOK8wnhD+5slYuVYsoZRBNqA7Cg0gqt5X48KZz3+IIJ+G dHKxrzHd4GMz2/KafSYZPEVug4xzHiSZuQMvGaXcBPA03Z8yXXIIYA8pP6hHVApHDQgq afAw== 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=LXw6Y46Gbl1DJe7pGpYk8xOwyPzlejaO/V3ePgy56BY=; b=M7rSkD15F6AQGpYCXVDyHgibzeZGlbFq5VUh3cY4IFiX1SAXs5K/RUFTe6KSjQSKCe fiijgSw6N24Cid/RWjS8RqGg5N3FgTMUy5BOtSDZZJmTE0tmzGYEQerFWpj8WctpWlQ3 qWG7fiKZGTJLKKW+1TFvlzumsnwwq+HXriJqxe8BpranQTS6WWGrw0eIDLgHYadIUAIi yXJ3VrIkW4XkNhbsLzk734ui4eavXTx09igqk+K6LgaSAjRsOmJhRP5gJIaqa549A39C JOWda/7Fyxt6sSjYKE/9Y9HEw+XPfu8t/H773J+mSqiLIgdEwC0OEzIsb1H6CKOjsXN1 r5XQ== X-Gm-Message-State: ALQs6tBf8z7bRmKUeJ91tN/aOoSb5KDiG4s1MJ3UFwpmeDfnJQxLtx1T ZJUslpSxXBBf2DT0Gnt3Uvv+29Ky X-Google-Smtp-Source: AB8JxZrFKHAztdwV2Ec/18A8pI7NSUd5ltUNuogKQyRCwu/IJK6bdWloWzd5r6nIq7q92scgoQBaIw== X-Received: by 10.55.31.199 with SMTP id n68mr22904671qkh.418.1525449619581; Fri, 04 May 2018 09:00:19 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id a83sm8587066qkb.22.2018.05.04.09.00.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 09:00:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" Date: Fri, 4 May 2018 12:59:16 -0300 Message-Id: <20180504155918.21287-19-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504155918.21287-1-f4bug@amsat.org> References: <20180504155918.21287-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:c09::241 Subject: [Qemu-devel] [PATCH 18/20] sdcard: Fix sd_crc16() 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 The current sd_crc16() function does not pass the Spec test, change it by a working one. Code generated with pycrc v0.9.1 (https://pycrc.org) using the configuration: - Width = 16 - Poly = 0x1021 - XorIn = 0x0000 - ReflectIn = False - XorOut = 0x0000 - ReflectOut = False - Algorithm = bit-by-bit-fast Copyright of the generated source code ====================================== The code generated by pycrc is not considered a substantial portion of the software, therefore the licence does not cover the generated code, and the author of pycrc will not claim any copyright on the generated code. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdmmc-internal.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/hw/sd/sdmmc-internal.c b/hw/sd/sdmmc-internal.c index 0e82e69d99..d6f9b3b51c 100644 --- a/hw/sd/sdmmc-internal.c +++ b/hw/sd/sdmmc-internal.c @@ -90,23 +90,31 @@ uint8_t sd_crc7(const void *message, size_t width) return shift_reg; } -uint16_t sd_crc16(const void *message, size_t width) +/* 16 bit XMODEM CRC (polynomial 0x1021) */ +uint16_t sd_crc16(const void *data, size_t data_len) { - int i, bit; - uint16_t shift_reg = 0x0000; - const uint16_t *msg = (const uint16_t *)message; - width <<= 1; - - for (i = 0; i < width; i++, msg++) { - for (bit = 15; bit >= 0; bit--) { - shift_reg <<= 1; - if ((shift_reg >> 15) ^ ((*msg >> bit) & 1)) { - shift_reg ^= 0x1011; + const unsigned char *d = (const unsigned char *)data; + uint16_t crc = 0x0000; + unsigned char c; + unsigned int i; + bool bit; + + while (data_len--) { + c = *d++; + for (i = 0x80; i > 0; i >>= 1) { + bit = crc & 0x8000; + if (c & i) { + bit = !bit; + } + crc <<= 1; + if (bit) { + crc ^= 0x1021; } } + crc &= 0xffff; } - return shift_reg; + return crc; } static uint8_t sd_calc_frame48_crc7(uint8_t cmd, uint32_t arg, bool is_response)