Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1556109 > unrolled thread

[PATCH v1] scsi: ufs: fix arguments order some trace calls

Started bySubhash Jadavani <subhashj@codeaurora.org>
First post2017-01-11 01:50 +0100
Last post2017-01-12 04:40 +0100
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v1] scsi: ufs: fix arguments order some trace calls Subhash Jadavani <subhashj@codeaurora.org> - 2017-01-11 01:50 +0100
    Re: [PATCH v1] scsi: ufs: fix arguments order some trace calls Colin Ian King <colin.king@canonical.com> - 2017-01-11 10:40 +0100
    Re: [PATCH v1] scsi: ufs: fix arguments order some trace calls "Martin K. Petersen" <martin.petersen@oracle.com> - 2017-01-12 04:40 +0100

#1556109 — [PATCH v1] scsi: ufs: fix arguments order some trace calls

FromSubhash Jadavani <subhashj@codeaurora.org>
Date2017-01-11 01:50 +0100
Subject[PATCH v1] scsi: ufs: fix arguments order some trace calls
Message-ID<sYfh0-8l2-49@gated-at.bofh.it>
Colin Ian King <colin.king@canonical.com> reported that with
commit 7ff5ab473633 ("scsi: ufs: add tracing support") static analysis
is reporting that we may have swapped arguments on calls to:
    trace_ufshcd_runtime_resume,
    trace_ufshcd_runtime_suspend,
    trace_ufshcd_system_suspend,
    trace_ufshcd_system_resume,
and trace_ufshcd_init

Where:
    hba->uic_link_state is passed to dev_state
    hba->curr_dev_pwr_mode is passed to link_state

This wasn't intentional so it's a bug. This change fixed this bug.

Reported-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
---
 drivers/scsi/ufs/ufshcd.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index be6322e..6b56eb0 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -5805,7 +5805,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
 
 	trace_ufshcd_init(dev_name(hba->dev), ret,
 		ktime_to_us(ktime_sub(ktime_get(), start)),
-		hba->uic_link_state, hba->curr_dev_pwr_mode);
+		hba->curr_dev_pwr_mode, hba->uic_link_state);
 	return ret;
 }
 
@@ -6819,7 +6819,7 @@ int ufshcd_system_suspend(struct ufs_hba *hba)
 out:
 	trace_ufshcd_system_suspend(dev_name(hba->dev), ret,
 		ktime_to_us(ktime_sub(ktime_get(), start)),
-		hba->uic_link_state, hba->curr_dev_pwr_mode);
+		hba->curr_dev_pwr_mode, hba->uic_link_state);
 	if (!ret)
 		hba->is_sys_suspended = true;
 	return ret;
@@ -6852,7 +6852,7 @@ int ufshcd_system_resume(struct ufs_hba *hba)
 out:
 	trace_ufshcd_system_resume(dev_name(hba->dev), ret,
 		ktime_to_us(ktime_sub(ktime_get(), start)),
-		hba->uic_link_state, hba->curr_dev_pwr_mode);
+		hba->curr_dev_pwr_mode, hba->uic_link_state);
 	return ret;
 }
 EXPORT_SYMBOL(ufshcd_system_resume);
@@ -6880,7 +6880,7 @@ int ufshcd_runtime_suspend(struct ufs_hba *hba)
 out:
 	trace_ufshcd_runtime_suspend(dev_name(hba->dev), ret,
 		ktime_to_us(ktime_sub(ktime_get(), start)),
-		hba->uic_link_state, hba->curr_dev_pwr_mode);
+		hba->curr_dev_pwr_mode, hba->uic_link_state);
 	return ret;
 }
 EXPORT_SYMBOL(ufshcd_runtime_suspend);
@@ -6921,7 +6921,7 @@ int ufshcd_runtime_resume(struct ufs_hba *hba)
 out:
 	trace_ufshcd_runtime_resume(dev_name(hba->dev), ret,
 		ktime_to_us(ktime_sub(ktime_get(), start)),
-		hba->uic_link_state, hba->curr_dev_pwr_mode);
+		hba->curr_dev_pwr_mode, hba->uic_link_state);
 	return ret;
 }
 EXPORT_SYMBOL(ufshcd_runtime_resume);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

[toc] | [next] | [standalone]


#1556322

FromColin Ian King <colin.king@canonical.com>
Date2017-01-11 10:40 +0100
Message-ID<sYnxU-5ch-11@gated-at.bofh.it>
In reply to#1556109
On 11/01/17 00:48, Subhash Jadavani wrote:
> Colin Ian King <colin.king@canonical.com> reported that with
> commit 7ff5ab473633 ("scsi: ufs: add tracing support") static analysis
> is reporting that we may have swapped arguments on calls to:
>     trace_ufshcd_runtime_resume,
>     trace_ufshcd_runtime_suspend,
>     trace_ufshcd_system_suspend,
>     trace_ufshcd_system_resume,
> and trace_ufshcd_init
> 
> Where:
>     hba->uic_link_state is passed to dev_state
>     hba->curr_dev_pwr_mode is passed to link_state
> 
> This wasn't intentional so it's a bug. This change fixed this bug.
> 
> Reported-by: Colin Ian King <colin.king@canonical.com>
> Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
> ---
>  drivers/scsi/ufs/ufshcd.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index be6322e..6b56eb0 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -5805,7 +5805,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
>  
>  	trace_ufshcd_init(dev_name(hba->dev), ret,
>  		ktime_to_us(ktime_sub(ktime_get(), start)),
> -		hba->uic_link_state, hba->curr_dev_pwr_mode);
> +		hba->curr_dev_pwr_mode, hba->uic_link_state);
>  	return ret;
>  }
>  
> @@ -6819,7 +6819,7 @@ int ufshcd_system_suspend(struct ufs_hba *hba)
>  out:
>  	trace_ufshcd_system_suspend(dev_name(hba->dev), ret,
>  		ktime_to_us(ktime_sub(ktime_get(), start)),
> -		hba->uic_link_state, hba->curr_dev_pwr_mode);
> +		hba->curr_dev_pwr_mode, hba->uic_link_state);
>  	if (!ret)
>  		hba->is_sys_suspended = true;
>  	return ret;
> @@ -6852,7 +6852,7 @@ int ufshcd_system_resume(struct ufs_hba *hba)
>  out:
>  	trace_ufshcd_system_resume(dev_name(hba->dev), ret,
>  		ktime_to_us(ktime_sub(ktime_get(), start)),
> -		hba->uic_link_state, hba->curr_dev_pwr_mode);
> +		hba->curr_dev_pwr_mode, hba->uic_link_state);
>  	return ret;
>  }
>  EXPORT_SYMBOL(ufshcd_system_resume);
> @@ -6880,7 +6880,7 @@ int ufshcd_runtime_suspend(struct ufs_hba *hba)
>  out:
>  	trace_ufshcd_runtime_suspend(dev_name(hba->dev), ret,
>  		ktime_to_us(ktime_sub(ktime_get(), start)),
> -		hba->uic_link_state, hba->curr_dev_pwr_mode);
> +		hba->curr_dev_pwr_mode, hba->uic_link_state);
>  	return ret;
>  }
>  EXPORT_SYMBOL(ufshcd_runtime_suspend);
> @@ -6921,7 +6921,7 @@ int ufshcd_runtime_resume(struct ufs_hba *hba)
>  out:
>  	trace_ufshcd_runtime_resume(dev_name(hba->dev), ret,
>  		ktime_to_us(ktime_sub(ktime_get(), start)),
> -		hba->uic_link_state, hba->curr_dev_pwr_mode);
> +		hba->curr_dev_pwr_mode, hba->uic_link_state);
>  	return ret;
>  }
>  EXPORT_SYMBOL(ufshcd_runtime_resume);
> 
Thanks, looks good to me.

Acked-by: Colin Ian King <colin.king@canonical.com>

[toc] | [prev] | [next] | [standalone]


#1557088

From"Martin K. Petersen" <martin.petersen@oracle.com>
Date2017-01-12 04:40 +0100
Message-ID<sYEp4-7eK-7@gated-at.bofh.it>
In reply to#1556109
>>>>> "Subhash" == Subhash Jadavani <subhashj@codeaurora.org> writes:

Subhash> Colin Ian King <colin.king@canonical.com> reported that with
Subhash> commit 7ff5ab473633 ("scsi: ufs: add tracing support") static
Subhash> analysis is reporting that we may have swapped arguments on
Subhash> calls to:

[...]

Applied to 4.11/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web