From nobody Mon Feb 9 20:31:55 2026 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 1516279087372330.11012127810193; Thu, 18 Jan 2018 04:38:07 -0800 (PST) Received: from localhost ([::1]:56230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9SI-0003tb-AN for importer@patchew.org; Thu, 18 Jan 2018 07:38:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ec9NF-0008RQ-73 for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ec9NA-00078Y-BK for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:53 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ec9NA-00078C-7D for qemu-devel@nongnu.org; Thu, 18 Jan 2018 07:32:48 -0500 Received: by mail-qt0-x242.google.com with SMTP id u10so29718112qtg.2 for ; Thu, 18 Jan 2018 04:32:48 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id s12sm4489623qke.4.2018.01.18.04.32.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2018 04:32:47 -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=00nrGGpA2L/AHEcWpS6s9RPjwGQuI7CPnaHvWCVUKP4=; b=eJCPd+NJmIphKuSTwaBPYla+skE8vWe/39ag1HZf6JQSZpZFuT84/JSE9pT87AOtoy T+fXksYEJ/wLwO3z2ZXbmJjIRhYHumjs4WLbDlFKi2jpNUJ8UgLvpZ4Nax99AlK9RXIq Fp7Zue4kq6TbB7FXXuHwmQ6D08BVrZnMZJyLkDhY8Fkbu80vRFsFHTHHrmFrnWrBtBgc ddJiUIxLAunAFD9JXFnob9WfNuYMCI3DgUhgqb4lp9rtcOA3ttU8523zYl4K/piVxUW3 VFtzyHsB33JtqfeZ+d32sKhmu3aoqzklzNmYphxM+hfoXbIOYheEqWorigzXzSy0z1Mt wjHA== 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=00nrGGpA2L/AHEcWpS6s9RPjwGQuI7CPnaHvWCVUKP4=; b=Z+bYrdl3Kkg/y7FQxxVGx4voSPTAmfGlfN+pVx1Is9Ydz+QRAd4G2MAMG2iamBE0vh stm3cOq3Ckj4kEZW4+g6y9k6UZtWPLFr+eGKreoDdxZoY1vQKPyFAK4fZcQ0iZnNb4D3 lEdwWVnZfYHwGD74deZOjrV9xKQvAs/KS4JK68LK0HAVseUIwcZyd3EB4vwK0O8w+FqL g6FsXEreuZeJJb/VZ10OwEsR4wSTWCAW7GHKhPTji9xvPPUP5KYgR3jrAKASaWRsRUzu G9024UGnVzTGQgM1bP/4DsKESzEiyTwTQf2Bm5E99EvFaxAdvPEREmG2ZEhh5Q/XOL2k 6nug== X-Gm-Message-State: AKwxytev2tAIa4QzHqyDKULqhV+tbZqk3Z+Bc1pbXKhmAVlYdqOajtjB wA+6z2Bt7R8GliT9YxVejTQ= X-Google-Smtp-Source: ACJfBotxodq98Qw6fljs5ihn8kJPFCzkBGKA4iEG0H8yEzE/2UfdtdmZ+AvCHUARDmMhMG4TNNPdKg== X-Received: by 10.237.60.9 with SMTP id t9mr66538105qte.228.1516278767778; Thu, 18 Jan 2018 04:32:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell , Stefan Hajnoczi Date: Thu, 18 Jan 2018 09:32:08 -0300 Message-Id: <20180118123219.19410-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180118123219.19410-1-f4bug@amsat.org> References: <20180118123219.19410-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 v7 06/16] sdhci: add init_readonly_registers() to initialize the CAPAB register 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Marcel Apfelbaum 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f9264d3be5..08b85558f1 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1174,12 +1174,19 @@ static inline unsigned int sdhci_get_fifolen(SDHCIS= tate *s) } } =20 +static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) +{ + if (s->capareg =3D=3D UINT64_MAX) { + s->capareg =3D SDHC_CAPAB_REG_DEFAULT; + } +} + /* --- qdev common --- */ =20 #define DEFINE_SDHCI_COMMON_PROPERTIES(_state) \ - /* Capabilities registers provide information on supported features - * of this specific host controller implementation */ \ - DEFINE_PROP_UINT64("capareg", _state, capareg, SDHC_CAPAB_REG_DEFAULT)= , \ + /* deprecated: Capabilities registers provide information on supported + * features of this specific host controller implementation */ \ + DEFINE_PROP_UINT64("capareg", _state, capareg, UINT64_MAX), \ DEFINE_PROP_UINT64("maxcurr", _state, maxcurr, 0) =20 static void sdhci_initfn(SDHCIState *s) @@ -1204,6 +1211,10 @@ static void sdhci_uninitfn(SDHCIState *s) =20 static void sdhci_common_realize(SDHCIState *s, Error **errp) { + sdhci_init_readonly_registers(s, errp); + if (errp && *errp) { + return; + } s->buf_maxsz =3D sdhci_get_fifolen(s); s->fifo_buffer =3D g_malloc0(s->buf_maxsz); =20 --=20 2.15.1