From nobody Mon Feb 9 15:46:11 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527984935165873.1520314215595; Sat, 2 Jun 2018 17:15:35 -0700 (PDT) Received: from localhost ([::1]:33151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPGgD-00009c-4O for importer@patchew.org; Sat, 02 Jun 2018 20:15:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPGZu-00042n-Ug for qemu-devel@nongnu.org; Sat, 02 Jun 2018 20:08:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPGZt-00030B-Pl for qemu-devel@nongnu.org; Sat, 02 Jun 2018 20:08:58 -0400 Received: from mail-qt0-x230.google.com ([2607:f8b0:400d:c0d::230]:39856) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPGZt-0002zy-Kg; Sat, 02 Jun 2018 20:08:57 -0400 Received: by mail-qt0-x230.google.com with SMTP id p23-v6so11831491qtn.6; Sat, 02 Jun 2018 17:08:57 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 17:08:56 -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=IAGyLwpv3a5J8f3RNphJ9yfBZT3vwTiwYcQDW4gDTOg=; b=n4H8D9QZehbxCCFjBsNgYgK3+9ocBfGsM5oJ4PxOEEL0lrIrmuP6TTeRTgTaK2gqj7 8asjxw7KDc+mU15breNHxAB+hF4vcakZOrQyQghAbtKlwn+uhmcUqr0bEBsjyq4971lR NcL+Lc4eYUQnO01cYZO+9Gx0Ux1/HQeTMzf31i+8wCAM0sU997ndvHo/2m0zVSK5xl9o KUW2hh6wbTl4xBJVSdVbLuwqjo8cCtitHw39iWDtDQQcnFL94rWpXbXQa8MCBSkB237+ Yll+nJhM434XekvvfgPciKbYH03Ur5gJoz7S1UOo/WRa0NaHDUuyZ/vLxelK2+1jl2F3 4H+g== 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=IAGyLwpv3a5J8f3RNphJ9yfBZT3vwTiwYcQDW4gDTOg=; b=rxrhi4JEHAdblNuIiHfqv1B2HYTdAOu4b64W7I3CU3r4zTyMGCPwKSdnvL+rl8vOOU 1HdB+H1IJZVQ1r2V1OM20YRKdTgghUpOHs6JnYfqjjtwSY89Gcr1213L0KNGbF45owF0 qcQKuVzv+oxfs0fFxFu5x7b3l/1rA+8D8Yt5NtVoeGmYgPCkR7oxRO3BpSefjSSPIxZx CacgiFjSxOGa+BurWeuWjZY4m7HsOfQ4nvIMeJBsETA9qyiYSqbXQ+izCMZjxQGkJT4a m88rMsKnkm0iaeY+YcgpnZoN2ixnr8BvmhJ+V81VrVdxYqhjNPWguujAW3dvV3mN0vqH PVog== X-Gm-Message-State: APt69E3We5PBKPU16HIadPXYWQLC1QQJtNMlVSfh4KPICf1+r0Ecqsfa TUZHEbcuVY05DRGNQWcJolU= X-Google-Smtp-Source: ADUXVKJ7/JquHmtU+Fa6qarGpYC74lywEFptxpxzO3ecPyvwpBfLXAH2CC2GSGufFtJ1DSxPHNgynA== X-Received: by 2002:ac8:3f24:: with SMTP id c33-v6mr7541192qtk.235.1527984537220; Sat, 02 Jun 2018 17:08:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 2 Jun 2018 21:08:26 -0300 Message-Id: <20180603000827.30872-8-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::230 Subject: [Qemu-devel] [PATCH 7/8] 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 da65f2b178..83426da133 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -315,11 +315,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; @@ -2067,7 +2070,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