diff mbox

[dpdk-dev,1/2] bus/dpaa: fix incorrect ccsr mem allocation

Message ID 20170928141045.21762-1-shreyansh.jain@nxp.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply patch file failure

Commit Message

Shreyansh Jain Sept. 28, 2017, 2:10 p.m. UTC 
  Fixes: 5ad2d123be48 "(bus/dpaa: introducing FMan configurations)"

Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
---
 drivers/bus/dpaa/base/fman/fman.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Shreyansh Jain Sept. 28, 2017, 2:12 p.m. UTC | #1 
Hello Ferruh,

On Thursday 28 September 2017 07:40 PM, Shreyansh Jain wrote:
> Fixes: 5ad2d123be48 "(bus/dpaa: introducing FMan configurations)"
> 
> Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>
> ---
>   drivers/bus/dpaa/base/fman/fman.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
> index 2c6029e..d0a8ee4 100644
> --- a/drivers/bus/dpaa/base/fman/fman.c
> +++ b/drivers/bus/dpaa/base/fman/fman.c
> @@ -242,11 +242,11 @@ fman_if_init(const struct device_node *dpa_node)
>   	if (!phys_addr) {
>   		FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)\n",
>   			 mname, regs_addr);
> -			 __if->ccsr_map = mmap(NULL, __if->regs_size,
> -			 PROT_READ | PROT_WRITE, MAP_SHARED,
> -			 fman_ccsr_map_fd, phys_addr);
>   		goto err;
>   	}
> +	__if->ccsr_map = mmap(NULL, __if->regs_size,
> +			      PROT_READ | PROT_WRITE, MAP_SHARED,
> +			      fman_ccsr_map_fd, phys_addr);
>   	if (__if->ccsr_map == MAP_FAILED) {
>   		FMAN_ERR(-errno, "mmap(0x%"PRIx64")\n", phys_addr);
>   		goto err;
> 

While working on the v6, I missed two small changes. I have created 
patches against these and added the fixes. Can you please apply them?
(I didn't want to send a complete v7 just for these).

-
Shreyansh
Ferruh Yigit Oct. 2, 2017, 11:05 p.m. UTC | #2 
On 9/28/2017 3:10 PM, Shreyansh Jain wrote:
> Fixes: 5ad2d123be48 "(bus/dpaa: introducing FMan configurations)"
> 
> Signed-off-by: Shreyansh Jain <shreyansh.jain@nxp.com>

Series squashed into relevant commit in next-net, thanks.
diff mbox

Patch

diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index 2c6029e..d0a8ee4 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -242,11 +242,11 @@  fman_if_init(const struct device_node *dpa_node)
 	if (!phys_addr) {
 		FMAN_ERR(-EINVAL, "of_translate_address(%s, %p)\n",
 			 mname, regs_addr);
-			 __if->ccsr_map = mmap(NULL, __if->regs_size,
-			 PROT_READ | PROT_WRITE, MAP_SHARED,
-			 fman_ccsr_map_fd, phys_addr);
 		goto err;
 	}
+	__if->ccsr_map = mmap(NULL, __if->regs_size,
+			      PROT_READ | PROT_WRITE, MAP_SHARED,
+			      fman_ccsr_map_fd, phys_addr);
 	if (__if->ccsr_map == MAP_FAILED) {
 		FMAN_ERR(-errno, "mmap(0x%"PRIx64")\n", phys_addr);
 		goto err;