From patchwork Tue Jan 23 03:30:18 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: 864576 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="GWBx1Bnz"; 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 3zQYs629g9z9s72 for ; Tue, 23 Jan 2018 14:37:30 +1100 (AEDT) Received: from localhost ([::1]:59522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpOq-0008EF-99 for incoming@patchwork.ozlabs.org; Mon, 22 Jan 2018 22:37:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edpIO-000380-TC for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:30:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edpIN-0007gf-Up for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:30:48 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:36871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edpIN-0007gS-QD for qemu-devel@nongnu.org; Mon, 22 Jan 2018 22:30:47 -0500 Received: by mail-qt0-x243.google.com with SMTP id d54so26493538qtd.4 for ; Mon, 22 Jan 2018 19:30:47 -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=de0WUYPuQ8kTa9BgAFW1dfIkl9Zgm2pPR9kv9sitTO8=; b=GWBx1Bnzfz8tXUM4L9rleNCkVSiKbDQOwxVyQH5HwQgLVd5MrpUd6km0dvq2DpDL7s A2sObjReb69HjmS34dBS3EisEbBsgm80W9zk7I1mUhmuv2wchhiaYt3AOBkKurvNwsne i7761ly2zyz5L6n38G6rdmqrSHwawE+8usrbb2sPo26UJu2H/SQhNEuHE0buWC0r5Db1 POSZsFErlq+VXKuGqLzsEZ8LNI5LrWhH+F7JEOurTN8zCncL7IQci7ZASR9YhvSNjDnb +VsAcXPx0NuVclKvX1hDXYcVr/lGQ/o1MxV3wwkwso0r3gOLmchsyQ357VK79TU/3CKc rH8g== 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=de0WUYPuQ8kTa9BgAFW1dfIkl9Zgm2pPR9kv9sitTO8=; b=MTWofq5rBPj4A2PUbgo5bOQOtInsmPcJeX3YiTy6e3//TrAvL6zVgr4jdqRxoo9J0i Sj7IuRcr697UO4MYbAAejNxAlJRelpManbqaiM3B1kBrxS9WzdFsBAgnasdn4zM9RTuN cinhPzM48ZhgzOaMzzEwrji6BF37J4P6uzAVi7bBYdEIUu3SnyFxfU/BHGgXHCymHVoH GEMNRaEcHgFgHv1xCPqdizayNJv7/LDNDd84BX3rvOVwmzLVbV6SuXs5WYZ2EINGu9xN 6CIfTNySZcSkprHFlJdGBNvtgplsyHJoayFmU2nQ8dJygLTyWHNHsi2tysyvlrT6u9Pn ZNYg== X-Gm-Message-State: AKwxyteOnvb1HMhPWa4LGchLww13sfNiw7Uyk6g4gnO9oB1+jHTtomv8 5J/p++KbueeX16COQatq7/Q= X-Google-Smtp-Source: AH8x225CY2AjGdEvekqZx0eBEMkt0p4x0INyxK9/cvAJ4z/HQXfdprsc33a/QgCYyy9BIZ7YJ0tOkw== X-Received: by 10.55.159.23 with SMTP id i23mr1553096qke.261.1516678247340; Mon, 22 Jan 2018 19:30:47 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id w8sm3848586qka.2.2018.01.22.19.30.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 19:30:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko Date: Tue, 23 Jan 2018 00:30:18 -0300 Message-Id: <20180123033034.29493-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180123033034.29493-1-f4bug@amsat.org> References: <20180123033034.29493-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::243 Subject: [Qemu-devel] [PATCH v3 02/18] sdcard: update the CSD CRC register regardless the CSD structure version 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 Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 20764451f2..f6318c6fdb 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -377,7 +377,6 @@ static void sd_reset_csd(SDState *sd, uint64_t size) sd->csd[13] = 0x20 | /* Max. write data block length */ ((HWBLOCK_SHIFT << 6) & 0xc0); sd->csd[14] = 0x00; /* File format group */ - sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1; } else { /* SDHC */ size /= 512 * 1024; size -= 1; @@ -396,8 +395,8 @@ static void sd_reset_csd(SDState *sd, uint64_t size) sd->csd[12] = 0x0a; sd->csd[13] = 0x40; sd->csd[14] = 0x00; - sd->csd[15] = 0x00; } + sd->csd[15] = (sd_crc7(sd->csd, 15) << 1) | 1; } static void sd_reset_rca(SDState *sd)