Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f821f8b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: sensors: fix MPU6050 mutex deadlock"

parents dc5a2d4e b6368ba1

drivers/input/misc/mpu6050.c

+16 −8
Original line number Original line Diff line number Diff line
@@ -118,6 +118,8 @@ struct axis_data { 
 *  @accel_poll_ms:	accelerometer polling delay

 *  @accel_poll_ms:	accelerometer polling delay

 *  @accel_latency_ms:	max latency for accelerometer batching

 *  @accel_latency_ms:	max latency for accelerometer batching

 *  @gyro_latency_ms:	max latency for gyroscope batching

 *  @gyro_latency_ms:	max latency for gyroscope batching

 *  @accel_en:	accelerometer enabling flag

 *  @gyro_en:	gyroscope enabling flag

 *  @use_poll:		use polling mode instead of  interrupt mode

 *  @use_poll:		use polling mode instead of  interrupt mode

 *  @motion_det_en:	motion detection wakeup is enabled

 *  @motion_det_en:	motion detection wakeup is enabled

 *  @batch_accel:	accelerometer is working on batch mode

 *  @batch_accel:	accelerometer is working on batch mode
@@ -153,6 +155,8 @@ struct mpu6050_sensor { 
	u32 accel_poll_ms;

	u32 accel_poll_ms;

	u32 accel_latency_ms;

	u32 accel_latency_ms;

	u32 gyro_latency_ms;

	u32 gyro_latency_ms;

	atomic_t accel_en;

	atomic_t gyro_en;

	bool use_poll;

	bool use_poll;

	bool motion_det_en;

	bool motion_det_en;

	bool batch_accel;

	bool batch_accel;
@@ -752,7 +756,6 @@ static void mpu6050_accel_work_fn(struct work_struct *work) 
	sensor = container_of((struct delayed_work *)work,

	sensor = container_of((struct delayed_work *)work,

				struct mpu6050_sensor, accel_poll_work);

				struct mpu6050_sensor, accel_poll_work);





	mutex_lock(&sensor->op_lock);

	timestamp = ktime_get();

	timestamp = ktime_get();

	mpu6050_read_accel_data(sensor, &sensor->axis);

	mpu6050_read_accel_data(sensor, &sensor->axis);

	mpu6050_remap_accel_data(&sensor->axis, sensor->pdata->place);

	mpu6050_remap_accel_data(&sensor->axis, sensor->pdata->place);
@@ -772,9 +775,9 @@ static void mpu6050_accel_work_fn(struct work_struct *work) 
		ktime_to_timespec(timestamp).tv_nsec);

		ktime_to_timespec(timestamp).tv_nsec);

	input_sync(sensor->accel_dev);

	input_sync(sensor->accel_dev);





	if (atomic_read(&sensor->accel_en))

		schedule_delayed_work(&sensor->accel_poll_work,

		schedule_delayed_work(&sensor->accel_poll_work,

			msecs_to_jiffies(sensor->accel_poll_ms));

			msecs_to_jiffies(sensor->accel_poll_ms));

	mutex_unlock(&sensor->op_lock);

}

}





/**

/**
@@ -793,7 +796,6 @@ static void mpu6050_gyro_work_fn(struct work_struct *work) 
	sensor = container_of((struct delayed_work *)work,

	sensor = container_of((struct delayed_work *)work,

				struct mpu6050_sensor, gyro_poll_work);

				struct mpu6050_sensor, gyro_poll_work);





	mutex_lock(&sensor->op_lock);

	timestamp = ktime_get();

	timestamp = ktime_get();

	mpu6050_read_gyro_data(sensor, &sensor->axis);

	mpu6050_read_gyro_data(sensor, &sensor->axis);

	mpu6050_remap_gyro_data(&sensor->axis, sensor->pdata->place);

	mpu6050_remap_gyro_data(&sensor->axis, sensor->pdata->place);
@@ -813,9 +815,9 @@ static void mpu6050_gyro_work_fn(struct work_struct *work) 
		ktime_to_timespec(timestamp).tv_nsec);

		ktime_to_timespec(timestamp).tv_nsec);

	input_sync(sensor->gyro_dev);

	input_sync(sensor->gyro_dev);





	if (atomic_read(&sensor->gyro_en))

		schedule_delayed_work(&sensor->gyro_poll_work,

		schedule_delayed_work(&sensor->gyro_poll_work,

			msecs_to_jiffies(sensor->gyro_poll_ms));

			msecs_to_jiffies(sensor->gyro_poll_ms));

	mutex_unlock(&sensor->op_lock);

}

}





/**

/**
@@ -1246,7 +1248,9 @@ static int mpu6050_gyro_set_enable(struct mpu6050_sensor *sensor, bool enable) 
			schedule_delayed_work(&sensor->gyro_poll_work,

			schedule_delayed_work(&sensor->gyro_poll_work,

				msecs_to_jiffies(sensor->gyro_poll_ms));

				msecs_to_jiffies(sensor->gyro_poll_ms));

		}

		}

		atomic_set(&sensor->gyro_en, 1);

	} else {

	} else {

		atomic_set(&sensor->gyro_en, 0);

		if (sensor->batch_gyro) {

		if (sensor->batch_gyro) {

			ret = mpu6050_set_fifo_int(sensor,

			ret = mpu6050_set_fifo_int(sensor,

				sensor->cfg.accel_enable, false);

				sensor->cfg.accel_enable, false);
@@ -1930,7 +1934,9 @@ static int mpu6050_accel_set_enable(struct mpu6050_sensor *sensor, bool enable) 
			schedule_delayed_work(&sensor->accel_poll_work,

			schedule_delayed_work(&sensor->accel_poll_work,

				msecs_to_jiffies(sensor->accel_poll_ms));

				msecs_to_jiffies(sensor->accel_poll_ms));

		}

		}

		atomic_set(&sensor->accel_en, 1);

	} else {

	} else {

		atomic_set(&sensor->accel_en, 0);

		if (sensor->batch_accel) {

		if (sensor->batch_accel) {

			ret = mpu6050_set_fifo_int(sensor,

			ret = mpu6050_set_fifo_int(sensor,

				false, sensor->cfg.gyro_enable);

				false, sensor->cfg.gyro_enable);
@@ -2639,6 +2645,8 @@ static int mpu6050_probe(struct i2c_client *client, 
	}

	}





	sensor->cfg.is_asleep = false;

	sensor->cfg.is_asleep = false;

	atomic_set(&sensor->accel_en, 0);

	atomic_set(&sensor->gyro_en, 0);

	ret = mpu6050_init_config(sensor);

	ret = mpu6050_init_config(sensor);

	if (ret) {

	if (ret) {

		dev_err(&client->dev, "Failed to set default config\n");

		dev_err(&client->dev, "Failed to set default config\n");