UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

reset: Ensure drivers are explicit when requesting reset lines 

Phasing out generic reset line requests enables us to make some better
decisions on when and how to (de)assert said lines.  If an 'exclusive'
line is requested, we know a device *requires* a reset and that it's
preferable to act upon a request right away.  However, if a 'shared'
reset line is requested, we can reasonably assume sure that placing a
device into reset isn't a hard requirement, but probably a measure to
save power and is thus able to cope with not being asserted if another
device is still in use.

In order allow gentle adoption and not to forcing all consumers to
move to the API immediately, causing administration headache between
subsystems, this patch adds some temporary stand-in shim-calls.  This
will ease the burden at merge time and allow subsystems to migrate over
to the new API in a more realistic time-frame.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Lee Jones 2016-06-06 16:56:50 +01:00 committed by Philipp Zabel
parent 3c35f6edc0
commit a53e35db70
1 changed files with 82 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
include/linux/reset.h
View File

@ -84,8 +84,8 @@ static inline struct reset_control *__devm_reset_control_get(
#endif /* CONFIG_RESET_CONTROLLER */ #endif /* CONFIG_RESET_CONTROLLER */
/** /**
* reset_control_get - Lookup and obtain an exclusive reference to a * reset_control_get_exclusive - Lookup and obtain an exclusive reference
* reset controller. * to a reset controller.
* @dev: device to be reset by the controller * @dev: device to be reset by the controller
* @id: reset line name * @id: reset line name
* *
@ -98,8 +98,8 @@ static inline struct reset_control *__devm_reset_control_get(
* *
* Use of id names is optional. * Use of id names is optional.
*/ */
static inline struct reset_control *__must_check reset_control_get( static inline struct reset_control *
struct device *dev, const char *id) __must_check reset_control_get_exclusive(struct device *dev, const char *id)
{ {
#ifndef CONFIG_RESET_CONTROLLER #ifndef CONFIG_RESET_CONTROLLER
WARN_ON(1); WARN_ON(1);
@ -135,15 +135,15 @@ static inline struct reset_control *reset_control_get_shared(
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1); return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 1);
} }
static inline struct reset_control *reset_control_get_optional( static inline struct reset_control *reset_control_get_optional_exclusive(
struct device *dev, const char *id) struct device *dev, const char *id)
{ {
return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0); return __of_reset_control_get(dev ? dev->of_node : NULL, id, 0, 0);
} }
/** /**
* of_reset_control_get - Lookup and obtain an exclusive reference to a * of_reset_control_get_exclusive - Lookup and obtain an exclusive reference
* reset controller. * to a reset controller.
* @node: device to be reset by the controller * @node: device to be reset by the controller
* @id: reset line name * @id: reset line name
* *
@ -151,15 +151,16 @@ static inline struct reset_control *reset_control_get_optional(
* *
* Use of id names is optional. * Use of id names is optional.
*/ */
static inline struct reset_control *of_reset_control_get( static inline struct reset_control *of_reset_control_get_exclusive(
struct device_node *node, const char *id) struct device_node *node, const char *id)
{ {
return __of_reset_control_get(node, id, 0, 0); return __of_reset_control_get(node, id, 0, 0);
} }
/** /**
* of_reset_control_get_by_index - Lookup and obtain an exclusive reference to * of_reset_control_get_exclusive_by_index - Lookup and obtain an exclusive
* a reset controller by index. * reference to a reset controller
* by index.
* @node: device to be reset by the controller * @node: device to be reset by the controller
* @index: index of the reset controller * @index: index of the reset controller
* *
@ -167,23 +168,27 @@ static inline struct reset_control *of_reset_control_get(
* in whatever order. Returns a struct reset_control or IS_ERR() condition * in whatever order. Returns a struct reset_control or IS_ERR() condition
* containing errno. * containing errno.
*/ */
static inline struct reset_control *of_reset_control_get_by_index( static inline struct reset_control *of_reset_control_get_exclusive_by_index(
struct device_node *node, int index) struct device_node *node, int index)
{ {
return __of_reset_control_get(node, NULL, index, 0); return __of_reset_control_get(node, NULL, index, 0);
} }
/** /**
* devm_reset_control_get - resource managed reset_control_get() * devm_reset_control_get_exclusive - resource managed
* reset_control_get_exclusive()
* @dev: device to be reset by the controller * @dev: device to be reset by the controller
* @id: reset line name * @id: reset line name
* *
* Managed reset_control_get(). For reset controllers returned from this * Managed reset_control_get_exclusive(). For reset controllers returned
* function, reset_control_put() is called automatically on driver detach. * from this function, reset_control_put() is called automatically on driver
* See reset_control_get() for more information. * detach.
*
* See reset_control_get_exclusive() for more information.
*/ */
static inline struct reset_control *__must_check devm_reset_control_get( static inline struct reset_control *
struct device *dev, const char *id) __must_check devm_reset_control_get_exclusive(struct device *dev,
const char *id)
{ {
#ifndef CONFIG_RESET_CONTROLLER #ifndef CONFIG_RESET_CONTROLLER
WARN_ON(1); WARN_ON(1);
@ -206,23 +211,26 @@ static inline struct reset_control *devm_reset_control_get_shared(
return __devm_reset_control_get(dev, id, 0, 1); return __devm_reset_control_get(dev, id, 0, 1);
} }
static inline struct reset_control *devm_reset_control_get_optional( static inline struct reset_control *devm_reset_control_get_optional_exclusive(
struct device *dev, const char *id) struct device *dev, const char *id)
{ {
return __devm_reset_control_get(dev, id, 0, 0); return __devm_reset_control_get(dev, id, 0, 0);
} }
/** /**
* devm_reset_control_get_by_index - resource managed reset_control_get * devm_reset_control_get_exclusive_by_index - resource managed
* reset_control_get_exclusive()
* @dev: device to be reset by the controller * @dev: device to be reset by the controller
* @index: index of the reset controller * @index: index of the reset controller
* *
* Managed reset_control_get(). For reset controllers returned from this * Managed reset_control_get_exclusive(). For reset controllers returned from
* function, reset_control_put() is called automatically on driver detach. * this function, reset_control_put() is called automatically on driver
* See reset_control_get() for more information. * detach.
*
* See reset_control_get_exclusive() for more information.
*/ */
static inline struct reset_control *devm_reset_control_get_by_index( static inline struct reset_control *
struct device *dev, int index) devm_reset_control_get_exclusive_by_index(struct device *dev, int index)
{ {
return __devm_reset_control_get(dev, NULL, index, 0); return __devm_reset_control_get(dev, NULL, index, 0);
} }
@ -243,4 +251,54 @@ static inline struct reset_control *devm_reset_control_get_shared_by_index(
return __devm_reset_control_get(dev, NULL, index, 1); return __devm_reset_control_get(dev, NULL, index, 1);
} }
/*
* TEMPORARY calls to use during transition:
*
* of_reset_control_get() => of_reset_control_get_exclusive()
*
* These inline function calls will be removed once all consumers
* have been moved over to the new explicit API.
*/
static inline struct reset_control *reset_control_get(
struct device *dev, const char *id)
{
return reset_control_get_exclusive(dev, id);
}
static inline struct reset_control *reset_control_get_optional(
struct device *dev, const char *id)
{
return reset_control_get_optional_exclusive(dev, id);
}
static inline struct reset_control *of_reset_control_get(
struct device_node *node, const char *id)
{
return of_reset_control_get_exclusive(node, id);
}
static inline struct reset_control *of_reset_control_get_by_index(
struct device_node *node, int index)
{
return of_reset_control_get_exclusive_by_index(node, index);
}
static inline struct reset_control *devm_reset_control_get(
struct device *dev, const char *id)
{
return devm_reset_control_get_exclusive(dev, id);
}
static inline struct reset_control *devm_reset_control_get_optional(
struct device *dev, const char *id)
{
return devm_reset_control_get_optional_exclusive(dev, id);
}
static inline struct reset_control *devm_reset_control_get_by_index(
struct device *dev, int index)
{
return devm_reset_control_get_exclusive_by_index(dev, index);
}
#endif #endif