From patchwork Wed Jan 3 21:24:24 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: 855253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oqyuM2ft"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBkgZ2jVnz9s7G for ; Thu, 4 Jan 2018 08:33:14 +1100 (AEDT) Received: from localhost ([::1]:37665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqeu-0000AU-CH for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 16:33:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqXq-0002nG-Qv for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqXf-0008BL-Vr for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:54 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:35006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqXf-0008B0-P6 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:43 -0500 Received: by mail-qt0-x241.google.com with SMTP id u10so3818128qtg.2 for ; Wed, 03 Jan 2018 13:25:43 -0800 (PST) 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=3eOH8/0ZvgNCKGwT+pql79pst+aCYZXfgXSVy3amNxY=; b=oqyuM2ftKOjdqRFMBY5HR+rh3wF+LWA0Us3TvXETYQBtd1zrX4bxzfOlmnRuTBGkC9 fllV2eJRlBia6yZodL07BUbKoUeWOa/ihhic8VDlLj74QqLtbuMwTgH7EBKkNCMhKh1L 5H+SiRU1l5OHG9B+04CuHq7oZq06eaBGxXtN2O2gB28vEVVMUA/EU70F9pNkbdSpu7TP QjOPDslGpBhCpQ9PcD9FaIhLqu73QXDBiBxoyTUyQgu5JZMGSALhqTmyLQ2FGMnW6kzc 4z14Z3g738ARA1Kh1rJyTm9SD+FUGnRKoMYbBPCAyxP9bwCmaAxO5GDdelTQ1M/7JnmA a18A== 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=3eOH8/0ZvgNCKGwT+pql79pst+aCYZXfgXSVy3amNxY=; b=iZO8RJBDzdZd0YYVAEDGR5bKX8dO0svKOLxHJEDi1r1SXm2UX4xaejYp1pFJoO7rWe WfmH00byZXv5GMTFGuIOML8a7p7LyhMEjRVd9dMHD8NXh0s30SN/YhPqyZC9ZHu+h/ab hK24mJk50hx5Xh6+XL/49wvgDtfAyIQYhI7syNTuSMDMFD0hisTreMovP3ieAQX8jhIP 9ur3U+TfjpN3hkRnFiBeRNebxJTx5YwGvZGxHPKw1xIOC4YVZb2I9unLfRhLFOamLYzr 4nfnvfQh/lpNL3WsO2uktWiO2gktapO7I5eNcbfevrBrf3ABlL7HaFJ4BMt51hdIsLQ+ lwTA== X-Gm-Message-State: AKGB3mJWhCY92qay6FjPH9O16w/8ZyDoD3cKPsjGJ5TRu+6QEvS1MKNy z9P9drZlrOg6/jL7ldCfn1A= X-Google-Smtp-Source: ACJfBovfUDm8xTDJ9RcqZ0eafkM0ZMyaTT7pxibuDwDwJ4bIey3gmKgAedqXnUqQmNG6Tfg57zJwzA== X-Received: by 10.200.23.221 with SMTP id r29mr3719099qtk.27.1515014743310; Wed, 03 Jan 2018 13:25:43 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.25.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:25:42 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko , Andrew Baumann , Olbrich , Andrzej Zaborowski Date: Wed, 3 Jan 2018 18:24:24 -0300 Message-Id: <20180103212436.15762-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-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::241 Subject: [Qemu-devel] [PATCH v2 13/25] sdcard: let function handling response codes returns the response size 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: "Edgar E . Iglesias" , Prasad J Pandit , Peter Crosthwaite , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paul Brook , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" this will ease cases when the response is different regarding the protocol use (SPI, MMC). Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index e6a6e0b2ad..7e9d7366fe 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -460,7 +460,7 @@ static int sd_req_crc_validate(SDRequest *req) return sd_crc7(buffer, 5) != req->crc; /* TODO */ } -static void sd_response_r1_make(SDState *sd, uint8_t *response) +static size_t sd_response_r1_make(SDState *sd, uint8_t *response) { uint32_t status = sd->card_status; /* Clear the "clear on read" status bits */ @@ -470,14 +470,25 @@ static void sd_response_r1_make(SDState *sd, uint8_t *response) response[1] = (status >> 16) & 0xff; response[2] = (status >> 8) & 0xff; response[3] = (status >> 0) & 0xff; + + return 4; +} + +static size_t sd_response_r2s_make(SDState *sd, uint8_t *response) +{ + memcpy(response, sd->csd, sizeof(sd->csd)); + + return 16; } -static void sd_response_r3_make(SDState *sd, uint8_t *response) +static size_t sd_response_r3_make(SDState *sd, uint8_t *response) { response[0] = (sd->ocr >> 24) & 0xff; response[1] = (sd->ocr >> 16) & 0xff; response[2] = (sd->ocr >> 8) & 0xff; response[3] = (sd->ocr >> 0) & 0xff; + + return 4; } static void sd_response_r6_make(SDState *sd, uint8_t *response) @@ -1513,8 +1524,7 @@ send_response: switch (rtype) { case sd_r1: case sd_r1b: - sd_response_r1_make(sd, response); - rsplen = 4; + rsplen = sd_response_r1_make(sd, response); break; case sd_r2_i: @@ -1523,13 +1533,11 @@ send_response: break; case sd_r2_s: - memcpy(response, sd->csd, sizeof(sd->csd)); - rsplen = 16; + rsplen = sd_response_r2s_make(sd, response); break; case sd_r3: - sd_response_r3_make(sd, response); - rsplen = 4; + rsplen = sd_response_r3_make(sd, response); break; case sd_r6: