From nobody Tue Feb 10 04:16:32 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 1513195893749688.0621431368005; Wed, 13 Dec 2017 12:11:33 -0800 (PST) Received: from localhost ([::1]:37430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDNI-0003tV-J6 for importer@patchew.org; Wed, 13 Dec 2017 15:11:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDCK-0003Ji-Pe for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:00:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDCH-0005oM-4l for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:00:08 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:42279) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDCH-0005oE-0P for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:00:05 -0500 Received: by mail-qt0-x241.google.com with SMTP id g9so5224810qth.9 for ; Wed, 13 Dec 2017 12:00:04 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id o5sm1518876qtc.72.2017.12.13.12.00.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:00:03 -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=6oh+8F3RYoqsg8Deaijp1ExuN06BjyrACVMU2dRK0j4=; b=WKQr2MJiZLyv46TvWlDg94XR9RMs7j2xrGglLgVPY7l2Oztt+fIS+o1dj997frE16/ kU9sX7tNgTo2Uicq0nOyHr/VZittQiS5ygS92QEcsJcNlqriQyWQOKvUoE08dGKZ7Hs4 sxu+tF6psyS8cL4qrc8YpJ09Q40+dCLBeKzlwE82wESWiMldEUcpadxUe7T6ZxI5+xTn xH5898dr+8mBs0psIRPCh5Gitvq7oVB8TT9PLqrdD5cGOXlOs/WYeRzpo7X1SgBrh60T S5BF42TIEmDvUvzvBvy6m/XYuAlH/rJ+iwCnCEuQo1qEVCWmsPpngfDUpIyLOFKXHZVr zHYQ== 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=6oh+8F3RYoqsg8Deaijp1ExuN06BjyrACVMU2dRK0j4=; b=gDmif9o1mY2fJ6Yb/llFg/olKrhe7VEl9IXc7cnpNaAMh8DD05/lBYW9mPWoP4f1G5 bZ/rReTCrVz7zwL0wKOJhSR8YuEXOdRd0GaI0J+pXtmAr/lZ94H8q16ZQJQGFYvxHyI/ mfb5Uzi3LNdbNjQS9ddB3O/Sf+9KdkBAJlPjsN1yOux8pSB2p40LOiXL0nYsGKxrPJUD NS2ReI1elDE9PzZZnXCwzMGuYOkr0V8m8fVLlMJC0Ikh3LfBNJ13RunV4QnPJKTPTHq7 6Ol66mQsDcbdnqJ/Vlfbd/u1N4gZwqhWSxbPrWWS1b/G+McGSFcizZJyHbRfOmCB7hoW FP0g== X-Gm-Message-State: AKGB3mK+pIUpLlMF46J0LODZwti1DI4K7w5NmZkP3E2ZzMyO4bodhfM6 ckbLRZJ/YgEEBLEhm6tgGec= X-Google-Smtp-Source: ACJfBos2BOq/2n6zeAGjAywUflsqngRJBTqMUFYckdDARZocTANPlotI83IXovUODMwbBXxxEv0SzQ== X-Received: by 10.200.25.227 with SMTP id s32mr12407641qtk.307.1513195204430; Wed, 13 Dec 2017 12:00:04 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky Date: Wed, 13 Dec 2017 16:58:51 -0300 Message-Id: <20171213195852.30439-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213195852.30439-1-f4bug@amsat.org> References: <20171213195852.30439-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::241 Subject: [Qemu-devel] [PATCH 13/14] sdhci: add sdhci_init_capareg() 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: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 following patches modifying CAPAB will be easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index dadc4787b2..78bb8e8e89 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -100,6 +100,13 @@ =20 #define MASKED_WRITE(reg, mask, val) (reg =3D (reg & (mask)) | (val)) =20 +static void sdhci_init_capareg(SDHCIState *s, Error **errp) +{ + if (s->capareg =3D=3D UINT32_MAX) { + s->capareg =3D SDHC_CAPAB_REG_DEFAULT; + } +} + static uint8_t sdhci_slotint(SDHCIState *s) { return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsig= en) || @@ -1158,6 +1165,8 @@ static void sdhci_initfn(SDHCIState *s) =20 static void sdhci_realizefn(SDHCIState *s, Error **errp) { + sdhci_init_capareg(s, errp); + s->buf_maxsz =3D sdhci_get_fifolen(s); s->fifo_buffer =3D g_malloc0(s->buf_maxsz); =20 @@ -1244,8 +1253,7 @@ const VMStateDescription sdhci_vmstate =3D { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_properties[] =3D { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), + DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, UINT32_MAX), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, false), --=20 2.15.1