From nobody Tue Feb 10 15:45:11 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 1516041379007338.6593051610582; Mon, 15 Jan 2018 10:36:19 -0800 (PST) Received: from localhost ([::1]:53322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9cI-0000w0-7n for importer@patchew.org; Mon, 15 Jan 2018 13:36:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9Rz-0000Oo-SO for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb9Rw-0003LS-Mx for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:39 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:33551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eb9Rw-0003L3-6w for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:36 -0500 Received: by mail-qk0-x241.google.com with SMTP id i141so17926003qke.0 for ; Mon, 15 Jan 2018 10:25:36 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d20sm154623qtn.23.2018.01.15.10.25.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 10:25:35 -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=BfvG5wbseKzVE6xzPJ9U30AUGQkNXu75yIFVeXeq0S8=; b=N5+RpHMCDATexu69zKoMjG3NrL1XkJVYrgGjWVs0C0fluhjbedqnPn7pkjGsBoVL4Q FOi1gL7n6OwrFWlsPTIDZbHP/rM6ygTlzdNJloSwWPKe3EsbTfV0kcSHbOdNcZ11Qlev v4M6YAQ8HJiNUWleeUke2z8jP/v57wJmyCMw3kQJbuWSRI4lQDc+iA8dKdJGZHxjqI5h lF/vbhO4MXtkwPl6eCta+Wu5Y2A/axSsgwBaVWjGpM4FL+v2aFgDGsWOsFGHKrsW9ely HMbj5/Tw3i5THIjqxMu4KU37QqwCGgMQPZFiZSFpfB2oouvBoE6fqZDO2zJRbwdAf3Ym CwRg== 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=BfvG5wbseKzVE6xzPJ9U30AUGQkNXu75yIFVeXeq0S8=; b=bBDmNVKat94oCHFIgZwH2nUY4eDCoSpy1LkkUTJvDRqTEM/GgWPLwUT8i4QkfJI6k2 xUqvwZEGJqtZH+cA3U/PPDnskeCla8sUopQPPqoI4PTTyuD66WI9XZ2NIvhQJcnrNCZ6 z7qIpaexVM03fepSg1rzxBD1j74Q4r1qtafJpjqxMAaTuCFsslHZokM9KaQlhI4cIW0E 2oCaIfTXTkPVvogAve+CNxLzZrkkS9Dq/9hKp2vZLHE9cWx+l4B6OZXx7jtTXvIN+dDh O0rbb1efBl3VGWHdm4WuTYzXVEf4Juu7626v9SwF1Q1qdLy7OaBJK2BDSf8rJM2D7A5L 17eA== X-Gm-Message-State: AKGB3mLUOnyam4TvQM7XxmZkdkthvahoFzU1HUV40uEv2GRLx+U/lD8Y uT+iAz3IOOYJQmFR6na/QW4= X-Google-Smtp-Source: ACJfBoty7JRqnYdLcysB41KkNgStYcEntsIo/WJ9GPxr9BUTTQ1by2pSbBtH95hBTIMgnKtUVij4LQ== X-Received: by 10.55.40.16 with SMTP id o16mr52342893qkh.216.1516040735755; Mon, 15 Jan 2018 10:25:35 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell Date: Mon, 15 Jan 2018 15:24:36 -0300 Message-Id: <20180115182436.2066-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115182436.2066-1-f4bug@amsat.org> References: <20180115182436.2066-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::241 Subject: [Qemu-devel] [PATCH v8 14/14] sdhci: add a 'dma' property to the sysbus devices 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 Add a 'dma' property allowing machine creation to provide the address-space SDHCI DMA operates on. [based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2016.1] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 4a102b86ce..cb37182536 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -42,6 +42,7 @@ typedef struct SDHCIState { SDBus sdbus; MemoryRegion iomem; AddressSpace *dma_as; + MemoryRegion *dma_mr; =20 QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index dd400695e4..f9264d3be5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1354,6 +1354,8 @@ static Property sdhci_sysbus_properties[] =3D { DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, false), + DEFINE_PROP_LINK("dma", SDHCIState, + dma_mr, TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -1367,6 +1369,11 @@ static void sdhci_sysbus_init(Object *obj) static void sdhci_sysbus_finalize(Object *obj) { SDHCIState *s =3D SYSBUS_SDHCI(obj); + + if (s->dma_mr) { + object_unparent(OBJECT(s->dma_mr)); + } + sdhci_uninitfn(s); } =20 @@ -1380,7 +1387,12 @@ static void sdhci_sysbus_realize(DeviceState *dev, E= rror ** errp) return; } =20 - s->dma_as =3D &address_space_memory; + if (s->dma_mr) { + address_space_init(s->dma_as, s->dma_mr, "sdhci-dma"); + } else { + /* use system_memory() if property "dma" not set */ + s->dma_as =3D &address_space_memory; + } =20 sysbus_init_irq(sbd, &s->irq); sysbus_init_mmio(sbd, &s->iomem); @@ -1391,6 +1403,10 @@ static void sdhci_sysbus_unrealize(DeviceState *dev,= Error **errp) SDHCIState *s =3D SYSBUS_SDHCI(dev); =20 sdhci_common_unrealize(s, &error_abort); + + if (s->dma_mr) { + address_space_destroy(s->dma_as); + } } =20 static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) --=20 2.15.1