Commit 5c395097 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-4.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management and ACPI fixes from Rafael Wysocki:
 "These are fixes that didn't make it to the previous PM+ACPI pull
  request or are fixing issues introduced by it.

  Specifics:

   - Fix a recently added memory leak in an error path in the ACPI
     resources management code (Dan Carpenter)

   - Fix a build warning triggered by an ACPI video header function that
     should be static inline (Borislav Petkov)

   - Change names of helper function converting struct fwnode_handle
     pointers to either struct device_node or struct acpi_device
     pointers so they don't conflict with local variable names
     (Alexander Sverdlin)

   - Make the hibernate core re-enable nonboot CPUs on failures to
     disable them as expected (Vitaly Kuznetsov)

   - Increase the default timeout of the device suspend watchdog to
     prevent it from triggering too early on some systems (Takashi Iwai)

   - Prevent the cpuidle powernv driver from registering idle states
     with CPUIDLE_FLAG_TIMER_STOP set if CONFIG_TICK_ONESHOT is unset
     which leads to boot hangs (Preeti U Murthy)"

* tag 'pm+acpi-4.2-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  tick/idle/powerpc: Do not register idle states with CPUIDLE_FLAG_TIMER_STOP set in periodic mode
  PM / sleep: Increase default DPM watchdog timeout to 60
  PM / hibernate: re-enable nonboot cpus on disable_nonboot_cpus() failure
  ACPI / OF: Rename of_node() and acpi_node() to to_of_node() and to_acpi_node()
  ACPI / video: Inline acpi_video_set_dmi_backlight_type
  ACPI / resources: free memory on error in add_region_before()
parents 7adf12b8 132c242d

drivers/acpi/resource.c

+3 −1
Original line number Diff line number Diff line
@@ -660,8 +660,10 @@ static int add_region_before(u64 start, u64 end, u8 space_id, 
		return -ENOMEM;



	error = request_range(start, end, space_id, flags, desc);

	if (error)

	if (error) {

		kfree(reg);

		return error;

	}



	reg->start = start;

	reg->end = end;

drivers/base/property.c

+13 −13
Original line number Diff line number Diff line
@@ -129,9 +129,9 @@ EXPORT_SYMBOL_GPL(device_property_present); 
bool fwnode_property_present(struct fwnode_handle *fwnode, const char *propname)

{

	if (is_of_node(fwnode))

		return of_property_read_bool(of_node(fwnode), propname);

		return of_property_read_bool(to_of_node(fwnode), propname);

	else if (is_acpi_node(fwnode))

		return !acpi_dev_prop_get(acpi_node(fwnode), propname, NULL);

		return !acpi_dev_prop_get(to_acpi_node(fwnode), propname, NULL);



	return !!pset_prop_get(to_pset(fwnode), propname);

}
@@ -286,10 +286,10 @@ EXPORT_SYMBOL_GPL(device_property_read_string); 
({ \

	int _ret_; \

	if (is_of_node(_fwnode_)) \

		_ret_ = OF_DEV_PROP_READ_ARRAY(of_node(_fwnode_), _propname_, \

		_ret_ = OF_DEV_PROP_READ_ARRAY(to_of_node(_fwnode_), _propname_, \

					       _type_, _val_, _nval_); \

	else if (is_acpi_node(_fwnode_)) \

		_ret_ = acpi_dev_prop_read(acpi_node(_fwnode_), _propname_, \

		_ret_ = acpi_dev_prop_read(to_acpi_node(_fwnode_), _propname_, \

					   _proptype_, _val_, _nval_); \

	else \

		_ret_ = pset_prop_read_array(to_pset(_fwnode_), _propname_, \
@@ -425,11 +425,11 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode, 
{

	if (is_of_node(fwnode))

		return val ?

			of_property_read_string_array(of_node(fwnode), propname,

						      val, nval) :

			of_property_count_strings(of_node(fwnode), propname);

			of_property_read_string_array(to_of_node(fwnode),

						      propname, val, nval) :

			of_property_count_strings(to_of_node(fwnode), propname);

	else if (is_acpi_node(fwnode))

		return acpi_dev_prop_read(acpi_node(fwnode), propname,

		return acpi_dev_prop_read(to_acpi_node(fwnode), propname,

					  DEV_PROP_STRING, val, nval);



	return pset_prop_read_array(to_pset(fwnode), propname,
@@ -456,9 +456,9 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode, 
				const char *propname, const char **val)

{

	if (is_of_node(fwnode))

		return of_property_read_string(of_node(fwnode), propname, val);

		return of_property_read_string(to_of_node(fwnode), propname, val);

	else if (is_acpi_node(fwnode))

		return acpi_dev_prop_read(acpi_node(fwnode), propname,

		return acpi_dev_prop_read(to_acpi_node(fwnode), propname,

					  DEV_PROP_STRING, val, 1);



	return -ENXIO;
@@ -476,13 +476,13 @@ struct fwnode_handle *device_get_next_child_node(struct device *dev, 
	if (IS_ENABLED(CONFIG_OF) && dev->of_node) {

		struct device_node *node;



		node = of_get_next_available_child(dev->of_node, of_node(child));

		node = of_get_next_available_child(dev->of_node, to_of_node(child));

		if (node)

			return &node->fwnode;

	} else if (IS_ENABLED(CONFIG_ACPI)) {

		struct acpi_device *node;



		node = acpi_get_next_child(dev, acpi_node(child));

		node = acpi_get_next_child(dev, to_acpi_node(child));

		if (node)

			return acpi_fwnode_handle(node);

	}
@@ -501,7 +501,7 @@ EXPORT_SYMBOL_GPL(device_get_next_child_node); 
void fwnode_handle_put(struct fwnode_handle *fwnode)

{

	if (is_of_node(fwnode))

		of_node_put(of_node(fwnode));

		of_node_put(to_of_node(fwnode));

}

EXPORT_SYMBOL_GPL(fwnode_handle_put);

drivers/cpuidle/cpuidle-powernv.c

+12 −3
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ static int nap_loop(struct cpuidle_device *dev, 
	return index;

}



/* Register for fastsleep only in oneshot mode of broadcast */

#ifdef CONFIG_TICK_ONESHOT

static int fastsleep_loop(struct cpuidle_device *dev,

				struct cpuidle_driver *drv,

				int index)
@@ -90,7 +92,7 @@ static int fastsleep_loop(struct cpuidle_device *dev, 


	return index;

}



#endif

/*

 * States for dedicated partition case.

 */
@@ -216,7 +218,14 @@ static int powernv_add_idle_states(void) 
			powernv_states[nr_idle_states].flags = 0;

			powernv_states[nr_idle_states].target_residency = 100;

			powernv_states[nr_idle_states].enter = &nap_loop;

		} else if (flags[i] & OPAL_PM_SLEEP_ENABLED ||

		}



		/*

		 * All cpuidle states with CPUIDLE_FLAG_TIMER_STOP set must come

		 * within this config dependency check.

		 */

#ifdef CONFIG_TICK_ONESHOT

		if (flags[i] & OPAL_PM_SLEEP_ENABLED ||

			flags[i] & OPAL_PM_SLEEP_ENABLED_ER1) {

			/* Add FASTSLEEP state */

			strcpy(powernv_states[nr_idle_states].name, "FastSleep");
@@ -225,7 +234,7 @@ static int powernv_add_idle_states(void) 
			powernv_states[nr_idle_states].target_residency = 300000;

			powernv_states[nr_idle_states].enter = &fastsleep_loop;

		}



#endif

		powernv_states[nr_idle_states].exit_latency =

				((unsigned int)latency_ns[i]) / 1000;

drivers/gpio/gpiolib.c

+2 −2
Original line number Diff line number Diff line
@@ -2052,14 +2052,14 @@ struct gpio_desc *fwnode_get_named_gpiod(struct fwnode_handle *fwnode, 
	if (is_of_node(fwnode)) {

		enum of_gpio_flags flags;



		desc = of_get_named_gpiod_flags(of_node(fwnode), propname, 0,

		desc = of_get_named_gpiod_flags(to_of_node(fwnode), propname, 0,

						&flags);

		if (!IS_ERR(desc))

			active_low = flags & OF_GPIO_ACTIVE_LOW;

	} else if (is_acpi_node(fwnode)) {

		struct acpi_gpio_info info;



		desc = acpi_get_gpiod_by_index(acpi_node(fwnode), propname, 0,

		desc = acpi_get_gpiod_by_index(to_acpi_node(fwnode), propname, 0,

					       &info);

		if (!IS_ERR(desc))

			active_low = info.active_low;

drivers/leds/leds-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev) 
			goto err;

		}



		np = of_node(child);

		np = to_of_node(child);



		if (fwnode_property_present(child, "label")) {

			fwnode_property_read_string(child, "label", &led.name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE