nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: tegra-cec: Short-circuit init on suspend

Browse Source 
Bug 1591149

Initialization of cec engine is slow.
Short-circuit the init in event of suspend.

Change-Id: Ibfbd6f36883a7bf45fdb5137120b041a52f42086
Signed-off-by: Xia Yang <xiay@nvidia.com>
Reviewed-on: http://git-master/r/714423
(cherry picked from commit d5f4a6602678c87e8caa5032e43f2415c314d800)
Reviewed-on: http://git-master/r/716496
Reviewed-on: http://git-master/r/1164147
(cherry picked from commit 82a640a1ea11e850f769b78b5d0c531731b1ffd8)
This commit is contained in:
Xia Yang
2015-02-20 15:45:52 -08:00
committed by Prafull Suryawanshi
parent 2c5db18fa0
commit 42e7733cc7
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/misc/tegra-cec/tegra_cec.c
View File

@@ -1,7 +1,7 @@
/* /*
* drivers/misc/tegra-cec/tegra_cec.c * drivers/misc/tegra-cec/tegra_cec.c
* *
* Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2012-2015, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -298,7 +298,15 @@ static void tegra_cec_init(struct tegra_cec *cec)
writel(0x00, cec->cec_base + TEGRA_CEC_HW_CONTROL); writel(0x00, cec->cec_base + TEGRA_CEC_HW_CONTROL);
writel(0x00, cec->cec_base + TEGRA_CEC_INT_MASK); writel(0x00, cec->cec_base + TEGRA_CEC_INT_MASK);
writel(0xffffffff, cec->cec_base + TEGRA_CEC_INT_STAT); writel(0xffffffff, cec->cec_base + TEGRA_CEC_INT_STAT);
#ifdef CONFIG_PM
if (wait_event_interruptible_timeout(cec->suspend_waitq,
atomic_xchg(&cec->init_cancel, 0) == 1,
msecs_to_jiffies(1000)) > 0)
return;
#else
msleep(1000); msleep(1000);
#endif
writel(0x00, cec->cec_base + TEGRA_CEC_SW_CONTROL); writel(0x00, cec->cec_base + TEGRA_CEC_SW_CONTROL);
@@ -475,6 +483,11 @@ static int tegra_cec_probe(struct platform_device *pdev)
init_waitqueue_head(&cec->tx_waitq); init_waitqueue_head(&cec->tx_waitq);
init_waitqueue_head(&cec->init_waitq); init_waitqueue_head(&cec->init_waitq);
#ifdef CONFIG_PM
init_waitqueue_head(&cec->suspend_waitq);
atomic_set(&cec->init_cancel, 0);
#endif
platform_set_drvdata(pdev, cec); platform_set_drvdata(pdev, cec);
/* clear out the hardware. */ /* clear out the hardware. */
@@ -539,10 +552,16 @@ static int tegra_cec_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct tegra_cec *cec = platform_get_drvdata(pdev); struct tegra_cec *cec = platform_get_drvdata(pdev);
atomic_set(&cec->init_cancel, 1);
wmb();
wake_up_interruptible(&cec->suspend_waitq);
/* cancel the work queue */ /* cancel the work queue */
cancel_work_sync(&cec->work); cancel_work_sync(&cec->work);
atomic_set(&cec->init_done, 0); atomic_set(&cec->init_done, 0);
atomic_set(&cec->init_cancel, 0);
clk_disable(cec->clk); clk_disable(cec->clk);

6
drivers/misc/tegra-cec/tegra_cec.h
View File

@@ -1,7 +1,7 @@
/* /*
* drivers/misc/tegra-cec/tegra_cec.h * drivers/misc/tegra-cec/tegra_cec.h
* *
* Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2012-2015, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -35,6 +35,10 @@ struct tegra_cec {
wait_queue_head_t tx_waitq; wait_queue_head_t tx_waitq;
wait_queue_head_t init_waitq; wait_queue_head_t init_waitq;
atomic_t init_done; atomic_t init_done;
#ifdef CONFIG_PM
wait_queue_head_t suspend_waitq;
atomic_t init_cancel;
#endif
u16 logical_addr; u16 logical_addr;
struct work_struct work; struct work_struct work;
unsigned int rx_wake; unsigned int rx_wake;