* [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
@ 2016-01-22 19:51 Shraddha Barke
2016-01-22 19:58 ` Joe Perches
0 siblings, 1 reply; 6+ messages in thread
From: Shraddha Barke @ 2016-01-22 19:51 UTC (permalink / raw)
To: Greg Kroah-Hartman, Dan Carpenter, Joe Perches, linux-kernel
Cc: Peter Senna Tschudin, Julia Lawall, Shraddha Barke
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
2016-01-22 19:51 [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version Shraddha Barke
@ 2016-01-22 19:58 ` Joe Perches
0 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2016-01-22 19:58 UTC (permalink / raw)
To: Shraddha Barke, Greg Kroah-Hartman, Dan Carpenter, linux-kernel
Cc: Peter Senna Tschudin, Julia Lawall
On Sat, 2016-01-23 at 01:21 +0530, Shraddha Barke wrote:
> Function setup_access_params_addr is called only from probe function, hence
> managed version dmam_alloc_coherent is used.
trivia:
> diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
[]
> @@ -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");
Unnecessary error message
> + 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);
Probably better to use upper_32_bits and lower_32_bits
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
@ 2016-02-06 5:06 Shraddha Barke
2016-02-08 5:27 ` Greg Kroah-Hartman
0 siblings, 1 reply; 6+ messages in thread
From: Shraddha Barke @ 2016-02-06 5:06 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Peter Senna Tschudin, Dan Carpenter, linux-kernel, Shraddha Barke
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 | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index e7a29e2..4b0babb 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;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
2016-02-06 5:06 Shraddha Barke
@ 2016-02-08 5:27 ` Greg Kroah-Hartman
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2016-02-08 5:27 UTC (permalink / raw)
To: Shraddha Barke; +Cc: Peter Senna Tschudin, Dan Carpenter, linux-kernel
On Sat, Feb 06, 2016 at 10:36:20AM +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>
> ---
> drivers/platform/goldfish/goldfish_pipe.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
Doesn't apply to my char-misc tree anymore due to other changes in the
driver, can you rebase and resend?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
@ 2016-02-12 7:23 Shraddha Barke
2016-02-12 10:17 ` Joe Perches
0 siblings, 1 reply; 6+ messages in thread
From: Shraddha Barke @ 2016-02-12 7:23 UTC (permalink / raw)
To: Greg Kroah-Hartman, Peter Senna Tschudin, Dan Carpenter,
linux-kernel
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 | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index e7a29e2..49f877d 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,18 @@ 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(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;
--
2.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version
2016-02-12 7:23 Shraddha Barke
@ 2016-02-12 10:17 ` Joe Perches
0 siblings, 0 replies; 6+ messages in thread
From: Joe Perches @ 2016-02-12 10:17 UTC (permalink / raw)
To: Shraddha Barke, Greg Kroah-Hartman, Peter Senna Tschudin,
Dan Carpenter, linux-kernel
On Fri, 2016-02-12 at 12:53 +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.
trivia:
> diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
[]
> @@ -217,17 +218,18 @@ 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");
This is still an unnecessary allocation failure message.
There's already a generic OOM message and stack dump emitted.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-12 10:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-22 19:51 [PATCH] Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version Shraddha Barke
2016-01-22 19:58 ` Joe Perches
-- strict thread matches above, loose matches on Subject: below --
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
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).