From nobody Mon Feb 9 16:35:08 2026 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; 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; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15284653625451017.9182054426121; Fri, 8 Jun 2018 06:42:42 -0700 (PDT) Received: from localhost ([::1]:35737 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRHf7-0007hR-QG for importer@patchew.org; Fri, 08 Jun 2018 09:42:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGly-0003FW-Kz for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:45:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGlx-0004TJ-LO for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:45:42 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:42608) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRGlx-0004QX-DP for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:45:41 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fRGlw-0003oG-2x for qemu-devel@nongnu.org; Fri, 08 Jun 2018 13:45:40 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 8 Jun 2018 13:45:16 +0100 Message-Id: <20180608124517.29475-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608124517.29475-1-peter.maydell@linaro.org> References: <20180608124517.29475-1-peter.maydell@linaro.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: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 30/31] sdcard: Reflect when the Spec v3 is supported in the Config Register (SCR) 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 From: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Message-id: 20180607180641.874-6-f4bug@amsat.org Signed-off-by: Peter Maydell --- include/hw/sd/sd.h | 1 + hw/sd/sd.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 7c6ad3c8f14..b865aafc336 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -57,6 +57,7 @@ enum SDPhySpecificationVersion { SD_PHY_SPECv1_10_VERS =3D 1, SD_PHY_SPECv2_00_VERS =3D 2, + SD_PHY_SPECv3_01_VERS =3D 3, }; =20 typedef enum { diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 3ec0f71f240..4e49a3827a3 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -316,11 +316,14 @@ static void sd_set_scr(SDState *sd) 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[0] |=3D 2; /* Spec Version 2.00 or Version 3.0X */ } 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. */ + if (sd->spec_version >=3D SD_PHY_SPECv3_01_VERS) { + sd->scr[2] |=3D 1 << 7; /* Spec Version 3.0X */ + } sd->scr[3] =3D 0x00; /* reserved for manufacturer usage */ sd->scr[4] =3D 0x00; @@ -2068,7 +2071,7 @@ static void sd_realize(DeviceState *dev, Error **errp) =20 switch (sd->spec_version) { case SD_PHY_SPECv1_10_VERS - ... SD_PHY_SPECv2_00_VERS: + ... SD_PHY_SPECv3_01_VERS: break; default: error_setg(errp, "Invalid SD card Spec version: %u", sd->spec_vers= ion); --=20 2.17.1