[v3] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
diff mbox series

Message ID 1453497085-23818-1-git-send-email-shraddha.6596@gmail.com
State New, archived
Headers show
Series
  • [v3] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
Related show

Commit Message

Shraddha Barke Jan. 22, 2016, 9:11 p.m. UTC
setup_access_params_addr has 2 goals-

-Initialize the access_params field so that it can be used to send and read
commands from the device in access_with_param
-Get a bus address for the allocated memory to transfer to the device.

Replace the combination of devm_kzalloc and _pa() with dmam_alloc_coherent.
Coherent mapping guarantees that the device and CPU are in sync.

Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
---
Changes in v3-
 Both writel in the same style
Changes in v2-
 Updated commit message, use upper_32_bits and lower_32_bits

 drivers/platform/goldfish/goldfish_pipe.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Greg Kroah-Hartman Jan. 29, 2016, 7:57 a.m. UTC | #1
On Sat, Jan 23, 2016 at 02:41:25AM +0530, Shraddha Barke wrote:
> setup_access_params_addr has 2 goals-
> 
> -Initialize the access_params field so that it can be used to send and read
> commands from the device in access_with_param
> -Get a bus address for the allocated memory to transfer to the device.
> 
> Replace the combination of devm_kzalloc and _pa() with dmam_alloc_coherent.
> Coherent mapping guarantees that the device and CPU are in sync.
> 
> Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
> ---
> Changes in v3-
>  Both writel in the same style
> Changes in v2-
>  Updated commit message, use upper_32_bits and lower_32_bits
> 
>  drivers/platform/goldfish/goldfish_pipe.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)

Due to some other changes to this file, this doesn't apply to my
char-misc-testing tree.  Can you refresh it based on that and resend?

thanks,

greg k-h

Patch
diff mbox series

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index e7a29e2..9f6734c 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -57,6 +57,7 @@ 
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/goldfish.h>
+#include <linux/dma-mapping.h>
 
 /*
  * IMPORTANT: The following constants must match the ones used and defined
@@ -217,17 +218,16 @@  static int valid_batchbuffer_addr(struct goldfish_pipe_dev *dev,
 static int setup_access_params_addr(struct platform_device *pdev,
 					struct goldfish_pipe_dev *dev)
 {
-	u64 paddr;
+	dma_addr_t dma_handle;
 	struct access_params *aps;
 
-	aps = devm_kzalloc(&pdev->dev, sizeof(struct access_params), GFP_KERNEL);
+	aps = dmam_alloc_coherent(&pdev->dev, sizeof(struct access_params),
+				  &dma_handle, GFP_KERNEL);
 	if (!aps)
-		return -1;
+		return -ENOMEM;
 
-	/* FIXME */
-	paddr = __pa(aps);
-	writel((u32)(paddr >> 32), dev->base + PIPE_REG_PARAMS_ADDR_HIGH);
-	writel((u32)paddr, dev->base + PIPE_REG_PARAMS_ADDR_LOW);
+	writel(upper_32_bits(dma_handle), dev->base + PIPE_REG_PARAMS_ADDR_HIGH);
+	writel(lower_32_bits(dma_handle), dev->base + PIPE_REG_PARAMS_ADDR_LOW);
 
 	if (valid_batchbuffer_addr(dev, aps)) {
 		dev->aps = aps;