From nobody Tue Oct 28 12:37:20 2025 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515015867666437.37530326647857; Wed, 3 Jan 2018 13:44:27 -0800 (PST) Received: from localhost ([::1]:37878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqph-0001bI-Pj for importer@patchew.org; Wed, 03 Jan 2018 16:44:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqYH-0003GX-5s for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqYA-0000Cd-En for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:21 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:46602) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqYA-0000Bv-5q for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:14 -0500 Received: by mail-qk0-x242.google.com with SMTP id b132so3256461qkc.13 for ; Wed, 03 Jan 2018 13:26:14 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.26.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:26:13 -0800 (PST) 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=SYEcZmYePa9FZIRq4vMILYj8fbduE+fDUMm3YKE8BoM=; b=TSIr1dlpj8JxgnzQOXLO1QOdLn+f6kueZwMujBoYgTbmiG5UadyN1Av7oxJ4FPD4Xw IOJ+tD3NXwpAkaVXbQB0PtpTpWCN5KHUy1g1SF1suS4em6NiFVsf0Kv/30abR+rnHhB5 4gWTeqb2s5gB3ZySe34UGoZOAN23oQWBdakey/uUwNym35jQ9XrpApxbrDVXM8xWp8aw QBvDukm4ZLxKonJhnnVrQLQlSgRvUJr9mTEmIOyk0qxmbjVva2pr6wOeQm2luWl4wkK9 1BPupo0SM5xdYA+/bEms9xwvYVSeWkjoiMX7D1BIbZqD0wDOh4ShMNouYB8C+LBBRvCA c1ug== 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=SYEcZmYePa9FZIRq4vMILYj8fbduE+fDUMm3YKE8BoM=; b=Hy5DLj6vG1FN2zf2W8wFtg1dxpVlYkiRvF31T3RbQRg+2+qizvmMiNSykKHnZ1rA/0 VuSSPfdfALrXaR/YtpeBpgizSVru9sn5YWFoV0qlglnHxScEzq4JDxWHF/fLIREaZmEp IlwumeX2Iy9YGiZOyRE++65DnlNXed0H33tI4kyCV5Rt12rTO3BuuAJ8z7kbUNY8T4v4 u8dm1bbANgOeGRBVNvi+n6XGt2r6aHO8ODJDRk2KttX1JjqZCPj+N/jQk9ECW5M6OfFE pfFswJE8jht7oOuAxJ6XxWPd49FA6dlGnHfX+CoeZPrIjPH8KO9nzL6t72bRukydAakz a/WQ== X-Gm-Message-State: AKGB3mJRwsysMi/qLaAZJ5lX0QVQMIT+0qQqzdedF8shhOX2vC6PafP9 UO6o4OQpNOUAcooFfy99PMU= X-Google-Smtp-Source: ACJfBouYVWYo1dMHMChFSEGn5Bnjlb8Et2rC8+2xoGbKXkPTxdG0wTEoySsgerTzVUaxX/QFbxMMAw== X-Received: by 10.55.16.80 with SMTP id a77mr3355844qkh.148.1515014773750; Wed, 03 Jan 2018 13:26:13 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko , Andrew Baumann , Olbrich , Andrzej Zaborowski Date: Wed, 3 Jan 2018 18:24:31 -0300 Message-Id: <20180103212436.15762-21-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-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:c09::242 Subject: [Qemu-devel] [PATCH v2 20/25] sdcard: Don't always set the high capacity bit 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: "Edgar E . Iglesias" , Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paul Brook , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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 Don't set the high capacity bit by default as it will be set if required in the sd_set_csd() function. [based on a patch from Alistair Francis and Peter Ogden from qemu/xilinx tag xilinx-v2015.4] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a7cede8da6..16a8a7411d 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -318,6 +318,7 @@ static uint16_t sd_crc16(void *message, size_t width) return shift_reg; } =20 +FIELD(OCR, CARD_CAPACITY, 30, 1); /* 0:SDSC, 1:SDHC/SDXC */ FIELD(OCR, CARD_POWER_UP, 31, 1); =20 #define OCR_POWER_DELAY_NS 500000 /* 0.5ms */ @@ -336,6 +337,10 @@ static void sd_ocr_powerup(void *opaque) =20 /* card power-up OK */ sd->ocr =3D FIELD_DP32(sd->ocr, OCR, CARD_POWER_UP, 1); + + if (sd->capacity >=3D sd_capacity_sdhc) { + sd->ocr =3D FIELD_DP32(sd->ocr, OCR, CARD_CAPACITY, 1); + } } =20 static void sd_reset_scr(SDState *sd) @@ -440,7 +445,6 @@ static void sd_reset_csd(SDState *sd, uint64_t size) sd->csd[13] =3D 0x40; sd->csd[14] =3D 0x00; sd->csd[15] =3D 0x00; - sd->ocr |=3D 1 << 30; /* High Capacity SD Memory Card */ } } =20 --=20 2.15.1