From nobody Sat Oct 11 12:08:52 2025 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 2919629DB8E for ; Tue, 10 Jun 2025 13:13:04 +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=1749561186; cv=none; b=EV2ea2a6MSWDYAEdASi1qgQPm0rm90ejJagkaGoYMKru0VJlrMgcJbQt4u6IUkc6siiLB1YXbNb84+RkY4BM1iUU7dEu8qGSM30Ru+aNZOT08e2oKh5FMg1hWEJcMU10Do3D+26VL5FhEdeTphGPV8RiX5dwTw1+NJiylGUZYys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749561186; c=relaxed/simple; bh=NfGd8wiVsnIGlkddAY6txj9tOa78YL4VYJnBGkbEwwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QNcXN2A4hPjmiDZ3pNwoIPj5LndrF5lnxsaLcBl9Om9RdzSvw9MReeNpsSn2k7lvpSnxEOykSNPH6RInXtPKkjeY/iRDR41c5vHy/g4HKEbUNUZ6kUOEc2xylw8UZPJFNE2ZWV7zJ3cTX+pCAisDU7MsueeXvcmmclNexx+M/6o= 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=enXCOOsl; 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="enXCOOsl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749561184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PECxVyikQ9zU3hJ7MtiQUOf3zC4eClOuuMti35ulFIo=; b=enXCOOsleK4wf8WVCNU2SD7VmQ57CFvZpO7g2Pgs0NA288oBw+HhL8IIpCYjrKsrTkLYk4 npVGPVYgfOiq6XLVD99W1frwgbdSAz7O6TsitC5vz+TDMTSHrIpHTAVWzeUTHMCBqeyKik p6fU3/9MhikskvGf0Yx0FcrFGN8KKgI= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-R1eNUcJDN8WdvjmNEvZkYA-1; Tue, 10 Jun 2025 09:12:49 -0400 X-MC-Unique: R1eNUcJDN8WdvjmNEvZkYA-1 X-Mimecast-MFC-AGG-ID: R1eNUcJDN8WdvjmNEvZkYA_1749561168 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c5d608e6f5so1365665585a.0 for ; Tue, 10 Jun 2025 06:12:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749561168; x=1750165968; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PECxVyikQ9zU3hJ7MtiQUOf3zC4eClOuuMti35ulFIo=; b=WFIgk54JciPveIzSRAuCSf3c6/w5xkf3/Q5AwxQi+q8R98/SUDjvn+ITskUqxD6gwb Ywi6Ep94NwdKhJ/ZSCpiNF2UzIqeW5/VzUqRZTj8Lwgn8Ug2LGZM+AQIDV4g5a18syGN tLC7CF/XhmDiWPtkdt4oxXCHNeqQp9LhkiuzETxwwUw5SQWJg2N29pPBE/x5l/cKb/tJ XczqNrdyJgomM9wDvtl10P0EZcLZotemexm4V0ZQoZWpOXtQ2Ujaoyl4HNGyxh+HoVz4 D1FQcukuM4xpER21rOOhOhPJ/k8fbIAO6QSSs+jLvMPQG2B2R4onWLPmyWsfUBJxQrtG 33bw== X-Forwarded-Encrypted: i=1; AJvYcCXChCGwLF8NnWVAwF8h7pK140wXwOkjuNfeKS+bvM2wWSiwYcag1VZf8HoHBf67zoSAJoS38rrfKEM23wE=@vger.kernel.org X-Gm-Message-State: AOJu0YxSTjT0tES1vd5LOP9+JGgNIY67wvZ//tzNUdZhFQhFS4BAhOy+ PVYmcQMB72fABNQdsMhFZ1qZED3oQkGESfdBAG7704mTi7yGjCx+zW5cEiWGqoD1p6HowKQ0Dg/ ZBNRGaAJYW/G2RCyBCK8pCFiPwbWpmaYMZ9t/QWD+c0GpEguVEESOij3vPvZfOAoOlQ== X-Gm-Gg: ASbGncuR9/KH0wWuUdJih/7qVA8aWFloqze+/KxYLOF8uNZLvY9n/Rb+VtNj0rVfEjO BLHLJ82iDHRw2g0jlJs1IIHpODnsNV4Es8v/gIxexZxtSqHOiVRtRFqeqU8AVPzw60OMoM/3uKi lC+05LgMJRBrjWDZK3O0tNWy1vnW2KBOeBj9BDdIL5IKL2sqpzr7kXTkX/C8Z+/dPg+az2YCOeX aYQ8gtxpI8uFgvDcpm8lewUp8qgs9cW+xpFtB6PznSaUxn0HxLXfx6SyOeUC0nDVsxKfwEG1DbY 6m+u0eJRwLNrlj6461CeBIajoxoo+gHYTGw3/uF0ljNZtz8kY30QyQ== X-Received: by 2002:a05:620a:454b:b0:7cc:fef2:51b9 with SMTP id af79cd13be357-7d2298ec18fmr2737089985a.52.1749561167972; Tue, 10 Jun 2025 06:12:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG5bCzCA/Bb8gTxULZZifA/R0afXX8wGKlcmbzwfFYe6YdDUcmddGY0FzDv8nfqETa2Ner9Hg== X-Received: by 2002:a05:620a:454b:b0:7cc:fef2:51b9 with SMTP id af79cd13be357-7d2298ec18fmr2737085985a.52.1749561167617; Tue, 10 Jun 2025 06:12:47 -0700 (PDT) Received: from jkangas-thinkpadp1gen3.rmtuswa.csb ([2601:1c2:4301:5e20:98fe:4ecb:4f14:576b]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d25170615bsm696832285a.9.2025.06.10.06.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 06:12:47 -0700 (PDT) From: Jared Kangas To: sumit.semwal@linaro.org, benjamin.gaignard@collabora.com, Brian.Starkey@arm.com, jstultz@google.com, tjmercier@google.com, christian.koenig@amd.com Cc: mripard@kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, Jared Kangas Subject: [PATCH v4 1/3] Documentation: dma-buf: heaps: Fix code markup Date: Tue, 10 Jun 2025 06:12:29 -0700 Message-ID: <20250610131231.1724627-2-jkangas@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610131231.1724627-1-jkangas@redhat.com> References: <20250610131231.1724627-1-jkangas@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Code snippets should be wrapped in double backticks to follow reStructuredText semantics; the use of single backticks uses the :title-reference: role by default, which isn't quite what we want. Add double backticks to code snippets to fix this. Reviewed-by: Maxime Ripard Signed-off-by: Jared Kangas --- Documentation/userspace-api/dma-buf-heaps.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/userspace-api/dma-buf-heaps.rst b/Documentation/= userspace-api/dma-buf-heaps.rst index 535f49047ce64..23bd0bd7b0654 100644 --- a/Documentation/userspace-api/dma-buf-heaps.rst +++ b/Documentation/userspace-api/dma-buf-heaps.rst @@ -19,7 +19,7 @@ following heaps: - The ``cma`` heap allocates physically contiguous, cacheable, buffers. Only present if a CMA region is present. Such a region is usually created either through the kernel commandline through the - `cma` parameter, a memory region Device-Tree node with the - `linux,cma-default` property set, or through the `CMA_SIZE_MBYTES` or - `CMA_SIZE_PERCENTAGE` Kconfig options. Depending on the platform, it + ``cma`` parameter, a memory region Device-Tree node with the + ``linux,cma-default`` property set, or through the ``CMA_SIZE_MBYTES`` = or + ``CMA_SIZE_PERCENTAGE`` Kconfig options. Depending on the platform, it might be called ``reserved``, ``linux,cma``, or ``default-pool``. --=20 2.49.0 From nobody Sat Oct 11 12:08:52 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 D974D29B216 for ; Tue, 10 Jun 2025 13:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749561174; cv=none; b=Hfu0jpYyalM8PN6EVsmfUlUlCfXeQ23wJqw/LoPA060by/SpXawOM6Y6b8ZSQLMwwzuwd1C/U7QdktOlCW1ya5eB02KbSWjx/yAwPIEn5YRXhNkdiOBim9Zdky0uLCV6vWDxGvavbLCUO91YoVxSdwR5catAb+tuUsH74NHKd5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749561174; c=relaxed/simple; bh=g2hxjQIwU4XI9nVj4pbjHKw5DlPbghUsMwq8TZIMC2o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aB5UNYiUkceGglTkjVIZEOj5Ugjsmx3dKx6QfEmaB9ggZ6fhVKSePvBIlQJpp06SVdZHtYDiumk3gYipsc958ajGGndr0PtKqez1iUPL5K6R/6DfWk8IiBXynCdoh4FrKWbXAafX5n3a7ZoxsXI8/E642043o96JJkR/xdgf4GQ= 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=V+vb77v1; arc=none smtp.client-ip=170.10.133.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="V+vb77v1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749561171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lW5Zu8Mwjs06+WvYwa96tsCt+Qd1PG+1Iig01KCwGYs=; b=V+vb77v1jTNqX16G1DrF9vimeLrUIEqoTNCVAr8cCoa1YBWo5ccDgP73CjaHpbjG9Q+/Xy ZjTABgEUnI5+1YCnjff0Ac1B47y5Qm9S83xlzbr9Ht4m/yMK0hxybix3UHWPY7uGsAkOAn XB1ocxd0VzFXuSrEEQS73Wufpjl3Va8= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-QbN4M5OvMH2kfiW8pKjBfg-1; Tue, 10 Jun 2025 09:12:50 -0400 X-MC-Unique: QbN4M5OvMH2kfiW8pKjBfg-1 X-Mimecast-MFC-AGG-ID: QbN4M5OvMH2kfiW8pKjBfg_1749561170 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6facb96d553so90985056d6.0 for ; Tue, 10 Jun 2025 06:12:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749561170; x=1750165970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lW5Zu8Mwjs06+WvYwa96tsCt+Qd1PG+1Iig01KCwGYs=; b=qQ2Z83YsLBBPzv9RBYVQYneVF/UixLZPjwf60ZymmN8i6efS4OCf1pQ2RmZoNYFhp2 8Nbt/82aU1bNGHuKNC+ZhHlX0th+a1VDwMDK3CZb0E1t+aOKPY7vKIR2U6DMZPKkrCDJ UZ3viIOZlx7wHiIic0o1FRL9pdcMvpX/X0LxRPJibNC3xWPcokAuEiYnGgvC1JXt9F9T /jNP8P2RoefpuUCT2sMj3xzy8S6Ve8guY4JISDk2riIII31wzFhOQw3ykz8xbqowlWW1 oxl06vT7bWbBS/xzm8Bmm/AAbzPctThJkYiaiY1/k4420ywccZctgbB023qv0o5pG3o/ gfkg== X-Forwarded-Encrypted: i=1; AJvYcCX4Jq8vPDs1lrAYKIMdEfQK5VOD5J+VDuI4EC7+XVI+P2WboH4+rMZB+XlbWfvItj66bY4YmJ2HIvLvFas=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5bxJA7RL4Fs5km8Au98RAeUpfkKCAJpzl83MjgyOcpI1Zwk4B TMzG49mDUaDEcRt5if10x+hXNmpZ/3RMR0SYiBH/LoX8SJg+MRG7n4rxiLp+QNT0kPBWGzczwMX pt5F/5sRCeWM2V9Lre1o7acLI02NuePwjmn6TIPrH6hTWLkP3fkQw3N07yk1xdm1EWA== X-Gm-Gg: ASbGncv/FBdKh91084kqtrpuFGFGXvPi5cnVyLbTAjI1oR07yTFCvpo9Pt88phld+Qz 6OXv2fNBmrdznDJxlcPoc7vsmog2xvUfD313WecZ3HSHpcQdDjOT9NzbW3EEbvCAvqwtWHtse4R pxtmjm5KmagSdPLSonBUDzsusauLK5K36lxvWhMOo3j90MnB0yWmqLL5PArlPbT+dS/n7qGChBg xkYGlYK6UhC6NQKFsDj4ysoP12uxjy4wpxuX6ToZMgn/2XGF9lHWfvavzuwTR4IQVcxsnzQDBxp 1Mbpj6bBwW/HWw5SQE383KcFOsGASyhn6wzjVz/7hwrcvBSXtqzPPQ== X-Received: by 2002:a05:6214:19e7:b0:6fb:265:a2c5 with SMTP id 6a1803df08f44-6fb23985764mr50853016d6.17.1749561170084; Tue, 10 Jun 2025 06:12:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFWpUl5UmfIgKGDaJZjXVnPslFU8IB+su1QpZ8kf5RQSpb3U7fmC4kUy6BTQuOtse6w0v5xhg== X-Received: by 2002:a05:6214:19e7:b0:6fb:265:a2c5 with SMTP id 6a1803df08f44-6fb23985764mr50852596d6.17.1749561169668; Tue, 10 Jun 2025 06:12:49 -0700 (PDT) Received: from jkangas-thinkpadp1gen3.rmtuswa.csb ([2601:1c2:4301:5e20:98fe:4ecb:4f14:576b]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d25170615bsm696832285a.9.2025.06.10.06.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 06:12:49 -0700 (PDT) From: Jared Kangas To: sumit.semwal@linaro.org, benjamin.gaignard@collabora.com, Brian.Starkey@arm.com, jstultz@google.com, tjmercier@google.com, christian.koenig@amd.com Cc: mripard@kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, Jared Kangas Subject: [PATCH v4 2/3] dma-buf: heaps: Parameterize heap name in __add_cma_heap() Date: Tue, 10 Jun 2025 06:12:30 -0700 Message-ID: <20250610131231.1724627-3-jkangas@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610131231.1724627-1-jkangas@redhat.com> References: <20250610131231.1724627-1-jkangas@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Prepare for the introduction of a fixed-name CMA heap by replacing the unused void pointer parameter in __add_cma_heap() with the heap name. Reviewed-by: Maxime Ripard Signed-off-by: Jared Kangas --- drivers/dma-buf/heaps/cma_heap.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_h= eap.c index 9512d050563a9..e998d8ccd1dc6 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -366,17 +366,17 @@ static const struct dma_heap_ops cma_heap_ops =3D { .allocate =3D cma_heap_allocate, }; =20 -static int __init __add_cma_heap(struct cma *cma, void *data) +static int __init __add_cma_heap(struct cma *cma, const char *name) { - struct cma_heap *cma_heap; struct dma_heap_export_info exp_info; + struct cma_heap *cma_heap; =20 cma_heap =3D kzalloc(sizeof(*cma_heap), GFP_KERNEL); if (!cma_heap) return -ENOMEM; cma_heap->cma =3D cma; =20 - exp_info.name =3D cma_get_name(cma); + exp_info.name =3D name; exp_info.ops =3D &cma_heap_ops; exp_info.priv =3D cma_heap; =20 @@ -394,12 +394,16 @@ static int __init __add_cma_heap(struct cma *cma, voi= d *data) static int __init add_default_cma_heap(void) { struct cma *default_cma =3D dev_get_cma_area(NULL); - int ret =3D 0; + int ret; =20 - if (default_cma) - ret =3D __add_cma_heap(default_cma, NULL); + if (!default_cma) + return 0; =20 - return ret; + ret =3D __add_cma_heap(default_cma, cma_get_name(default_cma)); + if (ret) + return ret; + + return 0; } module_init(add_default_cma_heap); MODULE_DESCRIPTION("DMA-BUF CMA Heap"); --=20 2.49.0 From nobody Sat Oct 11 12:08:52 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 5899629B8F0 for ; Tue, 10 Jun 2025 13:12:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749561177; cv=none; b=iaDj8YM1aqfIoNbCUOBaUbQLsNeBPBHev4gIo9l6ZgMdboBP6eHxbeUADLo6cCO9VItx82QD2ivNvF1Yc80Zmyu5RuOHNoDAhC4MYxKDzJE8FAff8+/BsVvC80rAUAUZB/A9XughEAIwoGmnFaLSCMKjnZ2gsjrNqvMeoifaTrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749561177; c=relaxed/simple; bh=yef15B0sGtKhMMnl4sHNnJ32U5IclmJDl8sy1R7VHnk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ODu/A3W26xllL9iwRcJd3SdHhGHb5OG4EYDf2GDfuB+2iCzCO8bnlAVeEBhEIDcGB34zL6TR26ICIw7cXPdMSCZHJPBPPW4hPuvZUPcPZwOJe0MJJzZI27+QWWBKIYvNeWkshRJSejqZ34Jk0G8mCFxNEiKAJCVafLxFK/pFXHs= 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=POL3Ugiv; arc=none smtp.client-ip=170.10.133.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="POL3Ugiv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749561174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fwNvAxSsZLHPNJHICSvYXU8WtA4BAcBKIAsdjIZgB+Y=; b=POL3UgivvKi7UjB/AUN+Nm0bctMDGgwioec0eUbs1mhaOWDd09jIBrZJwxCeGjsCskr1nB rxcKYUZLRtPUhGnGN7+tz5lsRpNJnibkvlY/RjmXmJpAuVNz3zoIPRPh2g26qRDlGld5C6 6P0ovVJmbLT3AdGyki17ADmGJO0tsjw= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-154-mG8lWV0tNEe7VBlrhGZe8A-1; Tue, 10 Jun 2025 09:12:53 -0400 X-MC-Unique: mG8lWV0tNEe7VBlrhGZe8A-1 X-Mimecast-MFC-AGG-ID: mG8lWV0tNEe7VBlrhGZe8A_1749561173 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-6fad34d3cd8so92001576d6.3 for ; Tue, 10 Jun 2025 06:12:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749561173; x=1750165973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fwNvAxSsZLHPNJHICSvYXU8WtA4BAcBKIAsdjIZgB+Y=; b=RXmI+vz5sOf0moThaWNjB/7dfNdGNftBKZf41KqrprVS1JrrJUthjSZ4tAQSmOxU8W NYgS/VAIT/VqcoDhWf9Tjq67WMJt74p4iz7A63Bdgw5timLC2I+OoQeunLiUFwm1hehf q27ytuYqhvQDl8M0c5bfJubTKCadYDJnivdBhtxAB581lVDnz+0kFjB4xeK+MFsd8RZ9 L7yEjR+r2s+2pHfcNqE3E7BRBSNFze1EpFErfW/HTsOvxs0j/nw7kIN+0ntgsRvlyhQ2 IF24QQq4+yWzZEvQCslYlJFQG7HTdJlEreS8QIZkiZV0GuDtVYBAPAFjDeFgHGaTwiI3 nKuA== X-Forwarded-Encrypted: i=1; AJvYcCWJML4Fb0iGnFWnv72Ntpj2FPAEWM+oRvoA3Ch6HGkTHrWkVUUBMYom3omYLMoumhJQsMhHu0wyV+3S3OQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzdxJnMS0qbJWaqKKdaLccEzfalakOZnkrMYPyfTyRhUiZ7UQh5 v6PFxIDncvbO1OJquf2C0IhGtJQFked2QApzLXXTFzcR7g9Yo+L4EQjSUcRBkHxw5AjCHB/9X+N W53lFlkFRMYGIoYyI+s6bHv/++YCNabBFLlC09En1rKR1dVkTLeTfUjmZeKybaBNfSA== X-Gm-Gg: ASbGncsqT0sELlWlampBquXR1qgZAaLaiAiRGxsj6FCxSOzxLjIvKjjYuRC3/NHSvk+ zcIVGE5piaxLazEkQ/TOZMgbc9T0UNlWVBmgTFlJ8iDB+VW7zcnQfYWBHgjHsr3g7S+8cYmJmtO FNVdDdG0dUdLw3vdTc21ENWBNPgYUaW+NPyFtnE47BXVg+xSYkqLWddze1jr0nqt2UyYHT7Tgd7 xfl3kN4BcRdo4iBh3g8nu1Qe1cFn8BHnEFbWBQtw4hxfYHLFFWd+WR1+OETvuKniSFHVG2A020H 5T/k1vl5blgGgGAmHFRzOdl9mjyWx5NP9v13nS7P582hXAChJa/GJw== X-Received: by 2002:a05:6214:2501:b0:6f4:c742:7a7b with SMTP id 6a1803df08f44-6fb24cc1827mr35155836d6.43.1749561172559; Tue, 10 Jun 2025 06:12:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFhwjqEuOk/V8BHIoXELyZMwDXwVFYf4ATZsDCoOS8jLuVTpHJJBi7SBGtQfW7GqBV1/L6ZsQ== X-Received: by 2002:a05:6214:2501:b0:6f4:c742:7a7b with SMTP id 6a1803df08f44-6fb24cc1827mr35155466d6.43.1749561172028; Tue, 10 Jun 2025 06:12:52 -0700 (PDT) Received: from jkangas-thinkpadp1gen3.rmtuswa.csb ([2601:1c2:4301:5e20:98fe:4ecb:4f14:576b]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d25170615bsm696832285a.9.2025.06.10.06.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 06:12:51 -0700 (PDT) From: Jared Kangas To: sumit.semwal@linaro.org, benjamin.gaignard@collabora.com, Brian.Starkey@arm.com, jstultz@google.com, tjmercier@google.com, christian.koenig@amd.com Cc: mripard@kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org, Jared Kangas Subject: [PATCH v4 3/3] dma-buf: heaps: Give default CMA heap a fixed name Date: Tue, 10 Jun 2025 06:12:31 -0700 Message-ID: <20250610131231.1724627-4-jkangas@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250610131231.1724627-1-jkangas@redhat.com> References: <20250610131231.1724627-1-jkangas@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The CMA heap's name in devtmpfs can vary depending on how the heap is defined. Its name defaults to "reserved", but if a CMA area is defined in the devicetree, the heap takes on the devicetree node's name, such as "default-pool" or "linux,cma". To simplify naming, unconditionally name it "default_cma_region", but keep a legacy node in place backed by the same underlying allocator for backwards compatibility. Reviewed-by: Maxime Ripard Signed-off-by: Jared Kangas --- Documentation/userspace-api/dma-buf-heaps.rst | 7 +++++-- drivers/dma-buf/heaps/Kconfig | 10 ++++++++++ drivers/dma-buf/heaps/cma_heap.c | 20 ++++++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Documentation/userspace-api/dma-buf-heaps.rst b/Documentation/= userspace-api/dma-buf-heaps.rst index 23bd0bd7b0654..1dfe5e7acd5a3 100644 --- a/Documentation/userspace-api/dma-buf-heaps.rst +++ b/Documentation/userspace-api/dma-buf-heaps.rst @@ -21,5 +21,8 @@ following heaps: usually created either through the kernel commandline through the ``cma`` parameter, a memory region Device-Tree node with the ``linux,cma-default`` property set, or through the ``CMA_SIZE_MBYTES`` = or - ``CMA_SIZE_PERCENTAGE`` Kconfig options. Depending on the platform, it - might be called ``reserved``, ``linux,cma``, or ``default-pool``. + ``CMA_SIZE_PERCENTAGE`` Kconfig options. The heap's name in devtmpfs is + ``default_cma_region``. For backwards compatibility, when the + ``DMABUF_HEAPS_CMA_LEGACY`` Kconfig option is set, a duplicate node is + created following legacy naming conventions; the legacy name might be + ``reserved``, ``linux,cma``, or ``default-pool``. diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig index a5eef06c42264..bb369b38b001a 100644 --- a/drivers/dma-buf/heaps/Kconfig +++ b/drivers/dma-buf/heaps/Kconfig @@ -12,3 +12,13 @@ config DMABUF_HEAPS_CMA Choose this option to enable dma-buf CMA heap. This heap is backed by the Contiguous Memory Allocator (CMA). If your system has these regions, you should say Y here. + +config DMABUF_HEAPS_CMA_LEGACY + bool "Legacy DMA-BUF CMA Heap" + default y + depends on DMABUF_HEAPS_CMA + help + Add a duplicate CMA-backed dma-buf heap with legacy naming derived + from the CMA area's devicetree node, or "reserved" if the area is not + defined in the devicetree. This uses the same underlying allocator as + CONFIG_DMABUF_HEAPS_CMA. diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_h= eap.c index e998d8ccd1dc6..0df0071119754 100644 --- a/drivers/dma-buf/heaps/cma_heap.c +++ b/drivers/dma-buf/heaps/cma_heap.c @@ -9,6 +9,9 @@ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ * Andrew F. Davis */ + +#define pr_fmt(fmt) "cma_heap: " fmt + #include #include #include @@ -22,6 +25,7 @@ #include #include =20 +#define DEFAULT_CMA_NAME "default_cma_region" =20 struct cma_heap { struct dma_heap *heap; @@ -394,15 +398,29 @@ static int __init __add_cma_heap(struct cma *cma, con= st char *name) static int __init add_default_cma_heap(void) { struct cma *default_cma =3D dev_get_cma_area(NULL); + const char *legacy_cma_name; int ret; =20 if (!default_cma) return 0; =20 - ret =3D __add_cma_heap(default_cma, cma_get_name(default_cma)); + ret =3D __add_cma_heap(default_cma, DEFAULT_CMA_NAME); if (ret) return ret; =20 + if (IS_ENABLED(CONFIG_DMABUF_HEAPS_CMA_LEGACY)) { + legacy_cma_name =3D cma_get_name(default_cma); + if (!strcmp(legacy_cma_name, DEFAULT_CMA_NAME)) { + pr_warn("legacy name and default name are the same, skipping legacy hea= p\n"); + return 0; + } + + ret =3D __add_cma_heap(default_cma, legacy_cma_name); + if (ret) + pr_warn("failed to add legacy heap: %pe\n", + ERR_PTR(ret)); + } + return 0; } module_init(add_default_cma_heap); --=20 2.49.0