From patchwork Wed Jul 3 08:51:46 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: 809335 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp582760wru; Wed, 3 Jul 2024 01:53:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUDFPQJS140OAmOAXdRmJ2aT2K/ql+vpAJx2E0TuwJHYN+UncUtKMe152gGkehNMYjAy6VWWA3cBCaYPDc4O5Tz X-Google-Smtp-Source: AGHT+IHEdAoG5vlunQbIl5Ozhi0W6BDrf6W+bvNJ+XvrYfabrtVrs28Pb2N4hE+11bqR1jwElwyK X-Received: by 2002:a05:620a:e09:b0:79d:569a:6997 with SMTP id af79cd13be357-79d7babb03amr1164961185a.70.1719996814859; Wed, 03 Jul 2024 01:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719996814; cv=none; d=google.com; s=arc-20160816; b=Pao8t7dhA7PEuCSPBSibwMJMGzX0bq40VDBbFlP364Ec5sKU2FDnpHXG+fmyZm4Tzt Sqk8MJnTIZy3pyLwHxf1MJ086nZPLe9UPPY1grpoXJb7U+EZsU0ycFvwXXeQoIanse05 FbFs5fIsl/beLhwrI1twFBMQo7qbTORcm4SPackYhrrId69dqYt16OlQ9el9NwLyAHSN 4h4BCc/suhHPhlc8jG2XpjxOfvJxvaUrelc0gzC0HOEPypLakzYjV63HrutoLmEaK53u 8vGKfvOfEcDaeBpB4jRH+ZycCrPB+4T2f6Mr8f+s2MVgbTf8sYVPtUnV2y+bSScjsTpj 6v3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6t+GbJBD58UyWaUHFeiM6fRRrol1LCDDEUBkP2sRRWQ=; fh=sm4kUqS+PZkTP1JTB3s3dmcU1BIJDESbrihfSbjSoO0=; b=TLn5uHbEbluSu1jj4QWAw8eZ9ArVx4nKV7WBGyhY5i4/YxqLLmphOpAeWTROPCe+kA xI/z2bawh+/1DZZRrfSuJaKHgJreOl+2yLdQEGz0uSfMsV1yktYHJEnUwWHD2NOrfiH7 FgnJ835ib4ihzzmGQuRRDR/Zs6j30+o1kFQDBfDFWsXD7jnNiE65RPcNUr5pWNpgRjcI sdTzfP9xJORfYrOIAQdYrsYpLOzniioV6ikfUCAyhaRgUtNx020OYvzeuazNLO5skLIb VCFL0tGEe6cFnkhtopXRpW+DEP5T+s0COp4f6pyFnuLtL6XaCyqjFI1aIZtgtKZKjUIy mjJg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cGV8OzWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-79d69307f71si1158767185a.457.2024.07.03.01.53.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2024 01:53:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cGV8OzWc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOvij-0001WK-2P; Wed, 03 Jul 2024 04:52:09 -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 1sOvih-0001VT-Kz for qemu-devel@nongnu.org; Wed, 03 Jul 2024 04:52:07 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOvif-0003yj-PL for qemu-devel@nongnu.org; Wed, 03 Jul 2024 04:52:07 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-42579b60af1so29610795e9.2 for ; Wed, 03 Jul 2024 01:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719996720; x=1720601520; 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=6t+GbJBD58UyWaUHFeiM6fRRrol1LCDDEUBkP2sRRWQ=; b=cGV8OzWcx6hw9a4v3Gy85y6bHH73qDgmXUdynLEfEpaDwp0eg5s/M0Qn75WxdNIPJg wt3bL30RsU2W4IaqdstSS3WLyPwvq1jj+iWqgu4fVO2xV3G9YQKCOqOwJqgoSjzjlHtc o+i3rgsENywmid0H5peyX3Yw/Cju+pbR9N6rEt+4R0m98ft4WJffbyP7QYpexBAEevms 8UmvcPCz6NGMeR+DOgpNxpUj/VrbksgH5NxfC7++gQOBwHGR28HbUKqAMyJ/mgmcfJh8 HzSl1xSz7OlUmbpwzv13F04ZoMn6G1AqzNMLIbMOjlSBmtKTSudiFThTFsbSwbAJuT/z LbuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719996720; x=1720601520; 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=6t+GbJBD58UyWaUHFeiM6fRRrol1LCDDEUBkP2sRRWQ=; b=urxDkhs0KwUmSrBvZeZMsixbv0d/5xq/cUpnkLWHf3+pPirdokUnPaAA1kIpeVgw3b DoK4fDjp3/zArBHDNn6en2EgXqVjS97SSlXVJ5xEZn18MXUaPGgDQxd9WV9a0rGnuxcl kHuxbBNXW47+upHR2Y3tz2715u8mx8qzpasPLB7u4m2PXWMdtIPUja5cay+g4UXtjT1b 2/+uUKGh9nKcBTV3imVvtaDfaxf0t/xdac6Mzb7psPWiLHTc9/D38o80i07Pw/kdD+K8 /nIYDnxQMFqNpqQ00EjzFvEsMolei51Lw5tz29Fx6YYnOoy5OrkFeJQNC+0GTeQ8Cu6A TnNQ== X-Gm-Message-State: AOJu0Yy0tWP9ZQNxnKrY9Ls2nOAK6aNL+YJ9RZxLHAKs9EbsDVxM+/jc 5GfJPkXNOqARdhNErTmUBNS4eeBTX4pzHfPFZ45xvtln8LUJptaS93n6tF3P+UEad+e7Br0Dl7c C X-Received: by 2002:a05:600c:3089:b0:425:7835:4382 with SMTP id 5b1f17b1804b1-4257a06da46mr83354855e9.34.1719996719944; Wed, 03 Jul 2024 01:51:59 -0700 (PDT) Received: from m1x-phil.lan ([176.187.220.97]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42573c55ff4sm205970375e9.46.2024.07.03.01.51.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 03 Jul 2024 01:51:59 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , qemu-block@nongnu.org, Luc Michel , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Bin Meng , Eduardo Habkost , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Yanan Wang , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH v44 1/3] hw/sd/sdcard: Use spec v3.01 by default Date: Wed, 3 Jul 2024 10:51:46 +0200 Message-ID: <20240703085148.66188-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240703085148.66188-1-philmd@linaro.org> References: <20240703085148.66188-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Recent SDHCI expect cards to support the v3.01 spec to negociate lower I/O voltage. Select it by default. Versioned machine types with a version of 9.0 or earlier retain the old default (spec v2.00). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater --- v43: update versioned machines (danpb) --- hw/core/machine.c | 1 + hw/sd/sd.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 655d75c21f..4377f943d5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -38,6 +38,7 @@ GlobalProperty hw_compat_9_0[] = { {"arm-cpu", "backcompat-cntfrq", "true" }, {"scsi-disk-base", "migrate-emulated-scsi-request", "false" }, {"vfio-pci", "skip-vsc-check", "false" }, + {"sd-card", "spec_version", "2" }, }; const size_t hw_compat_9_0_len = G_N_ELEMENTS(hw_compat_9_0); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b158402704..808dc1cea6 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2471,7 +2471,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 Wed Jul 3 08:51:47 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: 809333 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp582575wru; Wed, 3 Jul 2024 01:52:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHWMtP3GaJi5shIryK2qHbL/4RzgBTMiJSKwGGsjr3IfKSBCdrk+dMgZVP1jvlqGUk2uYwWnykf6548swmQxJ1 X-Google-Smtp-Source: AGHT+IFCXfiXTihj6XbVvqLpGwQ2i18LjgEda2H+aS8myajZJFaQnAUpsM68GOtYJKsGMJeN9SHN X-Received: by 2002:ac8:7f53:0:b0:440:5f5c:2a4f with SMTP id d75a77b69052e-447bf9577fbmr16677861cf.33.1719996769115; Wed, 03 Jul 2024 01:52:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719996769; cv=none; d=google.com; s=arc-20160816; b=aGAuQ8LH6qYdmrFGNwH/XvUcnwzH9seJ28bTXZNFwDlwXXfabXAY0SyClHqPjA4B8A nzTk8XqpHdtsnFDQGbZDvL9qUa1ukB1SghICyFaPajRKlTEo6qdsHibKLYzHBDDt98K0 A7L9H0M4OF7GsmyVxyrnahDly06okA8WVRS410veWHe0CXgtluuEZsgSAfQCFUnEl0Rd VW+DUIfU+jXUqN/gvxcTP7aF+PIgWrHKJuk2T0s54DLS22HfXDuf5pyqFxFLzL3hA+bV +L0l8kyrTq+uOZMbkJ+IAr/8tIWUVniqYlbeYzkMwOa/lgVfnMZXtu1NeTwaIuP/iy15 YQeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GULqliqQH80JFHfX+S6uCfl3unrMvquKhQ3WGcPZsrw=; fh=U5YFgUgZula5zOru7wlLoXDQbSAwz2jbnFjgZS3TGjg=; b=u8QBZRkFXWBPe7QUQgzIhNLFEIYF9DtzDu/yiEwucLA+LcE8WWMMXwHS7K8ok3vM5a R0jQR/U9ja5PRdTHH7xyh2Ebi2lRn84oa4wbzxlO9Yc8lMGfhMlf9+h2rN1uxfIewgM6 FWsIhCz/6TYUXTAQ9nDmESNPv+PBOyYedZHsNNVX9bncWCQvUr6X4ywCQCfoC8io5BF8 ti1lRLkvAv0SkrA8Wj0Ns1oZpwnmZezvrJD2A1UY/C9kOx0ImMartyVhXUsj0bxxRiWt K119DudIYnbUknL/WtFQtyJH3JaJj8Uuch/g+LKcU4FgFAy7OMD9lnmuAWAZtcWUNu7B jrvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HhFdsZpn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-446514a0f86si116199421cf.399.2024.07.03.01.52.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2024 01:52:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HhFdsZpn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOvin-0001Xe-1I; Wed, 03 Jul 2024 04:52:13 -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 1sOvil-0001XB-2h for qemu-devel@nongnu.org; Wed, 03 Jul 2024 04:52:11 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOvii-00044u-9X for qemu-devel@nongnu.org; Wed, 03 Jul 2024 04:52:10 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-42641dec7c3so1446085e9.0 for ; Wed, 03 Jul 2024 01:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719996726; x=1720601526; 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=GULqliqQH80JFHfX+S6uCfl3unrMvquKhQ3WGcPZsrw=; b=HhFdsZpnEAzrT3kEpRtGisS0iC+u8u0EgSXg+h+PmOkkJzV4AvT2qBFa+ilN0jU9uu FgSlfzAmizsNgJ7bKWWZfwfZ4J+oiErNPal2kfyeuPQxrSfbmPzmhdn8GLD6pcBwFIXO PWtN6tOau6fBPptyF69hrRjwfsVbjuLyYB6dyDDHmID2XDCQoUjypLqiBmySXI2IWMOF wsqjeVoGBGmu9XK2SB0jfHC0e5h6TT8ETXkCZdx+OrN8oxBBYzca/Huwc3X1bTrmy8/W PRRVXDoP9Y52mavQ0VFq5v5ZVjdL+t9a8/BtZOS2CGQ9ddRHGWB2YZHMfilJIcQGIvD+ GmhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719996726; x=1720601526; 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=GULqliqQH80JFHfX+S6uCfl3unrMvquKhQ3WGcPZsrw=; b=CCleKqLacp51AanaxCXd5WJ22UlZD6l6sYi3mtewU2E1dQseE/be3lkzWGNnJVEB5T 3jG06+zigf6gxrZbs4O5pT6H2kRLOxOI2qLb0kv8+llyVYt/HoUFrZdm2VeIDw5aIG2S HbrsZ+/d3SZNS3QIJf376TqAdq7mVhe9bO1N4PAc//2I0mqQgcyq4Z/LeVR1NBxDl6ts DXGjsPKkGplp+CO8PkmnnGmxgtPVhtX7DGqINhlvtoZ1lms3LOSbAASpMRIalImViyt3 RgdkHxPzh6hkcWJnt7jluFQqQanQHKT27IIYmffdVMP5VN97SP2DFTRUtB/tHVprNEju ts6g== X-Gm-Message-State: AOJu0YwLbyjNPIH2NGOxIoEj2h00WJ/fFaJ1nPrFGgLI9Y7YetPejex4 d9ckxWKxkNHofFNYREA6EC4qIvP8NhMoPsnXhbF2N5QXtpmpbTk7XjOVTiFNjfVGy7w4i0fuaA2 s X-Received: by 2002:a05:600c:63c8:b0:424:a48a:99ff with SMTP id 5b1f17b1804b1-4257a0257cemr69894585e9.8.1719996726347; Wed, 03 Jul 2024 01:52:06 -0700 (PDT) Received: from m1x-phil.lan ([176.187.220.97]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256af376easm230227865e9.5.2024.07.03.01.52.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 03 Jul 2024 01:52:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , qemu-block@nongnu.org, Luc Michel , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Bin Meng , Eduardo Habkost , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Yanan Wang Subject: [PATCH v44 2/3] hw/sd/sdcard: Do not store vendor data on block drive (CMD56) Date: Wed, 3 Jul 2024 10:51:47 +0200 Message-ID: <20240703085148.66188-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240703085148.66188-1-philmd@linaro.org> References: <20240703085148.66188-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org "General command" (GEN_CMD, CMD56) is described as: GEN_CMD is the same as the single block read or write commands (CMD24 or CMD17). The difference is that [...] the data block is not a memory payload data but has a vendor specific format and meaning. Thus this block must not be stored overwriting data block on underlying storage drive. Keep it in a dedicated 'vendor_data[]' array. Signed-off-by: Philippe Mathieu-Daudé --- v43: Do not re-use VMSTATE_UNUSED_V (danpb) v44: Use subsection (Luc) --- hw/sd/sd.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 808dc1cea6..000b923c73 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -153,6 +153,8 @@ struct SDState { uint32_t data_offset; size_t data_size; uint8_t data[512]; + uint8_t vendor_data[512]; + qemu_irq readonly_cb; qemu_irq inserted_cb; QEMUTimer *ocr_power_timer; @@ -719,6 +721,7 @@ static void sd_reset(DeviceState *dev) sd->wp_switch = sd->blk ? !blk_is_writable(sd->blk) : false; sd->wp_group_bits = sect; sd->wp_group_bmap = bitmap_new(sd->wp_group_bits); + memset(sd->vendor_data, 0xec, sizeof(sd->vendor_data)); memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start = INVALID_ADDRESS; sd->erase_end = INVALID_ADDRESS; @@ -793,6 +796,16 @@ static const VMStateDescription sd_ocr_vmstate = { }, }; +static const VMStateDescription sd_vendordata_vmstate = { + .name = "sd-card/vendor_data-state", + .version_id = 1, + .minimum_version_id = 1, + .fields = (const VMStateField[]) { + VMSTATE_UINT8_ARRAY(vendor_data, SDState, 512), + VMSTATE_END_OF_LIST() + }, +}; + static int sd_vmstate_pre_load(void *opaque) { SDState *sd = opaque; @@ -840,6 +853,7 @@ static const VMStateDescription sd_vmstate = { }, .subsections = (const VMStateDescription * const []) { &sd_ocr_vmstate, + &sd_vendordata_vmstate, NULL }, }; @@ -2187,9 +2201,8 @@ void sd_write_byte(SDState *sd, uint8_t value) break; case 56: /* CMD56: GEN_CMD */ - sd->data[sd->data_offset ++] = value; - if (sd->data_offset >= sd->blk_len) { - APP_WRITE_BLOCK(sd->data_start, sd->data_offset); + sd->vendor_data[sd->data_offset++] = value; + if (sd->data_offset >= sizeof(sd->vendor_data)) { sd->state = sd_transfer_state; } break; @@ -2261,12 +2274,11 @@ uint8_t sd_read_byte(SDState *sd) break; case 56: /* CMD56: GEN_CMD */ - if (sd->data_offset == 0) - APP_READ_BLOCK(sd->data_start, sd->blk_len); - ret = sd->data[sd->data_offset ++]; + ret = sd->vendor_data[sd->data_offset++]; - if (sd->data_offset >= sd->blk_len) + if (sd->data_offset >= sizeof(sd->vendor_data)) { sd->state = sd_transfer_state; + } break; default: From patchwork Wed Jul 3 08:51:48 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: 809334 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp582752wru; Wed, 3 Jul 2024 01:53:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWcjDLuScki61DRJ0xCnsl2UFfcSnI5bERNW6KfajsYK39pJGivMmDtmMWhMwBJLczAm9NcFDnV/CAYUBzTtQL4 X-Google-Smtp-Source: AGHT+IH7P6Xzj1kbH0Nasftap2lwt4xYnczDpsc09f4POB5jgU9dxh4kElN+2Qd1HT1U7auUAxxx X-Received: by 2002:a05:620a:4593:b0:79d:6dd6:5a66 with SMTP id af79cd13be357-79d7b9f1dfcmr1686535885a.36.1719996812390; Wed, 03 Jul 2024 01:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719996812; cv=none; d=google.com; s=arc-20160816; b=Rb0xxnQlfct10Sqw0QrUcqjBXlUycDPwLpcAjo77UxKgjQMqg6uSVbObMfa5Kfzai8 wFVnQ5y0s715BkvEl02wLtFQlL/ng3b+VnLyL3olG6OeibXlCrxYDNQjdvn3zlYL2atR PyrzaxeD24ZLCwxwT/VTRVRzr+tfDLFMEcVJvKW4leuu8LTPZfW8kG+a8pn2S+3MJv7I nYe4pNZiHiAKuimUga+BawNlPSnISDVUN33mfuPV6n1e+dH4bPvF6CbpwfOcKbiJbt+j oJwu2IeY583sJ5DVHSoki/eXXJ/KcIGMgfiDl/V0QYlm1SCn3Ec8FTLPjlSlwiMCHBoV pgPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zj4HYUzXDv0A1hTe/qO2rFG9BXTThHtoCKV011XHWzs=; fh=U5YFgUgZula5zOru7wlLoXDQbSAwz2jbnFjgZS3TGjg=; b=w6AXRTAeOaC5x09QfdoexaQ2+aBVyJmntmuHIDGRu1Hanlyy6bx4hqMxiluBAUQrQ/ sJ85BtGEgHYf58O29RgnJTYdz007vUpXgXyy8DQl69LW8itINe9s1sle2bHwayY8mE8o VpTJ9Q6fgdKvFa0s4D0ZpQFBhzlfS0eC85hU8aPwPGJZQecZWfry5wTAj3Ib7U5/bcDB gn2zm8P0td8bFle26lQ55bbKXyrHAtvwtJW8fnGN5OYaXX97EJyvnB/xx6TwhuWD5sX+ QSZAau0r26RVMdPLK8z1LE+PMVRRfhKNZ7COLKu+BCB8qxx6uBK9hfT5H9z3XEr5qA1W t8Sg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VNJoAEGx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-446514e2be2si134808721cf.721.2024.07.03.01.53.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2024 01:53:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VNJoAEGx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOviz-0001aa-BN; Wed, 03 Jul 2024 04:52:25 -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 1sOviv-0001a5-Jh for qemu-devel@nongnu.org; Wed, 03 Jul 2024 04:52:21 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOvio-0004T8-SO for qemu-devel@nongnu.org; Wed, 03 Jul 2024 04:52:20 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-52e992a24a1so319610e87.0 for ; Wed, 03 Jul 2024 01:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719996733; x=1720601533; 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=zj4HYUzXDv0A1hTe/qO2rFG9BXTThHtoCKV011XHWzs=; b=VNJoAEGxOKixBf544yMb/mQ6By1JA8evG7GaKOKlL4Kk4+aufy9bIPzMB/8AOv8ka2 5E519gaiHby6SXZv27ILgLQUw2RH6887Nk0kc3EvjMa8sFkfjobmVc0mOshijcvDN/BZ VG4simuo7uptheLcpyFjDxEe+4IRDpM03pdiRMJHkUOggAirNqJGN/p87Nuu/xjkF725 oDOi9Nla53QKsn70wwxLQ6Gb5/4QzEaP1WYJkVO80oBvNN3DBGqixoJrGU2SnEfBN+kS rjYODq+Gog0hoUjRYJuF6n0UB6Pzj1iZJRWHMPopLqF7tWzwbhXCNHdLVj2mqPJF7AHD C8aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719996733; x=1720601533; 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=zj4HYUzXDv0A1hTe/qO2rFG9BXTThHtoCKV011XHWzs=; b=eUPuwT2YMyxR49OB6WeR/7hFf3wEbhgNuJxrX/8UkURu6zqPhWNzcRC1RVs9IzPAHv 4lSs+qhkHTnnhAwIBe3HvduMSyAzNsTV6Xc0L7c1KZ+Miezt9U5+jVRrb9GhI4Nbouhx 58VlYlkKikGxpQHuZbKjjSPMGnVuiCVb3xDw3sedT3mrQ31KBdKelll0Y+/f5dX+1CJF +ET1Q2FBbn/VJo3P7C5qaPXTIGQkS3MK3m4fWoBXHBE3HtULtiOaO3MZimpIv85ALENs 8hMyqO0iHk8q+E9QYxlg4lJeZTZfoRV3c7dnpaPELC+fLDqWjlqIlsZDRSndfRVHXUfY xjMQ== X-Gm-Message-State: AOJu0Yy9RQVtw4h0xJT0yhsISPQNa1bKh+qhlv9PWpy8dfy1PT+fD1CS Tsg+marXN2dTDeTDTKYF20Q0Jvq0tI03s3tC06kaVV2p/wUwMjRM5gWNF5jqqtcVu58blprbUWA p X-Received: by 2002:a05:6512:3a8e:b0:52e:7448:e137 with SMTP id 2adb3069b0e04-52e8264dfebmr8097238e87.6.1719996732873; Wed, 03 Jul 2024 01:52:12 -0700 (PDT) Received: from m1x-phil.lan ([176.187.220.97]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4257c4e1112sm158320545e9.3.2024.07.03.01.52.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 03 Jul 2024 01:52:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , qemu-block@nongnu.org, Luc Michel , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Bin Meng , Eduardo Habkost , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Yanan Wang Subject: [PATCH v44 3/3] hw/sd/sdcard: Remove leftover comment about removed 'spi' Property Date: Wed, 3 Jul 2024 10:51:48 +0200 Message-ID: <20240703085148.66188-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240703085148.66188-1-philmd@linaro.org> References: <20240703085148.66188-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=philmd@linaro.org; helo=mail-lf1-x12e.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, T_SPF_TEMPERROR=0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Commit c3287c0f70 ("hw/sd: Introduce a "sd-card" SPI variant model") removed the 'spi' property. Remove the comment left over. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 000b923c73..904da440ba 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2485,10 +2485,6 @@ static Property sd_properties[] = { DEFINE_PROP_UINT8("spec_version", SDState, 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 - * board to ensure that ssi transfers only occur when the chip select - * is asserted. */ DEFINE_PROP_END_OF_LIST() };