evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "scsi: ufs: Add clock ungating to a separate workqueue"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-09 01:32:16 -08:00 • committed by Gerrit - the friendly Code Review server
commit fd9e18a8de
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/ufs/ufshcd.c
View file

@ -1344,7 +1344,8 @@ start:
hba->clk_gating.state = REQ_CLKS_ON; hba->clk_gating.state = REQ_CLKS_ON;
trace_ufshcd_clk_gating(dev_name(hba->dev), trace_ufshcd_clk_gating(dev_name(hba->dev),
hba->clk_gating.state); hba->clk_gating.state);
schedule_work(&hba->clk_gating.ungate_work); queue_work(hba->clk_gating.ungating_workq,
&hba->clk_gating.ungate_work);
/* /*
* fall through to check if we should wait for this * fall through to check if we should wait for this
* work to be done or not. * work to be done or not.
@ -1617,6 +1618,7 @@ static enum hrtimer_restart ufshcd_clkgate_hrtimer_handler(
static void ufshcd_init_clk_gating(struct ufs_hba *hba) static void ufshcd_init_clk_gating(struct ufs_hba *hba)
{ {
struct ufs_clk_gating *gating = &hba->clk_gating; struct ufs_clk_gating *gating = &hba->clk_gating;
char wq_name[sizeof("ufs_clk_ungating_00")];
hba->clk_gating.state = CLKS_ON; hba->clk_gating.state = CLKS_ON;
@ -1645,6 +1647,10 @@ static void ufshcd_init_clk_gating(struct ufs_hba *hba)
hrtimer_init(&gating->gate_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer_init(&gating->gate_hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
gating->gate_hrtimer.function = ufshcd_clkgate_hrtimer_handler; gating->gate_hrtimer.function = ufshcd_clkgate_hrtimer_handler;
snprintf(wq_name, ARRAY_SIZE(wq_name), "ufs_clk_ungating_%d",
hba->host->host_no);
hba->clk_gating.ungating_workq = create_singlethread_workqueue(wq_name);
gating->is_enabled = true; gating->is_enabled = true;
gating->delay_ms_pwr_save = UFSHCD_CLK_GATING_DELAY_MS_PWR_SAVE; gating->delay_ms_pwr_save = UFSHCD_CLK_GATING_DELAY_MS_PWR_SAVE;
@ -1707,6 +1713,7 @@ static void ufshcd_exit_clk_gating(struct ufs_hba *hba)
device_remove_file(hba->dev, &hba->clk_gating.enable_attr); device_remove_file(hba->dev, &hba->clk_gating.enable_attr);
ufshcd_cancel_gate_work(hba); ufshcd_cancel_gate_work(hba);
cancel_work_sync(&hba->clk_gating.ungate_work); cancel_work_sync(&hba->clk_gating.ungate_work);
destroy_workqueue(hba->clk_gating.ungating_workq);
} }
static void ufshcd_set_auto_hibern8_timer(struct ufs_hba *hba, u32 delay) static void ufshcd_set_auto_hibern8_timer(struct ufs_hba *hba, u32 delay)

1
drivers/scsi/ufs/ufshcd.h
View file

@ -431,6 +431,7 @@ struct ufs_clk_gating {
struct device_attribute enable_attr; struct device_attribute enable_attr;
bool is_enabled; bool is_enabled;
int active_reqs; int active_reqs;
struct workqueue_struct *ungating_workq;
}; };
/* Hibern8 state */ /* Hibern8 state */