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 64C8532E6BC; Thu, 28 May 2026 20:03:35 +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=1779998616; cv=none; b=u/KWXXANNK3aHvE6wChd2d4NC77/gqAxdJSHugKEY/6jEyeFcTTucVUwr7GzXKrOpuANGL6Joi6HhKTat3tlmNoT2/RlcCpFZupyasQmiIPImueqLtZNBqQzlMaMUeKIQ1pT6HhSkYVTre5XYPtdCHzpAQBPdkhYIx+h8SQ3ZsE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779998616; c=relaxed/simple; bh=2CJldPSN2tTXalR74mTeR8XhlSCkMF1nmp0VF1EsMOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UwMIWFLyI3NpkVpqYa5hLRLrjU/z7aRjbg0/lu+AQGDOcMqoYkjBTdlJAUN8Nlf98XD1IcWwo4D0RDJSSZ/FEPS1TFk2ceEcHf2Wc7cI5Yh8V6IWzYDQuAgLpBgqVEjFHnVg7WhodnPjwe6x1c3Wzouh8W91ogiHayNxDs7dIF8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PZxb0bXe; 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="PZxb0bXe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D38B1F000E9; Thu, 28 May 2026 20:03:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779998615; bh=j3yn1WZuLzKH0DnKvMzXs0/2mwQJUxL1E5Ol53gpqzI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PZxb0bXe6JKfVZy/kJnYkFGRFoT9+P1n5wD3L2B3JY4EbjAcJ84+wok1LX0/3IL5V unQOOrKZeL11fO5lfx8+m6BqBfuyPx7LCEnXRez4KS+Lr3e0QBHelNlYtkyyDTCce2 Yz8NH87yhdQ5uIqHluLe0ZZmEVWqg+LsgAAFOyOY= 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 7.0 200/461] firmware: arm_ffa: Align RxTx buffer size before mapping Date: Thu, 28 May 2026 21:45:29 +0200 Message-ID: <20260528194652.877314659@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194646.819809818@linuxfoundation.org> References: <20260528194646.819809818@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.0-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 ed24794986c57..001e6f40881df 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -2106,6 +2106,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) { @@ -2121,7 +2122,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