linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] soc: aspeed: lpc-ctrl: Fix probe error handling
@ 2019-06-20  9:17 Joel Stanley
  2019-06-21  1:56 ` Andrew Jeffery
  2019-06-21 16:56 ` Vijay Khemka
  0 siblings, 2 replies; 3+ messages in thread
From: Joel Stanley @ 2019-06-20  9:17 UTC (permalink / raw)
  To: Vijay Khemka
  Cc: Andrew Jeffery, linux-aspeed, linux-arm-kernel, Arnd Bergmann,
	linux-kernel

gcc warns that a mising "flash" phandle node leads to undefined
behavior later:

drivers/soc/aspeed/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
drivers/soc/aspeed/aspeed-lpc-ctrl.c:201:18: error: '*((void *)&resm+8)' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Only set the flash base and size if we find a phandle in the device
tree.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 drivers/soc/aspeed/aspeed-lpc-ctrl.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
index aca13779764a..eee26c2d8b52 100644
--- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
@@ -223,10 +223,11 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
 			dev_err(dev, "Couldn't address to resource for flash\n");
 			return rc;
 		}
+
+		lpc_ctrl->pnor_size = resource_size(&resm);
+		lpc_ctrl->pnor_base = resm.start;
 	}
 
-	lpc_ctrl->pnor_size = resource_size(&resm);
-	lpc_ctrl->pnor_base = resm.start;
 
 	dev_set_drvdata(&pdev->dev, lpc_ctrl);
 
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] soc: aspeed: lpc-ctrl: Fix probe error handling
  2019-06-20  9:17 [PATCH] soc: aspeed: lpc-ctrl: Fix probe error handling Joel Stanley
@ 2019-06-21  1:56 ` Andrew Jeffery
  2019-06-21 16:56 ` Vijay Khemka
  1 sibling, 0 replies; 3+ messages in thread
From: Andrew Jeffery @ 2019-06-21  1:56 UTC (permalink / raw)
  To: Joel Stanley, Vijay Khemka
  Cc: linux-aspeed, linux-arm-kernel, Arnd Bergmann, linux-kernel



On Thu, 20 Jun 2019, at 18:47, Joel Stanley wrote:
> gcc warns that a mising "flash" phandle node leads to undefined
> behavior later:
> 
> drivers/soc/aspeed/aspeed-lpc-ctrl.c: In function 
> 'aspeed_lpc_ctrl_probe':
> drivers/soc/aspeed/aspeed-lpc-ctrl.c:201:18: error: '*((void 
> *)&resm+8)' may be used uninitialized in this function 
> [-Werror=maybe-uninitialized]
> 
> Only set the flash base and size if we find a phandle in the device
> tree.

Ugh, yeah. Not sure how I missed that. Thanks for fixing it.

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

> 
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> ---
>  drivers/soc/aspeed/aspeed-lpc-ctrl.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c 
> b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
> index aca13779764a..eee26c2d8b52 100644
> --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
> +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
> @@ -223,10 +223,11 @@ static int aspeed_lpc_ctrl_probe(struct 
> platform_device *pdev)
>  			dev_err(dev, "Couldn't address to resource for flash\n");
>  			return rc;
>  		}
> +
> +		lpc_ctrl->pnor_size = resource_size(&resm);
> +		lpc_ctrl->pnor_base = resm.start;
>  	}
>  
> -	lpc_ctrl->pnor_size = resource_size(&resm);
> -	lpc_ctrl->pnor_base = resm.start;
>  
>  	dev_set_drvdata(&pdev->dev, lpc_ctrl);
>  
> -- 
> 2.20.1
> 
>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] soc: aspeed: lpc-ctrl: Fix probe error handling
  2019-06-20  9:17 [PATCH] soc: aspeed: lpc-ctrl: Fix probe error handling Joel Stanley
  2019-06-21  1:56 ` Andrew Jeffery
@ 2019-06-21 16:56 ` Vijay Khemka
  1 sibling, 0 replies; 3+ messages in thread
From: Vijay Khemka @ 2019-06-21 16:56 UTC (permalink / raw)
  To: Joel Stanley
  Cc: Andrew Jeffery, linux-aspeed, linux-arm-kernel, Arnd Bergmann,
	linux-kernel



On 6/20/19, 2:17 AM, "joel.stan@gmail.com on behalf of Joel Stanley" <joel.stan@gmail.com on behalf of joel@jms.id.au> wrote:

    gcc warns that a mising "flash" phandle node leads to undefined
    behavior later:
    
    drivers/soc/aspeed/aspeed-lpc-ctrl.c: In function 'aspeed_lpc_ctrl_probe':
    drivers/soc/aspeed/aspeed-lpc-ctrl.c:201:18: error: '*((void *)&resm+8)' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    
    Only set the flash base and size if we find a phandle in the device
    tree.
    
Thanks for fixing this.
Reviewed-by: Vijay Khemka <vijaykhemka@fb.com>

    Reported-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Joel Stanley <joel@jms.id.au>
    ---
     drivers/soc/aspeed/aspeed-lpc-ctrl.c | 5 +++--
     1 file changed, 3 insertions(+), 2 deletions(-)
    
    diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
    index aca13779764a..eee26c2d8b52 100644
    --- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
    +++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
    @@ -223,10 +223,11 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev)
     			dev_err(dev, "Couldn't address to resource for flash\n");
     			return rc;
     		}
    +
    +		lpc_ctrl->pnor_size = resource_size(&resm);
    +		lpc_ctrl->pnor_base = resm.start;
     	}
     
    -	lpc_ctrl->pnor_size = resource_size(&resm);
    -	lpc_ctrl->pnor_base = resm.start;
     
     	dev_set_drvdata(&pdev->dev, lpc_ctrl);
     
    -- 
    2.20.1
    
    

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-21 16:57 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-20  9:17 [PATCH] soc: aspeed: lpc-ctrl: Fix probe error handling Joel Stanley
2019-06-21  1:56 ` Andrew Jeffery
2019-06-21 16:56 ` Vijay Khemka

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).