From nobody Tue Feb 10 15:29:28 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; 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 1528394943891283.1700223014856; Thu, 7 Jun 2018 11:09:03 -0700 (PDT) Received: from localhost ([::1]:59605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQzLL-0003E3-5T for importer@patchew.org; Thu, 07 Jun 2018 14:09:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fQzJS-00028a-QP for qemu-devel@nongnu.org; Thu, 07 Jun 2018 14:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fQzJR-0004Uh-LR for qemu-devel@nongnu.org; Thu, 07 Jun 2018 14:07:06 -0400 Received: from mail-qt0-x22d.google.com ([2607:f8b0:400d:c0d::22d]:38214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fQzJR-0004U9-Fi; Thu, 07 Jun 2018 14:07:05 -0400 Received: by mail-qt0-x22d.google.com with SMTP id x34-v6so10792717qtk.5; Thu, 07 Jun 2018 11:07:05 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id s15-v6sm26838414qtc.81.2018.06.07.11.07.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Jun 2018 11:07:04 -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=p98FJDHXqtQFnoFIsChTFplRsIwsE6rDW5LxAt+70bk=; b=eHKgHOD1sFeaYlAO6ipnc86EjwDppKU1SaHdnK0PnxrhXneCQ+nls4p0gVvC1k+JKD H0fpSAl/EyujPkkm6rmdfZlmPj7PzEUMdNgy58w85NB/Cv71TsVCwxWYz9KmOhs6GKTa qpQaw3BLdeLvFLBrEcFvFSUjkfGAzuoEgGywKGE/0m0adBIocBprm9gCcLFlICIQldYz bDNWlBdXefBYqXFv4PTFtvgpPyGRStm6s5G7Tao7owIztSLCQ/XkI91ydD5fPupjGNQp jVCqH+YqUWP3wwGeGeckWwSkFVwCzqtGzCK5pqr0xr3kHEOE813nGRbjrL9IJtIWlpp1 Blpw== 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=p98FJDHXqtQFnoFIsChTFplRsIwsE6rDW5LxAt+70bk=; b=tdVM+8/mfluir7lhqbVXqAPWxWrEkz9LynAk4zKbBygK++DFAQBxFLsAg9SFProD6e FkvEJmxRKQHgbeQGYr5yuPaF6+kS7L9bhm4/8AmZGnNiBWW/zZHW3DBzfZIORvmqceLP xcnFUxsqJwJyUIyd+i7la22lQjoK4EdlY5PFUqLF1N78FXEG3dHUcyNXHhHbWhILdQoC YRabtoOBYq2l/QM/jy01UbvoEZ9gzx9U2MFry83x12jHT+Dn894xZ5PEwDM5TOYOiF2E BMXE6kwSB44UY1+oj59veY+EBomb26OGFXb1aJkb2U4TO6OXJWEUi5cSv3LvVTJiGQcX 7gVg== X-Gm-Message-State: APt69E2LLNKKfKqGMmHj7AEvxY+CR/RpY/DdYwth5A03h1UC4xX/bXNf 5dzxe6bT9Q7xYi1TJCMvu9g= X-Google-Smtp-Source: ADUXVKIA0O+dEOhsO7kAueLvu4YwiS4QiTNHWkU6KPK6cB3LdVnAGdkGCOb3MfnSiz1xMRkU7iIeHw== X-Received: by 2002:ac8:358a:: with SMTP id k10-v6mr2752341qtb.248.1528394825013; Thu, 07 Jun 2018 11:07:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 7 Jun 2018 15:06:39 -0300 Message-Id: <20180607180641.874-6-f4bug@amsat.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180607180641.874-1-f4bug@amsat.org> References: <20180607180641.874-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::22d Subject: [Qemu-devel] [PATCH v2 5/7] 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: , 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 | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 7c6ad3c8f1..b865aafc33 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 3ec0f71f24..4e49a3827a 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