From patchwork Fri May 4 15:59:00 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: 10380965 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 5169C6037D for ; Fri, 4 May 2018 16:04:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3BD9B294D6 for ; Fri, 4 May 2018 16:04:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3088C294D9; Fri, 4 May 2018 16:04:17 +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 B0963294D6 for ; Fri, 4 May 2018 16:04:16 +0000 (UTC) Received: from localhost ([::1]:35041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEdBv-0006DW-Vm for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 May 2018 12:04:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEd7Q-0002RM-9K for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEd7O-0001PB-1v for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:36 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:41210) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEd7N-0001Ox-Tm for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:33 -0400 Received: by mail-qt0-x242.google.com with SMTP id g13-v6so27949892qth.8 for ; Fri, 04 May 2018 08:59:33 -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=/ploRBYZN6FuaOwvNSKk25JzVkWEximfBIgwCdBU0kU=; b=TmpuwraF9Xgqmc99yf7seIqjHulqPyfoPgVulvO1R6gZJI/SbiqT8TLPMItUDzVBzx HXzty7nctgrw1DKQIhxmAdVVZ7+thm/CsnM4QSRsCK7BrEyORj3mE5aU8cMIKqmLtNPB 2W5Zc+kP6hS79UpO6fkoFbRDlEGGS0dYDooAd4WSM3KjoiB9Pn/U8FqjM/inPwLqZG/Q l7efNO7/h62/8EG5aaE4aVYHmzU3vBYoXvPIY7HurksEQbAY/85N0/r9nGMx+iI7dGZu zRqXoasIEXl9pqzqAktSodimC9XleEOOhM5awbg+ExKCyfinXxz7muDs/ZMZjbPyILGa +2Hw== 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=/ploRBYZN6FuaOwvNSKk25JzVkWEximfBIgwCdBU0kU=; b=tGz6WDZfJonam8zMR+xQ9wV2y7q6XD0bziybmUEW0+IkGbERbD2EhEwfRHh6Ofe/9s V7vs0nhABtjjIDIzGD18qzSkZBWhVmJ/e8BJTSOb0rPJknWfO7J+CxClrdi/hPGIzJFF PxJIBWOifPTS6Vf40NXAiKAeV4FW61PTceB3acNCUUZeJLvvH07qal+C3ZJFxDp4djzr tIF0b6Ww486r3EWpkVxor/7/f9pG3RgpnswUpEEf/v6OGKx/pJD0e4OQvf8eJ8Qr7iw7 qQKwVtIRkFOxzFWJrFOcgVV+/Hi7E+9vwISQo9IKaXR/d6DCd940czCxOjjJgf+CmCCD +H6Q== X-Gm-Message-State: ALQs6tAVh8k34SN3q3MRawMEf9FVCwVTsxw0QFlFp482Q72o3jbLzMqA rwM2WrXflPhWbnU8RYKqQGg= X-Google-Smtp-Source: AB8JxZonoQFxr/aB8KcpdtyBop3I2MQ3q+SvVszUM3GtWadUb4JT0Dfhfz/G9jsTmo3xDWTyfQJ35Q== X-Received: by 2002:a0c:ba97:: with SMTP id x23-v6mr23684941qvf.112.1525449573303; Fri, 04 May 2018 08:59:33 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id a83sm8587066qkb.22.2018.05.04.08.59.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 08:59:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" Date: Fri, 4 May 2018 12:59:00 -0300 Message-Id: <20180504155918.21287-3-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:c0d::242 Subject: [Qemu-devel] [PATCH 02/20] sdcard: Extract sd_calc_frame48_crc7() from sd_req_crc_validate() 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 Extract calculate() from validate() so we can calculate the CRC out of the validate() function. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 235e0518d6..861bba197d 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -481,13 +481,18 @@ static void sd_set_sdstatus(SDState *sd) memset(sd->sd_status, 0, 64); } -static int sd_req_crc_validate(SDRequest *req) +static uint8_t sd_calc_frame48_crc7(uint8_t cmd, uint32_t arg) { uint8_t buffer[5]; - buffer[0] = 0x40 | req->cmd; - stl_be_p(&buffer[1], req->arg); + buffer[0] = 0x40 | cmd; + stl_be_p(&buffer[1], arg); + return sd_crc7(buffer, sizeof(buffer)); +} + +static int sd_req_crc_validate(SDRequest *req) +{ return 0; - return sd_crc7(buffer, 5) != req->crc; /* TODO */ + return sd_calc_frame48_crc7(req->cmd, req->arg) != req->crc; /* TODO */ } static void sd_response_r1_make(SDState *sd, uint8_t *response)