From e41c9937238f52c66c07cbcb3a0ea5ed6de152df Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 10 Aug 2021 10:18:01 -0700 Subject: [PATCH] ANDROID: scsi: ufs: Enable CONFIG_SCSI_UFS_HPB Enable CONFIG_SCSI_UFS_HPB such that the UFS HPB (Host Performance Booster) feature can be used. From an Android test device running a kernel with this patch applied: $ cd /sys/devices/...ufs/host0 $ grep -aH . */*/hpb*/* grep: target0:0:0/0:0:0:0/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:0/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:0/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:0/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:0/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:0/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:0/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:0/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:0/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:0/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:0/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:0/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:0/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:0/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:0/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:0/hpb_stats/umap_req_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:1/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:1/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:1/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:1/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:1/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:1/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:1/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:1/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:1/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:1/hpb_stats/umap_req_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:2/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:2/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:2/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:2/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:2/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:2/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:2/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:2/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:2/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:2/hpb_stats/umap_req_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:3/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:3/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:3/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:3/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:3/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:3/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:3/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:3/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:3/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:3/hpb_stats/umap_req_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:49456/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:49456/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:49456/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:49456/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:49456/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:49456/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:49456/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:49456/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:49456/hpb_stats/umap_req_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:49476/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:49476/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:49476/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:49476/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:49476/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:49476/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:49476/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:49476/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:49476/hpb_stats/umap_req_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_params/activation_thld: No such device grep: target0:0:0/0:0:0:49488/hpb_params/eviction_thld_enter: No such device grep: target0:0:0/0:0:0:49488/hpb_params/eviction_thld_exit: No such device grep: target0:0:0/0:0:0:49488/hpb_params/inflight_map_req: No such device grep: target0:0:0/0:0:0:49488/hpb_params/normalization_factor: No such device grep: target0:0:0/0:0:0:49488/hpb_params/read_timeout_expiries: No such device grep: target0:0:0/0:0:0:49488/hpb_params/read_timeout_ms: No such device grep: target0:0:0/0:0:0:49488/hpb_params/requeue_timeout_ms: No such device grep: target0:0:0/0:0:0:49488/hpb_params/timeout_polling_interval_ms: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/hit_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/map_req_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/miss_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/rb_active_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/rb_inactive_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/rb_noti_cnt: No such device grep: target0:0:0/0:0:0:49488/hpb_stats/umap_req_cnt: No such device Bug: 194163838 Bug: 195507090 Change-Id: I1aab63c83445e243be190396c452a4203e93dbc1 Signed-off-by: Bart Van Assche --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 92175e738c81..74fc8a647899 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -301,6 +301,7 @@ CONFIG_SCSI_UFS_DWC_TC_PLATFORM=y CONFIG_SCSI_UFS_HISI=y CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y +CONFIG_SCSI_UFS_HPB=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 6ea0778d07ef..b2eb9fd0368d 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -274,6 +274,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y CONFIG_SCSI_UFS_DWC_TC_PLATFORM=y CONFIG_SCSI_UFS_BSG=y CONFIG_SCSI_UFS_CRYPTO=y +CONFIG_SCSI_UFS_HPB=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y