Skip to content

Commit e2b3b80

Browse files
rafaeljwrafaeljw
committed
Merge branches 'pm-sleep', 'pm-cpufreq', 'pm-core' and 'pm-opp'
* pm-sleep: x86/power/64: Do not refer to __PAGE_OFFSET from assembly code * pm-cpufreq: cpufreq: Do not default-yes CPU_FREQ_STAT cpufreq: intel_pstate: Add more out-of-band IDs * pm-core: PM-wakeup: Delete unnecessary checks before three function calls * pm-opp: PM / OPP: optimize dev_pm_opp_set_rate() performance a bit
5 parents 601f887 + c226fab + 79ad70d + 4f48ec8 + 067b7ce commit e2b3b80

File tree

6 files changed

+37
-35
lines changed

6 files changed

+37
-35
lines changed

‎arch/x86/power/hibernate_64.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ unsigned long jump_address_phys;
3737
*/
3838
unsigned long restore_cr3 __visible;
3939

40-
pgd_t *temp_level4_pgt __visible;
40+
unsigned long temp_level4_pgt __visible;
4141

4242
unsigned long relocated_restore_code __visible;
4343

44-
static int set_up_temporary_text_mapping(void)
44+
static int set_up_temporary_text_mapping(pgd_t *pgd)
4545
{
4646
pmd_t *pmd;
4747
pud_t *pud;
@@ -71,7 +71,7 @@ static int set_up_temporary_text_mapping(void)
7171
__pmd((jump_address_phys & PMD_MASK) | __PAGE_KERNEL_LARGE_EXEC));
7272
set_pud(pud + pud_index(restore_jump_address),
7373
__pud(__pa(pmd) | _KERNPG_TABLE));
74-
set_pgd(temp_level4_pgt + pgd_index(restore_jump_address),
74+
set_pgd(pgd + pgd_index(restore_jump_address),
7575
__pgd(__pa(pud) | _KERNPG_TABLE));
7676

7777
return 0;
@@ -90,15 +90,16 @@ static int set_up_temporary_mappings(void)
9090
.kernel_mapping = true,
9191
};
9292
unsigned long mstart, mend;
93+
pgd_t *pgd;
9394
int result;
9495
int i;
9596

96-
temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);
97-
if (!temp_level4_pgt)
97+
pgd = (pgd_t *)get_safe_page(GFP_ATOMIC);
98+
if (!pgd)
9899
return -ENOMEM;
99100

100101
/* Prepare a temporary mapping for the kernel text */
101-
result = set_up_temporary_text_mapping();
102+
result = set_up_temporary_text_mapping(pgd);
102103
if (result)
103104
return result;
104105

@@ -107,13 +108,12 @@ static int set_up_temporary_mappings(void)
107108
mstart = pfn_mapped[i].start << PAGE_SHIFT;
108109
mend = pfn_mapped[i].end << PAGE_SHIFT;
109110

110-
result = kernel_ident_mapping_init(&info, temp_level4_pgt,
111-
mstart, mend);
112-
111+
result = kernel_ident_mapping_init(&info, pgd, mstart, mend);
113112
if (result)
114113
return result;
115114
}
116115

116+
temp_level4_pgt = (unsigned long)pgd - __PAGE_OFFSET;
117117
return 0;
118118
}
119119

‎arch/x86/power/hibernate_asm_64.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ ENTRY(restore_image)
7272
/* code below has been relocated to a safe page */
7373
ENTRY(core_restore_code)
7474
/* switch to temporary page tables */
75-
movq $__PAGE_OFFSET, %rcx
76-
subq %rcx, %rax
7775
movq %rax, %cr3
7876
/* flush TLB */
7977
movq %rbx, %rcx

‎drivers/base/power/opp/core.c

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,22 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev,
402402
}
403403
EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact);
404404

405+
static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,
406+
unsigned long *freq)
407+
{
408+
struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
409+
410+
list_for_each_entry_rcu(temp_opp, &opp_table->opp_list, node) {
411+
if (temp_opp->available && temp_opp->rate >= *freq) {
412+
opp = temp_opp;
413+
*freq = opp->rate;
414+
break;
415+
}
416+
}
417+
418+
return opp;
419+
}
420+
405421
/**
406422
* dev_pm_opp_find_freq_ceil() - Search for an rounded ceil freq
407423
* @dev: device for which we do this operation
@@ -427,7 +443,6 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
427443
unsigned long *freq)
428444
{
429445
struct opp_table *opp_table;
430-
struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
431446

432447
opp_rcu_lockdep_assert();
433448

@@ -440,15 +455,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev,
440455
if (IS_ERR(opp_table))
441456
return ERR_CAST(opp_table);
442457

443-
list_for_each_entry_rcu(temp_opp, &opp_table->opp_list, node) {
444-
if (temp_opp->available && temp_opp->rate >= *freq) {
445-
opp = temp_opp;
446-
*freq = opp->rate;
447-
break;
448-
}
449-
}
450-
451-
return opp;
458+
return _find_freq_ceil(opp_table, freq);
452459
}
453460
EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil);
454461

@@ -612,7 +619,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
612619
return PTR_ERR(opp_table);
613620
}
614621

615-
old_opp = dev_pm_opp_find_freq_ceil(dev, &old_freq);
622+
old_opp = _find_freq_ceil(opp_table, &old_freq);
616623
if (!IS_ERR(old_opp)) {
617624
ou_volt = old_opp->u_volt;
618625
ou_volt_min = old_opp->u_volt_min;
@@ -622,7 +629,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
622629
__func__, old_freq, PTR_ERR(old_opp));
623630
}
624631

625-
opp = dev_pm_opp_find_freq_ceil(dev, &freq);
632+
opp = _find_freq_ceil(opp_table, &freq);
626633
if (IS_ERR(opp)) {
627634
ret = PTR_ERR(opp);
628635
dev_err(dev, "%s: failed to find OPP for freq %lu (%d)\n",

‎drivers/base/power/wakeup.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,9 @@ void device_wakeup_arm_wake_irqs(void)
334334
struct wakeup_source *ws;
335335

336336
rcu_read_lock();
337-
list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
338-
if (ws->wakeirq)
339-
dev_pm_arm_wake_irq(ws->wakeirq);
340-
}
337+
list_for_each_entry_rcu(ws, &wakeup_sources, entry)
338+
dev_pm_arm_wake_irq(ws->wakeirq);
339+
341340
rcu_read_unlock();
342341
}
343342

@@ -351,10 +350,9 @@ void device_wakeup_disarm_wake_irqs(void)
351350
struct wakeup_source *ws;
352351

353352
rcu_read_lock();
354-
list_for_each_entry_rcu(ws, &wakeup_sources, entry) {
355-
if (ws->wakeirq)
356-
dev_pm_disarm_wake_irq(ws->wakeirq);
357-
}
353+
list_for_each_entry_rcu(ws, &wakeup_sources, entry)
354+
dev_pm_disarm_wake_irq(ws->wakeirq);
355+
358356
rcu_read_unlock();
359357
}
360358

@@ -390,9 +388,7 @@ int device_wakeup_disable(struct device *dev)
390388
return -EINVAL;
391389

392390
ws = device_wakeup_detach(dev);
393-
if (ws)
394-
wakeup_source_unregister(ws);
395-
391+
wakeup_source_unregister(ws);
396392
return 0;
397393
}
398394
EXPORT_SYMBOL_GPL(device_wakeup_disable);

‎drivers/cpufreq/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ config CPU_FREQ_BOOST_SW
3232

3333
config CPU_FREQ_STAT
3434
bool "CPU frequency transition statistics"
35-
default y
3635
help
3736
Export CPU frequency statistics information through sysfs.
3837

‎drivers/cpufreq/intel_pstate.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,8 @@ MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
13741374

13751375
static const struct x86_cpu_id intel_pstate_cpu_oob_ids[] __initconst = {
13761376
ICPU(INTEL_FAM6_BROADWELL_XEON_D, core_params),
1377+
ICPU(INTEL_FAM6_BROADWELL_X, core_params),
1378+
ICPU(INTEL_FAM6_SKYLAKE_X, core_params),
13771379
{}
13781380
};
13791381

0 commit comments

Comments
 (0)