Skip to contentSkip to conversation

io: accel: kxcjk1013: restore the range after resume.

PATCH In review He, Bo 5 participants 7 messages Feb 21, 2019 – Mar 9, 2019 IIO

lore
Share & tools
lore

He, Bo

author
#0 lore raw

PATCH 1/1 io: accel: kxcjk1013: restore the range after resume.

restore the range register in case kxcjk1013 power is off after suspend

we see the issue on some laptops, after system suspend and resume, the CTRL_REG1 register changed from 0xc8 to 0x80, so acceleration range is changed, the patch is to restore the acceleration range after resume.

---
 drivers/iio/accel/kxcjk-1013.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iio/accel/kxcjk-1013.c +1 -0
index 7506bd9..c6bb3be 100644
@@ -1340,6 +1340,7 @@ static int kxcjk1013_resume(struct device *dev)
 
 	mutex_lock(&data->mutex);
 	ret = kxcjk1013_set_mode(data, OPERATION);
+	ret += kxcjk1013_set_range(data, data->range);
 	mutex_unlock(&data->mutex);
 
 	return ret;
Signature · 1 line
2.7.4
#1 lore raw
Quoted 8 lines · Bo

restore the range register in case kxcjk1013 power is off after suspend

we see the issue on some laptops, after system suspend and resume, the CTRL_REG1 register changed from 0xc8 to 0x80, so acceleration range is changed, the patch is to restore the acceleration range after resume.

Please don't do the ret += trick, it obscures the return value which we may want to know if anything goes wrong. Handle each error independently.

Thanks,

Jonathan

Quoted 16 lines
---
 drivers/iio/accel/kxcjk-1013.c | 1 +
 1 file changed, 1 insertion(+)
drivers/iio/accel/kxcjk-1013.c +1 -0
index 7506bd9..c6bb3be 100644
@@ -1340,6 +1340,7 @@ static int kxcjk1013_resume(struct device *dev)
 
 	mutex_lock(&data->mutex);
 	ret = kxcjk1013_set_mode(data, OPERATION);
+	ret += kxcjk1013_set_range(data, data->range);
 	mutex_unlock(&data->mutex);
 
 	return ret;
#2 lore raw

PATCH v2 1/1 io: accel: kxcjk1013: restore the range after resume.

From: "he, bo" <[email protected]>

On some laptops, kxcjk1013 is powered off when system enters S3. We need restore the range regiter during resume. Otherwise, the sensor doesn't work properly after S3.

---
Changes in v2:
- Handle return value independently in resume callback.

 drivers/iio/accel/kxcjk-1013.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/iio/accel/kxcjk-1013.c +5 -0
index 7096e577b23f..17837e26bcf2 100644
@@ -1437,6 +1437,11 @@ static int kxcjk1013_resume(struct device *dev)
 
 	mutex_lock(&data->mutex);
 	ret = kxcjk1013_set_mode(data, OPERATION);
+	if (ret < 0) {
+		mutex_unlock(&data->mutex);
+		return ret;
+	}
+	ret = kxcjk1013_set_range(data, data->range);
 	mutex_unlock(&data->mutex);
 
 	return ret;
Signature · 1 line
2.20.1
#3 lore raw

Hi,

Quoted 8 lines · Hu

From: "he, bo" <[email protected]>

On some laptops, kxcjk1013 is powered off when system enters S3. We need restore the range regiter during resume. Otherwise, the sensor doesn't work properly after S3.

Thank you for the patch.

Quoted 13 lines

---
Changes in v2:
- Handle return value independently in resume callback.

  drivers/iio/accel/kxcjk-1013.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/iio/accel/kxcjk-1013.c +0 -0
index 7096e577b23f..17837e26bcf2 100644
@@ -1437,6 +1437,11 @@ static int kxcjk1013_resume(struct device *dev)
 

drivers/iio/accel/kxcjk-1013.c static int kxcjk1013_resume(struct device *dev) · line 1447

Quoted 10 lines
drivers/iio/accel/kxcjk-1013.c +5 -0
  	mutex_lock(&data->mutex);
  	ret = kxcjk1013_set_mode(data, OPERATION);
+	if (ret < 0) {
+		mutex_unlock(&data->mutex);
+		return ret;
+	}
+	ret = kxcjk1013_set_range(data, data->range);
  	mutex_unlock(&data->mutex);
 
  	return ret;

I'm not a fan of the extra unlock, IMHO it would be better to instead do:

mutex_lock(&data->mutex);

 	ret = kxcjk1013_set_mode(data, OPERATION);
	if (ret == 0)
		ret = kxcjk1013_set_range(data, data->range);

mutex_unlock(&data->mutex);

Regards,

Hans

#4 lore raw

PATCH v3 1/1 io: accel: kxcjk1013: restore the range after resume.

From: "he, bo" <[email protected]>

On some laptops, kxcjk1013 is powered off when system enters S3. We need restore the range regiter during resume. Otherwise, the sensor doesn't work properly after S3.

---
v3: Avoid unnecessary mutex_unlock (Hans).
v2: Handle return value independently (Jonathan).

 drivers/iio/accel/kxcjk-1013.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iio/accel/kxcjk-1013.c +2 -0
index 7096e577b23f..50f3ff386bea 100644
@@ -1437,6 +1437,8 @@ static int kxcjk1013_resume(struct device *dev)
 
 	mutex_lock(&data->mutex);
 	ret = kxcjk1013_set_mode(data, OPERATION);
+	if (ret == 0)
+		ret = kxcjk1013_set_range(data, data->range);
 	mutex_unlock(&data->mutex);
 
 	return ret;
Signature · 1 line
2.20.1
Reviewed-by on v3 1/1
#5 lore raw

Hi,

Quoted 8 lines · Hu

From: "he, bo" <[email protected]>

On some laptops, kxcjk1013 is powered off when system enters S3. We need restore the range regiter during resume. Otherwise, the sensor doesn't work properly after S3.

Thanks, patch looks good to me:

Regards,

Hans

Quoted 21 lines

---
v3: Avoid unnecessary mutex_unlock (Hans).
v2: Handle return value independently (Jonathan).

  drivers/iio/accel/kxcjk-1013.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/iio/accel/kxcjk-1013.c +2 -0
index 7096e577b23f..50f3ff386bea 100644
@@ -1437,6 +1437,8 @@ static int kxcjk1013_resume(struct device *dev)
 
  	mutex_lock(&data->mutex);
  	ret = kxcjk1013_set_mode(data, OPERATION);
+	if (ret == 0)
+		ret = kxcjk1013_set_range(data, data->range);
  	mutex_unlock(&data->mutex);
 
  	return ret;
maintainer Applied
#6 lore raw
Quoted 5 lines · On Wed, 6 Mar 2019 09:43:24 +0100 Hans de Goede <[email protected]> wrote:

Hi,

Quoted 2 lines · Hu

From: "he, bo" <[email protected]>

Quoted 8 lines
Quoted 6 lines

On some laptops, kxcjk1013 is powered off when system enters S3. We need restore the range regiter during resume. Otherwise, the sensor doesn't work properly after S3.

Thanks, patch looks good to me:

I'd have had an ever so slight preference for a goto as I prefer errors to be checked for rather than good paths (as that's the more common pattern), but I don't care strongly enough to ask for a v4!

Quoted 2 lines

Applied to the fixes-togreg branch of iio.git and marked for stable.

Thanks,

Jonathan

Quoted 28 lines

Regards,

Hans

Quoted 21 lines

---
v3: Avoid unnecessary mutex_unlock (Hans).
v2: Handle return value independently (Jonathan).

  drivers/iio/accel/kxcjk-1013.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/iio/accel/kxcjk-1013.c +2 -0
index 7096e577b23f..50f3ff386bea 100644
@@ -1437,6 +1437,8 @@ static int kxcjk1013_resume(struct device *dev)
 
  	mutex_lock(&data->mutex);
  	ret = kxcjk1013_set_mode(data, OPERATION);
+	if (ret == 0)
+		ret = kxcjk1013_set_range(data, data->range);
  	mutex_unlock(&data->mutex);
 
  	return ret;