From nobody Tue Oct 28 12:15:18 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 151500480218846.6259342822774; Wed, 3 Jan 2018 10:40:02 -0800 (PST) Received: from localhost ([::1]:60793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnxJ-0007Yp-AT for importer@patchew.org; Wed, 03 Jan 2018 13:40:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnsF-00036T-78 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnsE-0007LU-Bz for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:47 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:33494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnsE-0007LH-7V for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:34:46 -0500 Received: by mail-qt0-x241.google.com with SMTP id e2so3238144qti.0 for ; Wed, 03 Jan 2018 10:34:46 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 185sm992854qkd.1.2018.01.03.10.34.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:34:44 -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=uW/1lW/hb/+BmWD9K07HPCkzJkScdTNhFZezi27ScS4=; b=qdgTfwYnrIyTNghO7rXzu1IKpvy59XJT73yAQnq9ViD/Nj8AT3tIDqEbDUw/PQkJLw uSExb2BwUVf15kr9gkQNga3KcN7Z+pubCsZumE2EfI+SLX2Zi5jvZuW+yc7L9pWSJvTc fx0LOjbmSDrzW4dImasni8ZHXoQfVHX4C2F8q4YDkQANdsjnT8JVtjQ7ZLfUNyhOam1l dUnoyIM1ef6zH2AJ9lGXVgC2XnC2Q6x/TibgIvyN2UiOldMGN1yNNxo60NHpcvkXf3oD YtpfbC7ncdkxzSzou3Ybu9/0ZXvXDUYBr+7O4c1L2WhMXzH9UcebPqk0MIsqCYx9/PLE J1Yw== 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=uW/1lW/hb/+BmWD9K07HPCkzJkScdTNhFZezi27ScS4=; b=QQWyvB2LhqssN1HNYhOCWj9wDHOyQrsxKaw8EQ1xuQx8icdzo0njXfnIqgu1O5bBAS 5V3pl3pkTAMFoaMEvuRwFqhoTdMQZSwZTcOPcKzOfavPFWm2D0qBYTZMrbt9R/DNL5dh pwmz6bh+PYnZ4HlZpxa8ARwjJijB3UsF+QIYhizkbsy48aL9jjGHcMUWqP/V969rNmLZ lWMkE2JXNsTKTgRqvwx9MqW18U/PbWBrD8v/8nv8vFECbMEQkDxpAoMbsacs7LAImqV4 +AcFqFW9t9kqavesI8sWutYVT7JLe1CKd0LE4FpjYLkhFrW4xQ9tgxTJqOzbQemzZLir b5sQ== X-Gm-Message-State: AKGB3mKsB5SuEsP+kltagV3POkFKZSFFMVdy0UKRM0tGxdpGYIu3bkUW lkhAeMby+hwfilLEAfkORCs= X-Google-Smtp-Source: ACJfBovStXXEbeNPToinWiRlTPNP3LRfaTA3OKveDjjwnEJI0p3X19JcWzn0XTmAJHbJ+h5DI/k3RA== X-Received: by 10.200.48.34 with SMTP id f31mr3046693qte.40.1515004485766; Wed, 03 Jan 2018 10:34:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Andrey Smirnov Date: Wed, 3 Jan 2018 15:34:00 -0300 Message-Id: <20180103183418.23730-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103183418.23730-1-f4bug@amsat.org> References: <20180103183418.23730-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 v4 07/25] sdhci: add a 'dma' shortcut property 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: 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 disabling it disables all DMAs at once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 4a9c3e9175..bac37f9e11 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -101,6 +101,7 @@ typedef struct SDHCIState { bool pending_insert_state; /* Configurable properties */ bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ + bool dma; /* shortcut for sdma + adma* */ uint8_t spec_version; struct { /* v1 */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 8692798021..cc1e28fa61 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1178,6 +1178,10 @@ static void sdhci_init_readonly_registers(SDHCIState= *s, Error **errp) } s->version =3D (SDHC_HCVER_VENDOR << 8) | (s->spec_version - 1); =20 + if (!s->dma) { + s->cap.sdma =3D s->cap.adma1 =3D s->cap.adma2 =3D false; + } + if (s->capareg =3D=3D UINT64_MAX) { sdhci_init_capareg(s, errp); } @@ -1312,6 +1316,7 @@ static Property sdhci_properties[] =3D { * Possible values: 512, 1024, 2048 bytes */ DEFINE_PROP_UINT16("max-block-length", SDHCIState, cap.max_blk_len, 51= 2), /* DMA */ + DEFINE_PROP_BOOL("dma", SDHCIState, dma, true), /* shortcut */ DEFINE_PROP_BOOL("sdma", SDHCIState, cap.sdma, true), DEFINE_PROP_BOOL("adma1", SDHCIState, cap.adma1, false), DEFINE_PROP_BOOL("adma2", SDHCIState, cap.adma2, true), --=20 2.15.1