diff --git a/drivers/scsi/ufs/ufshpb.h b/drivers/scsi/ufs/ufshpb.h index 6e6a0252dc15..b1128b0ce486 100644
--- a/drivers/scsi/ufs/ufshpb.h
+++ b/drivers/scsi/ufs/ufshpb.h

@@ -30,19 +30,29 @@
 #define PINNED_NOT_SET				U32_MAX
 
 /* hpb support chunk size */
-#define HPB_MULTI_CHUNK_HIGH			1
+#define HPB_LEGACY_CHUNK_HIGH			1
+#define HPB_MULTI_CHUNK_LOW			7
+#define HPB_MULTI_CHUNK_HIGH			128
 

According to the JEDEC spec, bMAX_DATA_SIZE_FOR_HPB_SINGLE_CMD can be set from 4kb to 1024kb. 
The transfer length should be provided up to 1020kb or 1024kb.
Why did you set HPB_MULTI_CHUNK_HIGH to 128? 
It can sends the hpb command up to 512kb. 
This doesn't seem to match the specs.

Thanks
Yohan.