From nobody Tue Oct 28 12:35:08 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 151501484811024.895956282194902; Wed, 3 Jan 2018 13:27:28 -0800 (PST) Received: from localhost ([::1]:37621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqZL-0003nG-6Q for importer@patchew.org; Wed, 03 Jan 2018 16:27:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqXQ-0002Pm-Mw for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqXO-0007xx-IP for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:28 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:39378) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqXO-0007xD-6A for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:25:26 -0500 Received: by mail-qt0-x242.google.com with SMTP id k19so3802433qtj.6 for ; Wed, 03 Jan 2018 13:25:26 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.25.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:25:25 -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=ypfvVHTS2Fa9w48ZQ9uAZyy/hrAwaYFbQlXtBEGz2HM=; b=dQ3g/W5gVvL6U8w1jM83tSMsS1jkKQ6f1pDdxP4x0y1lfmMielkbiOP/geTfju9bV4 fmxiuoU0mGw6pKCYVL1yj/TCE4MzKI7dDc0aU49e7rIZ9UREyIDA3TLPPAv/YJria+6X pGrVzm/BIPrJbDQQ03UdankuVNw/YIWILW8HTOaW6EvtSKDRqlMpL4+aEh0feDiCDTtS 3P0947r2UL/0oPa71Dqb7giuWfen/vgALJcQrwL68YzlouR77LdK5S0vQToPDJaVq3gR 397Uwr23GZtPLlJA/IEuVPTde9JaybsK7QchoRFqxPgeWE5rDKUxbH0g81pYxjZozt0U Hyug== 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=ypfvVHTS2Fa9w48ZQ9uAZyy/hrAwaYFbQlXtBEGz2HM=; b=i5ZBweo+7gKFZbDOS0tYXvLMGkEw1aMaEsDgLipjC4n9sN0GAHbYisPOmd+SRBuea4 K4sDlSguFEe22qOSCVSLaWrVieRDmFVne/7rPwZIrZYi0R6NabN+RYdW/jEDddS8vi+j JnyKTRhq8vaMrplxiK4rI6p/5AskUNztmObyNe4o9KgPG3jYBV8UZE7Pd7124Lzmd4E8 OXNSKG9y9n6JN2ig9vmPYZkeuEh1JB0keZ6XEfzEVXDzKbQMd0K6UaEV2Os4QK2332Zm 6UL4r895XfhngFX8FiQg0uYDpf3gi8PSOTlQ9TiKCZniOGk1PS5FC564zuB9d/n/xsWv WPgA== X-Gm-Message-State: AKGB3mJnAShCDafP0MJ58e8uUWKh2Wone9DsFcxR/hLkDwd3o8WBVVB2 uUJmMFf6Z/IrQD8AjWuzFlw= X-Google-Smtp-Source: ACJfBouwdMplg9Lbogt62Ox6j9oZk9n9O3vRxhd0xrOf4XG+i4+vEENe1iTNcQoB4kL14nCWXojP0A== X-Received: by 10.200.23.221 with SMTP id r29mr3717953qtk.27.1515014725660; Wed, 03 Jan 2018 13:25:25 -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:20 -0300 Message-Id: <20180103212436.15762-10-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:c0d::242 Subject: [Qemu-devel] [PATCH v2 09/25] sdcard: use G_BYTE from cutils 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 code is now easier to read. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 1f209b8199..d4aa7b4a92 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -38,6 +38,7 @@ #include "hw/sd/sdcard_legacy.h" #include "qapi/error.h" #include "qemu/bitmap.h" +#include "qemu/cutils.h" #include "hw/qdev-properties.h" #include "qemu/error-report.h" #include "qemu/timer.h" @@ -369,7 +370,7 @@ static void sd_reset_csd(SDState *sd, uint64_t size) uint32_t sectsize =3D (1 << (SECTOR_SHIFT + 1)) - 1; uint32_t wpsize =3D (1 << (WPGROUP_SHIFT + 1)) - 1; =20 - if (size <=3D 0x40000000) { /* Standard Capacity SD */ + if (size <=3D 1 * G_BYTE /* FIXME 2GB? */) { /* Standard Capacity SD */ sd->csd[0] =3D 0x00; /* CSD structure */ sd->csd[1] =3D 0x26; /* Data read access-time-1 */ sd->csd[2] =3D 0x00; /* Data read access-time-2 */ --=20 2.15.1