From nobody Fri Oct 18 08:43:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171947233099344.215151155896706; Thu, 27 Jun 2024 00:12:10 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D7E74D3A; Thu, 27 Jun 2024 03:12:09 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3907D13C6; Thu, 27 Jun 2024 03:11:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D2D25137F; Thu, 27 Jun 2024 03:11:34 -0400 (EDT) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B1CDE1365 for ; Thu, 27 Jun 2024 03:11:16 -0400 (EDT) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-424ad289912so12991365e9.2 for ; Thu, 27 Jun 2024 00:11:16 -0700 (PDT) Received: from localhost.localdomain (163.red-95-127-40.staticip.rima-tde.net. [95.127.40.163]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42564b7baa9sm12357225e9.22.2024.06.27.00.11.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jun 2024 00:11:14 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719472275; x=1720077075; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MqiVMmEkjN8Fbce556VJrgK/N9f2zTrZ51XC0SKKdOs=; b=th8xM042zE4Ve4EyRPGQHIUEG7MDy6x5gtgZsO7t27vmJeWZgc3FiMcgbK+XMCPMbz ZAQDSRq2I/+X8SMpKMQua4o4yS8ySajyg0YPGOiW+PfjuZPSQlMtHMjBSNa6r0aGOkdh MxRfyhqDcniXGiXxtloLLpR08NbhU54JrIaHzN7+vVLiMh8FXUPssf44CfnSV0n4luhd mMzRfTOw66cHOC0hf4ElTq0kInnanHpsrvDRuSCA92YDA38aTuhfNLDaeQkCd7FQg9co nvYRM5Mc/n6GRL0C2Vqkzt9GiLtX5IWhserwIGJyIzRDq8ZN3AVvQ7AmG8vlQWP5FxeJ 0hQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719472275; x=1720077075; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MqiVMmEkjN8Fbce556VJrgK/N9f2zTrZ51XC0SKKdOs=; b=f1SbBr14guoGXZXbYlMGxBYLEpPBTmam5wutYl+tyj4Beau1FLuUPpOzB69ZtjnFxw syOpqHV+XWxBoUb66buy+5k4EOCKxT25d6PqpOhEx+0Rt9108XJbay2EkJGk70qsKad+ vURk4kCNsTjvSZDVcwMCNpT4Nuqdl8eCmhd+9EkQm40rpMEv1cMY818u9srk8e3TQMhl esadUQ5R3pJJDawUWpug7K25kzH24GvSPVM7nZP0ztGLXXPXvYMyfuyJ5C+hoCdhJ5E5 XRP27JpGGdGxxBo6eQmPBhTsAZzgvGhcs1+b+un0rOZzXb+US3wvvkkAwZ5rnbk0HAbE mndA== X-Forwarded-Encrypted: i=1; AJvYcCVCq8YyJNJIEPW3MDf+l16b+Uupj+bMq/CZO1keojW15cKRFyMRq+uj+b/SQNV8kp2IgwCXAkLticQvEDIYZHN144CXCk5WcA== X-Gm-Message-State: AOJu0YwRsh8sc7ZCrOwJZrVZ/tXtITldlk4ScyFk52WwwjyquoEm1PAg 6V1DglzPry1OJN/1ahS5+xBuZ6Zk5ENvGT3qMfH4lUuupyGbcBkzex5MSTzFaIw= X-Google-Smtp-Source: AGHT+IE7FxGYasAWUuBxHkZ8gDR0rNja73NcLQilBhDLG513Io6NpXHqyZjn3C23nBvscKrjRIFb5g== X-Received: by 2002:a05:600c:434b:b0:424:abd7:2321 with SMTP id 5b1f17b1804b1-424abd72412mr35969995e9.12.1719472275489; Thu, 27 Jun 2024 00:11:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-10.0 3/3] hw/sd/sdcard: Remove support for spec v1.10 Date: Thu, 27 Jun 2024 09:10:39 +0200 Message-ID: <20240627071040.36190-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240627071040.36190-1-philmd@linaro.org> References: <20240627071040.36190-1-philmd@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: THH6RDDQA3PSJI2IWFODMSLQXD5OBDI5 X-Message-ID-Hash: THH6RDDQA3PSJI2IWFODMSLQXD5OBDI5 X-MailFrom: philmd@linaro.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0 CC: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , devel@lists.libvirt.org, Bin Meng , Sai Pavan Boddu , Joel Stanley X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1719472331704100005 Content-Type: text/plain; charset="utf-8" Support for spec v1.10 was deprecated in QEMU v9.1. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 5 +++++ include/hw/sd/sd.h | 1 - hw/sd/sd.c | 12 ++---------- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 02cdef14aa..ff3da68208 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -362,12 +362,6 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" =20 -``-device sd-card,spec_version=3D1`` (since 9.1) -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -SD physical layer specification v2.00 supersedes the v1.10 one. -v2.00 is the default since QEMU 3.0.0. - Block device options '''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index fc7b28e637..dfe04b0555 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1056,6 +1056,11 @@ by using ``-machine graphics=3Doff``. =20 The 'pvrdma' device and the whole RDMA subsystem have been removed. =20 +``-device sd-card,spec_version=3D1`` (since 10.0) +''''''''''''''''''''''''''''''''''''''''''''''' + +SD physical layer specification v2.00 supersedes the v1.10 one. + Related binaries ---------------- =20 diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 2c8748fb9b..362e149360 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -56,7 +56,6 @@ #define AKE_SEQ_ERROR (1 << 3) =20 enum SDPhySpecificationVersion { - SD_PHY_SPECv1_10_VERS =3D 1, SD_PHY_SPECv2_00_VERS =3D 2, SD_PHY_SPECv3_01_VERS =3D 3, }; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d0a1d5db18..37a6a989ee 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -168,7 +168,6 @@ static bool sd_is_spi(SDState *sd) static const char *sd_version_str(enum SDPhySpecificationVersion version) { static const char *sdphy_version[] =3D { - [SD_PHY_SPECv1_10_VERS] =3D "v1.10", [SD_PHY_SPECv2_00_VERS] =3D "v2.00", [SD_PHY_SPECv3_01_VERS] =3D "v3.01", }; @@ -371,11 +370,7 @@ static void sd_set_ocr(SDState *sd) static void sd_set_scr(SDState *sd) { 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 or Version 3.0X */ - } + 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. */ @@ -1241,9 +1236,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 8: /* CMD8: SEND_IF_COND */ - if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { - break; - } if (sd->state !=3D sd_idle_state) { break; } @@ -2231,7 +2223,7 @@ static void sd_realize(DeviceState *dev, Error **errp) int ret; =20 switch (sd->spec_version) { - case SD_PHY_SPECv1_10_VERS + case SD_PHY_SPECv2_00_VERS ... SD_PHY_SPECv3_01_VERS: break; default: --=20 2.41.0