[V2] soc/tegra: fuse: Add fuse clock check in tegra_fuse_readl
diff mbox series

Message ID 1567508212-1194-1-git-send-email-nkristam@nvidia.com
State New
Headers show
Series
  • [V2] soc/tegra: fuse: Add fuse clock check in tegra_fuse_readl
Related show

Commit Message

Nagarjuna Kristam Sept. 3, 2019, 10:56 a.m. UTC
tegra_fuse_readl() can be called from drivers at any time. If this API is
called before tegra_fuse_probe(), we end up enabling clock before it is
registered. Add check for fuse clock in tegra_fuse_readl() and return
corresponding error if any.

Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
---
V2:
	- Added Null and other error checks for fuse->clk.
---
 drivers/soc/tegra/fuse/fuse-tegra.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Thierry Reding Sept. 19, 2019, 8:40 a.m. UTC | #1
On Tue, Sep 03, 2019 at 04:26:52PM +0530, Nagarjuna Kristam wrote:
> tegra_fuse_readl() can be called from drivers at any time. If this API is
> called before tegra_fuse_probe(), we end up enabling clock before it is
> registered. Add check for fuse clock in tegra_fuse_readl() and return
> corresponding error if any.
> 
> Signed-off-by: Nagarjuna Kristam <nkristam@nvidia.com>
> ---
> V2:
> 	- Added Null and other error checks for fuse->clk.
> ---
>  drivers/soc/tegra/fuse/fuse-tegra.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Hi ARM-SoC maintainers,

can you pick this up as a bugfix for v5.4-rc1? Would you prefer to pick
it up directly or do you want a pull request for this?

The patchwork link is:

	http://patchwork.ozlabs.org/patch/1156928/

And in that case:

Acked-by: Thierry Reding <treding@nvidia.com>

Thanks,
Thierry

> diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
> index 3eb44e6..58996c6 100644
> --- a/drivers/soc/tegra/fuse/fuse-tegra.c
> +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
> @@ -186,9 +186,12 @@ u32 __init tegra_fuse_read_early(unsigned int offset)
>  
>  int tegra_fuse_readl(unsigned long offset, u32 *value)
>  {
> -	if (!fuse->read)
> +	if (!fuse->read || !fuse->clk)
>  		return -EPROBE_DEFER;
>  
> +	if (IS_ERR(fuse->clk))
> +		return PTR_ERR(fuse->clk);
> +
>  	*value = fuse->read(fuse, offset);
>  
>  	return 0;
> -- 
> 2.7.4
>

Patch
diff mbox series

diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
index 3eb44e6..58996c6 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
@@ -186,9 +186,12 @@  u32 __init tegra_fuse_read_early(unsigned int offset)
 
 int tegra_fuse_readl(unsigned long offset, u32 *value)
 {
-	if (!fuse->read)
+	if (!fuse->read || !fuse->clk)
 		return -EPROBE_DEFER;
 
+	if (IS_ERR(fuse->clk))
+		return PTR_ERR(fuse->clk);
+
 	*value = fuse->read(fuse, offset);
 
 	return 0;