From: Shraddha Barke <shraddha.6596@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Dan Carpenter <dan.carpenter@oracle.com>,
Joe Perches <joe@perches.com>,
linux-kernel@vger.kernel.org
Cc: Peter Senna Tschudin <peter.senna@gmail.com>,
Julia Lawall <julia.lawall@lip6.fr>,
Shraddha Barke <shraddha.6596@gmail.com>
Subject: [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
Date: Sat, 23 Jan 2016 01:21:32 +0530 [thread overview]
Message-ID: <1453492292-17279-1-git-send-email-shraddha.6596@gmail.com> (raw)
Function setup_access_params_addr is called only from probe function, hence
managed version dmam_alloc_coherent is used.
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>
---
drivers/platform/goldfish/goldfish_pipe.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index e7a29e2..fb982ac 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,19 @@ 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);
- if (!aps)
- return -1;
+ aps = dmam_alloc_coherent(&pdev->dev, sizeof(struct access_params),
+ &dma_handle, GFP_KERNEL);
+ if (!aps) {
+ dev_err(&pdev->dev, "allocate buffer failed\n");
+ 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((u32)((u64)dma_handle >> 32), dev->base +
+ PIPE_REG_PARAMS_ADDR_HIGH);
+ writel((u32)dma_handle, dev->base + PIPE_REG_PARAMS_ADDR_LOW);
if (valid_batchbuffer_addr(dev, aps)) {
dev->aps = aps;
--
2.1.4
next reply other threads:[~2016-01-22 19:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 19:51 Shraddha Barke [this message]
2016-01-22 19:58 ` [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version Joe Perches
2016-02-06 5:06 Shraddha Barke
2016-02-08 5:27 ` Greg Kroah-Hartman
2016-02-12 7:23 Shraddha Barke
2016-02-12 10:17 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453492292-17279-1-git-send-email-shraddha.6596@gmail.com \
--to=shraddha.6596@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=julia.lawall@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.senna@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).