From nobody Sat Apr 11 10:49:33 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F65B347FF4 for ; Tue, 3 Mar 2026 12:34:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772541290; cv=none; b=Rfh2msrEZc6WNgd37jAEyCCZPGPHiXDFKZ3KYsci6j2Q3uZcu78gS40MaGXaE49l119uVfVzIibr3z++TeWh8qa6OdF4GUa0+3Sd1tZmPKwXTRFwnYLUrRzl3YeSu6Fix7c7z5ynxsDJXYlWNYTQeoJHdCkpGDY5RYfgmsKRh8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772541290; c=relaxed/simple; bh=lrvc9MWslkCTI2B+p97908kyghT5uZlrlNqzW9O5SpY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WRlgG21lZRrk1PzpMQIc9dE/7eI94u0Ja3Y1nDr+eXhbSaE77US4LCENlHiFVweey8d17r1IKisFs/1kPEiScncYBS9Zv5eqAqVd72I73/jRvalsMB2F6LBa00dP8PcLjFIlAh1sBIcCJrXpWH2TwCZyWI+O+ciieygy4f2DhIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=eCkwmSVV; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eCkwmSVV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772541288; 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=R1UE53XZ4lch6jevT017UAHnSaeVjSTyhkHggOjem0k=; b=eCkwmSVVNJr4vIXurGH9CI3TxFlFdOnywDWNsVDHkE2KTB7MxN8kw6MdwDQokbW3VShqEL QB/LbYdOHx/Uc77NRXX47dZ8oaQ2BOWxE7+KcLLhrEJlMampGC8DhhxnFfHr0qNR/MMPoh qEi7+QgxmLqt3W7raAWNggQMZMlEl64= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-277-U_kfqHQZPh6gdPfelQmprw-1; Tue, 03 Mar 2026 07:34:45 -0500 X-MC-Unique: U_kfqHQZPh6gdPfelQmprw-1 X-Mimecast-MFC-AGG-ID: U_kfqHQZPh6gdPfelQmprw_1772541283 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 542EA1956051; Tue, 3 Mar 2026 12:34:43 +0000 (UTC) Received: from [192.168.1.153] (unknown [10.44.32.231]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 975DE30001B9; Tue, 3 Mar 2026 12:34:37 +0000 (UTC) From: Albert Esteve Date: Tue, 03 Mar 2026 13:33:48 +0100 Subject: [PATCH v2 5/6] dma: coherent: register to coherent heap Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260303-b4-dmabuf-heap-coherent-rmem-v2-5-65a4653b3378@redhat.com> References: <20260303-b4-dmabuf-heap-coherent-rmem-v2-0-65a4653b3378@redhat.com> In-Reply-To: <20260303-b4-dmabuf-heap-coherent-rmem-v2-0-65a4653b3378@redhat.com> To: Sumit Semwal , Benjamin Gaignard , Brian Starkey , John Stultz , "T.J. Mercier" , =?utf-8?q?Christian_K=C3=B6nig?= , Marek Szyprowski , Robin Murphy , Rob Herring , Saravana Kannan Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, Albert Esteve , echanude@redhat.com, mripard@redhat.com X-Developer-Signature: v=1; a=ed25519-sha256; t=1772541243; l=2169; i=aesteve@redhat.com; s=20260303; h=from:subject:message-id; bh=lrvc9MWslkCTI2B+p97908kyghT5uZlrlNqzW9O5SpY=; b=jLQqlRlnj7PRlCbO13o5sKaHNOI4ilEetAb8IzQq+Dinq87XdXnqlAWW/1/+f0nHz6U9Xht/K eb4/cQpBROmA/RFPjeX810ZnIgdDeGY5Lqjt+uKXdScoH64Zwa45gpV X-Developer-Key: i=aesteve@redhat.com; a=ed25519; pk=YSFz6sOHd2L45+Fr8DIvHTi6lSIjhLZ5T+rkxspJt1s= X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Add dma_heap_coherent_register() call within reserved memory DMA setup logic for non-reusable DT nodes. Signed-off-by: Albert Esteve --- kernel/dma/coherent.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 1147497bc512c..d0d0979ffb153 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -9,6 +9,7 @@ #include #include #include +#include =20 struct dma_coherent_mem { void *virt_base; @@ -334,6 +335,31 @@ static phys_addr_t dma_reserved_default_memory_base __= initdata; static phys_addr_t dma_reserved_default_memory_size __initdata; #endif =20 +#define MAX_COHERENT_REGIONS 64 + +static struct reserved_mem *rmem_coherent_areas[MAX_COHERENT_REGIONS]; +static unsigned int rmem_coherent_areas_num; + +static int rmem_coherent_insert_area(struct reserved_mem *rmem) +{ + if (rmem_coherent_areas_num >=3D MAX_COHERENT_REGIONS) { + pr_warn("Deferred heap areas list full, dropping %s\n", + rmem->name ? rmem->name : "unknown"); + return -EINVAL; + } + rmem_coherent_areas[rmem_coherent_areas_num++] =3D rmem; + return 0; +} + +struct reserved_mem *dma_coherent_get_reserved_region(unsigned int idx) +{ + if (idx >=3D rmem_coherent_areas_num) + return NULL; + + return rmem_coherent_areas[idx]; +} +EXPORT_SYMBOL_GPL(dma_coherent_get_reserved_region); + static int rmem_dma_device_init(struct reserved_mem *rmem, struct device *= dev) { struct dma_coherent_mem *mem =3D rmem->priv; @@ -393,6 +419,14 @@ static int __init rmem_dma_setup(struct reserved_mem *= rmem) rmem->ops =3D &rmem_dma_ops; pr_info("Reserved memory: created DMA memory pool at %pa, size %ld MiB\n", &rmem->base, (unsigned long)rmem->size / SZ_1M); + + if (IS_ENABLED(CONFIG_DMABUF_HEAPS_COHERENT)) { + int ret =3D rmem_coherent_insert_area(rmem); + + if (ret) + pr_warn("Reserved memory: failed to store coherent area for %s (%d)\n", + rmem->name ? rmem->name : "unknown", ret); + } return 0; } =20 --=20 2.52.0