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

Merge branches 'pm-core' and 'pm-opp' 

These are a PM core fix and an OPP framework fix for 4.18-rc2,
both "stable" material.

* pm-core:
  PM / core: Fix supplier device runtime PM usage counter imbalance

* pm-opp:
  PM / OPP: Update voltage in case freq == old_freq
parents 7a0f9d1e 47e5abfb 3477acca

drivers/base/core.c

+11 −4
Original line number Diff line number Diff line
@@ -236,6 +236,13 @@ struct device_link *device_link_add(struct device *consumer, 
			link->rpm_active = true;

		}

		pm_runtime_new_link(consumer);

		/*

		 * If the link is being added by the consumer driver at probe

		 * time, balance the decrementation of the supplier's runtime PM

		 * usage counter after consumer probe in driver_probe_device().

		 */

		if (consumer->links.status == DL_DEV_PROBING)

			pm_runtime_get_noresume(supplier);

	}

	get_device(supplier);

	link->supplier = supplier;
@@ -255,12 +262,12 @@ struct device_link *device_link_add(struct device *consumer, 
			switch (consumer->links.status) {

			case DL_DEV_PROBING:

				/*

				 * Balance the decrementation of the supplier's

				 * runtime PM usage counter after consumer probe

				 * in driver_probe_device().

				 * Some callers expect the link creation during

				 * consumer driver probe to resume the supplier

				 * even without DL_FLAG_RPM_ACTIVE.

				 */

				if (flags & DL_FLAG_PM_RUNTIME)

					pm_runtime_get_sync(supplier);

					pm_runtime_resume(supplier);



				link->status = DL_STATE_CONSUMER_PROBE;

				break;

drivers/opp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table, 
	}



	/* Scaling up? Scale voltage before frequency */

	if (freq > old_freq) {

	if (freq >= old_freq) {

		ret = _set_opp_voltage(dev, reg, new_supply);

		if (ret)

			goto restore_voltage;