All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] scsi: ufs-bsg: Remove ufs_bsg_get_query_desc_size function
@ 2022-06-20 12:26 Arthur Simchaev
  2022-07-17 11:28 ` Arthur Simchaev
                   ` (2 more replies)
  0 siblings, 3 replies; 16+ messages in thread
From: Arthur Simchaev @ 2022-06-20 12:26 UTC (permalink / raw)
  To: James, E.J.Bottomley, jejb, Martin, K.Petersen, martin.petersen
  Cc: linux-scsi, linux-kernel, Bean, Huo, beanhuo, Arthur Simchaev

The bsg driver allows user space to send device management commands.
As such, it is often used by field application engineers to debug various problems,
and as a test bed for new features as well.

Let's not bound ourself to hard coded descriptor sizes, as the new
Descriptors that supports new features are not defined yet.

Signed-off-by: Arthur Simchaev <Arthur.Simchaev@wdc.com>
---
 drivers/scsi/ufs/ufs_bsg.c | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/drivers/scsi/ufs/ufs_bsg.c b/drivers/scsi/ufs/ufs_bsg.c
index 39bf204..7c56eba 100644
--- a/drivers/scsi/ufs/ufs_bsg.c
+++ b/drivers/scsi/ufs/ufs_bsg.c
@@ -6,24 +6,6 @@
  */
 #include "ufs_bsg.h"
 
-static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
-				       struct utp_upiu_query *qr)
-{
-	int desc_size = be16_to_cpu(qr->length);
-	int desc_id = qr->idn;
-
-	if (desc_size <= 0)
-		return -EINVAL;
-
-	ufshcd_map_desc_id_to_length(hba, desc_id, desc_len);
-	if (!*desc_len)
-		return -EINVAL;
-
-	*desc_len = min_t(int, *desc_len, desc_size);
-
-	return 0;
-}
-
 static int ufs_bsg_verify_query_size(struct ufs_hba *hba,
 				     unsigned int request_len,
 				     unsigned int reply_len)
@@ -52,13 +34,11 @@ static int ufs_bsg_alloc_desc_buffer(struct ufs_hba *hba, struct bsg_job *job,
 		goto out;
 
 	qr = &bsg_request->upiu_req.qr;
-	if (ufs_bsg_get_query_desc_size(hba, desc_len, qr)) {
-		dev_err(hba->dev, "Illegal desc size\n");
-		return -EINVAL;
-	}
+	*desc_len = be16_to_cpu(qr->length);
 
-	if (*desc_len > job->request_payload.payload_len) {
-		dev_err(hba->dev, "Illegal desc size\n");
+	if (*desc_len <= 0 || *desc_len > QUERY_DESC_MAX_SIZE ||
+	    *desc_len > job->request_payload.payload_len) {
+		dev_err(hba->dev, "Illegal desc size %d\n", *desc_len);
 		return -EINVAL;
 	}
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2022-09-28 17:02 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-20 12:26 [PATCH] scsi: ufs-bsg: Remove ufs_bsg_get_query_desc_size function Arthur Simchaev
2022-07-17 11:28 ` Arthur Simchaev
2022-07-19  2:53   ` Martin K. Petersen
2022-08-07 23:30 ` Daniil Lunev
2022-08-16 14:32   ` Arthur Simchaev
2022-08-16 14:44   ` Arthur Simchaev
2022-08-24  9:36     ` Daniil Lunev
2022-09-11 10:35       ` Arthur Simchaev
2022-09-19  8:33         ` Arthur Simchaev
2022-09-20  3:16           ` Martin K. Petersen
2022-09-20  9:38 ` Bean Huo
2022-09-21  9:53   ` Arthur Simchaev
2022-09-28  8:33     ` Arthur Simchaev
2022-09-28 10:36       ` Bean Huo
2022-09-28 14:42         ` Arthur Simchaev
2022-09-28 17:01           ` Arthur Simchaev

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.