diff mbox series

scsi: ufs: core: Do not open code SZ_x

Message ID 20230530075033.11006-1-avri.altman@wdc.com (mailing list archive)
State Superseded
Headers show
Series scsi: ufs: core: Do not open code SZ_x | expand

Commit Message

Avri Altman May 30, 2023, 7:50 a.m. UTC 
A tad cleanup - No functional change.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
---
 drivers/ufs/core/ufshcd.c | 8 ++++----
 include/ufs/ufshci.h      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Bean Huo May 30, 2023, 11:11 a.m. UTC | #1 
On Tue, 2023-05-30 at 10:50 +0300, Avri Altman wrote:
> A tad cleanup - No functional change.
> 
> Signed-off-by: Avri Altman <avri.altman@wdc.com>

Reviewed-by: Bean Huo <beanhuo@micron.com>
Stanley Jhu May 30, 2023, 1:35 p.m. UTC | #2 
On Tue, May 30, 2023 at 7:22 PM Bean Huo <huobean@gmail.com> wrote:
>
> On Tue, 2023-05-30 at 10:50 +0300, Avri Altman wrote:
> > A tad cleanup - No functional change.
> >
> > Signed-off-by: Avri Altman <avri.altman@wdc.com>

Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Keoseong Park May 30, 2023, 2:08 p.m. UTC | #3 
Hi Avri,

>A tad cleanup - No functional change.
>
>Signed-off-by: Avri Altman <avri.altman@wdc.com>
>---
> drivers/ufs/core/ufshcd.c | 8 ++++----
> include/ufs/ufshci.h      | 2 +-
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
>index fdf5073c7c6c..1f206bd453cf 100644
>--- a/drivers/ufs/core/ufshcd.c
>+++ b/drivers/ufs/core/ufshcd.c
>@@ -2519,7 +2519,7 @@ static void ufshcd_sgl_to_prdt(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, int
> 			 * 11b to indicate Dword granularity. A value of '3'
> 			 * indicates 4 bytes, '7' indicates 8 bytes, etc."
> 			 */
>-			WARN_ONCE(len > 256 * 1024, "len = %#x\n", len);
>+			WARN_ONCE(len > SZ_256K, "len = %#x\n", len);
> 			prd->size = cpu_to_le32(len - 1);
> 			prd->addr = cpu_to_le64(sg->dma_address);
> 			prd->reserved = 0;
>@@ -3765,7 +3765,7 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba)
> 
> 	/*
> 	 * Allocate memory for UTP Transfer descriptors
>-	 * UFSHCI requires 1024 byte alignment of UTRD
>+	 * UFSHCI requires 1KB alignment of UTRD
> 	 */
> 	utrdl_size = (sizeof(struct utp_transfer_req_desc) * hba->nutrs);
> 	hba->utrdl_base_addr = dmam_alloc_coherent(hba->dev,
>@@ -3773,7 +3773,7 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba)
> 						   &hba->utrdl_dma_addr,
> 						   GFP_KERNEL);
> 	if (!hba->utrdl_base_addr ||
>-	    WARN_ON(hba->utrdl_dma_addr & (1024 - 1))) {
>+	    WARN_ON(hba->utrdl_dma_addr & (SZ_1K - 1))) {

How about changing the UTMRD part inside ufshcd_memory_alloc() as well?

Best Regards,
Keoseong

> 		dev_err(hba->dev,
> 			"Transfer Descriptor Memory allocation failed\n");
> 		goto out;
>@@ -8760,7 +8760,7 @@ static const struct scsi_host_template ufshcd_driver_template = {
> 	.cmd_per_lun		= UFSHCD_CMD_PER_LUN,
> 	.can_queue		= UFSHCD_CAN_QUEUE,
> 	.max_segment_size	= PRDT_DATA_BYTE_COUNT_MAX,
>-	.max_sectors		= (1 << 20) / SECTOR_SIZE, /* 1 MiB */
>+	.max_sectors		= SZ_1M / SECTOR_SIZE,
> 	.max_host_blocked	= 1,
> 	.track_queue_depth	= 1,
> 	.skip_settle_delay	= 1,
>diff --git a/include/ufs/ufshci.h b/include/ufs/ufshci.h
>index 11424bb03814..db2d5db5c88e 100644
>--- a/include/ufs/ufshci.h
>+++ b/include/ufs/ufshci.h
>@@ -453,7 +453,7 @@ enum {
> };
> 
> /* The maximum length of the data byte count field in the PRDT is 256KB */
>-#define PRDT_DATA_BYTE_COUNT_MAX	(256 * 1024)
>+#define PRDT_DATA_BYTE_COUNT_MAX	SZ_256K
> /* The granularity of the data byte count field in the PRDT is 32-bit */
> #define PRDT_DATA_BYTE_COUNT_PAD	4
> 
>-- 
>2.40.0
>
Avri Altman May 31, 2023, 5:05 a.m. UTC | #4 
> >int ufshcd_memory_alloc(struct ufs_hba *hba)
> >
> >       /*
> >        * Allocate memory for UTP Transfer descriptors
> >-       * UFSHCI requires 1024 byte alignment of UTRD
> >+       * UFSHCI requires 1KB alignment of UTRD
> >        */
> >       utrdl_size = (sizeof(struct utp_transfer_req_desc) * hba->nutrs);
> >       hba->utrdl_base_addr = dmam_alloc_coherent(hba->dev, @@ -3773,7
> >+3773,7 @@ static int ufshcd_memory_alloc(struct ufs_hba *hba)
> >                                                  &hba->utrdl_dma_addr,
> >                                                  GFP_KERNEL);
> >       if (!hba->utrdl_base_addr ||
> >-          WARN_ON(hba->utrdl_dma_addr & (1024 - 1))) {
> >+          WARN_ON(hba->utrdl_dma_addr & (SZ_1K - 1))) {
> 
> How about changing the UTMRD part inside ufshcd_memory_alloc() as well?
Oops - missed that.
Thanks,
Avri

> 
> Best Regards,
> Keoseong
diff mbox series

Patch

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index fdf5073c7c6c..1f206bd453cf 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -2519,7 +2519,7 @@  static void ufshcd_sgl_to_prdt(struct ufs_hba *hba, struct ufshcd_lrb *lrbp, int
 			 * 11b to indicate Dword granularity. A value of '3'
 			 * indicates 4 bytes, '7' indicates 8 bytes, etc."
 			 */
-			WARN_ONCE(len > 256 * 1024, "len = %#x\n", len);
+			WARN_ONCE(len > SZ_256K, "len = %#x\n", len);
 			prd->size = cpu_to_le32(len - 1);
 			prd->addr = cpu_to_le64(sg->dma_address);
 			prd->reserved = 0;
@@ -3765,7 +3765,7 @@  static int ufshcd_memory_alloc(struct ufs_hba *hba)
 
 	/*
 	 * Allocate memory for UTP Transfer descriptors
-	 * UFSHCI requires 1024 byte alignment of UTRD
+	 * UFSHCI requires 1KB alignment of UTRD
 	 */
 	utrdl_size = (sizeof(struct utp_transfer_req_desc) * hba->nutrs);
 	hba->utrdl_base_addr = dmam_alloc_coherent(hba->dev,
@@ -3773,7 +3773,7 @@  static int ufshcd_memory_alloc(struct ufs_hba *hba)
 						   &hba->utrdl_dma_addr,
 						   GFP_KERNEL);
 	if (!hba->utrdl_base_addr ||
-	    WARN_ON(hba->utrdl_dma_addr & (1024 - 1))) {
+	    WARN_ON(hba->utrdl_dma_addr & (SZ_1K - 1))) {
 		dev_err(hba->dev,
 			"Transfer Descriptor Memory allocation failed\n");
 		goto out;
@@ -8760,7 +8760,7 @@  static const struct scsi_host_template ufshcd_driver_template = {
 	.cmd_per_lun		= UFSHCD_CMD_PER_LUN,
 	.can_queue		= UFSHCD_CAN_QUEUE,
 	.max_segment_size	= PRDT_DATA_BYTE_COUNT_MAX,
-	.max_sectors		= (1 << 20) / SECTOR_SIZE, /* 1 MiB */
+	.max_sectors		= SZ_1M / SECTOR_SIZE,
 	.max_host_blocked	= 1,
 	.track_queue_depth	= 1,
 	.skip_settle_delay	= 1,
diff --git a/include/ufs/ufshci.h b/include/ufs/ufshci.h
index 11424bb03814..db2d5db5c88e 100644
--- a/include/ufs/ufshci.h
+++ b/include/ufs/ufshci.h
@@ -453,7 +453,7 @@  enum {
 };
 
 /* The maximum length of the data byte count field in the PRDT is 256KB */
-#define PRDT_DATA_BYTE_COUNT_MAX	(256 * 1024)
+#define PRDT_DATA_BYTE_COUNT_MAX	SZ_256K
 /* The granularity of the data byte count field in the PRDT is 32-bit */
 #define PRDT_DATA_BYTE_COUNT_PAD	4