Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4ee21ef authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'reset-fixes-for-4.11-2' of git://git.pengutronix.de/git/pza/linux into fixes 

Reset controller fixes for v4.11

Fix devm_reset_controller_get_optional to return NULL for non-DT devices,
if the RESET_CONTROLLER Kconfig option is enabled. This fixes probe failures
of the 8250_dw driver on Intel platforms after commit acbdad8d ("serial:
8250_dw: simplify optional reset handling").

* tag 'reset-fixes-for-4.11-2' of git://git.pengutronix.de/git/pza/linux

:
  reset: add exported __reset_control_get, return NULL if optional

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0fa974b8 62e24c57

drivers/reset/core.c

+16 −6
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int reset_control_status(struct reset_control *rstc) 
}

EXPORT_SYMBOL_GPL(reset_control_status);



static struct reset_control *__reset_control_get(

static struct reset_control *__reset_control_get_internal(

				struct reset_controller_dev *rcdev,

				unsigned int index, bool shared)

{
@@ -308,7 +308,7 @@ static struct reset_control *__reset_control_get( 
	return rstc;

}



static void __reset_control_put(struct reset_control *rstc)

static void __reset_control_put_internal(struct reset_control *rstc)

{

	lockdep_assert_held(&reset_list_mutex);
@@ -377,7 +377,7 @@ struct reset_control *__of_reset_control_get(struct device_node *node, 
	}



	/* reset_list_mutex also protects the rcdev's reset_control list */

	rstc = __reset_control_get(rcdev, rstc_id, shared);

	rstc = __reset_control_get_internal(rcdev, rstc_id, shared);



	mutex_unlock(&reset_list_mutex);
@@ -385,6 +385,17 @@ struct reset_control *__of_reset_control_get(struct device_node *node, 
}

EXPORT_SYMBOL_GPL(__of_reset_control_get);



struct reset_control *__reset_control_get(struct device *dev, const char *id,

					  int index, bool shared, bool optional)

{

	if (dev->of_node)

		return __of_reset_control_get(dev->of_node, id, index, shared,

					      optional);



	return optional ? NULL : ERR_PTR(-EINVAL);

}

EXPORT_SYMBOL_GPL(__reset_control_get);



/**

 * reset_control_put - free the reset controller

 * @rstc: reset controller
@@ -396,7 +407,7 @@ void reset_control_put(struct reset_control *rstc) 
		return;



	mutex_lock(&reset_list_mutex);

	__reset_control_put(rstc);

	__reset_control_put_internal(rstc);

	mutex_unlock(&reset_list_mutex);

}

EXPORT_SYMBOL_GPL(reset_control_put);
@@ -417,8 +428,7 @@ struct reset_control *__devm_reset_control_get(struct device *dev, 
	if (!ptr)

		return ERR_PTR(-ENOMEM);



	rstc = __of_reset_control_get(dev ? dev->of_node : NULL,

				      id, index, shared, optional);

	rstc = __reset_control_get(dev, id, index, shared, optional);

	if (!IS_ERR(rstc)) {

		*ptr = rstc;

		devres_add(dev, ptr);

include/linux/reset.h

+14 −8
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ int reset_control_status(struct reset_control *rstc); 
struct reset_control *__of_reset_control_get(struct device_node *node,

				     const char *id, int index, bool shared,

				     bool optional);

struct reset_control *__reset_control_get(struct device *dev, const char *id,

					  int index, bool shared,

					  bool optional);

void reset_control_put(struct reset_control *rstc);

struct reset_control *__devm_reset_control_get(struct device *dev,

				     const char *id, int index, bool shared,
@@ -72,6 +75,13 @@ static inline struct reset_control *__of_reset_control_get( 
	return optional ? NULL : ERR_PTR(-ENOTSUPP);

}



static inline struct reset_control *__reset_control_get(

					struct device *dev, const char *id,

					int index, bool shared, bool optional)

{

	return optional ? NULL : ERR_PTR(-ENOTSUPP);

}



static inline struct reset_control *__devm_reset_control_get(

					struct device *dev, const char *id,

					int index, bool shared, bool optional)
@@ -102,8 +112,7 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id) 
#ifndef CONFIG_RESET_CONTROLLER

	WARN_ON(1);

#endif

	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, false,

									false);

	return __reset_control_get(dev, id, 0, false, false);

}



/**
@@ -131,22 +140,19 @@ __must_check reset_control_get_exclusive(struct device *dev, const char *id) 
static inline struct reset_control *reset_control_get_shared(

					struct device *dev, const char *id)

{

	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true,

									false);

	return __reset_control_get(dev, id, 0, true, false);

}



static inline struct reset_control *reset_control_get_optional_exclusive(

					struct device *dev, const char *id)

{

	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, false,

									true);

	return __reset_control_get(dev, id, 0, false, true);

}



static inline struct reset_control *reset_control_get_optional_shared(

					struct device *dev, const char *id)

{

	return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, true,

									true);

	return __reset_control_get(dev, id, 0, true, true);

}



/**