From patchwork Thu Jun 27 07:10:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1953002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Lij/UNTt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W8qW05fStz20XB for ; Thu, 27 Jun 2024 17:11:40 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMjHa-0006Cp-4r; Thu, 27 Jun 2024 03:11:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMjHY-0006CT-NG for qemu-devel@nongnu.org; Thu, 27 Jun 2024 03:11:00 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMjHX-0004qD-1Q for qemu-devel@nongnu.org; Thu, 27 Jun 2024 03:11:00 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2ebec2f11b7so84186811fa.2 for ; Thu, 27 Jun 2024 00:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719472256; x=1720077056; darn=nongnu.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=VMACaTJ7ceKy98vN0dAl3R2Aaxm14mffc3kVkXfuwRk=; b=Lij/UNTtSlk7ZbXqBOQZD8MKtBDg6kTA06hnxVFZ4bHlxtaJvp4O7XaAxrn5sLzncG BxaiEEsaCPc+J+ur50+Wr9fUIE2vrSqr4z5wkJB4oXW0mmR5zD1f1NOI9czN2tWYuIOL 03YWVFUSZmigBMJBGBoAYKyeTA6fEfFdhrGpzagsCadF8dLQ7GoX7DCmRv3DSVkYLyAa A28ly5yONWh8hKhvk1v0wR+QdR+JXWRf+L5HVmn0EIt3yGbLQ/vpm/Z5CCvaZEio9WK3 uBD7ttJv3KMMvkt+duZiRNWsMmN9Pn4zyT9rvHouyhXLHBnlT3fVGuyf5ZyVvnvDbdoP CuQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719472256; x=1720077056; 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=VMACaTJ7ceKy98vN0dAl3R2Aaxm14mffc3kVkXfuwRk=; b=RBvr835bwK/AXqmt0AQQx/zEM5mWINrlH4k4lmv+/jPATvPacP9yYsIwYqEtb1rzvW uE1Z683tEiPD+NmdMNNUCd4kPyMq8YQuSk774R1uP/IknrqLi2Z3YCvwou3xYgnuxFqM jeWBOcGo1/3Rv/QWj1EgWcqYOPLb5wdjq/3tGxlwFut1xBJUI1Etu2sb6TaI8X89pQua u0CH0lvPdIhqf7SR5XVkt9+XZ9qTCWfYSVOMZHh05NISDTRLlJlCwwmsd5Datho+/FuV 5S5FRuq0JBqB/0Rx5E6gzB56+7RLYSI4OCJDC2xdlIFrcEOrvEfGrow2q5GnZpHDaqCu j95A== X-Gm-Message-State: AOJu0YwN2bJziW6Q2Q98ttdeyQMkyY22s2P64AuNAN34ZgLdZL0pasvN OrqwJsW1jUsir3efcwFQyr/grRabedxl9AhnMjRew0FOYFlfopSwHUL8LLSHwZCCaunWmR/NBvE btWI= X-Google-Smtp-Source: AGHT+IFQaxY7Rzvlk6/HeiEQJyNeUwjWgeSvzwoFLf/+d+DpsR4UxloF/xxwq8NSvyniNK8Wis3S6A== X-Received: by 2002:a2e:780a:0:b0:2ec:5a6e:777d with SMTP id 38308e7fff4ca-2ec5b39cdbamr66685641fa.51.1719472256315; Thu, 27 Jun 2024 00:10:56 -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-424c82519bdsm52155165e9.13.2024.06.27.00.10.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jun 2024 00:10:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , devel@lists.libvirt.org, Bin Meng , Sai Pavan Boddu , Joel Stanley Subject: [PATCH 1/3] hw/sd/sdcard: Deprecate support for spec v1.10 Date: Thu, 27 Jun 2024 09:10:37 +0200 Message-ID: <20240627071040.36190-2-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 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=philmd@linaro.org; helo=mail-lj1-x22f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We use the v2.00 spec by default since commit 2f0939c234 ("sdcard: Add a 'spec_version' property, default to Spec v2.00"). Time to deprecate the v1.10 which doesn't bring much, and is not tested. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater --- docs/about/deprecated.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ff3da68208..02cdef14aa 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -362,6 +362,12 @@ recommending to switch to their stable counterparts: - "Zve64f" should be replaced with "zve64f" - "Zve64d" should be replaced with "zve64d" +``-device sd-card,spec_version=1`` (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 '''''''''''''''''''' From patchwork Thu Jun 27 07:10:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1953004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=odl2hVqZ; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W8qWY4TZCz20XB for ; Thu, 27 Jun 2024 17:12:09 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMjHs-0006JU-Ir; Thu, 27 Jun 2024 03:11:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMjHn-0006HU-TE for qemu-devel@nongnu.org; Thu, 27 Jun 2024 03:11:15 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMjHm-0004qp-6V for qemu-devel@nongnu.org; Thu, 27 Jun 2024 03:11:15 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4255fc43f1cso8944855e9.0 for ; Thu, 27 Jun 2024 00:11:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719472266; x=1720077066; darn=nongnu.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=1BvAUzJDJRk95OJML/aybeF+xlz5tOaGkq6qYevEQMg=; b=odl2hVqZAzT4ztk9XKmoSDcebJxiBsFJhuVLEUWdqZXw+jvyFMAHHirsgDf0nTbdSa lI1EPkVEFQFLj42/GamEyhPQOk4B9DzkuTtqLDmpPsuq9sVFdZkyH5xAnv+HCT53VkeF Rr04wQNkgGUxS8LO4weWGvO4S8bQuIWkMzdiu6IM948mp4QV5YcI4E3JevKDjEU7JHVg Stjur+uIeBlReiRDxoLZedtq4mAZ52La3t4KsPAW/nQQEDhMqirg2te/g+uxtESPyEVm Nkm7hduc2TMr3R5TWfQOC0FPLmlH14FUazu/c8lSejXv+HA9rwTLaqoMPm8bm1AMssZ7 Yrvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719472266; x=1720077066; 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=1BvAUzJDJRk95OJML/aybeF+xlz5tOaGkq6qYevEQMg=; b=nrTfwlntEvLSnz8ET2vI6s7z79H0GT8hXALnPDj6Hesfd790eNiokRgsuUB58GWtTu lIp1KPf9hh6EEzlYs5UQGprDd8EMelJ2Nn7pKecthLxkinlnCC/oKRsl+qj9VyVJriK+ N74JcBljD9f/lqKLSAhoKDyx1vxOMPY0qo+ukBi0pDrJ3qxjrG+AU878G7+uHm8xgdj1 4Iqj2pi6JpjLnLLFI6wVK00YGjyK0t9h0v85GITZblObjutn9VQCAkFjjKlMdMFkDb8+ 5pfsl87or1nx7It9djKculUBYDmPUFgvtblhdE/dLFJ7Vvkz8MwSZGBljwrVc1hfxxPb kXJQ== X-Gm-Message-State: AOJu0Yy+DZpvwlbMAPQhKYUNVeebVjAiLJWH21dftDIXDARf/lqdEsAD MxPyzrF/FbOcSArUv4t35Rl+sCGMYyhno6RpdKj/UnBou5MNUc3TtjIfKtX7quYhwPUENf2Md21 llVs= X-Google-Smtp-Source: AGHT+IFuzwL9+Ud6NHoY1okbe19bVu2ehNQ2veeCej8S5qR6kvWCvUQnRFRIybf9+7CfNs1TB8TT7Q== X-Received: by 2002:a05:600c:3ac3:b0:424:9593:29e5 with SMTP id 5b1f17b1804b1-42495932ab4mr68789885e9.40.1719472266339; Thu, 27 Jun 2024 00:11:06 -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-42564b7b7a5sm12282925e9.24.2024.06.27.00.11.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jun 2024 00:11:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , devel@lists.libvirt.org, Bin Meng , Sai Pavan Boddu , Joel Stanley Subject: [PATCH 2/3] hw/sd/sdcard: Use spec v3.01 by default Date: Thu, 27 Jun 2024 09:10:38 +0200 Message-ID: <20240627071040.36190-3-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Recent SDHCI expect cards to support the v3.01 spec to negociate lower I/O voltage. Select it by default. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater --- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a48010cfc1..d0a1d5db18 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2280,7 +2280,7 @@ static void sd_realize(DeviceState *dev, Error **errp) static Property sd_properties[] = { DEFINE_PROP_UINT8("spec_version", SDState, - spec_version, SD_PHY_SPECv2_00_VERS), + spec_version, SD_PHY_SPECv3_01_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 From patchwork Thu Jun 27 07:10:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1953005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=dNTPYXO/; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W8qWc3hpnz20XB for ; Thu, 27 Jun 2024 17:12:12 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMjHz-0006My-PF; Thu, 27 Jun 2024 03:11:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMjHx-0006MZ-7L for qemu-devel@nongnu.org; Thu, 27 Jun 2024 03:11:25 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMjHr-0004re-I7 for qemu-devel@nongnu.org; Thu, 27 Jun 2024 03:11:24 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-42562e4b5d1so6191875e9.1 for ; Thu, 27 Jun 2024 00:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719472275; x=1720077075; darn=nongnu.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=dNTPYXO/TYDtHmvMRq7xpMXpaso6rb6AJ09tB36mJD2kr8iYgUMLnOWXaquTuf8t03 7pKU95CAW6EkYv/T7v/vOXE91/nsSb3pVWEPV+m9mwaok3DjE9m+m0BR3SKYbRdmdeYO oe0JGBK3sXteti5/1GhVTjQgrbwWVUMhiVZUmuzR4rg9hbJr1JFfpG3jN2nyspb1SgK+ sFCh5255JxubzO7fhDzwymshXZ8+EmetU9hPM1HZ+h4S9cHk4Rh8+rTIhKKK+VRQw25u /GiFqC9XJUaOiH7LxhB5LEFqUX+nCur2pMi9ovttNUvi3cThkxN4A2TSlW6v9hcelKDF vuuQ== 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=buQvE25Ny7CxlPbgAqgNaYz1MRtQKBd8RGT92dfymOfAxW7NCQJ8ImS6c5jIlTQ660 RbeM+Z+nwIfqDmMb8dboaI7q4VOEilf35RGmMSB87bODexQOce0k86vrcWGPa6U59cEy s3oa8fU/6hdD5lOeEtRO5Os/U2Iu5jWeeMAXSL7ceOCug+2G5a1jllMSP5WvefMinUxX M9JKZlFx5P9ghj5XjDJpjKom0vHp+O4LX+CSobGrhFoxW4rurs2vgi0/RUsDufrB809W flxDyuiE4S2JgpfRYyRKURPEJKsZb0GqAqUUTNbeiPdtslh44cIuLkvSvM9cGEPmjkx6 KafA== X-Gm-Message-State: AOJu0YwevEZwjwVIBkaqOLi+W1ussY2d1LGidK61ZtV1Bdy50cL+EJfa HTcp8gJYT5NgMdppAN081qkLagrMcwYBh4UUWY5asVUqA/vALRdU9BEEI9z9sZj6oDlWPQ9nxN+ HsbU= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , devel@lists.libvirt.org, Bin Meng , Sai Pavan Boddu , Joel Stanley 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 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Support for spec v1.10 was deprecated in QEMU v9.1. Signed-off-by: Philippe Mathieu-Daudé --- 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" -``-device sd-card,spec_version=1`` (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 '''''''''''''''''''' 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=off``. The 'pvrdma' device and the whole RDMA subsystem have been removed. +``-device sd-card,spec_version=1`` (since 10.0) +''''''''''''''''''''''''''''''''''''''''''''''' + +SD physical layer specification v2.00 supersedes the v1.10 one. + Related binaries ---------------- 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) enum SDPhySpecificationVersion { - SD_PHY_SPECv1_10_VERS = 1, SD_PHY_SPECv2_00_VERS = 2, SD_PHY_SPECv3_01_VERS = 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[] = { - [SD_PHY_SPECv1_10_VERS] = "v1.10", [SD_PHY_SPECv2_00_VERS] = "v2.00", [SD_PHY_SPECv3_01_VERS] = "v3.01", }; @@ -371,11 +370,7 @@ static void sd_set_ocr(SDState *sd) static void sd_set_scr(SDState *sd) { sd->scr[0] = 0 << 4; /* SCR structure version 1.0 */ - if (sd->spec_version == SD_PHY_SPECv1_10_VERS) { - sd->scr[0] |= 1; /* Spec Version 1.10 */ - } else { - sd->scr[0] |= 2; /* Spec Version 2.00 or Version 3.0X */ - } + sd->scr[0] |= 2; /* Spec Version 2.00 or Version 3.0X */ sd->scr[1] = (2 << 4) /* SDSC Card (Security Version 1.01) */ | 0b0101; /* 1-bit or 4-bit width bus modes */ sd->scr[2] = 0x00; /* Extended Security is not supported. */ @@ -1241,9 +1236,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) break; case 8: /* CMD8: SEND_IF_COND */ - if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { - break; - } if (sd->state != sd_idle_state) { break; } @@ -2231,7 +2223,7 @@ static void sd_realize(DeviceState *dev, Error **errp) int ret; switch (sd->spec_version) { - case SD_PHY_SPECv1_10_VERS + case SD_PHY_SPECv2_00_VERS ... SD_PHY_SPECv3_01_VERS: break; default: