Skip to content

Commit 33a20cd

Browse files
committed
Merge tag 'ffa-fix-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into soc/drivers
Arm FF-A fix for v7.1 Use the page aligned backing allocation size when computing the RXTX_MAP page count. This fixes FF-A RX/TX buffer registration on kernels built with 16K/64K PAGE_SIZE, where alloc_pages_exact() backs the buffer with a larger aligned span than the discovered minimum buffer size. * tag 'ffa-fix-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux: firmware: arm_ffa: Use the correct buffer size during RXTX_MAP Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents f5fc003 + 8321025 commit 33a20cd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/firmware/arm_ffa/driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2078,7 +2078,7 @@ static int __init ffa_init(void)
20782078

20792079
ret = ffa_rxtx_map(virt_to_phys(drv_info->tx_buffer),
20802080
virt_to_phys(drv_info->rx_buffer),
2081-
rxtx_bufsz / FFA_PAGE_SIZE);
2081+
PAGE_ALIGN(rxtx_bufsz) / FFA_PAGE_SIZE);
20822082
if (ret) {
20832083
pr_err("failed to register FFA RxTx buffers\n");
20842084
goto free_pages;

0 commit comments

Comments
 (0)