Skip to content

Commit a4630c6

Browse files
geerturafaeljw
authored andcommitted
PM / Domains: Skip timings during syscore suspend/resume
The PM Domain code uses ktime_get() to perform various latency measurements. However, if ktime_get() is called while timekeeping is suspended, the following warning is printed: WARNING: CPU: 0 PID: 1340 at kernel/time/timekeeping.c:576 ktime_get+0x3 This happens when resuming the PM Domain that contains the clock events source, which calls pm_genpd_syscore_poweron(). Chain of operations is: timekeeping_resume() { clockevents_resume() sh_cmt_clock_event_resume() pm_genpd_syscore_poweron() pm_genpd_sync_poweron() genpd_syscore_switch() genpd_power_on() ktime_get(), but timekeeping_suspended == 1 ... timekeeping_suspended = 0; } Fix this by adding a "timed" parameter to genpd_power_{on,off}() and pm_genpd_sync_power{off,on}(), to indicate whether latency measurements are allowed. This parameter is passed as false in genpd_syscore_switch() (i.e. during syscore suspend/resume), and true in all other cases. Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 0f57d86 commit a4630c6

File tree

1 file changed

+26
-16
lines changed

1 file changed

+26
-16
lines changed

drivers/base/power/domain.c

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static void genpd_recalc_cpu_exit_latency(struct generic_pm_domain *genpd)
181181
genpd->cpuidle_data->idle_state->exit_latency = usecs64;
182182
}
183183

184-
static int genpd_power_on(struct generic_pm_domain *genpd)
184+
static int genpd_power_on(struct generic_pm_domain *genpd, bool timed)
185185
{
186186
ktime_t time_start;
187187
s64 elapsed_ns;
@@ -190,6 +190,9 @@ static int genpd_power_on(struct generic_pm_domain *genpd)
190190
if (!genpd->power_on)
191191
return 0;
192192

193+
if (!timed)
194+
return genpd->power_on(genpd);
195+
193196
time_start = ktime_get();
194197
ret = genpd->power_on(genpd);
195198
if (ret)
@@ -208,7 +211,7 @@ static int genpd_power_on(struct generic_pm_domain *genpd)
208211
return ret;
209212
}
210213

211-
static int genpd_power_off(struct generic_pm_domain *genpd)
214+
static int genpd_power_off(struct generic_pm_domain *genpd, bool timed)
212215
{
213216
ktime_t time_start;
214217
s64 elapsed_ns;
@@ -217,6 +220,9 @@ static int genpd_power_off(struct generic_pm_domain *genpd)
217220
if (!genpd->power_off)
218221
return 0;
219222

223+
if (!timed)
224+
return genpd->power_off(genpd);
225+
220226
time_start = ktime_get();
221227
ret = genpd->power_off(genpd);
222228
if (ret == -EBUSY)
@@ -305,7 +311,7 @@ static int __pm_genpd_poweron(struct generic_pm_domain *genpd)
305311
}
306312
}
307313

308-
ret = genpd_power_on(genpd);
314+
ret = genpd_power_on(genpd, true);
309315
if (ret)
310316
goto err;
311317

@@ -615,7 +621,7 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
615621
* the pm_genpd_poweron() restore power for us (this shouldn't
616622
* happen very often).
617623
*/
618-
ret = genpd_power_off(genpd);
624+
ret = genpd_power_off(genpd, true);
619625
if (ret == -EBUSY) {
620626
genpd_set_active(genpd);
621627
goto out;
@@ -827,6 +833,7 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,
827833
/**
828834
* pm_genpd_sync_poweroff - Synchronously power off a PM domain and its masters.
829835
* @genpd: PM domain to power off, if possible.
836+
* @timed: True if latency measurements are allowed.
830837
*
831838
* Check if the given PM domain can be powered off (during system suspend or
832839
* hibernation) and do that if so. Also, in that case propagate to its masters.
@@ -836,7 +843,8 @@ static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,
836843
* executed sequentially, so it is guaranteed that it will never run twice in
837844
* parallel).
838845
*/
839-
static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd)
846+
static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd,
847+
bool timed)
840848
{
841849
struct gpd_link *link;
842850

@@ -847,38 +855,40 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd)
847855
|| atomic_read(&genpd->sd_count) > 0)
848856
return;
849857

850-
genpd_power_off(genpd);
858+
genpd_power_off(genpd, timed);
851859

852860
genpd->status = GPD_STATE_POWER_OFF;
853861

854862
list_for_each_entry(link, &genpd->slave_links, slave_node) {
855863
genpd_sd_counter_dec(link->master);
856-
pm_genpd_sync_poweroff(link->master);
864+
pm_genpd_sync_poweroff(link->master, timed);
857865
}
858866
}
859867

860868
/**
861869
* pm_genpd_sync_poweron - Synchronously power on a PM domain and its masters.
862870
* @genpd: PM domain to power on.
871+
* @timed: True if latency measurements are allowed.
863872
*
864873
* This function is only called in "noirq" and "syscore" stages of system power
865874
* transitions, so it need not acquire locks (all of the "noirq" callbacks are
866875
* executed sequentially, so it is guaranteed that it will never run twice in
867876
* parallel).
868877
*/
869-
static void pm_genpd_sync_poweron(struct generic_pm_domain *genpd)
878+
static void pm_genpd_sync_poweron(struct generic_pm_domain *genpd,
879+
bool timed)
870880
{
871881
struct gpd_link *link;
872882

873883
if (genpd->status != GPD_STATE_POWER_OFF)
874884
return;
875885

876886
list_for_each_entry(link, &genpd->slave_links, slave_node) {
877-
pm_genpd_sync_poweron(link->master);
887+
pm_genpd_sync_poweron(link->master, timed);
878888
genpd_sd_counter_inc(link->master);
879889
}
880890

881-
genpd_power_on(genpd);
891+
genpd_power_on(genpd, timed);
882892

883893
genpd->status = GPD_STATE_ACTIVE;
884894
}
@@ -1056,7 +1066,7 @@ static int pm_genpd_suspend_noirq(struct device *dev)
10561066
* the same PM domain, so it is not necessary to use locking here.
10571067
*/
10581068
genpd->suspended_count++;
1059-
pm_genpd_sync_poweroff(genpd);
1069+
pm_genpd_sync_poweroff(genpd, true);
10601070

10611071
return 0;
10621072
}
@@ -1086,7 +1096,7 @@ static int pm_genpd_resume_noirq(struct device *dev)
10861096
* guaranteed that this function will never run twice in parallel for
10871097
* the same PM domain, so it is not necessary to use locking here.
10881098
*/
1089-
pm_genpd_sync_poweron(genpd);
1099+
pm_genpd_sync_poweron(genpd, true);
10901100
genpd->suspended_count--;
10911101

10921102
return genpd_start_dev(genpd, dev);
@@ -1300,7 +1310,7 @@ static int pm_genpd_restore_noirq(struct device *dev)
13001310
* If the domain was off before the hibernation, make
13011311
* sure it will be off going forward.
13021312
*/
1303-
genpd_power_off(genpd);
1313+
genpd_power_off(genpd, true);
13041314

13051315
return 0;
13061316
}
@@ -1309,7 +1319,7 @@ static int pm_genpd_restore_noirq(struct device *dev)
13091319
if (genpd->suspend_power_off)
13101320
return 0;
13111321

1312-
pm_genpd_sync_poweron(genpd);
1322+
pm_genpd_sync_poweron(genpd, true);
13131323

13141324
return genpd_start_dev(genpd, dev);
13151325
}
@@ -1367,9 +1377,9 @@ static void genpd_syscore_switch(struct device *dev, bool suspend)
13671377

13681378
if (suspend) {
13691379
genpd->suspended_count++;
1370-
pm_genpd_sync_poweroff(genpd);
1380+
pm_genpd_sync_poweroff(genpd, false);
13711381
} else {
1372-
pm_genpd_sync_poweron(genpd);
1382+
pm_genpd_sync_poweron(genpd, false);
13731383
genpd->suspended_count--;
13741384
}
13751385
}

0 commit comments

Comments
 (0)