Commit e2b3b80d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 601f887d c226fab4 79ad70de 4f48ec8a 067b7ce0

arch/x86/power/hibernate_64.c

+9 −9
Original line number Diff line number Diff line
@@ -37,11 +37,11 @@ unsigned long jump_address_phys; 
 */

unsigned long restore_cr3 __visible;



pgd_t *temp_level4_pgt __visible;

unsigned long temp_level4_pgt __visible;



unsigned long relocated_restore_code __visible;



static int set_up_temporary_text_mapping(void)

static int set_up_temporary_text_mapping(pgd_t *pgd)

{

	pmd_t *pmd;

	pud_t *pud;
@@ -71,7 +71,7 @@ static int set_up_temporary_text_mapping(void) 
		__pmd((jump_address_phys & PMD_MASK) | __PAGE_KERNEL_LARGE_EXEC));

	set_pud(pud + pud_index(restore_jump_address),

		__pud(__pa(pmd) | _KERNPG_TABLE));

	set_pgd(temp_level4_pgt + pgd_index(restore_jump_address),

	set_pgd(pgd + pgd_index(restore_jump_address),

		__pgd(__pa(pud) | _KERNPG_TABLE));



	return 0;
@@ -90,15 +90,16 @@ static int set_up_temporary_mappings(void) 
		.kernel_mapping = true,

	};

	unsigned long mstart, mend;

	pgd_t *pgd;

	int result;

	int i;



	temp_level4_pgt = (pgd_t *)get_safe_page(GFP_ATOMIC);

	if (!temp_level4_pgt)

	pgd = (pgd_t *)get_safe_page(GFP_ATOMIC);

	if (!pgd)

		return -ENOMEM;



	/* Prepare a temporary mapping for the kernel text */

	result = set_up_temporary_text_mapping();

	result = set_up_temporary_text_mapping(pgd);

	if (result)

		return result;
@@ -107,13 +108,12 @@ static int set_up_temporary_mappings(void) 
		mstart = pfn_mapped[i].start << PAGE_SHIFT;

		mend   = pfn_mapped[i].end << PAGE_SHIFT;



		result = kernel_ident_mapping_init(&info, temp_level4_pgt,

						   mstart, mend);



		result = kernel_ident_mapping_init(&info, pgd, mstart, mend);

		if (result)

			return result;

	}



	temp_level4_pgt = (unsigned long)pgd - __PAGE_OFFSET;

	return 0;

}

arch/x86/power/hibernate_asm_64.S

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ ENTRY(restore_image) 
	/* code below has been relocated to a safe page */

ENTRY(core_restore_code)

	/* switch to temporary page tables */

	movq	$__PAGE_OFFSET, %rcx

	subq	%rcx, %rax

	movq	%rax, %cr3

	/* flush TLB */

	movq	%rbx, %rcx

drivers/base/power/opp/core.c

+19 −12
Original line number Diff line number Diff line
@@ -402,6 +402,22 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, 
}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_exact);



static noinline struct dev_pm_opp *_find_freq_ceil(struct opp_table *opp_table,

						   unsigned long *freq)

{

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);



	list_for_each_entry_rcu(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->available && temp_opp->rate >= *freq) {

			opp = temp_opp;

			*freq = opp->rate;

			break;

		}

	}



	return opp;

}



/**

 * dev_pm_opp_find_freq_ceil() - Search for an rounded ceil freq

 * @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, 
					     unsigned long *freq)

{

	struct opp_table *opp_table;

	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);



	opp_rcu_lockdep_assert();
@@ -440,15 +455,7 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, 
	if (IS_ERR(opp_table))

		return ERR_CAST(opp_table);



	list_for_each_entry_rcu(temp_opp, &opp_table->opp_list, node) {

		if (temp_opp->available && temp_opp->rate >= *freq) {

			opp = temp_opp;

			*freq = opp->rate;

			break;

		}

	}



	return opp;

	return _find_freq_ceil(opp_table, freq);

}

EXPORT_SYMBOL_GPL(dev_pm_opp_find_freq_ceil);
@@ -612,7 +619,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) 
		return PTR_ERR(opp_table);

	}



	old_opp = dev_pm_opp_find_freq_ceil(dev, &old_freq);

	old_opp = _find_freq_ceil(opp_table, &old_freq);

	if (!IS_ERR(old_opp)) {

		ou_volt = old_opp->u_volt;

		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) 
			__func__, old_freq, PTR_ERR(old_opp));

	}



	opp = dev_pm_opp_find_freq_ceil(dev, &freq);

	opp = _find_freq_ceil(opp_table, &freq);

	if (IS_ERR(opp)) {

		ret = PTR_ERR(opp);

		dev_err(dev, "%s: failed to find OPP for freq %lu (%d)\n",

drivers/base/power/wakeup.c

+7 −11
Original line number Diff line number Diff line
@@ -334,10 +334,9 @@ void device_wakeup_arm_wake_irqs(void) 
	struct wakeup_source *ws;



	rcu_read_lock();

	list_for_each_entry_rcu(ws, &wakeup_sources, entry) {

		if (ws->wakeirq)

	list_for_each_entry_rcu(ws, &wakeup_sources, entry)

		dev_pm_arm_wake_irq(ws->wakeirq);

	}



	rcu_read_unlock();

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



	rcu_read_lock();

	list_for_each_entry_rcu(ws, &wakeup_sources, entry) {

		if (ws->wakeirq)

	list_for_each_entry_rcu(ws, &wakeup_sources, entry)

		dev_pm_disarm_wake_irq(ws->wakeirq);

	}



	rcu_read_unlock();

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



	ws = device_wakeup_detach(dev);

	if (ws)

	wakeup_source_unregister(ws);



	return 0;

}

EXPORT_SYMBOL_GPL(device_wakeup_disable);

drivers/cpufreq/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ config CPU_FREQ_BOOST_SW 


config CPU_FREQ_STAT

	bool "CPU frequency transition statistics"

	default y

	help

	  Export CPU frequency statistics information through sysfs.

CRA Git | Maintained and supported by SUSTech CRA and CCSE