Re: [PATCH 01/10] ARM: OMAP2+: Return correct error values from device and hwmod

[Pali RohÃr]

On Thursday 26 February 2015 14:49:51 Pali RohÃr wrote:
> Without this patch function pm_runtime_get_sync() returns 0 even when some
> omap subfunction fails. This patch properly propagate error codes from omap
> functions back to caller.
> 
> This patch fix problem, when loading omap-aes driver in qemu cause kernel oops.
> 
> Signed-off-by: Pali RohÃr <pali.rohar@xxxxxxxxx>
> ---
>  arch/arm/mach-omap2/omap_device.c |   30 +++++++++++++++++-------------
>  arch/arm/mach-omap2/omap_hwmod.c  |   10 ++++++----
>  2 files changed, 23 insertions(+), 17 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
> index be9541e..9fd47a9 100644
> --- a/arch/arm/mach-omap2/omap_device.c
> +++ b/arch/arm/mach-omap2/omap_device.c
> @@ -224,13 +224,13 @@ static int _omap_device_notifier_call(struct notifier_block *nb,
>   */
>  static int _omap_device_enable_hwmods(struct omap_device *od)
>  {
> +	int ret = 0;
>  	int i;
>  
>  	for (i = 0; i < od->hwmods_cnt; i++)
> -		omap_hwmod_enable(od->hwmods[i]);
> +		ret |= omap_hwmod_enable(od->hwmods[i]);
>  
> -	/* XXX pass along return value here? */
> -	return 0;
> +	return ret;
>  }
>  
>  /**
> @@ -241,13 +241,13 @@ static int _omap_device_enable_hwmods(struct omap_device *od)
>   */
>  static int _omap_device_idle_hwmods(struct omap_device *od)
>  {
> +	int ret = 0;
>  	int i;
>  
>  	for (i = 0; i < od->hwmods_cnt; i++)
> -		omap_hwmod_idle(od->hwmods[i]);
> +		ret |= omap_hwmod_idle(od->hwmods[i]);
>  
> -	/* XXX pass along return value here? */
> -	return 0;
> +	return ret;
>  }
>  
>  /* Public functions for use by core code */
> @@ -595,18 +595,20 @@ static int _od_runtime_suspend(struct device *dev)
>  	int ret;
>  
>  	ret = pm_generic_runtime_suspend(dev);
> +	if (ret)
> +		return ret;
>  
> -	if (!ret)
> -		omap_device_idle(pdev);
> -
> -	return ret;
> +	return omap_device_idle(pdev);
>  }
>  
>  static int _od_runtime_resume(struct device *dev)
>  {
>  	struct platform_device *pdev = to_platform_device(dev);
> +	int ret;
>  
> -	omap_device_enable(pdev);
> +	ret = omap_device_enable(pdev);
> +	if (ret)
> +		return ret;
>  
>  	return pm_generic_runtime_resume(dev);
>  }
> @@ -740,7 +742,8 @@ int omap_device_enable(struct platform_device *pdev)
>  
>  	ret = _omap_device_enable_hwmods(od);
>  
> -	od->_state = OMAP_DEVICE_STATE_ENABLED;
> +	if (ret == 0)
> +		od->_state = OMAP_DEVICE_STATE_ENABLED;
>  
>  	return ret;
>  }
> @@ -770,7 +773,8 @@ int omap_device_idle(struct platform_device *pdev)
>  
>  	ret = _omap_device_idle_hwmods(od);
>  
> -	od->_state = OMAP_DEVICE_STATE_IDLE;
> +	if (ret == 0)
> +		od->_state = OMAP_DEVICE_STATE_IDLE;
>  
>  	return ret;
>  }
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 92afb72..870e984 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -3350,16 +3350,17 @@ int omap_hwmod_enable(struct omap_hwmod *oh)
>   */
>  int omap_hwmod_idle(struct omap_hwmod *oh)
>  {
> +	int r;
>  	unsigned long flags;
>  
>  	if (!oh)
>  		return -EINVAL;
>  
>  	spin_lock_irqsave(&oh->_lock, flags);
> -	_idle(oh);
> +	r = _idle(oh);
>  	spin_unlock_irqrestore(&oh->_lock, flags);
>  
> -	return 0;
> +	return r;
>  }
>  
>  /**
> @@ -3372,16 +3373,17 @@ int omap_hwmod_idle(struct omap_hwmod *oh)
>   */
>  int omap_hwmod_shutdown(struct omap_hwmod *oh)
>  {
> +	int r;
>  	unsigned long flags;
>  
>  	if (!oh)
>  		return -EINVAL;
>  
>  	spin_lock_irqsave(&oh->_lock, flags);
> -	_shutdown(oh);
> +	r = _shutdown(oh);
>  	spin_unlock_irqrestore(&oh->_lock, flags);
>  
> -	return 0;
> +	return r;
>  }
>  
>  /*

Hello Paul, can you apply this patch?

-- 
Pali RohÃr
pali.rohar@xxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/