From nobody Mon Feb 9 20:12: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 151319605220124.635692161477323; Wed, 13 Dec 2017 12:14:12 -0800 (PST) Received: from localhost ([::1]:37445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDPs-0006Jr-Du for importer@patchew.org; Wed, 13 Dec 2017 15:14:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDCR-0003Qv-7O for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:00:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDCL-0005qK-8r for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:00:15 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:34350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDCL-0005q3-42 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:00:09 -0500 Received: by mail-qt0-x242.google.com with SMTP id 33so5275399qtv.1 for ; Wed, 13 Dec 2017 12:00:08 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id o5sm1518876qtc.72.2017.12.13.12.00.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:00:07 -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=6lCJ8/l6nyzKTBImaQYKYOOD+mnxX2kav2RpSLSpz+g=; b=VKxU+KAane6ld/BdhdORXAhfofvRmoDcu4cZv9QABScyZzKQX3OM7MzLOwLeQoSl7S Vv8bUsoGt65zs3ONAOsvd7ERoXbdJ7zlYPv3WMjLipXW7jR6/lPHyope9+ERFWtSX1O6 RVmnsG+pcWlCYLTzaX9aO2uxbE54j9V8l5B23y0DZouMajXIs0wCZKHUWaO+WTSagEZc LRVhOoxqpunrRcW9xndVVi0cTzccEZVqDBuAzaiJGaExnYKJ+nR/mG1i0R40/6YuK5XV FyQ1igJ0fhN02pCxY8+fkiz2wryEHH0U6X+lDaRl72lUlgRidCdeVHDhKtbH+5c0N0ef iAUg== 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=6lCJ8/l6nyzKTBImaQYKYOOD+mnxX2kav2RpSLSpz+g=; b=smJCeKJ4oo2pbtdatOe5O/Emi1FBZ/ud9eut25eiWCsS2eGxrXhOstbPoWALM5QVS3 NGz4Z7GHwsmwcuBzZlLDqWwifIXSFeeTq9dtpSBcYWB7FrAWec/uq4WZVXl4EZZlgwjs LhOP2kgU4qJOoiz/nQbN8jIb3prcBBTQqiHAL7Fxe4I7IaCByjb67+4Kz9PcGEFqXX4L n9RA+J6ZZBM/WyluhRI2gWJMRC41KHUVuDv3wZZ6tuZekWrujLG0DdyWKKb6uyFbEx0F duvqEtPCRTnaY419NtiAUGrPH7nIqtSf4NHfiqT7YZuO6rRxxWw2gSQyvoXeOv8w0a+j bsvA== X-Gm-Message-State: AKGB3mKiNuJCCW2wv5C4KjFL1+k0WGDhscAygoGZBX29W8hEPPa3YqRT MPBdE7sop4MniKmjE1RXGYs= X-Google-Smtp-Source: ACJfBouYbGj+Q9jcxsprULNhYmg4YDyy3iXKFFN/Htb4OTgOdhAt2WRhpFLXELv4fO0J7fAHFkqwiw== X-Received: by 10.200.39.196 with SMTP id x4mr12272453qtx.246.1513195208544; Wed, 13 Dec 2017 12:00:08 -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 , Paolo Bonzini Date: Wed, 13 Dec 2017 16:58:52 -0300 Message-Id: <20171213195852.30439-15-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::242 Subject: [Qemu-devel] [PATCH 14/14] sdhci: add a "dma-memory" 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: Sai Pavan Boddu , Peter Crosthwaite , Fam Zheng , =?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 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 Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 1b6a98d578..e6644e6e7d 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -41,6 +41,8 @@ typedef struct SDHCIState { /*< public >*/ SDBus sdbus; MemoryRegion iomem; + MemoryRegion *dma_mr; + AddressSpace dma_as; =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 78bb8e8e89..5f8064c59b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -590,7 +590,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) hwaddr entry_addr =3D (hwaddr)s->admasysaddr; switch (SDHC_DMA_TYPE(s->hostctl)) { case SDHC_CTRL_ADMA2_32: - adma2 =3D ldq_le_dma(&address_space_memory, entry_addr); + adma2 =3D ldq_le_dma(&s->dma_as, entry_addr); /* The spec does not specify endianness of descriptor table. * We currently assume that it is LE. */ @@ -600,7 +600,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) dscr->incr =3D 8; break; case SDHC_CTRL_ADMA1_32: - adma1 =3D ldl_le_dma(&address_space_memory, entry_addr); + adma1 =3D ldl_le_dma(&s->dma_as, entry_addr); dscr->addr =3D (hwaddr)(adma1 & 0xFFFFF000); dscr->attr =3D (uint8_t)extract32(adma1, 0, 7); dscr->incr =3D 4; @@ -611,9 +611,9 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) } break; case SDHC_CTRL_ADMA2_64: - dscr->attr =3D ldub_dma(&address_space_memory, entry_addr); - dscr->length =3D lduw_le_dma(&address_space_memory, entry_addr + 2= ); - dscr->attr =3D ldq_le_dma(&address_space_memory, entry_addr + 4); + dscr->attr =3D ldub_dma(&s->dma_as, entry_addr); + dscr->length =3D lduw_le_dma(&s->dma_as, entry_addr + 2); + dscr->attr =3D ldq_le_dma(&s->dma_as, entry_addr + 4); dscr->attr &=3D 0xfffffff8; dscr->incr =3D 12; break; @@ -670,7 +670,7 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count =3D block_size; length -=3D block_size - begin; } - dma_memory_write(&address_space_memory, dscr.addr, + dma_memory_write(&s->dma_as, dscr.addr, &s->fifo_buffer[begin], s->data_count - begin); dscr.addr +=3D s->data_count - begin; @@ -1172,10 +1172,20 @@ static void sdhci_realizefn(SDHCIState *s, Error **= errp) =20 memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci= ", SDHC_REGISTERS_MAP_SIZE); + + /* use system_memory() if property "dma-memory" not set */ + address_space_init(&s->dma_as, + s->dma_mr ? s->dma_mr : get_system_memory(), + "sdhci-dma"); } =20 static void sdhci_unrealizefn(SDHCIState *s, Error **errp) { + if (s->dma_mr) { + address_space_destroy(&s->dma_as); + object_unparent(OBJECT(&s->dma_mr)); + } + g_free(s->fifo_buffer); s->fifo_buffer =3D NULL; } @@ -1257,6 +1267,8 @@ static Property sdhci_properties[] =3D { DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, false), + DEFINE_PROP_LINK("dma-memory", SDHCIState, dma_mr, + TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.15.1