scsi: ufs: core: Add enums for UFS lanes

Since there are enums available for UFS gears, let's add enums for lanes as
well to maintain uniformity.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20230731145020.41262-2-manivannan.sadhasivam@linaro.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 27e1a4914837c5a18bbcd81a9245c2868888ed49..c12c8e3c0b41872b8d34f43e4b5d48011dd6e2df 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -4375,8 +4375,8 @@ static void ufshcd_init_pwr_info(struct ufs_hba *hba)
 {
        hba->pwr_info.gear_rx = UFS_PWM_G1;
        hba->pwr_info.gear_tx = UFS_PWM_G1;
-       hba->pwr_info.lane_rx = 1;
-       hba->pwr_info.lane_tx = 1;
+       hba->pwr_info.lane_rx = UFS_LANE_1;
+       hba->pwr_info.lane_tx = UFS_LANE_1;
        hba->pwr_info.pwr_rx = SLOWAUTO_MODE;
        hba->pwr_info.pwr_tx = SLOWAUTO_MODE;
        hba->pwr_info.hs_rate = 0;

diff --git a/drivers/ufs/host/ufshcd-pltfrm.c b/drivers/ufs/host/ufshcd-pltfrm.c
index 0b7430033047d4ce3afc5b0ccb4fabb627668108..7005046e8a6923d1d9f47801be07bf6eb06b7ae9 100644 (file)
--- a/drivers/ufs/host/ufshcd-pltfrm.c
+++ b/drivers/ufs/host/ufshcd-pltfrm.c
@@ -305,8 +305,8 @@ EXPORT_SYMBOL_GPL(ufshcd_get_pwr_dev_param);
 void ufshcd_init_pwr_dev_param(struct ufs_dev_params *dev_param)
 {
        *dev_param = (struct ufs_dev_params){
-               .tx_lanes = 2,
-               .rx_lanes = 2,
+               .tx_lanes = UFS_LANE_2,
+               .rx_lanes = UFS_LANE_2,
                .hs_rx_gear = UFS_HS_G3,
                .hs_tx_gear = UFS_HS_G3,
                .pwm_rx_gear = UFS_PWM_G4,

diff --git a/include/ufs/unipro.h b/include/ufs/unipro.h
index dc9dd1d23f0f72a2618ec17ae8cc36a39a5a4809..256eb3a43f54078e2f71699c33ce78a67f4ea7f9 100644 (file)
--- a/include/ufs/unipro.h
+++ b/include/ufs/unipro.h
@@ -230,6 +230,12 @@ enum ufs_hs_gear_tag {
        UFS_HS_G5               /* HS Gear 5 */
 };
 
+enum ufs_lanes {
+       UFS_LANE_DONT_CHANGE,   /* Don't change Lane */
+       UFS_LANE_1,             /* Lane 1 (default for reset) */
+       UFS_LANE_2,             /* Lane 2 */
+};
+
 enum ufs_unipro_ver {
        UFS_UNIPRO_VER_RESERVED = 0,
        UFS_UNIPRO_VER_1_40 = 1, /* UniPro version 1.40 */