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 F060A33B6FC; Thu, 28 May 2026 20:39:26 +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=1780000767; cv=none; b=SeKOorxCywwXQzlSbN5kJpdNfH4kc6bI3vCpnRb4NB/Uv8Qrlc+cyN2TI0WpuoOV/48ejdt3K2oadOSZ0r0XTM6xyqx9aWY7hvSCMUKJDz5y7yhMdGtitKCr86niM6fhK6AcQ9Gq7mKT7s/Kp07NVSxyEMbkeKQs/zLIuNC+YjU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780000767; c=relaxed/simple; bh=ZpV4AJEFFJ9PjlXEsd77UlAE7wt3JoH7yTlqnn12gNU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yr5CFfVKu9KM0LC3L00/6Qnj91kiVnjrNqOz0wTuJGyZO2ICIAbthlBw20BlBOs5wGPoZkNM9DqnG0zEyyNQBytketRIYIV8l1j3tkcqjmv+bAM3UPj7NP7jXqCGUt4Sh6273Mw8h224RySBM6IHInxgchDXNesrU/JbmnhU/oc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=X/0AnEL/; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="X/0AnEL/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A0161F00A3A; Thu, 28 May 2026 20:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780000766; bh=XHZY6Djb9swetTbAdxQNhzMOL6ol16cyuftgCJghoeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=X/0AnEL/9QuOLIcsfLJGaFWopEQbAerbWzAL3+zCIHdgDq1wklXj0RZsmbX90CGZV fy8M4tVomAHQcsm5s8Oz3tZ+mKP2wYLQHyxr0zaQiCEYvcYPU61gDji7B1fDxyqcFz rsPVc/wzkKdjxgCJy62C+URCg9rOeVL4rT19dxCY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sebastian Ene , Sudeep Holla , Sasha Levin Subject: [PATCH 6.12 160/272] firmware: arm_ffa: Align RxTx buffer size before mapping Date: Thu, 28 May 2026 21:48:54 +0200 Message-ID: <20260528194633.825086635@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194629.379955525@linuxfoundation.org> References: <20260528194629.379955525@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sudeep Holla [ Upstream commit 0399e3f872ca3d78044bb715a73ea645806d2c7b ] Commit 83210251fd70 ("firmware: arm_ffa: Use the correct buffer size during RXTX_MAP") advertises PAGE_ALIGN(rxtx_bufsz) to firmware when mapping the buffers but the driver continues to stores the minimum FF-A buffer size in drv_info->rxtx_bufsz which is used elsewhere in the driver. Align the size before storing it so that the allocation, validation and FFA_RXTX_MAP all use the same buffer size. Fixes: 83210251fd70 ("firmware: arm_ffa: Use the correct buffer size during RXTX_MAP") Cc: Sebastian Ene Link: https://sashiko.dev/#/patchset/20260402113939.930221-1-sebastianene@google.com Reviewed-by: Sebastian Ene Link: https://patch.msgid.link/20260428-ffa_fixes-v2-9-8595ae450034@kernel.org Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_ffa/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 521007bfa35a4..f35c3a56326c7 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -1929,6 +1929,7 @@ static int __init ffa_init(void) rxtx_bufsz = SZ_4K; } + rxtx_bufsz = PAGE_ALIGN(rxtx_bufsz); drv_info->rxtx_bufsz = rxtx_bufsz; drv_info->rx_buffer = alloc_pages_exact(rxtx_bufsz, GFP_KERNEL); if (!drv_info->rx_buffer) { @@ -1944,7 +1945,7 @@ static int __init ffa_init(void) ret = ffa_rxtx_map(virt_to_phys(drv_info->tx_buffer), virt_to_phys(drv_info->rx_buffer), - PAGE_ALIGN(rxtx_bufsz) / FFA_PAGE_SIZE); + rxtx_bufsz / FFA_PAGE_SIZE); if (ret) { pr_err("failed to register FFA RxTx buffers\n"); goto free_pages; -- 2.53.0