reset: add reset_control_status helper function
PATCH v3 1/1 reset: add reset_control_status helper function
From: Dinh Nguyen <[email protected]>
There are cases where a system will want to read a reset status bit before doing any other toggling. Add a reset_control_status helper function to the reset controller API.
---
v3: Remove last unsigned int and update comment
v2: reset_control_status should be returning an int, and add a comment about
status in reset-controller.h
--- drivers/reset/core.c | 15 +++++++++++++++ include/linux/reset-controller.h | 2 ++ include/linux/reset.h | 7 +++++++ 3 files changed, 24 insertions(+)
drivers/reset/core.c +15 -0
@@ -126,6 +126,21 @@ int reset_control_deassert(struct reset_control *rstc)EXPORT_SYMBOL_GPL (reset_control_deassert);/** +* reset_control_status - returns a negative errno if not supported, a +* positive value if the reset line is asserted, or zero if the reset +* line is not asserted. +* @rstc: reset controller +*/ +int reset_control_status (struct reset_control *rstc) +{ +if (rstc->rcdev->ops->status) +return rstc->rcdev->ops->status (rstc->rcdev, rstc->id); + +return -ENOSYS ; +} +EXPORT_SYMBOL_GPL (reset_control_status); + +/** * of_reset_control_get - Lookup and obtain a reference to a reset controller. * @node: device to be reset by the controller * @id: reset line name
include/linux/reset-controller.h +2 -0
@@ -12,11 +12,13 @@ struct reset_controller_dev;* things to reset the device * @assert: manually assert the reset line, if supported * @deassert: manually deassert the reset line, if supported +* @status: return the status of the reset line, if supported */ struct reset_control_ops {int (*reset)(struct reset_controller_dev *rcdev,unsigned long id);int (*assert)(struct reset_controller_dev *rcdev,unsigned long id);int (*deassert)(struct reset_controller_dev *rcdev,unsigned long id); +int (*status)(struct reset_controller_dev *rcdev,unsigned long id); };struct module ;
include/linux/reset.h +7 -0
@@ -10,6 +10,7 @@ struct reset_control;int reset_control_reset (struct reset_control *rstc);int reset_control_assert (struct reset_control *rstc);int reset_control_deassert (struct reset_control *rstc); +int reset_control_status (struct reset_control *rstc);struct reset_control *reset_control_get (struct device *dev,const char *id);void reset_control_put (struct reset_control *rstc);
@@ -57,6 +58,12 @@ static inline int reset_control_deassert(struct reset_control *rstc)return 0 ; } +static inline int reset_control_status (struct reset_control *rstc) +{ +WARN_ON (1 ); +return 0 ; +} +static inline void reset_control_put (struct reset_control *rstc) {WARN_ON (1 );
Signature · 1 line
2.0.3
Hi Philipp,
Quoted 77 lines · On 10/10/2014 10:21 AM, [email protected] wrote:
From: Dinh Nguyen <[email protected]>
There are cases where a system will want to read a reset status bit before doing any other toggling. Add a
reset_control_statushelper function to the reset controller API.Signed-off-by Dinh Nguyen <[email protected]>---
v3: Remove last unsigned int and update comment
v2:reset_control_statusshould be returning an int, and add a comment about
status inreset-controller.h--- drivers/reset/core.c | 15 +++++++++++++++ include/linux/reset-controller.h | 2 ++ include/linux/reset.h | 7 +++++++ 3 files changed, 24 insertions(+)drivers/reset/core.c +15
-0@@ -126,6 +126,21 @@ int reset_control_deassert(struct reset_control *rstc)EXPORT_SYMBOL_GPL (reset_control_deassert);/** +* reset_control_status - returns a negative errno if not supported, a +* positive value if the reset line is asserted, or zero if the reset +* line is not asserted. +* @rstc: reset controller +*/ +int reset_control_status (struct reset_control *rstc) +{ +if (rstc->rcdev->ops->status) +return rstc->rcdev->ops->status (rstc->rcdev, rstc->id); + +return -ENOSYS ; +} +EXPORT_SYMBOL_GPL (reset_control_status); + +/** * of_reset_control_get - Lookup and obtain a reference to a reset controller. * @node: device to be reset by the controller * @id: reset line name include/linux/reset-controller.h +2
-0@@ -12,11 +12,13 @@ struct reset_controller_dev;* things to reset the device * @assert: manually assert the reset line, if supported * @deassert: manually deassert the reset line, if supported +* @status: return the status of the reset line, if supported */ struct reset_control_ops {int (*reset)(struct reset_controller_dev *rcdev,unsigned long id);int (*assert)(struct reset_controller_dev *rcdev,unsigned long id);int (*deassert)(struct reset_controller_dev *rcdev,unsigned long id); +int (*status)(struct reset_controller_dev *rcdev,unsigned long id); };struct module ;include/linux/reset.h +1
-0@@ -10,6 +10,7 @@ struct reset_control;int reset_control_reset (struct reset_control *rstc);int reset_control_assert (struct reset_control *rstc);int reset_control_deassert (struct reset_control *rstc); +int reset_control_status (struct reset_control *rstc);struct reset_control *reset_control_get (struct device *dev,const char *id);void reset_control_put (struct reset_control *rstc);@@ -57,6 +58,12 @@ static inline int reset_control_deassert(struct reset_control *rstc)return 0 ; }
include/linux/reset.h static inline int reset_control_deassert(struct reset_control *rstc) · line 69
Quoted 10 lines
include/linux/reset.h +6
-0+static inline int reset_control_status (struct reset_control *rstc) +{ +WARN_ON (1 ); +return 0 ; +} +static inline void reset_control_put (struct reset_control *rstc) {WARN_ON (1 );
Do you have any further comments on this version of that patch? If not, can I get an Ack-by?
Thanks,
Dinh
Hi Dinh,
Quoted 11 lines · Dinh Nguyen
Hi Philipp,
Quoted 8 lines · On 10/10/2014 10:21 AM, [email protected] wrote:
From: Dinh Nguyen <[email protected]>
There are cases where a system will want to read a reset status bit before doing any other toggling. Add a
reset_control_statushelper function to the reset controller API.Signed-off-by Dinh Nguyen <[email protected]>---
[...]
Quoted 2 lines
Do you have any further comments on this version of that patch? If not, can I get an Ack-by?
I have applied it here:git://git.pengutronix.de/git/pza/linux.git reset-for-3.19
Sorry about the delayed feedback. I was waiting for the Meson reset patches before pushing the branch, but that might still take a while.
regards
Philipp
Quoted 15 lines · Philipp Zabel
Hi Dinh,
Quoted 11 lines · Dinh Nguyen
Hi Philipp,
Quoted 8 lines · On 10/10/2014 10:21 AM, [email protected] wrote:
From: Dinh Nguyen <[email protected]>
There are cases where a system will want to read a reset status bit before doing any other toggling. Add a
reset_control_statushelper function to the reset controller API.Signed-off-by Dinh Nguyen <[email protected]>---
[...]
Quoted 9 lines
Quoted 2 lines
Do you have any further comments on this version of that patch? If not, can I get an Ack-by?
I have applied it here:
git://git.pengutronix.de/git/pza/linux.gitreset-for-3.19Sorry about the delayed feedback. I was waiting for the Meson reset patches before pushing the branch, but that might still take a while.
Ah thanks. I can send up a patch that populates status for SOCFPGA then.
Dinh