From nobody Mon Feb 9 12:43:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629390886; cv=none; d=zohomail.com; s=zohoarc; b=eRY6TejCjJunK9VixSYzmBdRrr36moPy1PexeOOkT9O6dr/nkGDHalmUlSXLEiFi/qlnKcUzYnl1+fzA0nsl85k40BIixQOpQpETa+2HX5cOuL8Fj2lK1iBHBT9kLr4Qe+IhWbbMl6Rh7YefxGpDwoycSy6n5El2ZtAfFZFIam0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629390886; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=UUbBguyXCVYJjhJZ+w9myvvn9hfolADVgWzdBMV8UY0=; b=cNlvb8k6qIUHY1EQ9vBQP3RR0vr+/4PKcutHagM/GSew5tR37ygGT/W8dIqZ6vqDxVRKFm51QA8Pvg4/f65jPT+fifUbjPim8wCYljJF0jNBumCpj01Xy6HLqarESjZBVqShI3ZDMuTg+3WeiqH3dmZ8AhaKwnfoL9HZn75i+tw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629390886541483.3127053725176; Thu, 19 Aug 2021 09:34:46 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-cREQ0Oc6N5e24nN1szuCLw-1; Thu, 19 Aug 2021 12:34:44 -0400 Received: by mail-wr1-f71.google.com with SMTP id m2-20020a0560000082b0290154f6e2e51fso1877148wrx.12 for ; Thu, 19 Aug 2021 09:34:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id b20sm3035140wmj.48.2021.08.19.09.34.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 09:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629390885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UUbBguyXCVYJjhJZ+w9myvvn9hfolADVgWzdBMV8UY0=; b=KWNfi7kioYTuFjci9olhb9aLIm7ytT2zkS9mhWXBmM3kaqIey7T1sjem5H7HHizwkL7qsi 4brTMFTzcteDfJhFVIDy+Nbwt0FzqwYmptcIS2dC8WZrtNrEhV3tISWgLrQGINe9OlP7Uh TVwvCzDY5dO8cCS1jVXm5/2ICRkpNL4= X-MC-Unique: cREQ0Oc6N5e24nN1szuCLw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UUbBguyXCVYJjhJZ+w9myvvn9hfolADVgWzdBMV8UY0=; b=X6tpTIjsxHXCLoiOBT6QWAajJIjHFcLYpGsNY3+JdGXROyXTQXQkVplWfczGM4ON/l 2wgBNWufFaWzhktzLT3dQAZ0ocPCWERg+rHMOehKsjzhsdNnMqnHwyyvFHLfVP6Yd8V0 7vfMQ+Yi7pizhvg98maRs8fagSDvWmoDdxKEiGgqEI/Lzvp6QbqXooUdt2FEjvr45lV2 O5hc+RBUV6IS57GWncCdLnm9katkl03vIO7U25dajf0oYNmJFgD2KewXSek44FIEE3VF kTR8PAOA+MfBXhIE42tKmHO1Jdru1ZzYmKq/31L0uWHnDnMHXZPut77kSETqBZHpBapG FEog== X-Gm-Message-State: AOAM532zT0hQaO2/WbQhKFi/UntyFctx/XGJpejwGPN/M2djm1cluwbI OfPxN0CyddJYoFMHuwKgwefTnHUqIrvqnmeUg6LxQr5Pr1rhmt2KAFcYJ/4f82Y5d33NMSJjMn0 VWDK52zR9euu1SQ== X-Received: by 2002:a5d:610d:: with SMTP id v13mr4999044wrt.199.1629390882948; Thu, 19 Aug 2021 09:34:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwmaEtnCEXhfyBtiG7sklsRZFxJHkJPBiuZL3RTfmR91Y7klbwLTOR6Lg0tS+Od/Q+PGWTGyg== X-Received: by 2002:a5d:610d:: with SMTP id v13mr4999028wrt.199.1629390882797; Thu, 19 Aug 2021 09:34:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Peter Maydell , qemu-arm@nongnu.org, Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/4] hw/dma/xlnx-zdma Always expect 'dma' link property to be set Date: Thu, 19 Aug 2021 18:34:22 +0200 Message-Id: <20210819163422.2863447-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210819163422.2863447-1-philmd@redhat.com> References: <20210819163422.2863447-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629390888475100001 Simplify by always passing a MemoryRegion property to the device. Doing so we can move the AddressSpace field to the device struct, removing need for heap allocation. Update the Xilinx ZynqMP / Versal SoC models to pass the default system memory instead of a NULL value. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- include/hw/dma/xlnx-zdma.h | 2 +- hw/arm/xlnx-versal.c | 2 ++ hw/arm/xlnx-zynqmp.c | 8 ++++++++ hw/dma/xlnx-zdma.c | 24 ++++++++++++------------ 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/include/hw/dma/xlnx-zdma.h b/include/hw/dma/xlnx-zdma.h index 6602e7ffa72..efc75217d59 100644 --- a/include/hw/dma/xlnx-zdma.h +++ b/include/hw/dma/xlnx-zdma.h @@ -56,7 +56,7 @@ struct XlnxZDMA { MemoryRegion iomem; MemTxAttrs attr; MemoryRegion *dma_mr; - AddressSpace *dma_as; + AddressSpace dma_as; qemu_irq irq_zdma_ch_imr; =20 struct { diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index fb776834f7e..d60eb4fb184 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -218,6 +218,8 @@ static void versal_create_admas(Versal *s, qemu_irq *pi= c) TYPE_XLNX_ZDMA); dev =3D DEVICE(&s->lpd.iou.adma[i]); object_property_set_int(OBJECT(dev), "bus-width", 128, &error_abor= t); + object_property_set_link(OBJECT(dev), "dma", + OBJECT(get_system_memory()), &error_fatal= ); sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal); =20 mr =3D sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0); diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 4344e223f2d..6cfce26210d 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -601,6 +601,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) errp)) { return; } + if (!object_property_set_link(OBJECT(&s->gdma[i]), "dma", + OBJECT(system_memory), errp)) { + return; + } if (!sysbus_realize(SYS_BUS_DEVICE(&s->gdma[i]), errp)) { return; } @@ -611,6 +615,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) } =20 for (i =3D 0; i < XLNX_ZYNQMP_NUM_ADMA_CH; i++) { + if (!object_property_set_link(OBJECT(&s->adma[i]), "dma", + OBJECT(system_memory), errp)) { + return; + } if (!sysbus_realize(SYS_BUS_DEVICE(&s->adma[i]), errp)) { return; } diff --git a/hw/dma/xlnx-zdma.c b/hw/dma/xlnx-zdma.c index fa38a556341..a5a92b4ff8c 100644 --- a/hw/dma/xlnx-zdma.c +++ b/hw/dma/xlnx-zdma.c @@ -320,9 +320,9 @@ static bool zdma_load_descriptor(XlnxZDMA *s, uint64_t = addr, return false; } =20 - descr->addr =3D address_space_ldq_le(s->dma_as, addr, s->attr, NULL); - descr->size =3D address_space_ldl_le(s->dma_as, addr + 8, s->attr, NUL= L); - descr->attr =3D address_space_ldl_le(s->dma_as, addr + 12, s->attr, NU= LL); + descr->addr =3D address_space_ldq_le(&s->dma_as, addr, s->attr, NULL); + descr->size =3D address_space_ldl_le(&s->dma_as, addr + 8, s->attr, NU= LL); + descr->attr =3D address_space_ldl_le(&s->dma_as, addr + 12, s->attr, N= ULL); return true; } =20 @@ -354,7 +354,7 @@ static void zdma_update_descr_addr(XlnxZDMA *s, bool ty= pe, } else { addr =3D zdma_get_regaddr64(s, basereg); addr +=3D sizeof(s->dsc_dst); - next =3D address_space_ldq_le(s->dma_as, addr, s->attr, NULL); + next =3D address_space_ldq_le(&s->dma_as, addr, s->attr, NULL); } =20 zdma_put_regaddr64(s, basereg, next); @@ -421,7 +421,7 @@ static void zdma_write_dst(XlnxZDMA *s, uint8_t *buf, u= int32_t len) } } =20 - address_space_write(s->dma_as, s->dsc_dst.addr, s->attr, buf, dlen= ); + address_space_write(&s->dma_as, s->dsc_dst.addr, s->attr, buf, dle= n); if (burst_type =3D=3D AXI_BURST_INCR) { s->dsc_dst.addr +=3D dlen; } @@ -497,7 +497,7 @@ static void zdma_process_descr(XlnxZDMA *s) len =3D s->cfg.bus_width / 8; } } else { - address_space_read(s->dma_as, src_addr, s->attr, s->buf, len); + address_space_read(&s->dma_as, src_addr, s->attr, s->buf, len); if (burst_type =3D=3D AXI_BURST_INCR) { src_addr +=3D len; } @@ -765,6 +765,12 @@ static void zdma_realize(DeviceState *dev, Error **err= p) XlnxZDMA *s =3D XLNX_ZDMA(dev); unsigned int i; =20 + if (!s->dma_mr) { + error_setg(errp, TYPE_XLNX_ZDMA " 'dma' link not set"); + return; + } + address_space_init(&s->dma_as, s->dma_mr, "zdma-dma"); + for (i =3D 0; i < ARRAY_SIZE(zdma_regs_info); ++i) { RegisterInfo *r =3D &s->regs_info[zdma_regs_info[i].addr / 4]; =20 @@ -777,12 +783,6 @@ static void zdma_realize(DeviceState *dev, Error **err= p) }; } =20 - if (s->dma_mr) { - s->dma_as =3D g_malloc0(sizeof(AddressSpace)); - address_space_init(s->dma_as, s->dma_mr, NULL); - } else { - s->dma_as =3D &address_space_memory; - } s->attr =3D MEMTXATTRS_UNSPECIFIED; } =20 --=20 2.31.1