Commit 33a20cda authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'ffa-fix-7.1' of... 

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: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents f5fc003c 83210251

drivers/firmware/arm_ffa/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,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),

			   rxtx_bufsz / FFA_PAGE_SIZE);

			   PAGE_ALIGN(rxtx_bufsz) / FFA_PAGE_SIZE);

	if (ret) {

		pr_err("failed to register FFA RxTx buffers\n");

		goto free_pages;