From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 20EFA47DD5E for ; Tue, 28 Apr 2026 18:33:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777401240; cv=none; b=BRG70Rzu1+KISRTYdsTYJjrfmYkZmTiAhQjI3ziaa7sBjRvYX/y6P3oF5u/2MEhsK0u+eC9uB810BUplOhE16oN61njKDCSFKSMQONiZNwUWGtJxBFJxpiq1VD5SxjBs8NEPdJ5CB0LdNxsNTpCSFTfm2l6IpauH/pzNRVpvk6Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777401240; c=relaxed/simple; bh=glclu19M+ae3lxxFIpyNkrMWO2EeTxJY2bLvze3ItMw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rewwJYoJyPwoVwcoMPR2us6Rtsi82srTl062wQDZECAIk02e9G9fGuPcMgD6eGOXr+WtZjRdyw/agaXBCKl3XjR74V83tNDlYG+sq1an/aHKTyrPklp+BO5dOnn+cPa53lrFwH/rQy//k/pzXyJpM0sZ5VQqnz7fyV0UaQeYLF4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lQa1Y+IX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lQa1Y+IX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE7B5C4AF09; Tue, 28 Apr 2026 18:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777401239; bh=glclu19M+ae3lxxFIpyNkrMWO2EeTxJY2bLvze3ItMw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lQa1Y+IXQW6XtGnsJPHuWIf2nBxsh/1yj3srE/jhY54PyKn0clyUnlNa2Kp+VFbfS aGoQR8m6UoiLQE6JF5EBn5N6ZG8rVsEMTsSHqyiGs4497sjVnE5uRxc7CAu96vwX4T vFNcJRrh/Ft8w1rlh+Bp5NvFnSYKbhCVEzRbClz3AbUd7JkmqN5223RuQC/orNrpim vwh8dD7m/KxwVVvEYoSn4DaRtWx4GJhcNriBVdmmNAw8X4dF5RHR6uATFYQYwUho8U XTlNq2b3hUdh5FFXF7a8tyXDePoxoEsZB/W9406igqlg9jgiHopvs3PbUgTTCTsiUJ 4um1wuvjeBKvg== From: Sudeep Holla Date: Tue, 28 Apr 2026 19:33:33 +0100 Subject: [PATCH v2 09/11] firmware: arm_ffa: Align RxTx buffer size before mapping 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: 7bit Message-Id: <20260428-ffa_fixes-v2-9-8595ae450034@kernel.org> References: <20260428-ffa_fixes-v2-0-8595ae450034@kernel.org> In-Reply-To: <20260428-ffa_fixes-v2-0-8595ae450034@kernel.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Jens Wiklander , Sudeep Holla , Sebastian Ene X-Mailer: b4 0.15.2 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 Signed-off-by: Sudeep Holla --- 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 4944aa6b815f..9181cc752ce1 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -2111,6 +2111,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) { @@ -2126,7 +2127,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.43.0