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

Commit 44d99d73 authored by Douglas Anderson's avatar Douglas Anderson Committed by Lee Jones
Browse files

mfd: cros_ec: Don't try to grab log when suspended 



We should stop our worker thread while we're suspended.  If we don't
then we'll get messages like:

  cros-ec-spi spi5.0: spi transfer failed: -108
  cros-ec-spi spi5.0: cs-deassert spi transfer failed: -108
  cros-ec-ctl cros-ec-ctl.0.auto: EC communication failed

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent eb3f2f23

drivers/mfd/cros_ec_dev.c

+4 −0
Original line number Diff line number Diff line
@@ -466,6 +466,8 @@ static __maybe_unused int ec_device_suspend(struct device *dev) 
{

	struct cros_ec_dev *ec = dev_get_drvdata(dev);



	cros_ec_debugfs_suspend(ec);



	lb_suspend(ec);



	return 0;
@@ -475,6 +477,8 @@ static __maybe_unused int ec_device_resume(struct device *dev) 
{

	struct cros_ec_dev *ec = dev_get_drvdata(dev);



	cros_ec_debugfs_resume(ec);



	lb_resume(ec);



	return 0;

drivers/platform/chrome/cros_ec_debugfs.c

+20 −0
Original line number Diff line number Diff line
@@ -470,3 +470,23 @@ void cros_ec_debugfs_remove(struct cros_ec_dev *ec) 
	cros_ec_cleanup_console_log(ec->debug_info);

}

EXPORT_SYMBOL(cros_ec_debugfs_remove);



void cros_ec_debugfs_suspend(struct cros_ec_dev *ec)

{

	/*

	 * cros_ec_debugfs_init() failures are non-fatal; it's also possible

	 * that we initted things but decided that console log wasn't supported.

	 * We'll use the same set of checks that cros_ec_debugfs_remove() +

	 * cros_ec_cleanup_console_log() end up using to handle those cases.

	 */

	if (ec->debug_info && ec->debug_info->log_buffer.buf)

		cancel_delayed_work_sync(&ec->debug_info->log_poll_work);

}

EXPORT_SYMBOL(cros_ec_debugfs_suspend);



void cros_ec_debugfs_resume(struct cros_ec_dev *ec)

{

	if (ec->debug_info && ec->debug_info->log_buffer.buf)

		schedule_delayed_work(&ec->debug_info->log_poll_work, 0);

}

EXPORT_SYMBOL(cros_ec_debugfs_resume);

include/linux/mfd/cros_ec.h

+2 −0
Original line number Diff line number Diff line
@@ -327,5 +327,7 @@ extern struct attribute_group cros_ec_vbc_attr_group; 
/* debugfs stuff */

int cros_ec_debugfs_init(struct cros_ec_dev *ec);

void cros_ec_debugfs_remove(struct cros_ec_dev *ec);

void cros_ec_debugfs_suspend(struct cros_ec_dev *ec);

void cros_ec_debugfs_resume(struct cros_ec_dev *ec);



#endif /* __LINUX_MFD_CROS_EC_H */