diff mbox

[PATCH-V2,08/12] i2c: pxa: enable/disable i2c module across msg xfer

Message ID 1434383399-2370-9-git-send-email-vaibhav.hiremath@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Vaibhav Hiremath June 15, 2015, 3:49 p.m. UTC 
From: Yi Zhang <yizhang@marvell.com>

Enable i2c module/unit before transmission and disable when it finishes.

why?
It's because the i2c bus may be distrubed if the slave device,
typically a touch, powers on.

As we do not want to break slave mode support, this patch introduces
DT property to control disable of the I2C module after xfer in master mode
of operation.

i2c-disable-after-xfer : If set, driver will disable I2C module after msg xfer

Signed-off-by: Yi Zhang <yizhang@marvell.com>
Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
---
 drivers/i2c/busses/i2c-pxa.c | 41 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

Comments

Robert Jarzmik July 3, 2015, 3:28 p.m. UTC | #1 
Vaibhav Hiremath <vaibhav.hiremath@linaro.org> writes:

>  #define _IBMR(i2c)	((i2c)->reg_ibmr)
> @@ -286,6 +287,22 @@ static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
>  static void i2c_pxa_master_complete(struct pxa_i2c *i2c, int ret);
>  static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id);
>  
> +/* enable/disable i2c unit */
> +static inline int i2c_pxa_is_enabled(struct pxa_i2c *i2c)
> +{
> +	return (readl(_ICR(i2c)) & ICR_IUE);
> +}
> +
> +static inline void i2c_pxa_enable(struct pxa_i2c *i2c, bool enable)
> +{
> +	if (enable && !i2c_pxa_is_enabled(i2c)) {
> +		writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
> +		udelay(100);
> +	} else {
> +		writel(readl(_ICR(i2c)) & ~ICR_IUE, _ICR(i2c));
> +	}
> +}
> +
>  static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c)
>  {
>  	return !(readl(_ICR(i2c)) & ICR_SCLE);
> @@ -482,8 +499,7 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c)
>  	i2c_pxa_set_slave(i2c, 0);
>  
>  	/* enable unit */
> -	writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
> -	udelay(100);
> +	i2c_pxa_enable(i2c, true);
>  }
>  
>  
> @@ -840,6 +856,9 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
>  	struct pxa_i2c *i2c = adap->algo_data;
>  	int ret, i;
>  
> +	/* Enable i2c unit */
> +	i2c_pxa_enable(i2c, true);
> +
>  	/* If the I2C controller is disabled we need to reset it
>  	  (probably due to a suspend/resume destroying state). We do
>  	  this here as we can then avoid worrying about resuming the
> @@ -860,6 +879,11 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
>  	ret = -EREMOTEIO;
>   out:
>  	i2c_pxa_set_slave(i2c, ret);
> +
> +	/* disable i2c unit */
> +	if (i2c->disable_after_xfer)
> +		i2c_pxa_enable(i2c, false);
> +
>  	return ret;
>  }
>  
> @@ -1075,6 +1099,9 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
>  	struct pxa_i2c *i2c = adap->algo_data;
>  	int ret, i;
>  
> +	/* Enable i2c unit */
> +	i2c_pxa_enable(i2c, true);
Okay, what happens in master mode when we get there on the 2nd xfer :
 - i2c is enabled AFAIU.
 - as a consequence i2c_pxa_is_enabled() returns true
 - as a consequence, i2c_pxa_enable() _disables_ the i2c, right ?
 - as a consequence i2c is broken

Is this correct, because if it is the patch needs a rework ?

Cheers.

--
Robert
Vaibhav Hiremath July 3, 2015, 6:23 p.m. UTC | #2 
On Friday 03 July 2015 08:58 PM, Robert Jarzmik wrote:
> Vaibhav Hiremath <vaibhav.hiremath@linaro.org> writes:
>
>>   #define _IBMR(i2c)	((i2c)->reg_ibmr)
>> @@ -286,6 +287,22 @@ static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
>>   static void i2c_pxa_master_complete(struct pxa_i2c *i2c, int ret);
>>   static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id);
>>
>> +/* enable/disable i2c unit */
>> +static inline int i2c_pxa_is_enabled(struct pxa_i2c *i2c)
>> +{
>> +	return (readl(_ICR(i2c)) & ICR_IUE);
>> +}
>> +
>> +static inline void i2c_pxa_enable(struct pxa_i2c *i2c, bool enable)
>> +{
>> +	if (enable && !i2c_pxa_is_enabled(i2c)) {
>> +		writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
>> +		udelay(100);
>> +	} else {
>> +		writel(readl(_ICR(i2c)) & ~ICR_IUE, _ICR(i2c));
>> +	}
>> +}
>> +
>>   static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c)
>>   {
>>   	return !(readl(_ICR(i2c)) & ICR_SCLE);
>> @@ -482,8 +499,7 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c)
>>   	i2c_pxa_set_slave(i2c, 0);
>>
>>   	/* enable unit */
>> -	writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
>> -	udelay(100);
>> +	i2c_pxa_enable(i2c, true);
>>   }
>>
>>
>> @@ -840,6 +856,9 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
>>   	struct pxa_i2c *i2c = adap->algo_data;
>>   	int ret, i;
>>
>> +	/* Enable i2c unit */
>> +	i2c_pxa_enable(i2c, true);
>> +
>>   	/* If the I2C controller is disabled we need to reset it
>>   	  (probably due to a suspend/resume destroying state). We do
>>   	  this here as we can then avoid worrying about resuming the
>> @@ -860,6 +879,11 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
>>   	ret = -EREMOTEIO;
>>    out:
>>   	i2c_pxa_set_slave(i2c, ret);
>> +
>> +	/* disable i2c unit */
>> +	if (i2c->disable_after_xfer)
>> +		i2c_pxa_enable(i2c, false);
>> +
>>   	return ret;
>>   }
>>
>> @@ -1075,6 +1099,9 @@ static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
>>   	struct pxa_i2c *i2c = adap->algo_data;
>>   	int ret, i;
>>
>> +	/* Enable i2c unit */
>> +	i2c_pxa_enable(i2c, true);
> Okay, what happens in master mode when we get there on the 2nd xfer :
>   - i2c is enabled AFAIU.
>   - as a consequence i2c_pxa_is_enabled() returns true
>   - as a consequence, i2c_pxa_enable() _disables_ the i2c, right ?
>   - as a consequence i2c is broken
>
> Is this correct, because if it is the patch needs a rework ?
>

Good catch :)

I will fix this in next version.

Thanks,
Vaibhav
Vaibhav Hiremath July 3, 2015, 6:48 p.m. UTC | #3 
On Friday 03 July 2015 11:53 PM, Vaibhav Hiremath wrote:
>
>
> On Friday 03 July 2015 08:58 PM, Robert Jarzmik wrote:
>> Vaibhav Hiremath <vaibhav.hiremath@linaro.org> writes:
>>
>>>   #define _IBMR(i2c)    ((i2c)->reg_ibmr)
>>> @@ -286,6 +287,22 @@ static void i2c_pxa_scream_blue_murder(struct
>>> pxa_i2c *i2c, const char *why)
>>>   static void i2c_pxa_master_complete(struct pxa_i2c *i2c, int ret);
>>>   static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id);
>>>
>>> +/* enable/disable i2c unit */
>>> +static inline int i2c_pxa_is_enabled(struct pxa_i2c *i2c)
>>> +{
>>> +    return (readl(_ICR(i2c)) & ICR_IUE);
>>> +}
>>> +
>>> +static inline void i2c_pxa_enable(struct pxa_i2c *i2c, bool enable)
>>> +{
>>> +    if (enable && !i2c_pxa_is_enabled(i2c)) {
>>> +        writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
>>> +        udelay(100);
>>> +    } else {
>>> +        writel(readl(_ICR(i2c)) & ~ICR_IUE, _ICR(i2c));
>>> +    }
>>> +}
>>> +
>>>   static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c)
>>>   {
>>>       return !(readl(_ICR(i2c)) & ICR_SCLE);
>>> @@ -482,8 +499,7 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c)
>>>       i2c_pxa_set_slave(i2c, 0);
>>>
>>>       /* enable unit */
>>> -    writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
>>> -    udelay(100);
>>> +    i2c_pxa_enable(i2c, true);
>>>   }
>>>
>>>
>>> @@ -840,6 +856,9 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter
>>> *adap,
>>>       struct pxa_i2c *i2c = adap->algo_data;
>>>       int ret, i;
>>>
>>> +    /* Enable i2c unit */
>>> +    i2c_pxa_enable(i2c, true);
>>> +
>>>       /* If the I2C controller is disabled we need to reset it
>>>         (probably due to a suspend/resume destroying state). We do
>>>         this here as we can then avoid worrying about resuming the
>>> @@ -860,6 +879,11 @@ static int i2c_pxa_pio_xfer(struct i2c_adapter
>>> *adap,
>>>       ret = -EREMOTEIO;
>>>    out:
>>>       i2c_pxa_set_slave(i2c, ret);
>>> +
>>> +    /* disable i2c unit */
>>> +    if (i2c->disable_after_xfer)
>>> +        i2c_pxa_enable(i2c, false);
>>> +
>>>       return ret;
>>>   }
>>>
>>> @@ -1075,6 +1099,9 @@ static int i2c_pxa_xfer(struct i2c_adapter
>>> *adap, struct i2c_msg msgs[], int num
>>>       struct pxa_i2c *i2c = adap->algo_data;
>>>       int ret, i;
>>>
>>> +    /* Enable i2c unit */
>>> +    i2c_pxa_enable(i2c, true);
>> Okay, what happens in master mode when we get there on the 2nd xfer :
>>   - i2c is enabled AFAIU.
>>   - as a consequence i2c_pxa_is_enabled() returns true
>>   - as a consequence, i2c_pxa_enable() _disables_ the i2c, right ?
>>   - as a consequence i2c is broken
>>
>> Is this correct, because if it is the patch needs a rework ?
>>
>
> Good catch :)
>
> I will fix this in next version.
>

I have taken care of all comments on the 3 patches.

Just in case if you have any comments on other patches in series,
I will wait for a day before pushing next version.

Thanks,
Vaibhav
Robert Jarzmik July 3, 2015, 7:44 p.m. UTC | #4 
Vaibhav Hiremath <vaibhav.hiremath@linaro.org> writes:

> I have taken care of all comments on the 3 patches.
>
> Just in case if you have any comments on other patches in series,
> I will wait for a day before pushing next version.

That would be great, yeah. I'll make another pass tomorrow. If that works for
you, and if you release your next version before Sunday morning (french local
time), I'll make another review for Sunday evening of all the patches.

Cheers.
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 0a8b3bb..c753411 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -161,6 +161,7 @@  struct pxa_i2c {
 	unsigned char		master_code;
 	unsigned long		rate;
 	bool			highmode_enter;
+	bool			disable_after_xfer;
 };
 
 #define _IBMR(i2c)	((i2c)->reg_ibmr)
@@ -286,6 +287,22 @@  static void i2c_pxa_scream_blue_murder(struct pxa_i2c *i2c, const char *why)
 static void i2c_pxa_master_complete(struct pxa_i2c *i2c, int ret);
 static irqreturn_t i2c_pxa_handler(int this_irq, void *dev_id);
 
+/* enable/disable i2c unit */
+static inline int i2c_pxa_is_enabled(struct pxa_i2c *i2c)
+{
+	return (readl(_ICR(i2c)) & ICR_IUE);
+}
+
+static inline void i2c_pxa_enable(struct pxa_i2c *i2c, bool enable)
+{
+	if (enable && !i2c_pxa_is_enabled(i2c)) {
+		writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
+		udelay(100);
+	} else {
+		writel(readl(_ICR(i2c)) & ~ICR_IUE, _ICR(i2c));
+	}
+}
+
 static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c)
 {
 	return !(readl(_ICR(i2c)) & ICR_SCLE);
@@ -482,8 +499,7 @@  static void i2c_pxa_reset(struct pxa_i2c *i2c)
 	i2c_pxa_set_slave(i2c, 0);
 
 	/* enable unit */
-	writel(readl(_ICR(i2c)) | ICR_IUE, _ICR(i2c));
-	udelay(100);
+	i2c_pxa_enable(i2c, true);
 }
 
 
@@ -840,6 +856,9 @@  static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
 	struct pxa_i2c *i2c = adap->algo_data;
 	int ret, i;
 
+	/* Enable i2c unit */
+	i2c_pxa_enable(i2c, true);
+
 	/* If the I2C controller is disabled we need to reset it
 	  (probably due to a suspend/resume destroying state). We do
 	  this here as we can then avoid worrying about resuming the
@@ -860,6 +879,11 @@  static int i2c_pxa_pio_xfer(struct i2c_adapter *adap,
 	ret = -EREMOTEIO;
  out:
 	i2c_pxa_set_slave(i2c, ret);
+
+	/* disable i2c unit */
+	if (i2c->disable_after_xfer)
+		i2c_pxa_enable(i2c, false);
+
 	return ret;
 }
 
@@ -1075,6 +1099,9 @@  static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
 	struct pxa_i2c *i2c = adap->algo_data;
 	int ret, i;
 
+	/* Enable i2c unit */
+	i2c_pxa_enable(i2c, true);
+
 	for (i = adap->retries; i >= 0; i--) {
 		ret = i2c_pxa_do_xfer(i2c, msgs, num);
 		if (ret != I2C_RETRY)
@@ -1088,6 +1115,10 @@  static int i2c_pxa_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num
 	ret = -EREMOTEIO;
  out:
 	i2c_pxa_set_slave(i2c, ret);
+	/* disable i2c unit */
+	if (i2c->disable_after_xfer)
+		i2c_pxa_enable(i2c, false);
+
 	return ret;
 }
 
@@ -1128,6 +1159,9 @@  static int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c,
 	/* For device tree we always use the dynamic or alias-assigned ID */
 	i2c->adap.nr = -1;
 
+	i2c->disable_after_xfer = of_property_read_bool(np,
+				"i2c-disable-after-xfer");
+
 	if (of_get_property(np, "mrvl,i2c-polling", NULL))
 		i2c->use_pio = 1;
 	if (of_get_property(np, "mrvl,i2c-fast-mode", NULL))
@@ -1278,6 +1312,9 @@  static int i2c_pxa_probe(struct platform_device *dev)
 
 	platform_set_drvdata(dev, i2c);
 
+	if (i2c->disable_after_xfer)
+		i2c_pxa_enable(i2c, false);
+
 #ifdef CONFIG_I2C_PXA_SLAVE
 	dev_info(&i2c->adap.dev, " PXA I2C adapter, slave address %d\n",
 		i2c->slave_addr);