From patchwork Tue Jul 2 16:10:30 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: 809131 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp289621wru; Tue, 2 Jul 2024 09:11:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWsgV0/b0Gai+RR65dkwDjcvR0LiIhjhqrp+hC4ugULT4JlVlJbxJy0bSdnyYWiDxYX/HmzyEr6SrXbzbOvezuY X-Google-Smtp-Source: AGHT+IHkDjvmuFSwxxjPWkx9seXSkV4ruwqwPmYN7D1Vf3EPiKL6url1CsCSGm0uA1jVVlHeSyXI X-Received: by 2002:a05:620a:29d2:b0:79c:4030:d891 with SMTP id af79cd13be357-79d7b987e53mr1102048385a.12.1719936709422; Tue, 02 Jul 2024 09:11:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719936709; cv=none; d=google.com; s=arc-20160816; b=E3TJhs68X24W/pwRNrd+h087QEvSyPx73nqvaX0cRiuHM023VI26tG1+1GUAG6u3Vf rOTz3SL24H/zdVeF3XFO28FM58qOvrDlqOQdnv/7OBGFqZchSVC9r5BeSe7IEkr/ZMYp UpRTN8F48CmiknhTJtYY0h8SlR1UG3Q70AhnPzMhU1o7GL1MX9vZpITZEPDw+nHE8wR2 hEjR3EJp92Osub36sfgtFAGaFlhVEJW6Poq+Yh873Q7eV8DUvB/b6W4yoqJUK/bVv026 lHfxQPZLX5K0PdgAehi0U4w5YS9P61ikDTNeXmI8AOG4/bcrTRd5maWFOHqbiSRxB9LC rPpA== 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=RBVuHZm3rIq3dtsPdBj6GEOeeuFg4kVGrJigngjm3C0=; b=VrqWAhqO85qsvnRbtcaLa8WzDTo9YuQD4hIzFsVUxCu9IGXXydN4nzSNu1x2J3HT8k yswWmw+hDf+RmiDU4ie7RbR+E6pAZl62FS9oncvgLdcqOvLJRvXvjAhKAMTZYiofahy7 WVTIcsR4vWYcpNo59ueMDDCwL+ffTi0LmORzzSAR6CcmijLtW5QathCOe6YIUgfsYqJS m9Iu02uQn8O5pElxBHHnMQrnimGc0+cVG+/EcAwJTTn1OYsjto2BDp+YIhEEI6oMbkVz JBtbmDeihFJa75eshtqF+sOLZ33PyI0LbFk87MCLzKhGhbsyNudZUvWPRcZSmgiZ9A9m 0keA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="dAHkw/ol"; 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-79d6934c857si1035371885a.730.2024.07.02.09.11.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jul 2024 09:11: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="dAHkw/ol"; 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 1sOg5e-0006gk-Lx; Tue, 02 Jul 2024 12:10:46 -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 1sOg5d-0006g6-Ih for qemu-devel@nongnu.org; Tue, 02 Jul 2024 12:10:45 -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 1sOg5Z-0008UP-UC for qemu-devel@nongnu.org; Tue, 02 Jul 2024 12:10:45 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4256aee6d4fso27050335e9.3 for ; Tue, 02 Jul 2024 09:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719936640; x=1720541440; 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=dAHkw/olkc4sWbVLMOCYXcLhWxcNtG3qLCe/HyjmXL7v1Kl3Jn2KkSBG4IvK4WjBKr gKQMSri2aYDBSasP8RQ8eDPJfT3ddnQedTDSgHJj0BmiJw+rW65ByJi53SeHXOrflapJ 5v8VFuCya8VX1hAOc9fkfmTZJyXZ9KXsar8GjxhFH8SOVFCxdzGJKSh/diuIs8zCkbzy ZYlsPKMKcOidG6XibsLBg1m7x1J+GNgCzctZiGGg/BCWpk8I1KCo8dHHRtTqq7gBXZOw AycAqIyH+IcZseuyc74tL2Xi7/ZY8P9HxZO4msBYEwXbzi7icgxnnPN4hOBIMd+7ovDO 7cgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719936640; x=1720541440; 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=UFuqogtYv9xqFfke02yHtG8H+Zo8AyAH+29QNu6fR7Fpdp/oDe8S21ghsU58htDgrz cO5L4NiluroELsT+RetaXkIJ8vqmNLkvozNlvtzI27hTT4nzRXAf6D5BZNxpC+u+FbjV sXtHdQZxBYjq02WmXJcJyHUIVd+PGVZ6Yf/NlTgmK93kGvL2P7H5+tMPAQx2XIXhVBNI yHwWniPEzsOqwo80rpxLZwvIbDroGIBO9UMeNKg2jTcfsVlrEEXyxFqL1hcGcna72V5n JO2KBe5cyqhsFZthlWPaTPa/i6g/hF0IC46t5uHLx1LHnsbaocAz1fSFLCttdHQDtpKY g1eg== X-Gm-Message-State: AOJu0YyJJBJZBUsBjRsuw7Q9K1qM9KbSIrFkW5Mu40UGM37qqRvtrH6X EvUoWFVHXKrwDNVrjAGeKKyTl8cX7kJnljPApbdyWGSWz3nvrPcjevGU69efE8pmIAnOirj9PZV t X-Received: by 2002:a05:600c:1604:b0:425:5f0e:bb69 with SMTP id 5b1f17b1804b1-4257a05f0a6mr57323665e9.38.1719936640047; Tue, 02 Jul 2024 09:10:40 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b097bcbsm204602385e9.35.2024.07.02.09.10.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Jul 2024 09:10:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Luc Michel , =?utf-8?q?C=C3=A9dric_Le_Goater?= , qemu-block@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH v43 1/2] hw/sd/sdcard: Use spec v3.01 by default Date: Tue, 2 Jul 2024 18:10:30 +0200 Message-ID: <20240702161031.59362-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240702161031.59362-1-philmd@linaro.org> References: <20240702161031.59362-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 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 Tue Jul 2 16:10:31 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: 809130 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp289373wru; Tue, 2 Jul 2024 09:11:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVijYCNqzIooKRizwKU192LUjbd7ZTP13u4T5zZcfL8Z3qTGXTaI5FIV0bLU17x2qI/9j+UDl/P/2iv53hzZXYG X-Google-Smtp-Source: AGHT+IH9B20+V5xziikAgFntxx5DOva2GmCDBrJzzppsvrOvF42qUcARneAU+63U2mOJu9d42z3N X-Received: by 2002:a05:620a:29c3:b0:795:579c:f609 with SMTP id af79cd13be357-79d7b796ebbmr1949109985a.19.1719936683205; Tue, 02 Jul 2024 09:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719936683; cv=none; d=google.com; s=arc-20160816; b=NGJbNIbfl7WaMk0qTjAckf64MpaSTZLGWMxHT0FzJRbTHcstF0ypSjEnBlIIo/UfRh 9bHRoIyskJN6IA/ii6PSNtWlMyVZ9SoOkXPFTsX3LMUeDs31bg7wqZZtSbgx2y0zwBBo 2qNMvlOtWSHIVp3hSp8MoAkugHludTZJjoIkJkUUSRfR+v71n+TIOZxp84qjbKOaacQZ SQ/FTVxAYea6wGmL04HDZiI/CCGqIdM1xzcmSQr5HFreXoCvDDZPGBbWm4Zv3vldrYmT GNmA6dcfmf70NO6yZ7Uvb8b/8XrJ48s/V7PnJ13JYVQIxhR9M82iMuPT09LFPxC7LG8Q l8Mg== 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=zAGUZtgm/PGc7UqUDzjkHrvf3V8BxDqJV4UN4glZXWQ=; fh=RBVuHZm3rIq3dtsPdBj6GEOeeuFg4kVGrJigngjm3C0=; b=vNRniScRB8NUzynf0DKJndF5NwOSnWat80EoRds53Gqxh0R7a3dl2P+jRFTYYGgLSU jjK24nCmpuNKVTEA0MTdCxmebi3E5CnDuzh2HKOPnlK7PIxOGaVJ6tVqBXbUB3L3QGAf RbB/WwMjfDklZjkPiTREK9xgXFexx7HcyU2iAyqCztDZknJnZosZuCIqPfkxe87mfiNg HSn9fdir4QIFbyRlW27tmsZFwYXLR+ae2jUr/PkoYN/71/Yrrl0mNtOrYFSK+NHuaxtQ rDVwjd5edCyN0AWqWKKMbxPgz0ozzBTqPH/C9XQ31g8fYR5rZJnDLUOz/a/JBYqH/HSX RGyQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ps2pXo++; 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-79d6934d248si1029591585a.759.2024.07.02.09.11.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jul 2024 09:11:23 -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=ps2pXo++; 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 1sOg5z-0006pq-5N; Tue, 02 Jul 2024 12:11:07 -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 1sOg5w-0006pT-RK for qemu-devel@nongnu.org; Tue, 02 Jul 2024 12:11:04 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOg5i-0008VL-Fi for qemu-devel@nongnu.org; Tue, 02 Jul 2024 12:11:04 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3629c517da9so3460998f8f.2 for ; Tue, 02 Jul 2024 09:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719936646; x=1720541446; 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=zAGUZtgm/PGc7UqUDzjkHrvf3V8BxDqJV4UN4glZXWQ=; b=ps2pXo++TjsbKMcQ1nL2Wn8mtPFqzlcNAKVvMsPyKR3p7gUqYz4g9BMSWcPG8s7/cK cfn/BGZIUO8N/slf8f1FuTwoBn7oSLSZx6j8WlGZuhqkWJdEH+iFU4sJzJfF2UZSE04s yPQcBH4lUqZKnl4HdhICKdwmEbX3ougHcOvD8XIIeOuPSdiI/2k9Jkt90fO38COp2Wdf J3kEl9I1mkhaWmeSOIEidG503zAGIuss3JZ02bYb2XNy8k+hnwQlZOEvjJLewcawte+W /TeK62gdD6oICGeXMRTMUyTs9l8Jo1n+IkpkkrdKDhcb+xC4zw/rW60kj9hs4NQyMLMf 4c3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719936646; x=1720541446; 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=zAGUZtgm/PGc7UqUDzjkHrvf3V8BxDqJV4UN4glZXWQ=; b=iP2VigrLukDX40jkK+aieOB2A4guqD+u4TJrNVMt1F2sKFmTsdVM2dd+CazIwaohMA EapOEakP9YDA0QjqZClr5FHKVd9EI74Tkh6H2S4BLr0xR+EzFHQfi1DO/3/49UFv30FZ TJRr+4Kc/tuOm/ns3UgQm8cJODU8EOTJE9KM3YRbwjeXpV3KmuRUKecl5H0JGISOoJcD EgQiJDWVySSlhvUj1dSBeUR2hVFhvEkKBgKFy0U9yxD5LDm1ieyXHi6MbPM+zvhICJsH 26onfEMvgk/5qFzRGIfSQaIay/g9Wc0AmfVigA2snhOlmgAxEm9L8P2mf3V4qi0DYxJc glWg== X-Gm-Message-State: AOJu0YyEjrwtTR3gB8DoGee4mQGAhAng8v4+NjtU6qhuSkIj8XCMue9K EyFyCmnGe4dIkRid6rp8jH2ZRbVdY8Myn6pUX/0bVG6DqDcZw/rMTB0gXyMcpNblWmb+FizPkQE R X-Received: by 2002:a5d:5889:0:b0:366:eba0:8d8c with SMTP id ffacd0b85a97d-36775724976mr8465096f8f.54.1719936646060; Tue, 02 Jul 2024 09:10:46 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.58]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a103e5esm13610996f8f.108.2024.07.02.09.10.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Jul 2024 09:10:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Luc Michel , =?utf-8?q?C=C3=A9dric_Le_Goater?= , qemu-block@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH v43 2/2] hw/sd/sdcard: Do not store vendor data on block drive (CMD56) Date: Tue, 2 Jul 2024 18:10:31 +0200 Message-ID: <20240702161031.59362-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240702161031.59362-1-philmd@linaro.org> References: <20240702161031.59362-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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, 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é Tested-by: Cédric Le Goater --- v43: Do not re-use VMSTATE_UNUSED_V (danpb) --- hw/sd/sd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 808dc1cea6..418ccb14a4 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; @@ -835,6 +838,7 @@ static const VMStateDescription sd_vmstate = { VMSTATE_UINT32(data_offset, SDState), VMSTATE_UINT8_ARRAY(data, SDState, 512), VMSTATE_UNUSED_V(1, 512), + VMSTATE_UINT8_ARRAY(vendor_data, SDState, 512), VMSTATE_BOOL(enable, SDState), VMSTATE_END_OF_LIST() }, @@ -2187,9 +2191,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 +2264,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: