twl4030: Add some error checking to twl4030 init

Message ID	1241611418-19730-1-git-send-email-amit.kucheria@verdurent.com (mailing list archive)
State	Accepted, archived
Commit	944f94235969c15b3012aa4dc832ed3e2f08e4da
Headers	show Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n46C3wBp027010 for <patchwork-omap@patchwork.kernel.org>; Wed, 6 May 2009 12:03:59 GMT From: Amit Kucheria <amit.kucheria@verdurent.com> To: linux-omap@vger.kernel.org Subject: [PATCH] [PATCH] twl4030: Add some error checking to twl4030 init Date: Wed, 6 May 2009 15:03:38 +0300 Message-Id: <1241611418-19730-1-git-send-email-amit.kucheria@verdurent.com> In-Reply-To: <200904231416.37219.david-b@pacbell.net> References: <200904231416.37219.david-b@pacbell.net> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk

Message ID

1241611418-19730-1-git-send-email-amit.kucheria@verdurent.com (mailing list archive)

State

Accepted, archived

Commit

944f94235969c15b3012aa4dc832ed3e2f08e4da

Headers

From: Amit Kucheria <amit.kucheria@verdurent.com>
To: linux-omap@vger.kernel.org
Subject: [PATCH] [PATCH] twl4030: Add some error checking to twl4030 init
Date: Wed,  6 May 2009 15:03:38 +0300
Message-Id: <1241611418-19730-1-git-send-email-amit.kucheria@verdurent.com>
In-Reply-To: <200904231416.37219.david-b@pacbell.net>
References: <200904231416.37219.david-b@pacbell.net>
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk

Commit Message

Amit Kucheria May 6, 2009, 12:03 p.m. UTC

Check for return values of i2c read/write operations and size of scripts being
uploaded to TWL4030

(Removed the unrelated string changes based on David Brownell's comment)

Signed-off-by: Amit Kucheria <amit.kucheria@verdurent.com>
---
 drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 14 deletions(-)

Comments

Amit Kucheria June 3, 2009, 8:49 a.m. UTC | #1

Bump..

This patch was acked by David Brownell earlier in the thread.

Regards,
Amit

On Wed, May 06, 2009 at 03:03:38PM +0300, Amit Kucheria wrote:
> Check for return values of i2c read/write operations and size of scripts being
> uploaded to TWL4030
> 
> (Removed the unrelated string changes based on David Brownell's comment)
> 
> Signed-off-by: Amit Kucheria <amit.kucheria@verdurent.com>
> ---
>  drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
>  1 files changed, 38 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 9dc493b..8f5d149 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -257,36 +257,40 @@ static int __init config_warmreset_sequence(u8 address)
>  	return err;
>  }
>  
> -void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
> +static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
>  {
>  	int rconfig_addr;
> +	int err;
>  	u8 type;
>  
>  	if (rconfig->resource > NUM_OF_RESOURCES) {
>  		printk(KERN_ERR
>  			"TWL4030 Resource %d does not exist\n",
>  			rconfig->resource);
> -		return;
> +		return -EINVAL;
>  	}
>  
>  	rconfig_addr = res_config_addrs[rconfig->resource];
>  
>  	/* Set resource group */
> -
>  	if (rconfig->devgroup >= 0)
> -		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> +		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
>  					rconfig->devgroup << 5,
>  					rconfig_addr + DEVGROUP_OFFSET);
> +	if (err < 0) {
> +		printk(KERN_ERR
> +		       "TWL4030 failed to program devgroup");
> +		return err;
> +	}
>  
>  	/* Set resource types */
> -
> -	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
> -					&type,
> -					rconfig_addr + TYPE_OFFSET) < 0) {
> +	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
> +				  rconfig_addr + TYPE_OFFSET);
> +	if (err < 0) {
>  		printk(KERN_ERR
> -			"TWL4030 Resource %d type could not read\n",
> -			rconfig->resource);
> -		return;
> +		       "TWL4030 Resource %d type could not be read\n",
> +		       rconfig->resource);
> +		return err;
>  	}
>  
>  	if (rconfig->type >= 0) {
> @@ -299,8 +303,15 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
>  		type |= rconfig->type2 << 3;
>  	}
>  
> -	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> +	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
>  				type, rconfig_addr + TYPE_OFFSET);
> +	if (err < 0) {
> +		printk(KERN_ERR
> +		       "TWL4030 failed to program resource type");
> +		return err;
> +	}
> +
> +	return 0;
>  
>  }
>  
> @@ -309,6 +320,12 @@ static int __init load_triton_script(struct twl4030_script *tscript)
>  	u8 address = triton_next_free_address;
>  	int err;
>  
> +	/* Make sure the script isn't going beyond last valid address */
> +	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
> +		printk(KERN_ERR "TWL4030 script too big error\n");
> +		return -EINVAL;
> +	}
> +
>  	err = twl4030_write_script(address, tscript->script, tscript->size);
>  	if (err)
>  		return err;
> @@ -346,15 +363,22 @@ void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
>  
>  	for (i = 0; i < triton2_scripts->size; i++) {
>  		err = load_triton_script(triton2_scripts->scripts[i]);
> -		if (err)
> +		if (err < 0) {
> +			printk(KERN_ERR "TWL4030 failed to load scripts");
>  			break;
> +		}
>  	}
>  
>  	resconfig = triton2_scripts->resource_config;
>  	if (resconfig) {
>  		while (resconfig->resource) {
> -			twl4030_configure_resource(resconfig);
> +			err = twl4030_configure_resource(resconfig);
>  			resconfig++;
> +			if (err < 0) {
> +				printk(KERN_ERR
> +				       "TWL4030 failed to configure resource");
> +				break;
> +			}
>  		}
>  	}
>  
> -- 
> 1.6.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Tony Lindgren June 3, 2009, 4:53 p.m. UTC | #2

* Amit Kucheria <amit.kucheria@verdurent.com> [090603 01:51]:
> Bump..
> 
> This patch was acked by David Brownell earlier in the thread.

OK, I add it, but will reset all the twl stuff to mainline after 2.6.30.

These patches need to get submitted to mainline, all the other twl code is
there already.

Tony
 
> Regards,
> Amit
> 
> On Wed, May 06, 2009 at 03:03:38PM +0300, Amit Kucheria wrote:
> > Check for return values of i2c read/write operations and size of scripts being
> > uploaded to TWL4030
> > 
> > (Removed the unrelated string changes based on David Brownell's comment)
> > 
> > Signed-off-by: Amit Kucheria <amit.kucheria@verdurent.com>
> > ---
> >  drivers/mfd/twl4030-power.c |   52 +++++++++++++++++++++++++++++++-----------
> >  1 files changed, 38 insertions(+), 14 deletions(-)
> > 
> > diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> > index 9dc493b..8f5d149 100644
> > --- a/drivers/mfd/twl4030-power.c
> > +++ b/drivers/mfd/twl4030-power.c
> > @@ -257,36 +257,40 @@ static int __init config_warmreset_sequence(u8 address)
> >  	return err;
> >  }
> >  
> > -void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
> > +static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
> >  {
> >  	int rconfig_addr;
> > +	int err;
> >  	u8 type;
> >  
> >  	if (rconfig->resource > NUM_OF_RESOURCES) {
> >  		printk(KERN_ERR
> >  			"TWL4030 Resource %d does not exist\n",
> >  			rconfig->resource);
> > -		return;
> > +		return -EINVAL;
> >  	}
> >  
> >  	rconfig_addr = res_config_addrs[rconfig->resource];
> >  
> >  	/* Set resource group */
> > -
> >  	if (rconfig->devgroup >= 0)
> > -		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> > +		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> >  					rconfig->devgroup << 5,
> >  					rconfig_addr + DEVGROUP_OFFSET);
> > +	if (err < 0) {
> > +		printk(KERN_ERR
> > +		       "TWL4030 failed to program devgroup");
> > +		return err;
> > +	}
> >  
> >  	/* Set resource types */
> > -
> > -	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
> > -					&type,
> > -					rconfig_addr + TYPE_OFFSET) < 0) {
> > +	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
> > +				  rconfig_addr + TYPE_OFFSET);
> > +	if (err < 0) {
> >  		printk(KERN_ERR
> > -			"TWL4030 Resource %d type could not read\n",
> > -			rconfig->resource);
> > -		return;
> > +		       "TWL4030 Resource %d type could not be read\n",
> > +		       rconfig->resource);
> > +		return err;
> >  	}
> >  
> >  	if (rconfig->type >= 0) {
> > @@ -299,8 +303,15 @@ void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
> >  		type |= rconfig->type2 << 3;
> >  	}
> >  
> > -	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> > +	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
> >  				type, rconfig_addr + TYPE_OFFSET);
> > +	if (err < 0) {
> > +		printk(KERN_ERR
> > +		       "TWL4030 failed to program resource type");
> > +		return err;
> > +	}
> > +
> > +	return 0;
> >  
> >  }
> >  
> > @@ -309,6 +320,12 @@ static int __init load_triton_script(struct twl4030_script *tscript)
> >  	u8 address = triton_next_free_address;
> >  	int err;
> >  
> > +	/* Make sure the script isn't going beyond last valid address */
> > +	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
> > +		printk(KERN_ERR "TWL4030 script too big error\n");
> > +		return -EINVAL;
> > +	}
> > +
> >  	err = twl4030_write_script(address, tscript->script, tscript->size);
> >  	if (err)
> >  		return err;
> > @@ -346,15 +363,22 @@ void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
> >  
> >  	for (i = 0; i < triton2_scripts->size; i++) {
> >  		err = load_triton_script(triton2_scripts->scripts[i]);
> > -		if (err)
> > +		if (err < 0) {
> > +			printk(KERN_ERR "TWL4030 failed to load scripts");
> >  			break;
> > +		}
> >  	}
> >  
> >  	resconfig = triton2_scripts->resource_config;
> >  	if (resconfig) {
> >  		while (resconfig->resource) {
> > -			twl4030_configure_resource(resconfig);
> > +			err = twl4030_configure_resource(resconfig);
> >  			resconfig++;
> > +			if (err < 0) {
> > +				printk(KERN_ERR
> > +				       "TWL4030 failed to configure resource");
> > +				break;
> > +			}
> >  		}
> >  	}
> >  
> > -- 
> > 1.6.0.4
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> -- 
> -------------------------------------------------------------------------
> Amit Kucheria,				 Kernel Developer, Verdurent
> -------------------------------------------------------------------------
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Tony Lindgren June 3, 2009, 4:53 p.m. UTC | #3

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 944f94235969c15b3012aa4dc832ed3e2f08e4da

PatchWorks
http://patchwork.kernel.org/patch/22012/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=944f94235969c15b3012aa4dc832ed3e2f08e4da


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 9dc493b..8f5d149 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -257,36 +257,40 @@  static int __init config_warmreset_sequence(u8 address)
 	return err;
 }
 
-void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
+static int __init twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 {
 	int rconfig_addr;
+	int err;
 	u8 type;
 
 	if (rconfig->resource > NUM_OF_RESOURCES) {
 		printk(KERN_ERR
 			"TWL4030 Resource %d does not exist\n",
 			rconfig->resource);
-		return;
+		return -EINVAL;
 	}
 
 	rconfig_addr = res_config_addrs[rconfig->resource];
 
 	/* Set resource group */
-
 	if (rconfig->devgroup >= 0)
-		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+		err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 					rconfig->devgroup << 5,
 					rconfig_addr + DEVGROUP_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program devgroup");
+		return err;
+	}
 
 	/* Set resource types */
-
-	if (twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER,
-					&type,
-					rconfig_addr + TYPE_OFFSET) < 0) {
+	err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_RECEIVER, &type,
+				  rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
 		printk(KERN_ERR
-			"TWL4030 Resource %d type could not read\n",
-			rconfig->resource);
-		return;
+		       "TWL4030 Resource %d type could not be read\n",
+		       rconfig->resource);
+		return err;
 	}
 
 	if (rconfig->type >= 0) {
@@ -299,8 +303,15 @@  void twl4030_configure_resource(struct twl4030_resconfig *rconfig)
 		type |= rconfig->type2 << 3;
 	}
 
-	twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+	err = twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
 				type, rconfig_addr + TYPE_OFFSET);
+	if (err < 0) {
+		printk(KERN_ERR
+		       "TWL4030 failed to program resource type");
+		return err;
+	}
+
+	return 0;
 
 }
 
@@ -309,6 +320,12 @@  static int __init load_triton_script(struct twl4030_script *tscript)
 	u8 address = triton_next_free_address;
 	int err;
 
+	/* Make sure the script isn't going beyond last valid address */
+	if ((address + tscript->size) > (END_OF_SCRIPT-1)) {
+		printk(KERN_ERR "TWL4030 script too big error\n");
+		return -EINVAL;
+	}
+
 	err = twl4030_write_script(address, tscript->script, tscript->size);
 	if (err)
 		return err;
@@ -346,15 +363,22 @@  void __init twl4030_power_init(struct twl4030_power_data *triton2_scripts)
 
 	for (i = 0; i < triton2_scripts->size; i++) {
 		err = load_triton_script(triton2_scripts->scripts[i]);
-		if (err)
+		if (err < 0) {
+			printk(KERN_ERR "TWL4030 failed to load scripts");
 			break;
+		}
 	}
 
 	resconfig = triton2_scripts->resource_config;
 	if (resconfig) {
 		while (resconfig->resource) {
-			twl4030_configure_resource(resconfig);
+			err = twl4030_configure_resource(resconfig);
 			resconfig++;
+			if (err < 0) {
+				printk(KERN_ERR
+				       "TWL4030 failed to configure resource");
+				break;
+			}
 		}
 	}