Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce7d4a0e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

firmware: qcom_scm: fix bogous abuse of dma-direct internals 



[ Upstream commit 459b1f86f1cba7de813fbc335df476c111feec22 ]

As far as the device is concerned the dma address is the physical
address.  There is no need to convert it to a physical address,
especially not using dma-direct internals that are not available
to drivers and which will interact badly with IOMMUs.  Last but not
least the commit introducing it claimed to just fix a type issue,
but actually changed behavior.

Fixes: 6e37ccf78a532 ("firmware: qcom_scm: Use proper types for dma mappings")
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20200414123136.441454-1-hch@lst.de


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 089e03e1

drivers/firmware/qcom_scm.c

+3 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/init.h>

#include <linux/cpumask.h>

#include <linux/export.h>

#include <linux/dma-direct.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>

#include <linux/types.h>
@@ -449,8 +448,7 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, 
	struct qcom_scm_mem_map_info *mem_to_map;

	phys_addr_t mem_to_map_phys;

	phys_addr_t dest_phys;

	phys_addr_t ptr_phys;

	dma_addr_t ptr_dma;

	dma_addr_t ptr_phys;

	size_t mem_to_map_sz;

	size_t dest_sz;

	size_t src_sz;
@@ -468,10 +466,9 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, 
	ptr_sz = ALIGN(src_sz, SZ_64) + ALIGN(mem_to_map_sz, SZ_64) +

			ALIGN(dest_sz, SZ_64);



	ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_dma, GFP_KERNEL);

	ptr = dma_alloc_coherent(__scm->dev, ptr_sz, &ptr_phys, GFP_KERNEL);

	if (!ptr)

		return -ENOMEM;

	ptr_phys = dma_to_phys(__scm->dev, ptr_dma);



	/* Fill source vmid detail */

	src = ptr;
@@ -501,7 +498,7 @@ int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz, 


	ret = __qcom_scm_assign_mem(__scm->dev, mem_to_map_phys, mem_to_map_sz,

				    ptr_phys, src_sz, dest_phys, dest_sz);

	dma_free_coherent(__scm->dev, ptr_sz, ptr, ptr_dma);

	dma_free_coherent(__scm->dev, ptr_sz, ptr, ptr_phys);

	if (ret) {

		dev_err(__scm->dev,

			"Assign memory protection call failed %d.\n", ret);