Message ID | 20180222152307.7499-19-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | e8feec808e96163dd82754521383a203b8fe7bce |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2162521edc; Thu, 22 Feb 2018 07:49:29 -0800 (PST) X-Google-Smtp-Source: AH8x225+I6UZ1fHYHWqsogDpLLiyQA77RF+4/xVkvGKkTyX7n7LchZS734yMnEMxGDzTkSCJkZKw X-Received: by 2002:a25:ad04:: with SMTP id y4-v6mr5058901ybi.168.1519314569478; Thu, 22 Feb 2018 07:49:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519314569; cv=none; d=google.com; s=arc-20160816; b=Wi7pXwdB02ZEd1iD1tjXl2ORL4L+iU8yX63rqBFXeHlggPHolxkXqaIhXjTOj3MJUW 5ZainI+qp4qFRvhl5gij2ygAqokW5DjjaatyInYo60gj6k49MRT+e8oSJg3nsDshPF5c tD9PjVtnApcMzIchyA1NMet1B5leRzweebahxdbr7dVMtcDNwMarSILx7TG2d1rM97mI hI0RqRYUVKE890NdoMtU4GKBDztFaLmH/bZ0hq0Oi9HuD+TqNGt+8HrSM/15wTCQNeq7 8HMUbDZLoRqRJdR8Ti8XyjgoY7c8xB3CGgrun9Azx4EEkxTNR5JlLt6NgT8COSdsLV1w hM0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=TUjM8ZnvwDcsRSzuWL/1OlFiFCuFGx63G95WPryDhfw=; b=NhfpAfD90I+dWQDnuG3LIQ11TPL/lrc2TBEnjo4tWFuFU1vXnkWW4flE6OipZxqxmU KR44sJdC+ReIl4vaYe6i5NU0dbsR4j0SO9msSlTuvMtdGUpvn81LJ2Nsmt8jHMNuy3nn zdNNWyJxnSm2ukxmbHBYJCJiNVTfwWkuqgVkeoZNL4JFP+bBzJPFHokethMHlLx1JgbG oi2o3YBNokd12j3O9Jc9Dv6ifPJVtot2Zlu6NKGH3Qy2ngVRsjHKmjQaIki3J+IcT+Dy PjqiMxRYvURDQBeQie2CSxTl3ngrBdv1IuuMNfoXtNriWRfhhaseRf1TDZdCbYlr3IXM Osgw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f8-v6si52492ybk.590.2018.02.22.07.49.29 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 22 Feb 2018 07:49:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1eot7g-0002Oz-Td for patch@linaro.org; Thu, 22 Feb 2018 10:49:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1eosij-0004xN-UR for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1eosif-0001kw-QA for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:41 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1eosif-0001ix-IX for qemu-devel@nongnu.org; Thu, 22 Feb 2018 10:23:37 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1eosie-00024R-G7 for qemu-devel@nongnu.org; Thu, 22 Feb 2018 15:23:36 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 22 Feb 2018 15:22:53 +0000 Message-Id: <20180222152307.7499-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180222152307.7499-1-peter.maydell@linaro.org> References: <20180222152307.7499-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 18/32] 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index cc347ff782..110f2f1d0a 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -378,7 +378,6 @@ static void sd_set_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; @@ -397,8 +396,8 @@ static void sd_set_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_set_rca(SDState *sd)