diff options
| author | Rakesh Bodla <rbodla@nvidia.com> | 2013-05-13 15:26:36 +0530 |
|---|---|---|
| committer | Harshada Kale <hkale@nvidia.com> | 2013-05-16 05:16:13 -0700 |
| commit | d04550eb0e86946e9c140d966735fffccf98cdf0 (patch) | |
| tree | 88de6b681bc68c8b0315b0c7e945e8d644fdbfc3 /drivers/usb | |
| parent | 3096f373982fc56fd6cfd1c276eebdda82a521fc (diff) | |
usb: gadget: tegra:Change cpu frequency boost logic
Changing the logic for boosting and unboosting
CPU frequency during USB device transfers for
performance.
Bug 1216779
Change-Id: I8b5378ee9e95c890d2cdc4a614f95e378ffb016f
Signed-off-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-on: http://git-master/r/227913
Reviewed-by: Harshada Kale <hkale@nvidia.com>
Tested-by: Harshada Kale <hkale@nvidia.com>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/tegra_udc.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/drivers/usb/gadget/tegra_udc.c b/drivers/usb/gadget/tegra_udc.c index f1932798fd24..ab85a28d6cb4 100644 --- a/drivers/usb/gadget/tegra_udc.c +++ b/drivers/usb/gadget/tegra_udc.c @@ -40,6 +40,7 @@ #include <linux/io.h> #include <linux/pm_qos.h> #include <linux/platform_data/tegra_usb.h> +#include <linux/timer.h> #include <asm/byteorder.h> #include <asm/io.h> @@ -104,6 +105,7 @@ static struct tegra_udc *the_udc; static struct pm_qos_request boost_cpu_freq_req; static u32 ep_queue_request_count; static u8 boost_cpufreq_work_flag; + static struct timer_list boost_timer; #endif static char *const tegra_udc_extcon_cable[] = { @@ -212,11 +214,8 @@ static void done(struct tegra_ep *ep, struct tegra_req *req, int status) ep->stopped = 1; #ifdef CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ - if (req->req.complete && req->req.length >= BOOST_TRIGGER_SIZE) { + if (req->req.complete && req->req.length >= BOOST_TRIGGER_SIZE) ep_queue_request_count--; - if (!ep_queue_request_count) - schedule_work(&udc->boost_cpufreq_work); - } #endif /* complete() is from gadget layer, @@ -958,8 +957,7 @@ tegra_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags) #ifdef CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ if (req->req.length >= BOOST_TRIGGER_SIZE) { ep_queue_request_count++; - if (ep_queue_request_count && boost_cpufreq_work_flag) - schedule_work(&udc->boost_cpufreq_work); + schedule_work(&udc->boost_cpufreq_work); } #endif @@ -2323,17 +2321,24 @@ static void tegra_udc_set_current_limit_work(struct work_struct *work) } #ifdef CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ +void tegra_set_cpu_freq_normal(unsigned long data) +{ + pm_qos_update_request(&boost_cpu_freq_req, PM_QOS_DEFAULT_VALUE); + boost_cpufreq_work_flag = 1; + DBG("%s(%d) set CPU frequency to normal\n", __func__, __LINE__); +} + static void tegra_udc_boost_cpu_frequency_work(struct work_struct *work) { - if (ep_queue_request_count && boost_cpufreq_work_flag) { + /* If CPU frequency is not boosted earlier boost it, otherwise + * change timer expiry time to 2sec */ + if (boost_cpufreq_work_flag) { pm_qos_update_request(&boost_cpu_freq_req, (s32)CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ * 1000); boost_cpufreq_work_flag = 0; - } else if (!ep_queue_request_count && !boost_cpufreq_work_flag) { - pm_qos_update_request(&boost_cpu_freq_req, - PM_QOS_DEFAULT_VALUE); - boost_cpufreq_work_flag = 1; + DBG("%s(%d) boost CPU frequency\n", __func__, __LINE__); } + mod_timer(&boost_timer, jiffies + msecs_to_jiffies(2000)); } #endif @@ -2866,6 +2871,7 @@ static int __init tegra_udc_probe(struct platform_device *pdev) tegra_udc_boost_cpu_frequency_work); pm_qos_add_request(&boost_cpu_freq_req, PM_QOS_CPU_FREQ_MIN, PM_QOS_DEFAULT_VALUE); + setup_timer(&boost_timer, tegra_set_cpu_freq_normal, 0); #endif /* Create work for controlling clocks to the phy if otg is disabled */ @@ -2976,6 +2982,7 @@ static int __exit tegra_udc_remove(struct platform_device *pdev) cancel_work_sync(&udc->irq_work); #ifdef CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ cancel_work_sync(&udc->boost_cpufreq_work); + del_timer(&boost_timer); #endif if (udc->vbus_reg) |