From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 457C551A14F; Tue, 22 Sep 2026 23:31:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790119874; cv=none; b=ur9Xz2SKrS96OWLexMKnKRXnp05z1c+7PJCYTukfJDJ6LHjWA9NPhsFjPGajm+jcyQs/F2GiiN7CyS2Rqpq/dJ2vlddz1/KB88gEvLVBwZQBnexVsPLbIxH6r1ts4+OaACDLCTR1ISyeR5iauQvJwwtifGaMirN5lo+H2swyhso= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790119874; c=relaxed/simple; bh=wW9xsK+mkk3yYb/vOCBZqRfQ66BYTbOzcN2uDu2m5BU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I+YcXEuX9NhYFksTjtE9WI0tV5J2jOJD6Mko1wb1yCbtMNU1S3BLd80TVhc+IxhFD2S2qZrzo0tm4N1webo23jpUhO/b4qfzIzxptNBjf9SsZ0hErDuqjpgZQpJKvepM10A70FUsOxvKNbwoLHPtymPc5e+i3Z4Z1K6xgaqQWYk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HbHG4NPG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HbHG4NPG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CE5E1F000FF; Tue, 22 Sep 2026 23:31:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790119872; bh=svG6WTXKn5F5IhHvbiOKwJXRrOM/Mfcb9jfVBDvDRCg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=HbHG4NPGGqewTUcY0iptE3zim90yknZmnf5TZDCG1FglCkdNWuGV4+T2xpFieSitz qN6l5XJulVvkP6lTbyYh91i6b98r5h4d2xOL2ZTvoQ33dm6Ky4Ld9nrx/88O78iIy7 V+kjmo/TOXOYxO4K/5gNYWuxWIkm7pFM5UoDKLVlapJwa06y2AJ4PxSyc5n/XzqYXs lPFk8+e0zp1z+iFywhnKbAYfxbgASeoRkgzL5d84OxcfbshoiWPbCVURjZF0E1UOhS iPsUK0yiv5zVRST4BppXXO+7nsMRG9/psWM6bQyr+SGqqdHCWqd93Qstf5lJuMSIJh 1jetxfpLJei3g== From: Linus Walleij Date: Wed, 23 Sep 2026 01:30:57 +0200 Subject: [PATCH v5 12/23] dmaengine: ste_dma40: Fix LCLA allocation order Precedence: bulk X-Mailing-List: phone-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260923-dma40-fixes-v5-12-709d160cde76@kernel.org> References: <20260923-dma40-fixes-v5-0-709d160cde76@kernel.org> In-Reply-To: <20260923-dma40-fixes-v5-0-709d160cde76@kernel.org> To: Vinod Koul , Frank Li Cc: dmaengine@vger.kernel.org, phone-devel@vger.kernel.org, Linus Walleij , sashiko-bot@kernel.org X-Mailer: b4 0.14.3 d40_lcla_allocate() calculates the number of pages needed for LCLA, but passes that raw page count as the allocation order to __get_free_pages(). The same value is later passed to free_pages(). Store the allocation order with get_order() instead, and use a separate byte size for allocation diagnostics, fallback kmalloc() sizing and DMA mapping. Fixes: 508849ade23c ("DMAENGINE: ste_dma40: allocate LCLA dynamically") Reported-by: sashiko-bot@kernel.org Closes: https://lore.kernel.org/dmaengine/20260819225114.AE1511F000E9@smtp.kernel.org/ Assisted-by: LLM Signed-off-by: Linus Walleij --- drivers/dma/ste_dma40.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 3f5b25933ff5..11b451feb9ff 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -426,8 +426,8 @@ struct d40_desc { * @dma_addr: DMA address, if mapped * @base_unaligned: The original kmalloc pointer, if kmalloc is used. * This pointer is only there for clean-up on error. - * @pages: The number of pages needed for all physical channels. - * Only used later for clean-up on error + * @alloc_order: Order used for the LCLA page allocation. + * Only used later for clean-up on error. * @lock: Lock to protect the content in this struct. * @alloc_map: big map over which LCLA entry is own by which job. */ @@ -435,7 +435,7 @@ struct d40_lcla_pool { void *base; dma_addr_t dma_addr; void *base_unaligned; - int pages; + unsigned int alloc_order; spinlock_t lock; struct d40_desc **alloc_map; }; @@ -3611,6 +3611,7 @@ static void __init d40_hw_init(struct d40_base *base) static int __init d40_lcla_allocate(struct d40_base *base) { struct d40_lcla_pool *pool = &base->lcla_pool; + size_t lcla_size = SZ_1K * base->num_phy_chans; unsigned long *page_list; int i, j; int ret; @@ -3626,20 +3627,20 @@ static int __init d40_lcla_allocate(struct d40_base *base) if (!page_list) return -ENOMEM; - /* Calculating how many pages that are required */ - base->lcla_pool.pages = SZ_1K * base->num_phy_chans / PAGE_SIZE; + base->lcla_pool.alloc_order = get_order(lcla_size); for (i = 0; i < MAX_LCLA_ALLOC_ATTEMPTS; i++) { page_list[i] = __get_free_pages(GFP_KERNEL, - base->lcla_pool.pages); + base->lcla_pool.alloc_order); if (!page_list[i]) { - d40_err(base->dev, "Failed to allocate %d pages.\n", - base->lcla_pool.pages); + d40_err(base->dev, "Failed to allocate %zu bytes.\n", + lcla_size); ret = -ENOMEM; for (j = 0; j < i; j++) - free_pages(page_list[j], base->lcla_pool.pages); + free_pages(page_list[j], + base->lcla_pool.alloc_order); goto free_page_list; } @@ -3649,7 +3650,7 @@ static int __init d40_lcla_allocate(struct d40_base *base) } for (j = 0; j < i; j++) - free_pages(page_list[j], base->lcla_pool.pages); + free_pages(page_list[j], base->lcla_pool.alloc_order); if (i < MAX_LCLA_ALLOC_ATTEMPTS) { base->lcla_pool.base = (void *)page_list[i]; @@ -3659,10 +3660,9 @@ static int __init d40_lcla_allocate(struct d40_base *base) * alignment, try with allocating a big buffer. */ dev_warn(base->dev, - "[%s] Failed to get %d pages @ 18 bit align.\n", - __func__, base->lcla_pool.pages); - base->lcla_pool.base_unaligned = kmalloc(SZ_1K * - base->num_phy_chans + + "[%s] Failed to get %zu bytes @ 18 bit align.\n", + __func__, lcla_size); + base->lcla_pool.base_unaligned = kmalloc(lcla_size + LCLA_ALIGNMENT, GFP_KERNEL); if (!base->lcla_pool.base_unaligned) { @@ -3674,8 +3674,7 @@ static int __init d40_lcla_allocate(struct d40_base *base) LCLA_ALIGNMENT); } - pool->dma_addr = dma_map_single(base->dev, pool->base, - SZ_1K * base->num_phy_chans, + pool->dma_addr = dma_map_single(base->dev, pool->base, lcla_size, DMA_TO_DEVICE); if (dma_mapping_error(base->dev, pool->dma_addr)) { pool->dma_addr = 0; @@ -3919,7 +3918,7 @@ static int __init d40_probe(struct platform_device *pdev) if (!base->lcla_pool.base_unaligned && base->lcla_pool.base) free_pages((unsigned long)base->lcla_pool.base, - base->lcla_pool.pages); + base->lcla_pool.alloc_order); kfree(base->lcla_pool.base_unaligned); -- 2.55.0