From nobody Mon Nov 3 00:31:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527984940385560.7075992964913; Sat, 2 Jun 2018 17:15:40 -0700 (PDT) Received: from localhost ([::1]:33156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPGgL-0000K9-LQ for importer@patchew.org; Sat, 02 Jun 2018 20:15:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPGZl-0003s5-GX for qemu-devel@nongnu.org; Sat, 02 Jun 2018 20:08:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPGZk-0002w3-FM for qemu-devel@nongnu.org; Sat, 02 Jun 2018 20:08:49 -0400 Received: from mail-qt0-x22e.google.com ([2607:f8b0:400d:c0d::22e]:38730) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPGZk-0002vx-AK; Sat, 02 Jun 2018 20:08:48 -0400 Received: by mail-qt0-x22e.google.com with SMTP id x34-v6so23398247qtk.5; Sat, 02 Jun 2018 17:08:48 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 17-v6sm10610894qkg.97.2018.06.02.17.08.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 17:08:47 -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=HqxMyMutU5IjG39a5/VDAMgaCxZPQ4m2y4UZtXqHVEI=; b=G/TaAnHgIHDmWXbDrsRzVx5+doICs7fzljFOrFcw/B5J8vPbKS5/3qk/RZ6jwLqt41 GXWHpBqzkGskvYOdA/CZQWR87VA/vx1fluuHhyQSsbuJE6uXWFzwWzSeBdZm2OXdPPDl Qa3P9PLLhu+6XIRu8eXCaxvi8IydiGFI9WLSGZPb4+gyVEL33uE67z8k5OMqVcscj/J5 q6qQeLuR+l/Hgsi+N3qEjMIsspP6JUkDLgAERUBqUiXlhfEVkY3EPwbdmiapZU8pHhc+ mSIMI0by/jdnhN4E38zxiif4ObegR5+HjMiQlXoi2oVtEgJkXt2Qm8rdqOxiKKYhQ9EH mXWg== 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=HqxMyMutU5IjG39a5/VDAMgaCxZPQ4m2y4UZtXqHVEI=; b=r1JpvebB9WrIKTGdWRBfGIZqIj7Pk7BFL2qi9tMRE2Sl8sdL+H3ocVFwYx9cL2Cyp9 +n8ohioNzfo91u2/CXGFJF+Ch/Li+ddM36Ko2T89fwsFI9x641eiwwPB8EnAWn3yOsqM wsb1tHzT7Lw6IaRT3xhI79is5e1D3771roN4Kg9Oem/YtARGlcJ8mh6QfAi0MY9ONR6c CPChtnA71/C9qzXN93cEjZgdX7NT4EjV7bEzhO86zEp8mF2fF+M5DWtOF3t3wS3Lcizj Gex+YYgqnS8qnKcHw2pI/S5bfNClYwGUvP2W77IvQhrz+xdsjpQGT7Y2TvRqjgrlESDl CWDA== X-Gm-Message-State: APt69E10Heom1JmplvzCvxhCPl9TCrnRraN+Wcrt0RYI49BrS+qWAycC dcAK2aRYc3VbMWt+C6NiXmg= X-Google-Smtp-Source: ADUXVKJFcvzNJVJ07dK8nx64JMh1/+hSdk5m1CmaXjbl0LxKIdxSc1qosKiKKOr07ZgZdFbrMGk+dQ== X-Received: by 2002:ac8:35d7:: with SMTP id l23-v6mr15175125qtb.241.1527984527841; Sat, 02 Jun 2018 17:08:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 2 Jun 2018 21:08:23 -0300 Message-Id: <20180603000827.30872-5-f4bug@amsat.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180603000827.30872-1-f4bug@amsat.org> References: <20180603000827.30872-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::22e Subject: [Qemu-devel] [PATCH 4/8] sdcard: Set Spec v2.00 as default 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 , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- include/hw/sd/sd.h | 1 + hw/sd/sd.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 49f22b0b89..7c6ad3c8f1 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -56,6 +56,7 @@ =20 enum SDPhySpecificationVersion { SD_PHY_SPECv1_10_VERS =3D 1, + SD_PHY_SPECv2_00_VERS =3D 2, }; =20 typedef enum { diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 5ddd211114..81f178b36e 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -311,8 +311,12 @@ static void sd_ocr_powerup(void *opaque) =20 static void sd_set_scr(SDState *sd) { - sd->scr[0] =3D (0 << 4) /* SCR structure version 1.0 */ - | 1; /* Spec Version 1.10 */ + sd->scr[0] =3D 0 << 4; /* SCR structure version 1.0 */ + if (sd->spec_version =3D=3D SD_PHY_SPECv1_10_VERS) { + sd->scr[0] |=3D 1; /* Spec Version 1.10 */ + } else { + sd->scr[0] |=3D 2; /* Spec Version 2.00 */ + } sd->scr[1] =3D (2 << 4) /* SDSC Card (Security Version 1.01) */ | 0b0101; /* 1-bit or 4-bit width bus modes */ sd->scr[2] =3D 0x00; /* Extended Security is not supported. */ @@ -2060,7 +2064,8 @@ static void sd_realize(DeviceState *dev, Error **errp) sd->proto_name =3D sd->spi ? "SPI" : "SD"; =20 switch (sd->spec_version) { - case SD_PHY_SPECv1_10_VERS: + case SD_PHY_SPECv1_10_VERS + ... SD_PHY_SPECv2_00_VERS: break; default: error_setg(errp, "Invalid SD card Spec version: %u", sd->spec_vers= ion); @@ -2084,7 +2089,7 @@ static void sd_realize(DeviceState *dev, Error **errp) =20 static Property sd_properties[] =3D { DEFINE_PROP_UINT8("spec_version", SDState, - spec_version, SD_PHY_SPECv1_10_VERS), + spec_version, SD_PHY_SPECv2_00_VERS), DEFINE_PROP_DRIVE("drive", SDState, blk), /* We do not model the chip select pin, so allow the board to select * whether card should be in SSI or MMC/SD mode. It is also up to the --=20 2.17.1