summaryrefslogtreecommitdiff
path: root/common/host_command.c
diff options
context:
space:
mode:
authorChiranjeevi Rapolu <chiranjeevi.rapolu@intel.com>2015-06-18 23:47:43 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-25 17:21:50 +0000
commitddf77bbe785a5ae1c701ef70fb6e41a89168e341 (patch)
tree9b47d735af60c1a5a34224189885f72666539184 /common/host_command.c
parent331db691c418e607b9830ba96e6ca1b634c7cea4 (diff)
downloadchrome-ec-ddf77bbe785a5ae1c701ef70fb6e41a89168e341.tar.gz
Fix assertion crash in __wait_evt()
mutex_lock() is called from MEC1322_IRQ_ACPIEC0_IBF interrupt context, causing deadlock and assertion in __wait_evt(). In the interrupt context it now checks for mutex lock first. If the mutex is already locked,, it will disable ACPI interrupts and defer the memmap mutex lock. Added LPC interrupt disable/enable functions as needed. Increased deferred function count where needed. BRANCH=None BUG=chrome-os-partner:40820 TEST=Test for suspend-resume, cold, warm reboots and other general stability. Change-Id: I3dda0d4635a6b6281faf200c8c7b6fcba8877254 Signed-off-by: Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com> Reviewed-on: https://chromium-review.googlesource.com/280418 Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org> Commit-Queue: Divya Jyothi <divya.jyothi@intel.com> Tested-by: Divya Jyothi <divya.jyothi@intel.com>
Diffstat (limited to 'common/host_command.c')
-rw-r--r--common/host_command.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/host_command.c b/common/host_command.c
index da73d2dbd5..bc40a68441 100644
--- a/common/host_command.c
+++ b/common/host_command.c
@@ -88,6 +88,12 @@ void host_lock_memmap()
mutex_lock(&memmap_write_mutex);
}
+/* Returns host memmap lock status */
+int host_memmap_is_locked(void)
+{
+ return (memmap_write_mutex.lock != 0);
+}
+
void host_unlock_memmap()
{
mutex_unlock(&memmap_write_mutex);