[PATCH v2] scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE

[PATCH v2] scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE

[Alok Tiwari]

Previous checks incorrectly tested the DMA addresses (dma_handle)
for NULL. Since dma_alloc_coherent() returns the CPU (virtual)
address, the NULL check should be performed on the *_base_addr
pointer to correctly detect allocation failures.

Update the checks to validate sqe_base_addr and cqe_base_addr
instead of sqe_dma_addr and cqe_dma_addr.

Fixes: 4682abfae2eb ("scsi: ufs: core: mcq: Allocate memory for MCQ mode")
Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
---
v1 -> v2
rephrase commit message and added Reviewed-by Alim
---
 drivers/ufs/core/ufs-mcq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
index 1e50675772fe..cc88aaa106da 100644
--- a/drivers/ufs/core/ufs-mcq.c
+++ b/drivers/ufs/core/ufs-mcq.c
@@ -243,7 +243,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
 		hwq->sqe_base_addr = dmam_alloc_coherent(hba->dev, utrdl_size,
 							 &hwq->sqe_dma_addr,
 							 GFP_KERNEL);
-		if (!hwq->sqe_dma_addr) {
+		if (!hwq->sqe_base_addr) {
 			dev_err(hba->dev, "SQE allocation failed\n");
 			return -ENOMEM;
 		}
@@ -252,7 +252,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
 		hwq->cqe_base_addr = dmam_alloc_coherent(hba->dev, cqe_size,
 							 &hwq->cqe_dma_addr,
 							 GFP_KERNEL);
-		if (!hwq->cqe_dma_addr) {
+		if (!hwq->cqe_base_addr) {
 			dev_err(hba->dev, "CQE allocation failed\n");
 			return -ENOMEM;
 		}
-- 
2.50.1

Re: [PATCH v2] scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE

[Manivannan Sadhasivam]

On Sun, Sep 07, 2025 at 12:40:16PM GMT, Alok Tiwari wrote:
> Previous checks incorrectly tested the DMA addresses (dma_handle)
> for NULL. Since dma_alloc_coherent() returns the CPU (virtual)
> address, the NULL check should be performed on the *_base_addr
> pointer to correctly detect allocation failures.
> 
> Update the checks to validate sqe_base_addr and cqe_base_addr
> instead of sqe_dma_addr and cqe_dma_addr.
> 
> Fixes: 4682abfae2eb ("scsi: ufs: core: mcq: Allocate memory for MCQ mode")
> Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>

Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>

- Mani

> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
> v1 -> v2
> rephrase commit message and added Reviewed-by Alim
> ---
>  drivers/ufs/core/ufs-mcq.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
> index 1e50675772fe..cc88aaa106da 100644
> --- a/drivers/ufs/core/ufs-mcq.c
> +++ b/drivers/ufs/core/ufs-mcq.c
> @@ -243,7 +243,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
>  		hwq->sqe_base_addr = dmam_alloc_coherent(hba->dev, utrdl_size,
>  							 &hwq->sqe_dma_addr,
>  							 GFP_KERNEL);
> -		if (!hwq->sqe_dma_addr) {
> +		if (!hwq->sqe_base_addr) {
>  			dev_err(hba->dev, "SQE allocation failed\n");
>  			return -ENOMEM;
>  		}
> @@ -252,7 +252,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
>  		hwq->cqe_base_addr = dmam_alloc_coherent(hba->dev, cqe_size,
>  							 &hwq->cqe_dma_addr,
>  							 GFP_KERNEL);
> -		if (!hwq->cqe_dma_addr) {
> +		if (!hwq->cqe_base_addr) {
>  			dev_err(hba->dev, "CQE allocation failed\n");
>  			return -ENOMEM;
>  		}
> -- 
> 2.50.1
> 

-- 
மணிவண்ணன் சதாசிவம்

Re: [PATCH v2] scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE

[Peter Wang (王信友)]

On Sun, 2025-09-07 at 12:40 -0700, Alok Tiwari wrote:
> 
> Previous checks incorrectly tested the DMA addresses (dma_handle)
> for NULL. Since dma_alloc_coherent() returns the CPU (virtual)
> address, the NULL check should be performed on the *_base_addr
> pointer to correctly detect allocation failures.
> 
> Update the checks to validate sqe_base_addr and cqe_base_addr
> instead of sqe_dma_addr and cqe_dma_addr.
> 
> Fixes: 4682abfae2eb ("scsi: ufs: core: mcq: Allocate memory for MCQ
> mode")
> Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
> Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
> v1 -> v2
> rephrase commit message and added Reviewed-by Alim
> ---
>  drivers/ufs/core/ufs-mcq.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
> index 1e50675772fe..cc88aaa106da 100644
> --- a/drivers/ufs/core/ufs-mcq.c
> +++ b/drivers/ufs/core/ufs-mcq.c
> @@ -243,7 +243,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
>                 hwq->sqe_base_addr = dmam_alloc_coherent(hba->dev,
> utrdl_size,
>                                                          &hwq-
> >sqe_dma_addr,
>                                                          GFP_KERNEL);
> -               if (!hwq->sqe_dma_addr) {
> +               if (!hwq->sqe_base_addr) {
>                         dev_err(hba->dev, "SQE allocation failed\n");
>                         return -ENOMEM;
>                 }
> @@ -252,7 +252,7 @@ int ufshcd_mcq_memory_alloc(struct ufs_hba *hba)
>                 hwq->cqe_base_addr = dmam_alloc_coherent(hba->dev,
> cqe_size,
>                                                          &hwq-
> >cqe_dma_addr,
>                                                          GFP_KERNEL);
> -               if (!hwq->cqe_dma_addr) {
> +               if (!hwq->cqe_base_addr) {
>                         dev_err(hba->dev, "CQE allocation failed\n");
>                         return -ENOMEM;
>                 }
> --
> 2.50.1
> 

Reviewed-by: Peter Wang <peter.wang@mediatek.com>

Re: [PATCH v2] scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE

[Martin K. Petersen]

On Sun, 07 Sep 2025 12:40:16 -0700, Alok Tiwari wrote:

> Previous checks incorrectly tested the DMA addresses (dma_handle)
> for NULL. Since dma_alloc_coherent() returns the CPU (virtual)
> address, the NULL check should be performed on the *_base_addr
> pointer to correctly detect allocation failures.
> 
> Update the checks to validate sqe_base_addr and cqe_base_addr
> instead of sqe_dma_addr and cqe_dma_addr.
> 
> [...]

Applied to 6.17/scsi-fixes, thanks!

[1/1] scsi: ufs: mcq: Fix memory allocation checks for SQE and CQE
      https://git.kernel.org/mkp/scsi/c/5cb782ff3c62

-- 
Martin K. Petersen