Commit 5b2cacce authored by Hans de Goede's avatar Hans de Goede Committed by Daniel Vetter

i2c: designware-baytrail: Acquire P-Unit access on bus acquire

Acquire P-Unit access to stop others from accessing the P-Unit while the
PMIC i2c bus is in use. This is necessary because accessing the P-Unit
from the kernel may result in the P-Unit trying to access the PMIC i2c
bus, which results in a hang when it happens while we own the PMIC i2c
bus semaphore.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=155241Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatartagorereddy <tagore.chandan@gmail.com>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170210102802.20898-10-hdegoede@redhat.com
parent fd476fa2
...@@ -62,6 +62,8 @@ static void reset_semaphore(struct dw_i2c_dev *dev) ...@@ -62,6 +62,8 @@ static void reset_semaphore(struct dw_i2c_dev *dev)
dev_err(dev->dev, "iosf failed to reset punit semaphore during write\n"); dev_err(dev->dev, "iosf failed to reset punit semaphore during write\n");
pm_qos_update_request(&dev->pm_qos, PM_QOS_DEFAULT_VALUE); pm_qos_update_request(&dev->pm_qos, PM_QOS_DEFAULT_VALUE);
iosf_mbi_punit_release();
} }
static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) static int baytrail_i2c_acquire(struct dw_i2c_dev *dev)
...@@ -79,6 +81,8 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev) ...@@ -79,6 +81,8 @@ static int baytrail_i2c_acquire(struct dw_i2c_dev *dev)
if (!dev->release_lock) if (!dev->release_lock)
return 0; return 0;
iosf_mbi_punit_acquire();
/* /*
* Disallow the CPU to enter C6 or C7 state, entering these states * Disallow the CPU to enter C6 or C7 state, entering these states
* requires the punit to talk to the pmic and if this happens while * requires the punit to talk to the pmic and if this happens while
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment