two changes for UFS/HPB
cover two changes for UFS/HPB
From: Bean Huo <[email protected]>
These patches are based on the Martin's git Repo 5.15/scsi-staging branch
Bean Huo (2):
scsi: ufs: Add L2P entry swap quirk for Micron UFS in HPB READ command
scsi: ufs: Add lu_enable sysfs node
drivers/scsi/ufs/ufs-sysfs.c | 3 ++- drivers/scsi/ufs/ufs_quirks.h | 6 ++++++ drivers/scsi/ufs/ufshcd.c | 3 ++- drivers/scsi/ufs/ufshpb.c | 15 ++++++++++----- 4 files changed, 20 insertions(+), 7 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 scsi: ufs: Add L2P entry swap quirk for Micron UFS in HPB READ command
From: Bean Huo <[email protected]>
For the Micron UFS, L2P entry need to be swapped in HPB READ command before sending HPB READ command to the UFS device. Add this quirk UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ to fix this inconsistency.
--- drivers/scsi/ufs/ufs_quirks.h | 6 ++++++ drivers/scsi/ufs/ufshcd.c | 3 ++- drivers/scsi/ufs/ufshpb.c | 15 ++++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufs_quirks.h +6 -0
@@ -116,4 +116,10 @@ struct ufs_dev_fix {*/ #define UFS_DEVICE_QUIRK_DELAY_AFTER_LPM (1 << 11) +/* +* Some UFS devices require L2P entry should be swapped before being sent to the +* UFS device for HPB READ command. +*/ +#define UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ (1 << 12) +#endif /* UFS_QUIRKS_H_ */
drivers/scsi/ufs/ufshcd.c +2 -1
@@ -199,7 +199,8 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,static struct ufs_dev_fix ufs_fixups[] = {/* UFS cards deviations table */ UFS_FIX (UFS_VENDOR_MICRON ,UFS_ANY_MODEL , -UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM ), +UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM | +UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ ), UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL, UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM | UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE |
drivers/scsi/ufs/ufshpb.c +10 -5
@@ -323,15 +323,19 @@ ufshpb_get_pos_from_lpn(struct ufshpb_lu *hpb, unsigned long lpn, int *rgn_idx, }static void -ufshpb_set_hpb_read_to_upiu (struct ufshpb_lu *hpb,struct ufshcd_lrb *lrbp, -u32 lpn,__be64 ppn,u8 transfer_len,int read_id) +ufshpb_set_hpb_read_to_upiu (struct ufs_hba *hba,struct ufshpb_lu *hpb, +struct ufshcd_lrb *lrbp,u32 lpn,__be64 ppn, +u8 transfer_len,int read_id) {unsigned char *cdb = lrbp->cmd->cmnd; - +__be64 ppn_tmp = ppn; cdb[0 ] =UFSHPB_READ ; +if (hba->dev_quirks &UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ ) + ppn_tmp =swab64 (ppn); +/* ppn value is stored as big-endian in the host memory */ -memcpy (&cdb[6 ], &ppn,sizeof (__be64)); +memcpy (&cdb[6 ], &ppn_tmp,sizeof (__be64)); cdb[14 ] = transfer_len; cdb[15 ] = read_id;
@@ -689,7 +693,8 @@ int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) } } -ufshpb_set_hpb_read_to_upiu (hpb, lrbp, lpn, ppn, transfer_len, read_id); +ufshpb_set_hpb_read_to_upiu (hba, hpb, lrbp, lpn, ppn, transfer_len, + read_id); hpb->stats.hit_cnt++;return 0 ;
Signature · 1 line
2.25.1
RE: [PATCH v1 1/2] scsi: ufs: Add L2P entry swap quirk for Micron UFS in HPB READ command
Quoted 9 lines
From: Bean Huo <[email protected]>
For the Micron UFS, L2P entry need to be swapped in HPB READ command before sending HPB READ command to the UFS device. Add this quirk
UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READto fix this inconsistency.Fixes 2fff76f87542 ("scsi: ufs: ufshpb: Prepare HPB read for cached sub-region")
Not really needed - the patch is fine.
Quoted 1 line
Signed-off-by Bean Huo <[email protected]>
Quoted 80 lines
--- drivers/scsi/ufs/ufs_quirks.h | 6 ++++++ drivers/scsi/ufs/ufshcd.c | 3 ++- drivers/scsi/ufs/ufshpb.c | 15 ++++++++++----- 3 files changed, 18 insertions(+), 6 deletions(-)drivers/scsi/ufs/ufs_quirks.h +2
-0@@ -116,4 +116,10 @@ struct ufs_dev_fix {*/ #define UFS_DEVICE_QUIRK_DELAY_AFTER_LPM (1 << 11) +/* +* Some UFS devices require L2P entry should be swapped before being sent to the
+ * UFS device for HPB READ command.
+ */drivers/scsi/ufs/ufs_quirks.h +2
-0+#define UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ (1 << 12) +#endif /* UFS_QUIRKS_H_ */ drivers/scsi/ufs/ufshcd.c +2
-1@@ -199,7 +199,8 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enumufs_dev_pwr_mode dev_state, static struct ufs_dev_fix ufs_fixups[] = {/* UFS cards deviations table */ UFS_FIX (UFS_VENDOR_MICRON ,UFS_ANY_MODEL , -UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM ), +UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM | +UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ ), UFS_FIX(UFS_VENDOR_SAMSUNG, UFS_ANY_MODEL, UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM |
UFS_DEVICE_QUIRK_HOST_PA_TACTIVATE|drivers/scsi/ufs/ufshpb.c +8
-4@@ -323,15 +323,19 @@ ufshpb_get_pos_from_lpn(struct ufshpb_lu *hpb, unsigned long lpn, int *rgn_idx, } static void -ufshpb_set_hpb_read_to_upiu(struct ufshpb_lu *hpb, struct ufshcd_lrb *lrbp, - u32 lpn, __be64 ppn, u8 transfer_len, int read_id) +ufshpb_set_hpb_read_to_upiu(struct ufs_hba *hba, struct ufshpb_lu *hpb, + struct ufshcd_lrb *lrbp, u32 lpn, __be64 ppn, + u8 transfer_len, int read_id) { unsigned char *cdb = lrbp->cmd->cmnd; - +__be64 ppn_tmp = ppn; cdb[0 ] =UFSHPB_READ ; +if (hba->dev_quirks &UFS_DEVICE_QUIRK_SWAP_L2P_ENTRY_FOR_HPB_READ ) + ppn_tmp =swab64 (ppn); +/* ppn value is stored as big-endian in the host memory */ - memcpy(&cdb[6], &ppn, sizeof(__be64)); +memcpy (&cdb[6 ], &ppn_tmp,sizeof (__be64)); cdb[14 ] = transfer_len;cdb[15] = read_id;drivers/scsi/ufs/ufshpb.c +2
-1@@ -689,7 +693,8 @@ int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp) } } -ufshpb_set_hpb_read_to_upiu (hpb, lrbp, lpn, ppn, transfer_len, read_id); +ufshpb_set_hpb_read_to_upiu (hba, hpb, lrbp, lpn, ppn, transfer_len, + read_id); hpb->stats.hit_cnt++;return 0;--
2.25.1
PATCH 2/2 scsi: ufs: Add lu_enable sysfs node
In reply to Bean HuoFrom: Bean Huo <[email protected]>
We need to check HPB being enabled on which LU from the userspace tool, so, add lu_enable sysfs node.
--- drivers/scsi/ufs/ufs-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/ufs/ufs-sysfs.c +2 -1
@@ -1163,6 +1163,7 @@ static DEVICE_ATTR_RO(_pname)#define UFS_UNIT_DESC_PARAM (_name, _uname, _size) \ UFS_LUN_DESC_PARAM(_name, _uname, UNIT, _size) +UFS_UNIT_DESC_PARAM (lu_enable, _LU_ENABLE,1 );UFS_UNIT_DESC_PARAM (boot_lun_id, _BOOT_LUN_ID,1 );UFS_UNIT_DESC_PARAM (lun_write_protect, _LU_WR_PROTECT,1 );UFS_UNIT_DESC_PARAM (lun_queue_depth, _LU_Q_DEPTH,1 );
@@ -1181,8 +1182,8 @@ UFS_UNIT_DESC_PARAM(hpb_pinned_region_start_offset, _HPB_PIN_RGN_START_OFF, 2);UFS_UNIT_DESC_PARAM (hpb_number_pinned_regions, _HPB_NUM_PIN_RGNS,2 );UFS_UNIT_DESC_PARAM (wb_buf_alloc_units, _WB_BUF_ALLOC_UNITS,4 ); -static struct attribute *ufs_sysfs_unit_descriptor[] = { + &dev_attr_lu_enable.attr, &dev_attr_boot_lun_id.attr, &dev_attr_lun_write_protect.attr, &dev_attr_lun_queue_depth.attr,
Signature · 1 line
2.25.1
RE: [PATCH v1 2/2] scsi: ufs: Add lu_enable sysfs node
Quoted 6 lines
From: Bean Huo <[email protected]>
We need to check HPB being enabled on which LU from the userspace tool, so, add
lu_enablesysfs node.Signed-off-by Bean Huo <[email protected]>
Quoted 31 lines
--- drivers/scsi/ufs/ufs-sysfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/scsi/ufs/ufs-sysfs.c +2
-1@@ -1163,6 +1163,7 @@ static DEVICE_ATTR_RO(_pname)#define UFS_UNIT_DESC_PARAM (_name, _uname, _size) \ UFS_LUN_DESC_PARAM(_name, _uname, UNIT, _size) +UFS_UNIT_DESC_PARAM (lu_enable, _LU_ENABLE,1 );UFS_UNIT_DESC_PARAM (boot_lun_id, _BOOT_LUN_ID,1 );UFS_UNIT_DESC_PARAM (lun_write_protect, _LU_WR_PROTECT,1 );UFS_UNIT_DESC_PARAM (lun_queue_depth, _LU_Q_DEPTH,1 );@@ -1181,8 +1182,8 @@UFS_UNIT_DESC_PARAM (hpb_pinned_region_start_offset, _HPB_PIN_RGN_START_OFF,2 );UFS_UNIT_DESC_PARAM (hpb_number_pinned_regions, _HPB_NUM_PIN_RGNS,2 );UFS_UNIT_DESC_PARAM (wb_buf_alloc_units, _WB_BUF_ALLOC_UNITS,4 ); -static struct attribute *ufs_sysfs_unit_descriptor[] = { + &dev_attr_lu_enable.attr,&dev_attr_boot_lun_id.attr, &dev_attr_lun_write_protect.attr, &dev_attr_lun_queue_depth.attr,--
2.25.1
Martin K. Petersen
AppliedBean,
Quoted 2 lines
These patches are based on the Martin's git Repo 5.15/scsi-staging branch
Applied to 5.15/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Bean Huo
From: Bean Huo <[email protected]>
These patches are based on the Martin's git Repo 5.15/scsi-staging branch
Bean Huo (2):
scsi: ufs: Add L2P entry swap quirk for Micron UFS in HPB READ command
scsi: ufs: Addlu_enablesysfs node[...]
Applied to 5.15/scsi-queue, thanks!
[1/2] scsi: ufs: Add L2P entry swap quirk for Micron UFS in HPB READ command
https://git.kernel.org/mkp/scsi/c/63522bf3aced [2/2] scsi: ufs: Add lu_enable sysfs node https://git.kernel.org/mkp/scsi/c/f5efd4fe78de
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering