diff options
| author | Chiranjeevi Rapolu <chiranjeevi.rapolu@intel.com> | 2015-06-18 23:47:43 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-25 17:21:50 +0000 |
| commit | ddf77bbe785a5ae1c701ef70fb6e41a89168e341 (patch) | |
| tree | 9b47d735af60c1a5a34224189885f72666539184 /chip/mec1322/lpc.c | |
| parent | 331db691c418e607b9830ba96e6ca1b634c7cea4 (diff) | |
| download | chrome-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 'chip/mec1322/lpc.c')
| -rw-r--r-- | chip/mec1322/lpc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/chip/mec1322/lpc.c b/chip/mec1322/lpc.c index 7cdc120330..c486f75e77 100644 --- a/chip/mec1322/lpc.c +++ b/chip/mec1322/lpc.c @@ -557,6 +557,18 @@ int lpc_get_pltrst_asserted(void) return (MEC1322_LPC_BUS_MONITOR & (1<<1)) ? 1 : 0; } +/* Enable LPC ACPI-EC0 interrupts */ +void lpc_enable_acpi_interrupts(void) +{ + task_enable_irq(MEC1322_IRQ_ACPIEC0_IBF); +} + +/* Disable LPC ACPI-EC0 interrupts */ +void lpc_disable_acpi_interrupts(void) +{ + task_disable_irq(MEC1322_IRQ_ACPIEC0_IBF); +} + /* On boards without a host, this command is used to set up LPC */ static int lpc_command_init(int argc, char **argv) { |