Skip to contentSkip to conversation

UFS patches for kernel v5.19

PATCH Superseded Bart Van Assche 12 participants 101 messages Mar 31, 2022 – Apr 8, 2022

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover UFS patches for kernel v5.19

Hi Martin,

This patch series includes the following changes:
- Separation of UFS core and UFS driver source code into separate directories.
- Split the ufshcd.h header file into two header files - one file that defines the interface with UFS drivers and another file with definitions only used in the core.
- Multiple source code cleanup patches.
- A few patches with minor functional changes.

Please consider these changes for kernel v5.19.

Thank you,

Bart.

Bart Van Assche (29):
scsi: ufs: Declare ufshcd_wait_for_register() static
scsi: ufs: Remove superfluous boolean conversions
scsi: ufs: Simplify statements that return a boolean
scsi: ufs: Remove ufshcd_lrb.sense_bufflen
scsi: ufs: Remove ufshcd_lrb.sense_buffer
scsi: ufs: Use get_unaligned_be16() instead of be16_to_cpup()
scsi: ufs: Remove the UFS_FIX() and END_FIX() macros
scsi: ufs: Rename struct ufs_dev_fix into ufs_dev_quirk
scsi: ufs: Declare the quirks array const
scsi: ufs: Invert the return value of ufshcd_is_hba_active()
scsi: ufs: Remove unused constants and code
scsi: ufs: Switch to aggregate initialization
scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()
scsi: ufs: Make the config_scaling_param calls type safe
scsi: ufs: Remove the driver version
scsi: ufs: Rename sdev_ufs_device into ufs_device_wlun
scsi: ufs: Use an SPDX license identifier in the Kconfig file
scsi: ufs: Remove paths from source code comments
scsi: ufs: Remove the TRUE and FALSE definitions
scsi: ufs: Remove locking from around single register writes
scsi: ufs: Introduce ufshcd_clkgate_delay_set()
scsi: ufs: qcom: Fix ufs_qcom_resume()
scsi: ufs: Remove unnecessary ufshcd-crypto.h include directives
scsi: ufs: Fix kernel-doc syntax in ufshcd.h
scsi: ufs: Minimize #include directives
scsi: ufs: Split the ufshcd.h header file
scsi: ufs: Move the struct ufs_ref_clk definition
scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition
scsi: ufs: Split the drivers/scsi/ufs directory

 drivers/scsi/Kconfig                          |   3 +-
 drivers/scsi/Makefile                         |   4 +-
 drivers/scsi/ufs-core/Kconfig                 |  82 ++++
 drivers/scsi/ufs-core/Makefile                |  10 +
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c  |   4 +-
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h  |   0
 .../{ufs => ufs-core}/ufs-fault-injection.c   |   4 +-
 .../{ufs => ufs-core}/ufs-fault-injection.h   |   0
 drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c    |   4 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c    |   8 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h    |   3 +-
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.c      |   6 +
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.h      |   7 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.c    |   2 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.h    |   7 +-
 drivers/scsi/ufs-core/ufshcd-priv.h           | 296 ++++++++++++++
 drivers/scsi/{ufs => ufs-core}/ufshcd.c       | 254 ++++++------
 drivers/scsi/{ufs => ufs-core}/ufshpb.c       |  10 +-
 drivers/scsi/{ufs => ufs-core}/ufshpb.h       |   0
 drivers/scsi/ufs-drivers/Kconfig              | 118 ++++++
 drivers/scsi/{ufs => ufs-drivers}/Makefile    |  12 -
 .../scsi/{ufs => ufs-drivers}/cdns-pltfrm.c   |   5 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pci.c    |   8 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c |  10 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.c   |   8 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.h   |   2 +
 .../scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c  |   0
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.c    |  17 +-
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.h    |   8 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c  |  17 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h  |   0
 .../{ufs => ufs-drivers}/ufs-mediatek-trace.h |   2 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.c  |  40 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.h  |   0
 .../scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c  |   3 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c  |  49 +--
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h  |   6 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.c    |   6 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.h    |   2 +
 .../scsi/{ufs => ufs-drivers}/ufshcd-pci.c    |  14 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c |  35 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h |   2 +-
 .../scsi/{ufs => ufs-drivers}/ufshci-dwc.h    |   0
 drivers/scsi/ufs/Kconfig                      | 211 ----------
 {drivers/scsi/ufs => include/scsi}/ufs.h      |  35 --
 .../scsi/ufs => include/scsi}/ufs_quirks.h    |  15 +-
 {drivers/scsi/ufs => include/scsi}/ufshcd.h   | 366 ++++--------------
 {drivers/scsi/ufs => include/scsi}/ufshci.h   |   2 +
 {drivers/scsi/ufs => include/scsi}/unipro.h   |  16 -
 49 files changed, 856 insertions(+), 857 deletions(-)
 create mode 100644 drivers/scsi/ufs-core/Kconfig
 create mode 100644 drivers/scsi/ufs-core/Makefile
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.c (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c (98%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h (95%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.c (97%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.h (77%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.h (94%)
 create mode 100644 drivers/scsi/ufs-core/ufshcd-priv.h
 rename drivers/scsi/{ufs => ufs-core}/ufshcd.c (98%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.h (100%)
 create mode 100644 drivers/scsi/ufs-drivers/Kconfig
 rename drivers/scsi/{ufs => ufs-drivers}/Makefile (56%)
 rename drivers/scsi/{ufs => ufs-drivers}/cdns-pltfrm.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pci.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.h (97%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek-trace.h (92%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.c (97%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pci.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c (94%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshci-dwc.h (100%)
 delete mode 100644 drivers/scsi/ufs/Kconfig
 rename {drivers/scsi/ufs => include/scsi}/ufs.h (93%)
 rename {drivers/scsi/ufs => include/scsi}/ufs_quirks.h (94%)
 rename {drivers/scsi/ufs => include/scsi}/ufshcd.h (82%)
 rename {drivers/scsi/ufs => include/scsi}/ufshci.h (99%)
 rename {drivers/scsi/ufs => include/scsi}/unipro.h (98%)
#1 lore raw

PATCH 1/29 scsi: ufs: Declare ufshcd_wait_for_register() static

Declare this function static since it is only used inside the ufshcd.c source file.

---
 drivers/scsi/ufs/ufshcd.c | 2 +-
 drivers/scsi/ufs/ufshcd.h | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/scsi/ufs/ufshcd.c +1 -1
index 3f9caafa91bf..dbf50b50870b 100644
@@ -639,7 +639,7 @@ EXPORT_SYMBOL_GPL(ufshcd_delay_us);
  * Return:
  * -ETIMEDOUT on error, zero on success.
  */
-int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
+static int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
 				u32 val, unsigned long interval_us,
 				unsigned long timeout_ms)
 {
drivers/scsi/ufs/ufshcd.h +0 -3
index 88c20f3608c2..949427714d0e 100644
@@ -1030,9 +1030,6 @@ void ufshcd_remove(struct ufs_hba *);
 int ufshcd_uic_hibern8_enter(struct ufs_hba *hba);
 int ufshcd_uic_hibern8_exit(struct ufs_hba *hba);
 void ufshcd_delay_us(unsigned long us, unsigned long tolerance);
-int ufshcd_wait_for_register(struct ufs_hba *hba, u32 reg, u32 mask,
-				u32 val, unsigned long interval_us,
-				unsigned long timeout_ms);
 void ufshcd_parse_dev_ref_clk_freq(struct ufs_hba *hba, struct clk *refclk);
 void ufshcd_update_evt_hist(struct ufs_hba *hba, u32 id, u32 val);
 void ufshcd_hba_stop(struct ufs_hba *hba);
#4 lore raw

PATCH 2/29 scsi: ufs: Remove superfluous boolean conversions

In reply to Bart Van Assche

Remove "? true : false" if the preceding expression yields a boolean or if the result of the expression is assigned to a boolean since in these two cases the "? true : false" part is superfluous.

---
 drivers/scsi/ufs/ufs-qcom.c | 3 +--
 drivers/scsi/ufs/ufshcd.c   | 9 ++++-----
 drivers/scsi/ufs/ufshcd.h   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +1 -2
index 0d2e950d0865..808b677f6083 100644
@@ -299,8 +299,7 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
 	struct ufs_qcom_host *host = ufshcd_get_variant(hba);
 	struct phy *phy = host->generic_phy;
 	int ret = 0;
-	bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
-							? true : false;
+	bool is_rate_B = UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B;
 
 	/* Reset UFS Host Controller and PHY */
 	ret = ufs_qcom_host_reset(hba);
drivers/scsi/ufs/ufshcd.c +4 -5
index dbf50b50870b..983fac14b7cd 100644
@@ -712,8 +712,7 @@ static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
  */
 static inline bool ufshcd_is_device_present(struct ufs_hba *hba)
 {
-	return (ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
-						DEVICE_PRESENT) ? true : false;
+	return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & DEVICE_PRESENT;
 }
 
 /**
@@ -840,7 +839,7 @@ ufshcd_get_rsp_upiu_data_seg_len(struct utp_upiu_rsp *ucd_rsp_ptr)
 static inline bool ufshcd_is_exception_event(struct utp_upiu_rsp *ucd_rsp_ptr)
 {
 	return be32_to_cpu(ucd_rsp_ptr->header.dword_2) &
-			MASK_RSP_EXCEPTION_EVENT ? true : false;
+			MASK_RSP_EXCEPTION_EVENT;
 }
 
 /**
@@ -1350,7 +1349,7 @@ static int ufshcd_devfreq_target(struct device *dev,
 	}
 
 	/* Decide based on the rounded-off frequency and update */
-	scale_up = (*freq == clki->max_freq) ? true : false;
+	scale_up = *freq == clki->max_freq;
 	if (!scale_up)
 		*freq = clki->min_freq;
 	/* Update the frequency */
@@ -2800,7 +2799,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 	lrbp->sense_buffer = cmd->sense_buffer;
 	lrbp->task_tag = tag;
 	lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
-	lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba) ? true : false;
+	lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
 
 	ufshcd_prepare_lrbp_crypto(scsi_cmd_to_rq(cmd), lrbp);
 
drivers/scsi/ufs/ufshcd.h +1 -1
index 949427714d0e..b2740b51a546 100644
@@ -985,7 +985,7 @@ static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba)
 
 static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba)
 {
-	return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit) ? true : false;
+	return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit);
 }
 
 static inline bool ufshcd_is_wb_allowed(struct ufs_hba *hba)
Reviewed-by on v1 2/29
#5 lore raw

Re: [PATCH 02/29] scsi: ufs: Remove superfluous boolean conversions

Quoted 5 lines · Bart Van Assche

Remove "? true : false" if the preceding expression yields a boolean or if the result of the expression is assigned to a boolean since in these two cases the "? true : false" part is superfluous.

Quoted 11 lines
---
 drivers/scsi/ufs/ufs-qcom.c | 3 +--
 drivers/scsi/ufs/ufshcd.c   | 9 ++++-----
 drivers/scsi/ufs/ufshcd.h   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +0 -0
index 0d2e950d0865..808b677f6083 100644

drivers/scsi/ufs/ufs-qcom.c static int ufs_qcom_power_up_sequence(struct ufs_hba *hba) · line 302

Quoted 6 lines
drivers/scsi/ufs/ufs-qcom.c +1 -2
@@ -299,8 +299,7 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
 	struct ufs_qcom_host *host = ufshcd_get_variant(hba);
 	struct phy *phy = host->generic_phy;
 	int ret = 0;
-	bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
-							? true : false;
+	bool is_rate_B = UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B;

UFS_QCOM_LIMIT_HS_RATE is defined as PA_HS_MODE_B. I wonder if this is expected to change at some point, or if we could clean this up further (in a future change).

Regards,
Bjorn

Quoted 57 lines
drivers/scsi/ufs/ufs-qcom.c +0 -0
 	/* Reset UFS Host Controller and PHY */
 	ret = ufs_qcom_host_reset(hba);
drivers/scsi/ufs/ufshcd.c +4 -5
index dbf50b50870b..983fac14b7cd 100644
@@ -712,8 +712,7 @@ static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
  */
 static inline bool ufshcd_is_device_present(struct ufs_hba *hba)
 {
-	return (ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
-						DEVICE_PRESENT) ? true : false;
+	return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & DEVICE_PRESENT;
 }
 
 /**
@@ -840,7 +839,7 @@ ufshcd_get_rsp_upiu_data_seg_len(struct utp_upiu_rsp *ucd_rsp_ptr)
 static inline bool ufshcd_is_exception_event(struct utp_upiu_rsp *ucd_rsp_ptr)
 {
 	return be32_to_cpu(ucd_rsp_ptr->header.dword_2) &
-			MASK_RSP_EXCEPTION_EVENT ? true : false;
+			MASK_RSP_EXCEPTION_EVENT;
 }
 
 /**
@@ -1350,7 +1349,7 @@ static int ufshcd_devfreq_target(struct device *dev,
 	}
 
 	/* Decide based on the rounded-off frequency and update */
-	scale_up = (*freq == clki->max_freq) ? true : false;
+	scale_up = *freq == clki->max_freq;
 	if (!scale_up)
 		*freq = clki->min_freq;
 	/* Update the frequency */
@@ -2800,7 +2799,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 	lrbp->sense_buffer = cmd->sense_buffer;
 	lrbp->task_tag = tag;
 	lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
-	lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba) ? true : false;
+	lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
 
 	ufshcd_prepare_lrbp_crypto(scsi_cmd_to_rq(cmd), lrbp);
 
drivers/scsi/ufs/ufshcd.h +1 -1
index 949427714d0e..b2740b51a546 100644
@@ -985,7 +985,7 @@ static inline bool ufshcd_is_auto_hibern8_supported(struct ufs_hba *hba)
 
 static inline bool ufshcd_is_auto_hibern8_enabled(struct ufs_hba *hba)
 {
-	return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit) ? true : false;
+	return FIELD_GET(UFSHCI_AHIBERN8_TIMER_MASK, hba->ahit);
 }
 
 static inline bool ufshcd_is_wb_allowed(struct ufs_hba *hba)
#6 lore raw

Re: [PATCH 02/29] scsi: ufs: Remove superfluous boolean conversions

Quoted 16 lines · Bjorn Andersson

drivers/scsi/ufs/ufs-qcom.c static int ufs_qcom_power_up_sequence(struct ufs_hba *hba) · line 302

Quoted 11 lines · Bart Van Assche
drivers/scsi/ufs/ufs-qcom.c +1 -2
index 0d2e950d0865..808b677f6083 100644
@@ -299,8 +299,7 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
  	struct ufs_qcom_host *host = ufshcd_get_variant(hba);
  	struct phy *phy = host->generic_phy;
  	int ret = 0;
-	bool is_rate_B = (UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B)
-							? true : false;
+	bool is_rate_B = UFS_QCOM_LIMIT_HS_RATE == PA_HS_MODE_B;

UFS_QCOM_LIMIT_HS_RATE is defined as PA_HS_MODE_B. I wonder if this is expected to change at some point, or if we could clean this up further (in a future change).

If someone would like to work on this I can help with reviewing the resulting patches.

Thanks,

Bart.

#8 lore raw

PATCH 3/29 scsi: ufs: Simplify statements that return a boolean

In reply to Bart Van Assche

Convert "if (expr) return true; else return false;" into "return expr;" if either 'expr' is a boolean expression or the return type of the function is 'bool'.

---
 drivers/scsi/ufs/ufs-qcom.h |  5 +----
 drivers/scsi/ufs/ufshcd.c   | 22 +++++-----------------
 2 files changed, 6 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufs-qcom.h +1 -4
index 8208e3a3ef59..51570224a6e2 100644
@@ -239,10 +239,7 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host);
 
 static inline bool ufs_qcom_cap_qunipro(struct ufs_qcom_host *host)
 {
-	if (host->caps & UFS_QCOM_CAP_QUNIPRO)
-		return true;
-	else
-		return false;
+	return host->caps & UFS_QCOM_CAP_QUNIPRO;
 }
 
 /* ufs-qcom-ice.c */
drivers/scsi/ufs/ufshcd.c +5 -17
index 983fac14b7cd..c60519372b3b 100644
@@ -939,10 +939,7 @@ static bool ufshcd_is_unipro_pa_params_tuning_req(struct ufs_hba *hba)
 	 * logic simple, we will only do manual tuning if local unipro version
 	 * doesn't support ver1.6 or later.
 	 */
-	if (ufshcd_get_local_unipro_ver(hba) < UFS_UNIPRO_VER_1_6)
-		return true;
-	else
-		return false;
+	return ufshcd_get_local_unipro_ver(hba) < UFS_UNIPRO_VER_1_6;
 }
 
 /**
@@ -2216,10 +2213,7 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba)
  */
 static inline bool ufshcd_ready_for_uic_cmd(struct ufs_hba *hba)
 {
-	if (ufshcd_readl(hba, REG_CONTROLLER_STATUS) & UIC_COMMAND_READY)
-		return true;
-	else
-		return false;
+	return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & UIC_COMMAND_READY;
 }
 
 /**
@@ -5781,10 +5775,7 @@ static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,
 		return false;
 	}
 	/* Let it continue to flush when available buffer exceeds threshold */
-	if (avail_buf < hba->vps->wb_flush_threshold)
-		return true;
-
-	return false;
+	return avail_buf < hba->vps->wb_flush_threshold;
 }
 
 static void ufshcd_wb_force_disable(struct ufs_hba *hba)
@@ -5863,11 +5854,8 @@ static bool ufshcd_wb_need_flush(struct ufs_hba *hba)
 		return false;
 	}
 
-	if (!hba->dev_info.b_presrv_uspc_en) {
-		if (avail_buf <= UFS_WB_BUF_REMAIN_PERCENT(10))
-			return true;
-		return false;
-	}
+	if (!hba->dev_info.b_presrv_uspc_en)
+		return avail_buf <= UFS_WB_BUF_REMAIN_PERCENT(10);
 
 	return ufshcd_wb_presrv_usrspc_keep_vcc_on(hba, avail_buf);
 }
Reviewed-by on v1 3/29
#9 lore raw

Re: [PATCH 03/29] scsi: ufs: Simplify statements that return a boolean

Quoted 5 lines · Bart Van Assche

Convert "if (expr) return true; else return false;" into "return expr;" if either 'expr' is a boolean expression or the return type of the function is 'bool'.

Quoted 75 lines
---
 drivers/scsi/ufs/ufs-qcom.h |  5 +----
 drivers/scsi/ufs/ufshcd.c   | 22 +++++-----------------
 2 files changed, 6 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufs-qcom.h +1 -4
index 8208e3a3ef59..51570224a6e2 100644
@@ -239,10 +239,7 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host *host);
 
 static inline bool ufs_qcom_cap_qunipro(struct ufs_qcom_host *host)
 {
-	if (host->caps & UFS_QCOM_CAP_QUNIPRO)
-		return true;
-	else
-		return false;
+	return host->caps & UFS_QCOM_CAP_QUNIPRO;
 }
 
 /* ufs-qcom-ice.c */
drivers/scsi/ufs/ufshcd.c +5 -17
index 983fac14b7cd..c60519372b3b 100644
@@ -939,10 +939,7 @@ static bool ufshcd_is_unipro_pa_params_tuning_req(struct ufs_hba *hba)
 	 * logic simple, we will only do manual tuning if local unipro version
 	 * doesn't support ver1.6 or later.
 	 */
-	if (ufshcd_get_local_unipro_ver(hba) < UFS_UNIPRO_VER_1_6)
-		return true;
-	else
-		return false;
+	return ufshcd_get_local_unipro_ver(hba) < UFS_UNIPRO_VER_1_6;
 }
 
 /**
@@ -2216,10 +2213,7 @@ static inline int ufshcd_hba_capabilities(struct ufs_hba *hba)
  */
 static inline bool ufshcd_ready_for_uic_cmd(struct ufs_hba *hba)
 {
-	if (ufshcd_readl(hba, REG_CONTROLLER_STATUS) & UIC_COMMAND_READY)
-		return true;
-	else
-		return false;
+	return ufshcd_readl(hba, REG_CONTROLLER_STATUS) & UIC_COMMAND_READY;
 }
 
 /**
@@ -5781,10 +5775,7 @@ static bool ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,
 		return false;
 	}
 	/* Let it continue to flush when available buffer exceeds threshold */
-	if (avail_buf < hba->vps->wb_flush_threshold)
-		return true;
-
-	return false;
+	return avail_buf < hba->vps->wb_flush_threshold;
 }
 
 static void ufshcd_wb_force_disable(struct ufs_hba *hba)
@@ -5863,11 +5854,8 @@ static bool ufshcd_wb_need_flush(struct ufs_hba *hba)
 		return false;
 	}
 
-	if (!hba->dev_info.b_presrv_uspc_en) {
-		if (avail_buf <= UFS_WB_BUF_REMAIN_PERCENT(10))
-			return true;
-		return false;
-	}
+	if (!hba->dev_info.b_presrv_uspc_en)
+		return avail_buf <= UFS_WB_BUF_REMAIN_PERCENT(10);
 
 	return ufshcd_wb_presrv_usrspc_keep_vcc_on(hba, avail_buf);
 }
#10 lore raw

RE: [PATCH 03/29] scsi: ufs: Simplify statements that return a boolean

In reply to Bart Van Assche
Quoted 5 lines

Convert "if (expr) return true; else return false;" into "return expr;" if either 'expr' is a boolean expression or the return type of the function is 'bool'.

Maybe also add ufshpb_is_pinned_region()

Thanks,
Avri

Quoted 78 lines
---
 drivers/scsi/ufs/ufs-qcom.h |  5 +----
 drivers/scsi/ufs/ufshcd.c   | 22 +++++-----------------
 2 files changed, 6 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufs-qcom.h index renamed from drivers/scsi/ufs/ufs-qcom.h +0 -0

8208e3a3ef59..51570224a6e2 100644

drivers/scsi/ufs/ufs-qcom.h +1 -4
@@ -239,10 +239,7 @@ int ufs_qcom_testbus_config(struct ufs_qcom_host
 *host);
 
 static inline bool ufs_qcom_cap_qunipro(struct ufs_qcom_host *host)  {
-       if (host->caps & UFS_QCOM_CAP_QUNIPRO)
-               return true;
-       else
-               return false;
+       return host->caps & UFS_QCOM_CAP_QUNIPRO;
 }
 
 /* ufs-qcom-ice.c */
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0 -0

983fac14b7cd..c60519372b3b 100644

drivers/scsi/ufs/ufshcd.c +1 -4
@@ -939,10 +939,7 @@ static bool
 ufshcd_is_unipro_pa_params_tuning_req(struct ufs_hba *hba)
         * logic simple, we will only do manual tuning if local unipro version
         * doesn't support ver1.6 or later.
         */
-       if (ufshcd_get_local_unipro_ver(hba) < UFS_UNIPRO_VER_1_6)
-               return true;
-       else
-               return false;
+       return ufshcd_get_local_unipro_ver(hba) < UFS_UNIPRO_VER_1_6;
 }
 

/**

drivers/scsi/ufs/ufshcd.c +3 -8
@@ -2216,10 +2213,7 @@ static inline int ufshcd_hba_capabilities(struct
 ufs_hba *hba)
  */
 static inline bool ufshcd_ready_for_uic_cmd(struct ufs_hba *hba)  {
-       if (ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
 UIC_COMMAND_READY)
-               return true;
-       else
-               return false;
+       return ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
+ UIC_COMMAND_READY;
 }
 
 /**
@@ -5781,10 +5775,7 @@ static bool
 ufshcd_wb_presrv_usrspc_keep_vcc_on(struct ufs_hba *hba,
                return false;
        }
        /* Let it continue to flush when available buffer exceeds threshold */
-       if (avail_buf < hba->vps->wb_flush_threshold)
-               return true;
-
-       return false;
+       return avail_buf < hba->vps->wb_flush_threshold;
 }
 

static void ufshcd_wb_force_disable(struct ufs_hba *hba) @@ -5863,11
+5854,8 @@ static bool ufshcd_wb_need_flush(struct ufs_hba *hba)

                return false;
        }
drivers/scsi/ufs/ufshcd.c +2 -5
-       if (!hba->dev_info.b_presrv_uspc_en) {
-               if (avail_buf <= UFS_WB_BUF_REMAIN_PERCENT(10))
-                       return true;
-               return false;
-       }
+       if (!hba->dev_info.b_presrv_uspc_en)
+               return avail_buf <= UFS_WB_BUF_REMAIN_PERCENT(10);
 
        return ufshcd_wb_presrv_usrspc_keep_vcc_on(hba, avail_buf);  }
#11 lore raw

Re: [PATCH 03/29] scsi: ufs: Simplify statements that return a boolean

Quoted 6 lines · Avri Altman
Quoted 5 lines

Convert "if (expr) return true; else return false;" into "return expr;" if either 'expr' is a boolean expression or the return type of the function is 'bool'.

Maybe also add ufshpb_is_pinned_region()

Thanks for the feedback. I will take a look at that function.

Bart.

#12 lore raw

PATCH 4/29 scsi: ufs: Remove ufshcd_lrb.sense_bufflen

In reply to Bart Van Assche

ufshcd_lrb.sense_bufflen is set but never read. Hence remove this struct member.

---
 drivers/scsi/ufs/ufshcd.c | 3 ---
 drivers/scsi/ufs/ufshcd.h | 2 --
 2 files changed, 5 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -3
index c60519372b3b..e52e86b0b7a3 100644
@@ -2789,7 +2789,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 	lrbp = &hba->lrb[tag];
 	WARN_ON(lrbp->cmd);
 	lrbp->cmd = cmd;
-	lrbp->sense_bufflen = UFS_SENSE_SIZE;
 	lrbp->sense_buffer = cmd->sense_buffer;
 	lrbp->task_tag = tag;
 	lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
@@ -2830,7 +2829,6 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba,
 		struct ufshcd_lrb *lrbp, enum dev_cmd_type cmd_type, int tag)
 {
 	lrbp->cmd = NULL;
-	lrbp->sense_bufflen = 0;
 	lrbp->sense_buffer = NULL;
 	lrbp->task_tag = tag;
 	lrbp->lun = 0; /* device management cmd is not specific to any LUN */
@@ -6802,7 +6800,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
 	lrbp = &hba->lrb[tag];
 	WARN_ON(lrbp->cmd);
 	lrbp->cmd = NULL;
-	lrbp->sense_bufflen = 0;
 	lrbp->sense_buffer = NULL;
 	lrbp->task_tag = tag;
 	lrbp->lun = 0;
drivers/scsi/ufs/ufshcd.h +0 -2
index b2740b51a546..b6162b208d99 100644
@@ -182,7 +182,6 @@ struct ufs_pm_lvl_states {
  * @ucd_req_dma_addr: UPIU request dma address for debug
  * @cmd: pointer to SCSI command
  * @sense_buffer: pointer to sense buffer address of the SCSI command
- * @sense_bufflen: Length of the sense buffer
  * @scsi_status: SCSI status of the command
  * @command_type: SCSI, UFS, Query.
  * @task_tag: Task tag of the command
@@ -207,7 +206,6 @@ struct ufshcd_lrb {
 
 	struct scsi_cmnd *cmd;
 	u8 *sense_buffer;
-	unsigned int sense_bufflen;
 	int scsi_status;
 
 	int command_type;
Reviewed-by on v1 4/29
#13 lore raw

RE: [PATCH 04/29] scsi: ufs: Remove ufshcd_lrb.sense_bufflen

Hi Bart,

Quoted 4 lines

ufshcd_lrb.sense_bufflen is set but never read. Hence remove this struct member.

Best Regards,
Keoseong Park

Quoted 54 lines

---
drivers/scsi/ufs/ufshcd.c | 3 ---
drivers/scsi/ufs/ufshcd.h | 2 --

2 files changed, 5 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -3
index c60519372b3b..e52e86b0b7a3 100644
@@ -2789,7 +2789,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        lrbp->cmd = cmd;
-        lrbp->sense_bufflen = UFS_SENSE_SIZE;
        lrbp->sense_buffer = cmd->sense_buffer;
        lrbp->task_tag = tag;
        lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
@@ -2830,7 +2829,6 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba,
                struct ufshcd_lrb *lrbp, enum dev_cmd_type cmd_type, int tag)
 {
        lrbp->cmd = NULL;
-        lrbp->sense_bufflen = 0;
        lrbp->sense_buffer = NULL;
        lrbp->task_tag = tag;
        lrbp->lun = 0; /* device management cmd is not specific to any LUN */
@@ -6802,7 +6800,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        lrbp->cmd = NULL;
-        lrbp->sense_bufflen = 0;
        lrbp->sense_buffer = NULL;
        lrbp->task_tag = tag;
        lrbp->lun = 0;
drivers/scsi/ufs/ufshcd.h +0 -2
index b2740b51a546..b6162b208d99 100644
@@ -182,7 +182,6 @@ struct ufs_pm_lvl_states {
 * @ucd_req_dma_addr: UPIU request dma address for debug
 * @cmd: pointer to SCSI command
 * @sense_buffer: pointer to sense buffer address of the SCSI command
- * @sense_bufflen: Length of the sense buffer
 * @scsi_status: SCSI status of the command
 * @command_type: SCSI, UFS, Query.
 * @task_tag: Task tag of the command
@@ -207,7 +206,6 @@ struct ufshcd_lrb {
 
        struct scsi_cmnd *cmd;
        u8 *sense_buffer;
-        unsigned int sense_bufflen;
        int scsi_status;
 
        int command_type;
#15 lore raw

PATCH 5/29 scsi: ufs: Remove ufshcd_lrb.sense_buffer

In reply to Bart Van Assche

ufshcd_lrb.sense_buffer is NULL if ufshcd_lrb.cmd is NULL and ufshcd_lrb.sense_buffer points at cmd->sense_buffer if ufshcd_lrb.cmd is set. In other words, the ufshcd_lrb.sense_buffer member is identical to cmd->sense_buffer. Hence this patch that removes the ufshcd_lrb.sense_buffer structure member.

---
 drivers/scsi/ufs/ufshcd.c | 9 ++++-----
 drivers/scsi/ufs/ufshcd.h | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -5
index e52e86b0b7a3..eddaa57b6aad 100644
@@ -2127,15 +2127,17 @@ void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag)
  */
 static inline void ufshcd_copy_sense_data(struct ufshcd_lrb *lrbp)
 {
+	u8 *sense_buffer = lrbp->cmd ? lrbp->cmd->sense_buffer : NULL;
 	int len;
-	if (lrbp->sense_buffer &&
+
+	if (sense_buffer &&
 	    ufshcd_get_rsp_upiu_data_seg_len(lrbp->ucd_rsp_ptr)) {
 		int len_to_copy;
 
 		len = be16_to_cpu(lrbp->ucd_rsp_ptr->sr.sense_data_len);
 		len_to_copy = min_t(int, UFS_SENSE_SIZE, len);
 
-		memcpy(lrbp->sense_buffer, lrbp->ucd_rsp_ptr->sr.sense_data,
+		memcpy(sense_buffer, lrbp->ucd_rsp_ptr->sr.sense_data,
 		       len_to_copy);
 	}
 }
@@ -2789,7 +2791,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 	lrbp = &hba->lrb[tag];
 	WARN_ON(lrbp->cmd);
 	lrbp->cmd = cmd;
-	lrbp->sense_buffer = cmd->sense_buffer;
 	lrbp->task_tag = tag;
 	lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
 	lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
@@ -2829,7 +2830,6 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba *hba,
 		struct ufshcd_lrb *lrbp, enum dev_cmd_type cmd_type, int tag)
 {
 	lrbp->cmd = NULL;
-	lrbp->sense_buffer = NULL;
 	lrbp->task_tag = tag;
 	lrbp->lun = 0; /* device management cmd is not specific to any LUN */
 	lrbp->intr_cmd = true; /* No interrupt aggregation */
@@ -6800,7 +6800,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba,
 	lrbp = &hba->lrb[tag];
 	WARN_ON(lrbp->cmd);
 	lrbp->cmd = NULL;
-	lrbp->sense_buffer = NULL;
 	lrbp->task_tag = tag;
 	lrbp->lun = 0;
 	lrbp->intr_cmd = true;
drivers/scsi/ufs/ufshcd.h +0 -2
index b6162b208d99..b9f17219ca18 100644
@@ -181,7 +181,6 @@ struct ufs_pm_lvl_states {
  * @ucd_rsp_dma_addr: UPIU response dma address for debug
  * @ucd_req_dma_addr: UPIU request dma address for debug
  * @cmd: pointer to SCSI command
- * @sense_buffer: pointer to sense buffer address of the SCSI command
  * @scsi_status: SCSI status of the command
  * @command_type: SCSI, UFS, Query.
  * @task_tag: Task tag of the command
@@ -205,7 +204,6 @@ struct ufshcd_lrb {
 	dma_addr_t ucd_prdt_dma_addr;
 
 	struct scsi_cmnd *cmd;
-	u8 *sense_buffer;
 	int scsi_status;
 
 	int command_type;
#16 lore raw

RE: [PATCH 05/29] scsi: ufs: Remove ufshcd_lrb.sense_buffer

Quoted 17 lines

ufshcd_lrb.sense_buffer is NULL if ufshcd_lrb.cmd is NULL and ufshcd_lrb.sense_buffer points at cmd->sense_buffer if ufshcd_lrb.cmd is set. In other words, the ufshcd_lrb.sense_buffer member is identical to cmd->sense_buffer. Hence this patch that removes the ufshcd_lrb.sense_buffer structure member.

---
 drivers/scsi/ufs/ufshcd.c | 9 ++++-----
 drivers/scsi/ufs/ufshcd.h | 2 --
 2 files changed, 4 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufshcd.c +0 -0
index e52e86b0b7a3..eddaa57b6aad 100644

drivers/scsi/ufs/ufshcd.c void ufshcd_send_command(struct ufs_hba *hba, · line 2131

Quoted 5 lines
drivers/scsi/ufs/ufshcd.c +1 -0
@@ -2127,15 +2127,17 @@ void ufshcd_send_command(struct ufs_hba *hba,
 unsigned int task_tag)
  */
 static inline void ufshcd_copy_sense_data(struct ufshcd_lrb *lrbp)
 {
+       u8 *sense_buffer = lrbp->cmd ? lrbp->cmd->sense_buffer : NULL;

lrbp->cmd is tested in __ufshcd_transfer_req_compl(), which is the only caller of ufshcd_transfer_rsp_status(), which is the only caller of ufshcd_scsi_cmd_status(), which is the only caller of ufshcd_copy_sense_data().

Thanks,
Avri

Quoted 62 lines
drivers/scsi/ufs/ufshcd.c +3 -2
        int len;
-       if (lrbp->sense_buffer &&
+
+       if (sense_buffer &&
            ufshcd_get_rsp_upiu_data_seg_len(lrbp->ucd_rsp_ptr)) {
                int len_to_copy;
 
                len = be16_to_cpu(lrbp->ucd_rsp_ptr->sr.sense_data_len);
                len_to_copy = min_t(int, UFS_SENSE_SIZE, len);
 
-               memcpy(lrbp->sense_buffer, lrbp->ucd_rsp_ptr->sr.sense_data,
+               memcpy(sense_buffer, lrbp->ucd_rsp_ptr->sr.sense_data,
                       len_to_copy);
        }

}

drivers/scsi/ufs/ufshcd.c +0 -1
@@ -2789,7 +2791,6 @@ static int ufshcd_queuecommand(struct Scsi_Host
 *host, struct scsi_cmnd *cmd)
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        lrbp->cmd = cmd;
-       lrbp->sense_buffer = cmd->sense_buffer;
        lrbp->task_tag = tag;
        lrbp->lun = ufshcd_scsi_to_upiu_lun(cmd->device->lun);
        lrbp->intr_cmd = !ufshcd_is_intr_aggr_allowed(hba);
drivers/scsi/ufs/ufshcd.c +0 -1
@@ -2829,7 +2830,6 @@ static int ufshcd_compose_dev_cmd(struct ufs_hba
 *hba,
                struct ufshcd_lrb *lrbp, enum dev_cmd_type cmd_type, int tag)
 {
        lrbp->cmd = NULL;
-       lrbp->sense_buffer = NULL;
        lrbp->task_tag = tag;
        lrbp->lun = 0; /* device management cmd is not specific to any LUN */
        lrbp->intr_cmd = true; /* No interrupt aggregation */
drivers/scsi/ufs/ufshcd.c +0 -1
@@ -6800,7 +6800,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct
 ufs_hba *hba,
        lrbp = &hba->lrb[tag];
        WARN_ON(lrbp->cmd);
        lrbp->cmd = NULL;
-       lrbp->sense_buffer = NULL;
        lrbp->task_tag = tag;
        lrbp->lun = 0;
        lrbp->intr_cmd = true;
drivers/scsi/ufs/ufshcd.h +0 -2
index b6162b208d99..b9f17219ca18 100644
@@ -181,7 +181,6 @@ struct ufs_pm_lvl_states {
  * @ucd_rsp_dma_addr: UPIU response dma address for debug
  * @ucd_req_dma_addr: UPIU request dma address for debug
  * @cmd: pointer to SCSI command
- * @sense_buffer: pointer to sense buffer address of the SCSI command
  * @scsi_status: SCSI status of the command
  * @command_type: SCSI, UFS, Query.
  * @task_tag: Task tag of the command
@@ -205,7 +204,6 @@ struct ufshcd_lrb {
        dma_addr_t ucd_prdt_dma_addr;
 
        struct scsi_cmnd *cmd;
-       u8 *sense_buffer;
        int scsi_status;
 
        int command_type;
#17 lore raw

Re: [PATCH 05/29] scsi: ufs: Remove ufshcd_lrb.sense_buffer

Quoted 12 lines · Avri Altman
Quoted 12 lines

ufshcd_lrb.sense_buffer is NULL if ufshcd_lrb.cmd is NULL and ufshcd_lrb.sense_buffer points at cmd->sense_buffer if ufshcd_lrb.cmd is set. In other words, the ufshcd_lrb.sense_buffer member is identical to cmd->sense_buffer. Hence this patch that removes the ufshcd_lrb.sense_buffer structure member.

---
  drivers/scsi/ufs/ufshcd.c | 9 ++++-----
  drivers/scsi/ufs/ufshcd.h | 2 --
  2 files changed, 4 insertions(+), 7 deletions(-)
Quoted 14 lines

drivers/scsi/ufs/ufshcd.c void ufshcd_send_command(struct ufs_hba *hba, · line 2131

Quoted 10 lines
drivers/scsi/ufs/ufshcd.c +1 -0
index e52e86b0b7a3..eddaa57b6aad 100644
@@ -2127,15 +2127,17 @@ void ufshcd_send_command(struct ufs_hba *hba,
 unsigned int task_tag)
   */
  static inline void ufshcd_copy_sense_data(struct ufshcd_lrb *lrbp)
  {
+       u8 *sense_buffer = lrbp->cmd ? lrbp->cmd->sense_buffer : NULL;

lrbp->cmd is tested in __ufshcd_transfer_req_compl(), which is the only caller of ufshcd_transfer_rsp_status(), which is the only caller of ufshcd_scsi_cmd_status(), which is the only caller of ufshcd_copy_sense_data().

Thanks for the feedback. I will update this patch and leave out the lrbp->cmd test.

Bart.

#18 lore raw

PATCH 6/29 scsi: ufs: Use get_unaligned_be16() instead of be16_to_cpup()

In reply to Bart Van Assche

Use get_unaligned_be16(...) instead of the equivalent but harder to read be16_to_cpup((__be16 *)...).

---
 drivers/scsi/ufs/ufshcd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +1 -1
index eddaa57b6aad..016734e987bf 100644
@@ -7334,7 +7334,7 @@ static u32 ufshcd_get_max_icc_level(int sup_curr_uA, u32 start_scan, char *buff)
 	u16 unit;
 
 	for (i = start_scan; i >= 0; i--) {
-		data = be16_to_cpup((__be16 *)&buff[2 * i]);
+		data = get_unaligned_be16(&buff[2 * i]);
 		unit = (data & ATTR_ICC_LVL_UNIT_MASK) >>
 						ATTR_ICC_LVL_UNIT_OFFSET;
 		curr_uA = data & ATTR_ICC_LVL_VALUE_MASK;
#20 lore raw

PATCH 7/29 scsi: ufs: Remove the UFS_FIX() and END_FIX() macros

In reply to Bart Van Assche

Since these two macros reduce code readability, remove these two macros.

---
 drivers/scsi/ufs/ufs-mediatek.c | 12 +++++----
 drivers/scsi/ufs/ufs_quirks.h   |  9 -------
 drivers/scsi/ufs/ufshcd.c       | 43 +++++++++++++++++++--------------
 3 files changed, 32 insertions(+), 32 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +7 -5
index 86a938075f30..b275b440f027 100644
@@ -45,11 +45,13 @@
 	ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)
 
 static struct ufs_dev_fix ufs_mtk_dev_fixups[] = {
-	UFS_FIX(UFS_VENDOR_MICRON, UFS_ANY_MODEL,
-		UFS_DEVICE_QUIRK_DELAY_AFTER_LPM),
-	UFS_FIX(UFS_VENDOR_SKHYNIX, "H9HQ21AFAMZDAR",
-		UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES),
-	END_FIX
+	{ .wmanufacturerid = UFS_VENDOR_MICRON,
+	  .model = UFS_ANY_MODEL,
+	  .quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM },
+	{ .wmanufacturerid = UFS_VENDOR_SKHYNIX,
+	  .model = "H9HQ21AFAMZDAR",
+	  .quirk = UFS_DEVICE_QUIRK_SUPPORT_EXTENDED_FEATURES },
+	{}
 };
 
 static const struct of_device_id ufs_mtk_of_match[] = {
drivers/scsi/ufs/ufs_quirks.h +0 -9
index 35ec9ea79869..e6c535c77527 100644
@@ -29,15 +29,6 @@ struct ufs_dev_fix {
 	unsigned int quirk;
 };
 
-#define END_FIX { }
-
-/* add specific device quirk */
-#define UFS_FIX(_vendor, _model, _quirk) { \
-	.wmanufacturerid = (_vendor),\
-	.model = (_model),		   \
-	.quirk = (_quirk),		   \
-}
-
 /*
  * Some vendor's UFS device sends back to back NACs for the DL data frames
  * causing the host controller to raise the DFES error status. Sometimes
drivers/scsi/ufs/ufshcd.c +25 -18

49 lines not on this page · raw message

#22 lore raw

PATCH 8/29 scsi: ufs: Rename struct ufs_dev_fix into ufs_dev_quirk

In reply to Bart Van Assche

Since struct ufs_dev_fix contains quirk information, rename it into struct ufs_dev_quirk.

---
 drivers/scsi/ufs/ufs-mediatek.c | 2 +-
 drivers/scsi/ufs/ufs_quirks.h   | 4 ++--
 drivers/scsi/ufs/ufshcd.c       | 6 +++---
 drivers/scsi/ufs/ufshcd.h       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -1
index b275b440f027..217348dde6a6 100644
@@ -44,7 +44,7 @@
 #define ufs_mtk_device_reset_ctrl(high, res) \
 	ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)
 
-static struct ufs_dev_fix ufs_mtk_dev_fixups[] = {
+static struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
 	{ .wmanufacturerid = UFS_VENDOR_MICRON,
 	  .model = UFS_ANY_MODEL,
 	  .quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM },
drivers/scsi/ufs/ufs_quirks.h +2 -2
index e6c535c77527..e38dec5f0351 100644
@@ -19,11 +19,11 @@
 #define UFS_VENDOR_WDC         0x145
 
 /**
- * ufs_dev_fix - ufs device quirk info
+ * ufs_dev_quirk - ufs device quirk info
  * @card: ufs card details
  * @quirk: device quirk
  */
-struct ufs_dev_fix {
+struct ufs_dev_quirk {
 	u16 wmanufacturerid;
 	u8 *model;
 	unsigned int quirk;
drivers/scsi/ufs/ufshcd.c +3 -3
index b7cfe2dca705..97b9b2b77593 100644
@@ -204,7 +204,7 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,
 	return UFS_PM_LVL_0;
 }
 
-static struct ufs_dev_fix ufs_fixups[] = {
+static struct ufs_dev_quirk ufs_fixups[] = {
 	/* UFS cards deviations table */
 	{ .wmanufacturerid = UFS_VENDOR_MICRON,
 	  .model = UFS_ANY_MODEL,
@@ -7624,9 +7624,9 @@ static void ufshcd_temp_notif_probe(struct ufs_hba *hba, u8 *desc_buf)
 	}
 }
 
-void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups)
+void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_quirk *fixups)
 {
-	struct ufs_dev_fix *f;
+	struct ufs_dev_quirk *f;
 	struct ufs_dev_info *dev_info = &hba->dev_info;
 
 	if (!fixups)
drivers/scsi/ufs/ufshcd.h +1 -1
index b9f17219ca18..3d18581afc2b 100644
@@ -1180,7 +1180,7 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
 
 void ufshcd_auto_hibern8_enable(struct ufs_hba *hba);
 void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);
-void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_fix *fixups);
+void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_quirk *fixups);
 #define SD_ASCII_STD true
 #define SD_RAW false
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
#24 lore raw

Re: [PATCH 08/29] scsi: ufs: Rename struct ufs_dev_fix into ufs_dev_quirk

Quoted 5 lines · Avri Altman
Quoted 3 lines

Since struct ufs_dev_fix contains quirk information, rename it into struct ufs_dev_quirk.

Maybe squashed this one to 07/29?

Not sure what the best approach is in this case. I tried to make patches easy to review by splitting these if it makes sense.

Thanks,

Bart.

#25 lore raw

PATCH 9/29 scsi: ufs: Declare the quirks array const

In reply to Bart Van Assche

Declare the quirks array and also its 'model' member const to make it explicit that these are not modified.

---
 drivers/scsi/ufs/ufs-mediatek.c | 2 +-
 drivers/scsi/ufs/ufs_quirks.h   | 2 +-
 drivers/scsi/ufs/ufshcd.c       | 7 ++++---
 drivers/scsi/ufs/ufshcd.h       | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -1
index 217348dde6a6..9a4474210627 100644
@@ -44,7 +44,7 @@
 #define ufs_mtk_device_reset_ctrl(high, res) \
 	ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)
 
-static struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
+static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
 	{ .wmanufacturerid = UFS_VENDOR_MICRON,
 	  .model = UFS_ANY_MODEL,
 	  .quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM },
drivers/scsi/ufs/ufs_quirks.h +1 -1
index e38dec5f0351..bcb4f004bed5 100644
@@ -25,7 +25,7 @@
  */
 struct ufs_dev_quirk {
 	u16 wmanufacturerid;
-	u8 *model;
+	const u8 *model;
 	unsigned int quirk;
 };
 
drivers/scsi/ufs/ufshcd.c +4 -3
index 97b9b2b77593..931ce620fc34 100644
@@ -204,7 +204,7 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum ufs_dev_pwr_mode dev_state,
 	return UFS_PM_LVL_0;
 }
 
-static struct ufs_dev_quirk ufs_fixups[] = {
+static const struct ufs_dev_quirk ufs_fixups[] = {
 	/* UFS cards deviations table */
 	{ .wmanufacturerid = UFS_VENDOR_MICRON,
 	  .model = UFS_ANY_MODEL,
@@ -7624,9 +7624,10 @@ static void ufshcd_temp_notif_probe(struct ufs_hba *hba, u8 *desc_buf)
 	}
 }
 
-void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_quirk *fixups)
+void ufshcd_fixup_dev_quirks(struct ufs_hba *hba,
+			     const struct ufs_dev_quirk *fixups)
 {
-	struct ufs_dev_quirk *f;
+	const struct ufs_dev_quirk *f;
 	struct ufs_dev_info *dev_info = &hba->dev_info;
 
 	if (!fixups)
drivers/scsi/ufs/ufshcd.h +2 -1
index 3d18581afc2b..107d19e98d52 100644
@@ -1180,7 +1180,8 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
 
 void ufshcd_auto_hibern8_enable(struct ufs_hba *hba);
 void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);
-void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_quirk *fixups);
+void ufshcd_fixup_dev_quirks(struct ufs_hba *hba,
+			     const struct ufs_dev_quirk *fixups);
 #define SD_ASCII_STD true
 #define SD_RAW false
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
#26 lore raw

RE: [PATCH 09/29] scsi: ufs: Declare the quirks array const

Quoted 5 lines

Declare the quirks array and also its 'model' member const to make it explicit that these are not modified.

Sometimes it's useful to be able to add a quirk as part of e.g. a debug session in the OEM premises. And not always we are able to recompile the kernel.
Since we have a debugfs now, how about adding this capability, instead of blocking it?

Thanks,
Avri

Quoted 76 lines
---
 drivers/scsi/ufs/ufs-mediatek.c | 2 +-
 drivers/scsi/ufs/ufs_quirks.h   | 2 +-
 drivers/scsi/ufs/ufshcd.c       | 7 ++++---
 drivers/scsi/ufs/ufshcd.h       | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -1
index 217348dde6a6..9a4474210627 100644
@@ -44,7 +44,7 @@
 #define ufs_mtk_device_reset_ctrl(high, res) \
        ufs_mtk_smc(UFS_MTK_SIP_DEVICE_RESET, high, res)
 
-static struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
+static const struct ufs_dev_quirk ufs_mtk_dev_fixups[] = {
        { .wmanufacturerid = UFS_VENDOR_MICRON,
          .model = UFS_ANY_MODEL,
          .quirk = UFS_DEVICE_QUIRK_DELAY_AFTER_LPM }, diff --git

a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h index e38dec5f0351..bcb4f004bed5 100644

drivers/scsi/ufs/ufs_quirks.h +1 -1
@@ -25,7 +25,7 @@
  */
 struct ufs_dev_quirk {
        u16 wmanufacturerid;
-       u8 *model;
+       const u8 *model;
        unsigned int quirk;
 };
 
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0 -0

97b9b2b77593..931ce620fc34 100644

drivers/scsi/ufs/ufshcd.c +1 -1
@@ -204,7 +204,7 @@ ufs_get_desired_pm_lvl_for_dev_link_state(enum
 ufs_dev_pwr_mode dev_state,
        return UFS_PM_LVL_0;
 }
 
-static struct ufs_dev_quirk ufs_fixups[] = {
+static const struct ufs_dev_quirk ufs_fixups[] = {
        /* UFS cards deviations table */
        { .wmanufacturerid = UFS_VENDOR_MICRON,

.model = UFS_ANY_MODEL,

drivers/scsi/ufs/ufshcd.c +3 -2
@@ -7624,9 +7624,10 @@ static void ufshcd_temp_notif_probe(struct ufs_hba
 *hba, u8 *desc_buf)
        }
 }
 
-void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_quirk *fixups)
+void ufshcd_fixup_dev_quirks(struct ufs_hba *hba,
+                            const struct ufs_dev_quirk *fixups)
 {
-       struct ufs_dev_quirk *f;
+       const struct ufs_dev_quirk *f;
        struct ufs_dev_info *dev_info = &hba->dev_info;
 

if (!fixups)

drivers/scsi/ufs/ufshcd.h index renamed from drivers/scsi/ufs/ufshcd.h +0 -0

3d18581afc2b..107d19e98d52 100644

drivers/scsi/ufs/ufshcd.h +0 -0
@@ -1180,7 +1180,8 @@ int ufshcd_query_flag(struct ufs_hba *hba, enum
 query_opcode opcode,
 
 void ufshcd_auto_hibern8_enable(struct ufs_hba *hba);  void

ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit); -void ufshcd_fixup_dev_quirks(struct ufs_hba *hba, struct ufs_dev_quirk *fixups);

drivers/scsi/ufs/ufshcd.h +2 -0
+void ufshcd_fixup_dev_quirks(struct ufs_hba *hba,
+                            const struct ufs_dev_quirk *fixups);
 #define SD_ASCII_STD true
 #define SD_RAW false
 int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
#27 lore raw

Re: [PATCH 09/29] scsi: ufs: Declare the quirks array const

Quoted 6 lines · Avri Altman
Quoted 2 lines

Declare the quirks array and also its 'model' member const to make it explicit that these are not modified.

Sometimes it's useful to be able to add a quirk as part of e.g. a debug session in the OEM premises. And not always we are able to recompile the kernel.
Since we have a debugfs now, how about adding this capability, instead of blocking it?

Hmm ... does declaring data const prevent from modifying that data from inside a kernel debugger? Don't kernel debuggers allow to cast away constness?

Thanks,

Bart.

#28 lore raw

Re: [PATCH 09/29] scsi: ufs: Declare the quirks array const

Quoted 11 lines · Bart Van Assche
Quoted 6 lines · Avri Altman
Quoted 2 lines

Declare the quirks array and also its 'model' member const to make it explicit that these are not modified.

Sometimes it's useful to be able to add a quirk as part of e.g. a debug session in the OEM premises. And not always we are able to recompile the kernel.
Since we have a debugfs now, how about adding this capability, instead of blocking it?

Hmm ... does declaring data const prevent from modifying that data from inside a kernel debugger? Don't kernel debuggers allow to cast away constness?

We strive to make all initdata const for several safety reasons, so such debugging/hacking session without recompiling the kernel is not a good reason to abandon that goal.

Such data is already const (or constified in progress) in most of the kernel places, so why UFS is special? Other subsystems are not...

Best regards,
Krzysztof

#30 lore raw

PATCH 10/29 scsi: ufs: Invert the return value of ufshcd_is_hba_active()

In reply to Bart Van Assche

It is confusing that ufshcd_is_hba_active() returns 'true' if the HBA is not active. Clear up this confusion by inverting the return value of ufshcd_is_hba_active(). This patch does not change any functionality.

---
 drivers/scsi/ufs/ufshcd.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufshcd.c +4 -5
index 931ce620fc34..1ed54f6aef82 100644
@@ -917,12 +917,11 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance
  *
- * Returns false if controller is active, true otherwise
+ * Returns true if and only if the controller is active.
  */
 static inline bool ufshcd_is_hba_active(struct ufs_hba *hba)
 {
-	return (ufshcd_readl(hba, REG_CONTROLLER_ENABLE) & CONTROLLER_ENABLE)
-		? false : true;
+	return ufshcd_readl(hba, REG_CONTROLLER_ENABLE) & CONTROLLER_ENABLE;
 }
 
 u32 ufshcd_get_local_unipro_ver(struct ufs_hba *hba)
@@ -4552,7 +4551,7 @@ static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
 	int retry_inner;
 
 start:
-	if (!ufshcd_is_hba_active(hba))
+	if (ufshcd_is_hba_active(hba))
 		/* change controller state to "reset state" */
 		ufshcd_hba_stop(hba);
 
@@ -4578,7 +4577,7 @@ static int ufshcd_hba_execute_hce(struct ufs_hba *hba)
 
 	/* wait for the host controller to complete initialization */
 	retry_inner = 50;
-	while (ufshcd_is_hba_active(hba)) {
+	while (!ufshcd_is_hba_active(hba)) {
 		if (retry_inner) {
 			retry_inner--;
 		} else {
Reviewed-by on v1 10/29
#31 lore raw

RE: [PATCH 10/29] scsi: ufs: Invert the return value of ufshcd_is_hba_active()

Quoted 6 lines

It is confusing that ufshcd_is_hba_active() returns 'true' if the HBA is not active. Clear up this confusion by inverting the return value of ufshcd_is_hba_active(). This patch does not change any functionality.

#32 lore raw

PATCH 11/29 scsi: ufs: Remove unused constants and code

In reply to Bart Van Assche

Commit 5b44a07b6bb2 ("scsi: ufs: Remove pre-defined initial voltage values of device power") removed the code that uses the UFS_VREG_VCC* constants and also the code that sets the min_uV and max_uV member variables. Hence also remove these constants and that member variable.

---
 drivers/scsi/ufs/ufs.h    | 11 -----------
 drivers/scsi/ufs/ufshcd.c | 29 +++--------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
drivers/scsi/ufs/ufs.h +0 -11
index 4a00c24a3209..225b5b4a2a7e 100644
@@ -562,15 +562,6 @@ struct ufs_query_res {
 	struct utp_upiu_query upiu_res;
 };
 
-#define UFS_VREG_VCC_MIN_UV	   2700000 /* uV */
-#define UFS_VREG_VCC_MAX_UV	   3600000 /* uV */
-#define UFS_VREG_VCC_1P8_MIN_UV    1700000 /* uV */
-#define UFS_VREG_VCC_1P8_MAX_UV    1950000 /* uV */
-#define UFS_VREG_VCCQ_MIN_UV	   1140000 /* uV */
-#define UFS_VREG_VCCQ_MAX_UV	   1260000 /* uV */
-#define UFS_VREG_VCCQ2_MIN_UV	   1700000 /* uV */
-#define UFS_VREG_VCCQ2_MAX_UV	   1950000 /* uV */
-
 /*
  * VCCQ & VCCQ2 current requirement when UFS device is in sleep state
  * and link is in Hibern8 state.
@@ -582,8 +573,6 @@ struct ufs_vreg {
 	const char *name;
 	bool always_on;
 	bool enabled;
-	int min_uV;
-	int max_uV;
 	int max_uA;
 };
 
drivers/scsi/ufs/ufshcd.c +3 -26
index 1ed54f6aef82..a48362165672 100644
@@ -8309,33 +8309,10 @@ static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,
 static int ufshcd_config_vreg(struct device *dev,
 		struct ufs_vreg *vreg, bool on)
 {
-	int ret = 0;
-	struct regulator *reg;
-	const char *name;
-	int min_uV, uA_load;
-
-	BUG_ON(!vreg);
-
-	reg = vreg->reg;
-	name = vreg->name;
-
-	if (regulator_count_voltages(reg) > 0) {
-		uA_load = on ? vreg->max_uA : 0;
-		ret = ufshcd_config_vreg_load(dev, vreg, uA_load);
-		if (ret)
-			goto out;
+	if (regulator_count_voltages(vreg->reg) <= 0)
+		return 0;
 
-		if (vreg->min_uV && vreg->max_uV) {
-			min_uV = on ? vreg->min_uV : 0;
-			ret = regulator_set_voltage(reg, min_uV, vreg->max_uV);
-			if (ret)
-				dev_err(dev,
-					"%s: %s set voltage failed, err=%d\n",
-					__func__, name, ret);
-		}
-	}
-out:
-	return ret;
+	return ufshcd_config_vreg_load(dev, vreg, on ? vreg->max_uA : 0);
 }
 
 static int ufshcd_enable_vreg(struct device *dev, struct ufs_vreg *vreg)
#33 lore raw

RE: [PATCH 11/29] scsi: ufs: Remove unused constants and code

Quoted 7 lines

Commit 5b44a07b6bb2 ("scsi: ufs: Remove pre-defined initial voltage values of device power") removed the code that uses the UFS_VREG_VCC* constants and also the code that sets the min_uV and max_uV member variables. Hence also remove these constants and that member variable.

Looks fine to me, but better get an ack from Stanley,
because he specifically wrote in his commit log:
"...
Note that we keep struct ufs_vreg unchanged. This allows vendors to
configure proper min_uV and max_uV of any regulators to make regulator_set_voltage() works during regulator toggling flow in the future. Without specific vendor configurations, min_uV and max_uV will be NULL by default and UFS core driver will enable or disable the regulator only without adjusting its voltage.
..."

Thanks,
Avri

Quoted 76 lines
---
 drivers/scsi/ufs/ufs.h    | 11 -----------
 drivers/scsi/ufs/ufshcd.c | 29 +++--------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
drivers/scsi/ufs/ufs.h +0 -11
index 4a00c24a3209..225b5b4a2a7e 100644
@@ -562,15 +562,6 @@ struct ufs_query_res {
        struct utp_upiu_query upiu_res;
 };
 
-#define UFS_VREG_VCC_MIN_UV       2700000 /* uV */
-#define UFS_VREG_VCC_MAX_UV       3600000 /* uV */
-#define UFS_VREG_VCC_1P8_MIN_UV    1700000 /* uV */
-#define UFS_VREG_VCC_1P8_MAX_UV    1950000 /* uV */
-#define UFS_VREG_VCCQ_MIN_UV      1140000 /* uV */
-#define UFS_VREG_VCCQ_MAX_UV      1260000 /* uV */
-#define UFS_VREG_VCCQ2_MIN_UV     1700000 /* uV */
-#define UFS_VREG_VCCQ2_MAX_UV     1950000 /* uV */
-
 /*
  * VCCQ & VCCQ2 current requirement when UFS device is in sleep state
  * and link is in Hibern8 state.
@@ -582,8 +573,6 @@ struct ufs_vreg {
        const char *name;
        bool always_on;
        bool enabled;
-       int min_uV;
-       int max_uV;
        int max_uA;
 };
 
drivers/scsi/ufs/ufshcd.c +3 -26
index 1ed54f6aef82..a48362165672 100644
@@ -8309,33 +8309,10 @@ static inline int ufshcd_config_vreg_hpm(struct
 ufs_hba *hba,
 static int ufshcd_config_vreg(struct device *dev,
                struct ufs_vreg *vreg, bool on)
 {
-       int ret = 0;
-       struct regulator *reg;
-       const char *name;
-       int min_uV, uA_load;
-
-       BUG_ON(!vreg);
-
-       reg = vreg->reg;
-       name = vreg->name;
-
-       if (regulator_count_voltages(reg) > 0) {
-               uA_load = on ? vreg->max_uA : 0;
-               ret = ufshcd_config_vreg_load(dev, vreg, uA_load);
-               if (ret)
-                       goto out;
+       if (regulator_count_voltages(vreg->reg) <= 0)
+               return 0;
 
-               if (vreg->min_uV && vreg->max_uV) {
-                       min_uV = on ? vreg->min_uV : 0;
-                       ret = regulator_set_voltage(reg, min_uV, vreg->max_uV);
-                       if (ret)
-                               dev_err(dev,
-                                       "%s: %s set voltage failed, err=%d\n",
-                                       __func__, name, ret);
-               }
-       }
-out:
-       return ret;
+       return ufshcd_config_vreg_load(dev, vreg, on ? vreg->max_uA : 0);
 }
 

static int ufshcd_enable_vreg(struct device *dev, struct ufs_vreg *vreg)

#34 lore raw

Re: [PATCH 11/29] scsi: ufs: Remove unused constants and code

Quoted 7 lines · Avri Altman
Quoted 7 lines

Commit 5b44a07b6bb2 ("scsi: ufs: Remove pre-defined initial voltage values of device power") removed the code that uses the UFS_VREG_VCC* constants and also the code that sets the min_uV and max_uV member variables. Hence also remove these constants and that member variable.

Quoted 10 lines

Looks fine to me, but better get an ack from Stanley,
because he specifically wrote in his commit log:
"...
Note that we keep struct ufs_vreg unchanged. This allows vendors to
configure proper min_uV and max_uV of any regulators to make regulator_set_voltage() works during regulator toggling flow in the future. Without specific vendor configurations, min_uV and max_uV will be NULL by default and UFS core driver will enable or disable the regulator only without adjusting its voltage.
..."

(+Stanley)

Hi Stanley,

Can you take a look at this patch?

Thanks,

Bart.

#35 lore raw

RE: [PATCH 11/29] scsi: ufs: Remove unused constants and code

Quoted 22 lines · Avri Altman
Quoted 3 lines
Quoted 3 lines

Commit 5b44a07b6bb2 ("scsi: ufs: Remove pre-defined initial voltage values of device power") removed the code that uses the

UFS_VREG_VCC*

Quoted 11 lines
Quoted 4 lines

constants and also the code that sets the min_uV and max_uV member variables. Hence also remove these constants and that member variable.

Looks fine to me, but better get an ack from Stanley, because he specifically wrote in his commit log:
"...
Note that we keep struct ufs_vreg unchanged. This allows vendors to
configure proper min_uV and max_uV of any regulators to make regulator_set_voltage() works during regulator toggling flow in the future. Without specific vendor configurations, min_uV and max_uV will

be

Quoted 3 lines

NULL by default and UFS core driver will enable or disable the regulator only without adjusting its voltage.
..."

Quoted 5 lines

(+Stanley)

Hi Stanley,

Can you take a look at this patch?

If Stanley won't comment by your v2 - please add my RB.

Thanks,
Avri

Quoted 4 lines

Thanks,

Bart.

Reviewed-by
#36 lore raw

Re: [PATCH 11/29] scsi: ufs: Remove unused constants and code

Hi Bart, Avri,

Quoted 34 lines · Avri Altman
Quoted 34 lines · Avri Altman
Quoted 4 lines
Quoted 4 lines

Commit 5b44a07b6bb2 ("scsi: ufs: Remove pre-defined initial voltage
values of device power") removed the code that uses the

UFS_VREG_VCC*

Quoted 7 lines
Quoted 6 lines

constants and also the code that sets the min_uV and max_uV member
variables. Hence also remove these constants and that member variable.

Quoted 10 lines

Looks fine to me, but better get an ack from Stanley, because he specifically wrote in his commit log:
"...
Note that we keep struct ufs_vreg unchanged. This allows vendors to
configure proper min_uV and max_uV of any regulators to make regulator_set_voltage() works during regulator toggling flow
in the
future. Without specific vendor configurations, min_uV and
max_uV will

be

Quoted 4 lines

NULL by default and UFS core driver will enable or disable
the regulator
only without adjusting its voltage.
..."

(+Stanley)

Quoted 9 lines
Quoted 3 lines

Hi Stanley,

Can you take a look at this patch?

If Stanley won't comment by your v2 - please add my RB.

Thanks,
Avri

Fine to me: )

#37 lore raw

PATCH 12/29 scsi: ufs: Switch to aggregate initialization

In reply to Bart Van Assche

Make it easier to verify for humans that ufshcd_init_pwr_dev_param() initializes all structure members. This patch does not change any functionality.

---
 drivers/scsi/ufs/ufshcd-pltfrm.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
drivers/scsi/ufs/ufshcd-pltfrm.c +14 -12
index 87975d1a21c8..2725ce4de1c9 100644
@@ -297,18 +297,20 @@ EXPORT_SYMBOL_GPL(ufshcd_get_pwr_dev_param);
 
 void ufshcd_init_pwr_dev_param(struct ufs_dev_params *dev_param)
 {
-	dev_param->tx_lanes = 2;
-	dev_param->rx_lanes = 2;
-	dev_param->hs_rx_gear = UFS_HS_G3;
-	dev_param->hs_tx_gear = UFS_HS_G3;
-	dev_param->pwm_rx_gear = UFS_PWM_G4;
-	dev_param->pwm_tx_gear = UFS_PWM_G4;
-	dev_param->rx_pwr_pwm = SLOW_MODE;
-	dev_param->tx_pwr_pwm = SLOW_MODE;
-	dev_param->rx_pwr_hs = FAST_MODE;
-	dev_param->tx_pwr_hs = FAST_MODE;
-	dev_param->hs_rate = PA_HS_MODE_B;
-	dev_param->desired_working_mode = UFS_HS_MODE;
+	*dev_param = (struct ufs_dev_params){
+		.tx_lanes = 2,
+		.rx_lanes = 2,
+		.hs_rx_gear = UFS_HS_G3,
+		.hs_tx_gear = UFS_HS_G3,
+		.pwm_rx_gear = UFS_PWM_G4,
+		.pwm_tx_gear = UFS_PWM_G4,
+		.rx_pwr_pwm = SLOW_MODE,
+		.tx_pwr_pwm = SLOW_MODE,
+		.rx_pwr_hs = FAST_MODE,
+		.tx_pwr_hs = FAST_MODE,
+		.hs_rate = PA_HS_MODE_B,
+		.desired_working_mode = UFS_HS_MODE,
+	};
 }
 EXPORT_SYMBOL_GPL(ufshcd_init_pwr_dev_param);
 
#39 lore raw

PATCH 13/29 scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()

In reply to Bart Van Assche

Quiescing LUNs falls outside the scope of a shutdown callback. The shutdown callback is called from inside the reboot() system call and the reboot() system call is called after user space has stopped accessing block devices. Hence this patch that removes the quiescing calls from ufshcd_wl_shutdown(). This patch makes shutdown faster since multiple synchronize_rcu() calls are removed.

---
 drivers/scsi/ufs/ufshcd.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/scsi/ufs/ufshcd.c +1 -9
index a48362165672..ae08c7964f2d 100644
@@ -9212,9 +9212,7 @@ static int ufshcd_wl_resume(struct device *dev)
 static void ufshcd_wl_shutdown(struct device *dev)
 {
 	struct scsi_device *sdev = to_scsi_device(dev);
-	struct ufs_hba *hba;
-
-	hba = shost_priv(sdev->host);
+	struct ufs_hba *hba = shost_priv(sdev->host);
 
 	down(&hba->host_sem);
 	hba->shutting_down = true;
@@ -9222,12 +9220,6 @@ static void ufshcd_wl_shutdown(struct device *dev)
 
 	/* Turn on everything while shutting down */
 	ufshcd_rpm_get_sync(hba);
-	scsi_device_quiesce(sdev);
-	shost_for_each_device(sdev, hba->host) {
-		if (sdev == hba->sdev_ufs_device)
-			continue;
-		scsi_device_quiesce(sdev);
-	}
 	__ufshcd_wl_suspend(hba, UFS_SHUTDOWN_PM);
 }
 
#40 lore raw

Re: [PATCH 13/29] scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()

Quoted 6 lines · Bart Van Assche

Quiescing LUNs falls outside the scope of a shutdown callback. The shutdown callback is called from inside the reboot() system call and the reboot() system call is called after user space has stopped accessing block devices. Hence this patch that removes the quiescing calls from ufshcd_wl_shutdown(). This patch makes shutdown faster since multiple synchronize_rcu() calls are removed.

AFAIK there is nothing stopping shutdown being called during intense UFS I/O. What happens then?

Quoted 34 lines
---
 drivers/scsi/ufs/ufshcd.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/scsi/ufs/ufshcd.c +1 -9
index a48362165672..ae08c7964f2d 100644
@@ -9212,9 +9212,7 @@ static int ufshcd_wl_resume(struct device *dev)
 static void ufshcd_wl_shutdown(struct device *dev)
 {
 	struct scsi_device *sdev = to_scsi_device(dev);
-	struct ufs_hba *hba;
-
-	hba = shost_priv(sdev->host);
+	struct ufs_hba *hba = shost_priv(sdev->host);
 
 	down(&hba->host_sem);
 	hba->shutting_down = true;
@@ -9222,12 +9220,6 @@ static void ufshcd_wl_shutdown(struct device *dev)
 
 	/* Turn on everything while shutting down */
 	ufshcd_rpm_get_sync(hba);
-	scsi_device_quiesce(sdev);
-	shost_for_each_device(sdev, hba->host) {
-		if (sdev == hba->sdev_ufs_device)
-			continue;
-		scsi_device_quiesce(sdev);
-	}
 	__ufshcd_wl_suspend(hba, UFS_SHUTDOWN_PM);
 }
 
#41 lore raw

Re: [PATCH 13/29] scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()

Quoted 10 lines · Adrian Hunter
Quoted 6 lines · Bart Van Assche

Quiescing LUNs falls outside the scope of a shutdown callback. The shutdown callback is called from inside the reboot() system call and the reboot() system call is called after user space has stopped accessing block devices. Hence this patch that removes the quiescing calls from ufshcd_wl_shutdown(). This patch makes shutdown faster since multiple synchronize_rcu() calls are removed.

AFAIK there is nothing stopping shutdown being called during intense UFS I/O. What happens then?

Hmm ... how could this happen? Am I perhaps misunderstanding something about the Linux shutdown sequence?

The UFS driver is the only driver I know that tries to stop I/O from inside its shutdown callback. I'm not aware of any other Linux kernel driver that tries to pause I/O from inside its shutdown callback.

Thanks,

Bart.

#42 lore raw

Re: [PATCH 13/29] scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()

Quoted 9 lines · Bart Van Assche
Quoted 8 lines · Adrian Hunter
Quoted 6 lines · Bart Van Assche

Quiescing LUNs falls outside the scope of a shutdown callback. The shutdown callback is called from inside the reboot() system call and the reboot() system call is called after user space has stopped accessing block devices. Hence this patch that removes the quiescing calls from ufshcd_wl_shutdown(). This patch makes shutdown faster since multiple synchronize_rcu() calls are removed.

Quoted 6 lines
Quoted 2 lines

AFAIK there is nothing stopping shutdown being called during intense UFS I/O. What happens then?

Hmm ... how could this happen? Am I perhaps misunderstanding something about the Linux shutdown sequence?

The UFS driver is the only driver I know that tries to stop I/O from inside its shutdown callback. I'm not aware of any other Linux kernel driver that tries to pause I/O from inside its shutdown callback.

We are putting the UFS device into powerdown mode. I am not sure what will happen if the device is processing requests at the same time.

#43 lore raw

Re: [PATCH 13/29] scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()

Quoted 17 lines · Adrian Hunter
Quoted 16 lines · Bart Van Assche
Quoted 11 lines · Adrian Hunter
Quoted 7 lines · Bart Van Assche

Quiescing LUNs falls outside the scope of a shutdown callback. The shutdown callback is called from inside the reboot() system call and the reboot() system call is called after user space has stopped accessing block devices. Hence this patch that removes the quiescing calls from ufshcd_wl_shutdown(). This patch makes shutdown faster since multiple synchronize_rcu() calls are removed.

AFAIK there is nothing stopping shutdown being called during intense UFS I/O. What happens then?

Hmm ... how could this happen? Am I perhaps misunderstanding something about the Linux shutdown sequence?

Quoted 8 lines
Quoted 4 lines

The UFS driver is the only driver I know that tries to stop I/O from inside its shutdown callback. I'm not aware of any other Linux kernel driver that tries to pause I/O from inside its shutdown callback.

We are putting the UFS device into powerdown mode. I am not sure what will happen if the device is processing requests at the same time.

I will remove this patch from this patch series such that it does not block adoption of the other patches in this patch series.

Thanks,

Bart.

#44 lore raw

PATCH 14/29 scsi: ufs: Make the config_scaling_param calls type safe

In reply to Bart Van Assche

Pass the actual type to config_scaling_param callback as the third argment instead of a void pointer. Remove a superfluous NULL pointer check from ufs_qcom_config_scaling_param().

---
 drivers/scsi/ufs/ufs-qcom.c | 14 ++++----------
 drivers/scsi/ufs/ufshcd.h   | 10 +++++-----
 2 files changed, 9 insertions(+), 15 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +4 -10
index 808b677f6083..f24210652fe9 100644
@@ -1463,23 +1463,17 @@ static int ufs_qcom_device_reset(struct ufs_hba *hba)
 
 #if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
 static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,
-					  struct devfreq_dev_profile *p,
-					  void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *d)
 {
-	static struct devfreq_simple_ondemand_data *d;
-
-	if (!data)
-		return;
-
-	d = (struct devfreq_simple_ondemand_data *)data;
 	p->polling_ms = 60;
 	d->upthreshold = 70;
 	d->downdifferential = 5;
 }
 #else
 static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,
-					  struct devfreq_dev_profile *p,
-					  void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *data)
 {
 }
 #endif
drivers/scsi/ufs/ufshcd.h +5 -5
index 107d19e98d52..bb2624aabda2 100644
@@ -348,8 +348,8 @@ struct ufs_hba_variant_ops {
 	int	(*phy_initialization)(struct ufs_hba *);
 	int	(*device_reset)(struct ufs_hba *hba);
 	void	(*config_scaling_param)(struct ufs_hba *hba,
-					struct devfreq_dev_profile *profile,
-					void *data);
+				struct devfreq_dev_profile *profile,
+				struct devfreq_simple_ondemand_data *data);
 	int	(*program_key)(struct ufs_hba *hba,
 			       const union ufs_crypto_cfg_entry *cfg, int slot);
 	void	(*event_notify)(struct ufs_hba *hba,
@@ -1360,11 +1360,11 @@ static inline int ufshcd_vops_device_reset(struct ufs_hba *hba)
 }
 
 static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba,
-						    struct devfreq_dev_profile
-						    *profile, void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *data)
 {
 	if (hba->vops && hba->vops->config_scaling_param)
-		hba->vops->config_scaling_param(hba, profile, data);
+		hba->vops->config_scaling_param(hba, p, data);
 }
 
 extern struct ufs_pm_lvl_states ufs_pm_lvl_states[];
Reviewed-by on v1 14/29
#45 lore raw

Re: [PATCH 14/29] scsi: ufs: Make the config_scaling_param calls type safe

Quoted 15 lines · Bart Van Assche

Pass the actual type to config_scaling_param callback as the third argment instead of a void pointer. Remove a superfluous NULL pointer check from ufs_qcom_config_scaling_param().

---
 drivers/scsi/ufs/ufs-qcom.c | 14 ++++----------
 drivers/scsi/ufs/ufshcd.h   | 10 +++++-----
 2 files changed, 9 insertions(+), 15 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +0 -0
index 808b677f6083..f24210652fe9 100644

drivers/scsi/ufs/ufs-qcom.c static int ufs_qcom_device_reset(struct ufs_hba *hba) · line 1467

Quoted 7 lines
drivers/scsi/ufs/ufs-qcom.c +2 -2
@@ -1463,23 +1463,17 @@ static int ufs_qcom_device_reset(struct ufs_hba *hba)
 
 #if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
 static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,
-					  struct devfreq_dev_profile *p,
-					  void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *d)

This doesn't look to be properly indended to match the '('? What does ./scripts/checkpatch.pl --strict say about the patch?

Other than that, the change looks good, so feel free to add my r-b once you've double checked the indentation.

Regards,
Bjorn

Quoted 50 lines
drivers/scsi/ufs/ufs-qcom.c +2 -8
 {
-	static struct devfreq_simple_ondemand_data *d;
-
-	if (!data)
-		return;
-
-	d = (struct devfreq_simple_ondemand_data *)data;
 	p->polling_ms = 60;
 	d->upthreshold = 70;
 	d->downdifferential = 5;
 }
 #else
 static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,
-					  struct devfreq_dev_profile *p,
-					  void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *data)
 {
 }
 #endif
drivers/scsi/ufs/ufshcd.h +5 -5
index 107d19e98d52..bb2624aabda2 100644
@@ -348,8 +348,8 @@ struct ufs_hba_variant_ops {
 	int	(*phy_initialization)(struct ufs_hba *);
 	int	(*device_reset)(struct ufs_hba *hba);
 	void	(*config_scaling_param)(struct ufs_hba *hba,
-					struct devfreq_dev_profile *profile,
-					void *data);
+				struct devfreq_dev_profile *profile,
+				struct devfreq_simple_ondemand_data *data);
 	int	(*program_key)(struct ufs_hba *hba,
 			       const union ufs_crypto_cfg_entry *cfg, int slot);
 	void	(*event_notify)(struct ufs_hba *hba,
@@ -1360,11 +1360,11 @@ static inline int ufshcd_vops_device_reset(struct ufs_hba *hba)
 }
 
 static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba,
-						    struct devfreq_dev_profile
-						    *profile, void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *data)
 {
 	if (hba->vops && hba->vops->config_scaling_param)
-		hba->vops->config_scaling_param(hba, profile, data);
+		hba->vops->config_scaling_param(hba, p, data);
 }
 
 extern struct ufs_pm_lvl_states ufs_pm_lvl_states[];
#46 lore raw

Re: [PATCH 14/29] scsi: ufs: Make the config_scaling_param calls type safe

Quoted 12 lines · Bjorn Andersson

drivers/scsi/ufs/ufs-qcom.c static int ufs_qcom_device_reset(struct ufs_hba *hba) · line 1467

Quoted 6 lines · Bart Van Assche

#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND) static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,

drivers/scsi/ufs/ufs-qcom.c +2 -2
-					  struct devfreq_dev_profile *p,
-					  void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *d)

This doesn't look to be properly indended to match the '('? What does ./scripts/checkpatch.pl --strict say about the patch?

Quoted 4 lines

Other than that, the change looks good, so feel free to add my r-b once you've double checked the indentation.

Checkpatch doesn't verify this kind of indentation as far as I know. Anyway, I will fix up the indentation when I repost this patch. Thanks for having taken a look.

Bart.

#47 lore raw

Re: [PATCH 14/29] scsi: ufs: Make the config_scaling_param calls type safe

Quoted 13 lines · Bart Van Assche
Quoted 12 lines · Bjorn Andersson

drivers/scsi/ufs/ufs-qcom.c static int ufs_qcom_device_reset(struct ufs_hba *hba) · line 1467

Quoted 6 lines · Bart Van Assche

#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND) static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,

drivers/scsi/ufs/ufs-qcom.c +2 -2
-					  struct devfreq_dev_profile *p,
-					  void *data)
+		struct devfreq_dev_profile *p,
+		struct devfreq_simple_ondemand_data *d)

This doesn't look to be properly indended to match the '('? What does ./scripts/checkpatch.pl --strict say about the patch?

Quoted 6 lines
Quoted 4 lines

Other than that, the change looks good, so feel free to add my r-b once you've double checked the indentation.

Checkpatch doesn't verify this kind of indentation as far as I know.

I was expecting to get the "Alignment should match open parenthesis", but apparently this case doesn't trigger that check, for some reason...

Quoted 1 line

Anyway, I will fix up the indentation when I repost this patch.

Cool, thanks!

PS. This patch is quite trivial and could definitely be merged independent of the big shuffling later in the series.
If you send such patches on their own, or at least early in the series its possible for the maintainer to pick it up while you continue to iterate the more complex things at the end - and hence you won't continue to respin 29 patches.

Quoted 2 lines

Thanks for having taken a look.

You're welcome,
Bjorn

#48 lore raw

PATCH 15/29 scsi: ufs: Remove the driver version

In reply to Bart Van Assche

Driver version numbers are not useful in upstream kernel code. Hence remove the driver version number from the UFS driver.

---
 drivers/scsi/ufs/cdns-pltfrm.c   | 1 -
 drivers/scsi/ufs/ufshcd-pci.c    | 1 -
 drivers/scsi/ufs/ufshcd-pltfrm.c | 1 -
 drivers/scsi/ufs/ufshcd.c        | 1 -
 drivers/scsi/ufs/ufshcd.h        | 1 -
 5 files changed, 5 deletions(-)
drivers/scsi/ufs/cdns-pltfrm.c +0 -1
index 7da8be2f35c4..e91cf9fd5a95 100644
@@ -340,4 +340,3 @@ module_platform_driver(cdns_ufs_pltfrm_driver);
 MODULE_AUTHOR("Jan Kotas <[email protected]>");
 MODULE_DESCRIPTION("Cadence UFS host controller platform driver");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd-pci.c +0 -1
index f76692053ca1..81aa14661072 100644
@@ -601,4 +601,3 @@ MODULE_AUTHOR("Santosh Yaragnavi <[email protected]>");
 MODULE_AUTHOR("Vinayak Holikatti <[email protected]>");
 MODULE_DESCRIPTION("UFS host controller PCI glue driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd-pltfrm.c +0 -1
index 2725ce4de1c9..81e458d31222 100644
@@ -386,4 +386,3 @@ MODULE_AUTHOR("Santosh Yaragnavi <[email protected]>");
 MODULE_AUTHOR("Vinayak Holikatti <[email protected]>");
 MODULE_DESCRIPTION("UFS host controller Platform bus based glue driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd.c +0 -1
index ae08c7964f2d..9d433d2c616d 100644
@@ -9915,4 +9915,3 @@ MODULE_AUTHOR("Santosh Yaragnavi <[email protected]>");
 MODULE_AUTHOR("Vinayak Holikatti <[email protected]>");
 MODULE_DESCRIPTION("Generic UFS host controller driver Core");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd.h +0 -1
index bb2624aabda2..49edbdb5ffd6 100644
@@ -49,7 +49,6 @@
 #include "ufshci.h"
 
 #define UFSHCD "ufshcd"
-#define UFSHCD_DRIVER_VERSION "0.2"
 
 struct ufs_hba;
 
#49 lore raw

RE: [PATCH 15/29] scsi: ufs: Remove the driver version

Quoted 1 line

Driver version numbers are not useful in upstream kernel code. Hence

Yet still - very common across the stack, and particularly in many scsi low level drivers. Why the ufs drivers is any different?

Quoted 61 lines

remove the driver version number from the UFS driver.

---
 drivers/scsi/ufs/cdns-pltfrm.c   | 1 -
 drivers/scsi/ufs/ufshcd-pci.c    | 1 -
 drivers/scsi/ufs/ufshcd-pltfrm.c | 1 -
 drivers/scsi/ufs/ufshcd.c        | 1 -
 drivers/scsi/ufs/ufshcd.h        | 1 -
 5 files changed, 5 deletions(-)
drivers/scsi/ufs/cdns-pltfrm.c +0 -1
index 7da8be2f35c4..e91cf9fd5a95 100644
@@ -340,4 +340,3 @@ module_platform_driver(cdns_ufs_pltfrm_driver);
 MODULE_AUTHOR("Jan Kotas <[email protected]>");
 MODULE_DESCRIPTION("Cadence UFS host controller platform driver");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd-pci.c +0 -1
index f76692053ca1..81aa14661072 100644
@@ -601,4 +601,3 @@ MODULE_AUTHOR("Santosh Yaragnavi
 <[email protected]>");
 MODULE_AUTHOR("Vinayak Holikatti <[email protected]>");
 MODULE_DESCRIPTION("UFS host controller PCI glue driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd-pltfrm.c +0 -1
index 2725ce4de1c9..81e458d31222 100644
@@ -386,4 +386,3 @@ MODULE_AUTHOR("Santosh Yaragnavi
 <[email protected]>");
 MODULE_AUTHOR("Vinayak Holikatti <[email protected]>");
 MODULE_DESCRIPTION("UFS host controller Platform bus based glue driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd.c +0 -1
index ae08c7964f2d..9d433d2c616d 100644
@@ -9915,4 +9915,3 @@ MODULE_AUTHOR("Santosh Yaragnavi
 <[email protected]>");
 MODULE_AUTHOR("Vinayak Holikatti <[email protected]>");
 MODULE_DESCRIPTION("Generic UFS host controller driver Core");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(UFSHCD_DRIVER_VERSION);
drivers/scsi/ufs/ufshcd.h +0 -1
index bb2624aabda2..49edbdb5ffd6 100644
@@ -49,7 +49,6 @@
 #include "ufshci.h"
 
 #define UFSHCD "ufshcd"
-#define UFSHCD_DRIVER_VERSION "0.2"
 
 struct ufs_hba;
#50 lore raw

Re: [PATCH 15/29] scsi: ufs: Remove the driver version

Quoted 3 lines · Avri Altman
Quoted 1 line

Driver version numbers are not useful in upstream kernel code. Hence

Yet still - very common across the stack, and particularly in many scsi low level drivers. Why the ufs drivers is any different?

Some authors of SCSI drivers use the version number to track which version of their driver ends up in Linux distributions like RHEL or SLES. I think that the driver version numbers are not useful in the UFS drivers because the current version number is 0.2 and that version number was assigned in 2013, more than nine years ago. See also commit e0eca63e3421 ("[SCSI] ufs: Separate PCI code into glue driver").

Thanks,

Bart.

#53 lore raw

PATCH 16/29 scsi: ufs: Rename sdev_ufs_device into ufs_device_wlun

In reply to Bart Van Assche

The new name reflects the role of this member variable better: a WLUN through which the power mode of the UFS device is controlled.

---
 drivers/scsi/ufs/ufshcd.c | 48 +++++++++++++++++++--------------------
 drivers/scsi/ufs/ufshcd.h | 17 ++++++--------
 2 files changed, 31 insertions(+), 34 deletions(-)
drivers/scsi/ufs/ufshcd.c +24 -24
index 9d433d2c616d..c36658d97774 100644
@@ -540,7 +540,7 @@ static void ufshcd_print_tmrs(struct ufs_hba *hba, unsigned long bitmap)
 
 static void ufshcd_print_host_state(struct ufs_hba *hba)
 {
-	struct scsi_device *sdev_ufs = hba->sdev_ufs_device;
+	struct scsi_device *sdev_ufs = hba->ufs_device_wlun;
 
 	dev_err(hba->dev, "UFS Host state=%d\n", hba->ufshcd_state);
 	dev_err(hba->dev, "outstanding reqs=0x%lx tasks=0x%lx\n",
@@ -4195,7 +4195,7 @@ void ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit)
 	spin_unlock_irqrestore(hba->host->host_lock, flags);
 
 	if (update &&
-	    !pm_runtime_suspended(&hba->sdev_ufs_device->sdev_gendev)) {
+	    !pm_runtime_suspended(&hba->ufs_device_wlun->sdev_gendev)) {
 		ufshcd_rpm_get_sync(hba);
 		ufshcd_hold(hba, false);
 		ufshcd_auto_hibern8_enable(hba);
@@ -4911,13 +4911,13 @@ static void ufshcd_setup_links(struct ufs_hba *hba, struct scsi_device *sdev)
 	 * Device wlun is the supplier & rest of the luns are consumers.
 	 * This ensures that device wlun suspends after all other luns.
 	 */
-	if (hba->sdev_ufs_device) {
+	if (hba->ufs_device_wlun) {
 		link = device_link_add(&sdev->sdev_gendev,
-				       &hba->sdev_ufs_device->sdev_gendev,
+				       &hba->ufs_device_wlun->sdev_gendev,
 				       DL_FLAG_PM_RUNTIME | DL_FLAG_RPM_ACTIVE);
 		if (!link) {
 			dev_err(&sdev->sdev_gendev, "Failed establishing link - %s\n",
-				dev_name(&hba->sdev_ufs_device->sdev_gendev));
+				dev_name(&hba->ufs_device_wlun->sdev_gendev));
 			return;
 		}
 		hba->luns_avail--;
@@ -5053,15 +5053,15 @@ static void ufshcd_slave_destroy(struct scsi_device *sdev)
 	/* Drop the reference as it won't be needed anymore */
 	if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN) {
 		spin_lock_irqsave(hba->host->host_lock, flags);
-		hba->sdev_ufs_device = NULL;
+		hba->ufs_device_wlun = NULL;
 		spin_unlock_irqrestore(hba->host->host_lock, flags);
-	} else if (hba->sdev_ufs_device) {
+	} else if (hba->ufs_device_wlun) {
 		struct device *supplier = NULL;
 
 		/* Ensure UFS Device WLUN exists and does not disappear */
 		spin_lock_irqsave(hba->host->host_lock, flags);
-		if (hba->sdev_ufs_device) {
-			supplier = &hba->sdev_ufs_device->sdev_gendev;
+		if (hba->ufs_device_wlun) {
+			supplier = &hba->ufs_device_wlun->sdev_gendev;
 			get_device(supplier);
 		}
 		spin_unlock_irqrestore(hba->host->host_lock, flags);
@@ -6037,7 +6037,7 @@ static void ufshcd_clk_scaling_suspend(struct ufs_hba *hba, bool suspend)
 static void ufshcd_err_handling_prepare(struct ufs_hba *hba)
 {
 	ufshcd_rpm_get_sync(hba);
-	if (pm_runtime_status_suspended(&hba->sdev_ufs_device->sdev_gendev) ||
+	if (pm_runtime_status_suspended(&hba->ufs_device_wlun->sdev_gendev) ||
 	    hba->is_sys_suspended) {
 		enum ufs_pm_op pm_op;
 
@@ -6082,7 +6082,7 @@ static void ufshcd_err_handling_unprepare(struct ufs_hba *hba)
 static inline bool ufshcd_err_handling_should_stop(struct ufs_hba *hba)
 {
 	return (!hba->is_powered || hba->shutting_down ||
-		!hba->sdev_ufs_device ||
+		!hba->ufs_device_wlun ||
 		hba->ufshcd_state == UFSHCD_STATE_ERROR ||
 		(!(hba->saved_err || hba->saved_uic_err || hba->force_reset ||
 		   ufshcd_is_link_broken(hba))));
@@ -6101,7 +6101,7 @@ static void ufshcd_recover_pm_error(struct ufs_hba *hba)
 	 * Set RPM status of wlun device to RPM_ACTIVE,
 	 * this also clears its runtime error.
 	 */
-	ret = pm_runtime_set_active(&hba->sdev_ufs_device->sdev_gendev);
+	ret = pm_runtime_set_active(&hba->ufs_device_wlun->sdev_gendev);
 
 	/* hba device might have a runtime error otherwise */
 	if (ret)
@@ -7495,20 +7495,20 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba)
 	int ret = 0;
 	struct scsi_device *sdev_boot, *sdev_rpmb;
 
-	hba->sdev_ufs_device = __scsi_add_device(hba->host, 0, 0,
+	hba->ufs_device_wlun = __scsi_add_device(hba->host, 0, 0,
 		ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_UFS_DEVICE_WLUN), NULL);
-	if (IS_ERR(hba->sdev_ufs_device)) {
-		ret = PTR_ERR(hba->sdev_ufs_device);
-		hba->sdev_ufs_device = NULL;
+	if (IS_ERR(hba->ufs_device_wlun)) {
+		ret = PTR_ERR(hba->ufs_device_wlun);
+		hba->ufs_device_wlun = NULL;
 		goto out;
 	}
-	scsi_device_put(hba->sdev_ufs_device);
+	scsi_device_put(hba->ufs_device_wlun);
 
 	sdev_rpmb = __scsi_add_device(hba->host, 0, 0,
 		ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_RPMB_WLUN), NULL);
 	if (IS_ERR(sdev_rpmb)) {
 		ret = PTR_ERR(sdev_rpmb);
-		goto remove_sdev_ufs_device;
+		goto remove_ufs_device_wlun;
 	}
 	ufshcd_blk_pm_runtime_init(sdev_rpmb);
 	scsi_device_put(sdev_rpmb);
@@ -7523,8 +7523,8 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba)
 	}
 	goto out;
 
-remove_sdev_ufs_device:
-	scsi_remove_device(hba->sdev_ufs_device);
+remove_ufs_device_wlun:
+	scsi_remove_device(hba->ufs_device_wlun);
 out:
 	return ret;
 }
@@ -8660,7 +8660,7 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
 	int ret, retries;
 
 	spin_lock_irqsave(hba->host->host_lock, flags);
-	sdp = hba->sdev_ufs_device;
+	sdp = hba->ufs_device_wlun;
 	if (sdp) {
 		ret = scsi_device_get(sdp);
 		if (!ret && !scsi_device_online(sdp)) {
@@ -9437,7 +9437,7 @@ EXPORT_SYMBOL(ufshcd_shutdown);
  */
 void ufshcd_remove(struct ufs_hba *hba)
 {
-	if (hba->sdev_ufs_device)
+	if (hba->ufs_device_wlun)
 		ufshcd_rpm_get_sync(hba);
 	ufs_hwmon_remove(hba);
 	ufs_bsg_remove(hba);
@@ -9765,7 +9765,7 @@ EXPORT_SYMBOL_GPL(ufshcd_resume_complete);
 
 static bool ufshcd_rpm_ok_for_spm(struct ufs_hba *hba)
 {
-	struct device *dev = &hba->sdev_ufs_device->sdev_gendev;
+	struct device *dev = &hba->ufs_device_wlun->sdev_gendev;
 	enum ufs_dev_pwr_mode dev_pwr_mode;
 	enum uic_link_state link_state;
 	unsigned long flags;
@@ -9794,7 +9794,7 @@ int __ufshcd_suspend_prepare(struct device *dev, bool rpm_ok_for_spm)
 	 * if it's runtime suspended. But ufs doesn't follow that.
 	 * Refer ufshcd_resume_complete()
 	 */
-	if (hba->sdev_ufs_device) {
+	if (hba->ufs_device_wlun) {
 		/* Prevent runtime suspend */
 		ufshcd_rpm_get_noresume(hba);
 		/*
drivers/scsi/ufs/ufshcd.h +7 -10
index 49edbdb5ffd6..14414225faa1 100644
@@ -732,6 +732,7 @@ struct ufs_hba_monitor {
  * @utmrdl_dma_addr: UTMRDL DMA address
  * @host: Scsi_Host instance of the driver
  * @dev: device handle
+ * @ufs_device_wlun: WLUN that controls the entire UFS device.
  * @lrb: local reference block
  * @outstanding_tasks: Bits representing outstanding task requests
  * @outstanding_lock: Protects @outstanding_reqs.
@@ -799,11 +800,7 @@ struct ufs_hba {
 
 	struct Scsi_Host *host;
 	struct device *dev;
-	/*
-	 * This field is to keep a reference to "scsi_device" corresponding to
-	 * "UFS device" W-LU.
-	 */
-	struct scsi_device *sdev_ufs_device;
+	struct scsi_device *ufs_device_wlun;
 
 #ifdef CONFIG_SCSI_UFS_HWMON
 	struct device *hwmon_device;
@@ -1407,27 +1404,27 @@ static inline int ufshcd_update_ee_usr_mask(struct ufs_hba *hba,
 
 static inline int ufshcd_rpm_get_sync(struct ufs_hba *hba)
 {
-	return pm_runtime_get_sync(&hba->sdev_ufs_device->sdev_gendev);
+	return pm_runtime_get_sync(&hba->ufs_device_wlun->sdev_gendev);
 }
 
 static inline int ufshcd_rpm_put_sync(struct ufs_hba *hba)
 {
-	return pm_runtime_put_sync(&hba->sdev_ufs_device->sdev_gendev);
+	return pm_runtime_put_sync(&hba->ufs_device_wlun->sdev_gendev);
 }
 
 static inline void ufshcd_rpm_get_noresume(struct ufs_hba *hba)
 {
-	pm_runtime_get_noresume(&hba->sdev_ufs_device->sdev_gendev);
+	pm_runtime_get_noresume(&hba->ufs_device_wlun->sdev_gendev);
 }
 
 static inline int ufshcd_rpm_resume(struct ufs_hba *hba)
 {
-	return pm_runtime_resume(&hba->sdev_ufs_device->sdev_gendev);
+	return pm_runtime_resume(&hba->ufs_device_wlun->sdev_gendev);
 }
 
 static inline int ufshcd_rpm_put(struct ufs_hba *hba)
 {
-	return pm_runtime_put(&hba->sdev_ufs_device->sdev_gendev);
+	return pm_runtime_put(&hba->ufs_device_wlun->sdev_gendev);
 }
 
 #endif /* End of Header */
Reviewed-by on v1 16/29
#54 lore raw

RE: [PATCH 16/29] scsi: ufs: Rename sdev_ufs_device into ufs_device_wlun

Quoted 5 lines

The new name reflects the role of this member variable better: a WLUN through which the power mode of the UFS device is controlled.

Quoted 1 line

+ * @ufs_device_wlun: WLUN that controls the entire UFS device.

An optional suggestion: wlun that provides device-level interaction

#55 lore raw

PATCH 17/29 scsi: ufs: Use an SPDX license identifier in the Kconfig file

In reply to Bart Van Assche

As requested in Documentation/process/license-rules.rst, use an SPDX license identifier.

---
 drivers/scsi/ufs/Kconfig | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)
drivers/scsi/ufs/Kconfig +1 -24
index 9fe27b01904e..3ebcd5bbc344 100644
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Kernel configuration file for the UFS Host Controller
 #
@@ -7,30 +8,6 @@
 # Authors:
 #	Santosh Yaraganavi <[email protected]>
 #	Vinayak Holikatti <[email protected]>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# See the COPYING file in the top-level directory or visit
-# <http://www.gnu.org/licenses/gpl-2.0.html>
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# This program is provided "AS IS" and "WITH ALL FAULTS" and
-# without warranty of any kind. You are solely responsible for
-# determining the appropriateness of using and distributing
-# the program and assume all risks associated with your exercise
-# of rights with respect to the program, including but not limited
-# to infringement of third party rights, the risks and costs of
-# program errors, damage to or loss of data, programs or equipment,
-# and unavailability or interruption of operations. Under no
-# circumstances will the contributor of this Program be liable for
-# any damages of any kind arising from your use or distribution of
-# this program.
 
 config SCSI_UFSHCD
 	tristate "Universal Flash Storage Controller Driver Core"
#56 lore raw

PATCH 18/29 scsi: ufs: Remove paths from source code comments

In reply to Bart Van Assche

Since specifying the path in a source file is redundant, remove the paths from source code comments.

---
 drivers/scsi/ufs/Kconfig      | 1 -
 drivers/scsi/ufs/ufshcd-pci.c | 1 -
 drivers/scsi/ufs/unipro.h     | 2 --
 3 files changed, 4 deletions(-)
drivers/scsi/ufs/Kconfig +0 -1
index 3ebcd5bbc344..393b9a01da36 100644
@@ -2,7 +2,6 @@
 #
 # Kernel configuration file for the UFS Host Controller
 #
-# This code is based on drivers/scsi/ufs/Kconfig
 # Copyright (C) 2011-2013 Samsung India Software Operations
 #
 # Authors:
drivers/scsi/ufs/ufshcd-pci.c +0 -1
index 81aa14661072..d36873bc44fe 100644
@@ -2,7 +2,6 @@
 /*
  * Universal Flash Storage Host controller PCI glue driver
  *
- * This code is based on drivers/scsi/ufs/ufshcd-pci.c
  * Copyright (C) 2011-2013 Samsung India Software Operations
  *
  * Authors:
drivers/scsi/ufs/unipro.h +0 -2
index 8e9e486a4f7b..bdd0fa6a3c74 100644
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
- * drivers/scsi/ufs/unipro.h
- *
  * Copyright (C) 2013 Samsung Electronics Co., Ltd.
  */
 
#58 lore raw

PATCH 19/29 scsi: ufs: Remove the TRUE and FALSE definitions

In reply to Bart Van Assche

In the Linux kernel coding style document (Documentation/process/coding-style.rst) it is recommended to use the type 'bool' and also the values 'true' and 'false'. Hence this patch that removes the definitions and uses of TRUE and FALSE from the UFS driver.

---
 drivers/scsi/ufs/ufs-exynos.c |  4 ++--
 drivers/scsi/ufs/ufs-exynos.h |  8 ++++----
 drivers/scsi/ufs/ufshcd.c     |  8 ++++----
 drivers/scsi/ufs/unipro.h     | 14 --------------
 4 files changed, 10 insertions(+), 24 deletions(-)
drivers/scsi/ufs/ufs-exynos.c +2 -2
index 474a4a064a68..0b99c74955ef 100644
@@ -704,7 +704,7 @@ static void exynos_ufs_establish_connt(struct exynos_ufs *ufs)
 
 	/* local unipro attributes */
 	ufshcd_dme_set(hba, UIC_ARG_MIB(N_DEVICEID), DEV_ID);
-	ufshcd_dme_set(hba, UIC_ARG_MIB(N_DEVICEID_VALID), TRUE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(N_DEVICEID_VALID), true);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(T_PEERDEVICEID), PEER_DEV_ID);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(T_PEERCPORTID), PEER_CPORT_ID);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(T_CPORTFLAGS), CPORT_DEF_FLAGS);
@@ -1028,7 +1028,7 @@ static int exynos_ufs_post_link(struct ufs_hba *hba)
 
 	if (ufs->opts & EXYNOS_UFS_OPT_SKIP_CONNECTION_ESTAB)
 		ufshcd_dme_set(hba,
-			UIC_ARG_MIB(T_DBG_SKIP_INIT_HIBERN8_EXIT), TRUE);
+			UIC_ARG_MIB(T_DBG_SKIP_INIT_HIBERN8_EXIT), true);
 
 	if (attr->pa_granularity) {
 		exynos_ufs_enable_dbg_mode(hba);
drivers/scsi/ufs/ufs-exynos.h +4 -4
index 1c33e5466082..0b0a3d530ca6 100644
@@ -248,22 +248,22 @@ long exynos_ufs_calc_time_cntr(struct exynos_ufs *, long);
 
 static inline void exynos_ufs_enable_ov_tm(struct ufs_hba *hba)
 {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), TRUE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), true);
 }
 
 static inline void exynos_ufs_disable_ov_tm(struct ufs_hba *hba)
 {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), FALSE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), false);
 }
 
 static inline void exynos_ufs_enable_dbg_mode(struct ufs_hba *hba)
 {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), TRUE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), true);
 }
 
 static inline void exynos_ufs_disable_dbg_mode(struct ufs_hba *hba)
 {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), FALSE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), false);
 }
 
 #endif /* _UFS_EXYNOS_H_ */
drivers/scsi/ufs/ufshcd.c +4 -4
index c36658d97774..c81b5f3f0b9a 100644
@@ -4325,18 +4325,18 @@ static int ufshcd_change_power_mode(struct ufs_hba *hba,
 			pwr_mode->lane_rx);
 	if (pwr_mode->pwr_rx == FASTAUTO_MODE ||
 			pwr_mode->pwr_rx == FAST_MODE)
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), TRUE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), true);
 	else
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), FALSE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), false);
 
 	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXGEAR), pwr_mode->gear_tx);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_ACTIVETXDATALANES),
 			pwr_mode->lane_tx);
 	if (pwr_mode->pwr_tx == FASTAUTO_MODE ||
 			pwr_mode->pwr_tx == FAST_MODE)
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), TRUE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), true);
 	else
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), FALSE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), false);
 
 	if (pwr_mode->pwr_rx == FASTAUTO_MODE ||
 	    pwr_mode->pwr_tx == FASTAUTO_MODE ||
drivers/scsi/ufs/unipro.h +0 -14
index bdd0fa6a3c74..91152d8386e6 100644
@@ -298,20 +298,6 @@ enum ufs_unipro_ver {
 #define T_TC0TXMAXSDUSIZE	0x4060
 #define T_TC1TXMAXSDUSIZE	0x4061
 
-#ifdef FALSE
-#undef FALSE
-#endif
-
-#ifdef TRUE
-#undef TRUE
-#endif
-
-/* Boolean attribute values */
-enum {
-	FALSE = 0,
-	TRUE,
-};
-
 /* CPort setting */
 #define E2EFC_ON	(1 << 0)
 #define E2EFC_OFF	(0 << 0)
Reviewed-by on v1 19/29
#59 lore raw

RE: [PATCH 19/29] scsi: ufs: Remove the TRUE and FALSE definitions

Quoted 4 lines

In the Linux kernel coding style document (Documentation/process/coding-style.rst) it is recommended to use the type 'bool' and also the values 'true' and 'false'. Hence this patch that removes the definitions and uses of TRUE and FALSE from the UFS driver.

The third parameter of ufshcd_dme_set is "int" type.
I think the coding-style doc recommends to use "bool" as comparison purpose not int type conversion.
However, regarding C99 and C11, they might be converted to 0 and 1 respectively.

The usage of 'TRUE' and 'FALSE' seems to be written as following the description of below JEDEC doc.

Quoted 1 line

A Flag is a single Boolean value that represents a TRUE or FALSE, '0' or

'1', ON or OFF type of value.

Best Regards,
Chanho Park

Quoted 113 lines

---
drivers/scsi/ufs/ufs-exynos.c | 4 ++-- drivers/scsi/ufs/ufs-exynos.h |
8 ++++----

 drivers/scsi/ufs/ufshcd.c     |  8 ++++----
 drivers/scsi/ufs/unipro.h     | 14 --------------
 4 files changed, 10 insertions(+), 24 deletions(-)
drivers/scsi/ufs/ufs-exynos.c +1 -1
index 474a4a064a68..0b99c74955ef 100644
@@ -704,7 +704,7 @@ static void exynos_ufs_establish_connt(struct
 exynos_ufs *ufs)
 
 	/* local unipro attributes */
 	ufshcd_dme_set(hba, UIC_ARG_MIB(N_DEVICEID), DEV_ID);
-	ufshcd_dme_set(hba, UIC_ARG_MIB(N_DEVICEID_VALID), TRUE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(N_DEVICEID_VALID), true);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(T_PEERDEVICEID), PEER_DEV_ID);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(T_PEERCPORTID), PEER_CPORT_ID);
drivers/scsi/ufs/ufs-exynos.c +1 -2
 	ufshcd_dme_set(hba, UIC_ARG_MIB(T_CPORTFLAGS), CPORT_DEF_FLAGS); @@
-1028,7 +1028,7 @@ static int exynos_ufs_post_link(struct ufs_hba *hba)
 
 	if (ufs->opts & EXYNOS_UFS_OPT_SKIP_CONNECTION_ESTAB)
 		ufshcd_dme_set(hba,
-			UIC_ARG_MIB(T_DBG_SKIP_INIT_HIBERN8_EXIT), TRUE);
+			UIC_ARG_MIB(T_DBG_SKIP_INIT_HIBERN8_EXIT), true);
 
 	if (attr->pa_granularity) {
 		exynos_ufs_enable_dbg_mode(hba);
drivers/scsi/ufs/ufs-exynos.h +4 -4
index 1c33e5466082..0b0a3d530ca6 100644
@@ -248,22 +248,22 @@ long exynos_ufs_calc_time_cntr(struct exynos_ufs *,
 long);
 
 static inline void exynos_ufs_enable_ov_tm(struct ufs_hba *hba)  {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), TRUE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), true);
 }
 
 static inline void exynos_ufs_disable_ov_tm(struct ufs_hba *hba)  {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), FALSE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_OV_TM), false);
 }
 
 static inline void exynos_ufs_enable_dbg_mode(struct ufs_hba *hba)  {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), TRUE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), true);
 }
 
 static inline void exynos_ufs_disable_dbg_mode(struct ufs_hba *hba)  {
-	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), FALSE);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_DBG_MODE), false);
 }
 
 #endif /* _UFS_EXYNOS_H_ */
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0 -0

c36658d97774..c81b5f3f0b9a 100644

drivers/scsi/ufs/ufshcd.c +4 -4
@@ -4325,18 +4325,18 @@ static int ufshcd_change_power_mode(struct ufs_hba
 *hba,
 			pwr_mode->lane_rx);
 	if (pwr_mode->pwr_rx == FASTAUTO_MODE ||
 			pwr_mode->pwr_rx == FAST_MODE)
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), TRUE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), true);
 	else
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), FALSE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_RXTERMINATION), false);
 
 	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXGEAR), pwr_mode->gear_tx);
 	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_ACTIVETXDATALANES),
 			pwr_mode->lane_tx);
 	if (pwr_mode->pwr_tx == FASTAUTO_MODE ||
 			pwr_mode->pwr_tx == FAST_MODE)
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), TRUE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), true);
 	else
-		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), FALSE);
+		ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TXTERMINATION), false);
 
 	if (pwr_mode->pwr_rx == FASTAUTO_MODE ||

pwr_mode->pwr_tx == FASTAUTO_MODE || diff --git
a/drivers/scsi/ufs/unipro.h b/drivers/scsi/ufs/unipro.h index bdd0fa6a3c74..91152d8386e6 100644

drivers/scsi/ufs/unipro.h +0 -14
@@ -298,20 +298,6 @@ enum ufs_unipro_ver {
 #define T_TC0TXMAXSDUSIZE	0x4060
 #define T_TC1TXMAXSDUSIZE	0x4061
 
-#ifdef FALSE
-#undef FALSE
-#endif
-
-#ifdef TRUE
-#undef TRUE
-#endif
-
-/* Boolean attribute values */
-enum {
-	FALSE = 0,
-	TRUE,
-};
-
 /* CPort setting */
 #define E2EFC_ON	(1 << 0)
 #define E2EFC_OFF	(0 << 0)
#60 lore raw

Re: [PATCH 19/29] scsi: ufs: Remove the TRUE and FALSE definitions

Quoted 10 lines · Chanho Park
Quoted 4 lines

In the Linux kernel coding style document (Documentation/process/coding-style.rst) it is recommended to use the type 'bool' and also the values 'true' and 'false'. Hence this patch that removes the definitions and uses of TRUE and FALSE from the UFS driver.

The third parameter of ufshcd_dme_set is "int" type.
I think the coding-style doc recommends to use "bool" as comparison purpose not int type conversion.
However, regarding C99 and C11, they might be converted to 0 and 1 respectively.

That's right, 'true' and 'false' are converted into 1 and 0 respectively when converted to type 'int'. I want to keep the type of the third argument of ufshcd_dme_set() as 'u32' because many other values are passed to that parameter than only true and false.

Quoted 4 lines

The usage of 'TRUE' and 'FALSE' seems to be written as following the description of below JEDEC doc.
"A Flag is a single Boolean value that represents a TRUE or FALSE, '0' or '1', ON or OFF type of value."

Agreed that this is how it has been specified in the standard. I think that we have the freedom to use any symbolic names for 0 and 1 as long as these symbolic names are translated into the numerical values required by the standard.

Thanks,

Bart.

#61 lore raw

PATCH 20/29 scsi: ufs: Remove locking from around single register writes

In reply to Bart Van Assche

Single register writes are atomic and hence do not need to be surrounded by locking. Additionally, PCI bus writes are posted asynchronously and hence there is no guarantee that these have finished by the time the spin_unlock*() call has finished.

---
 drivers/scsi/ufs/ufs-mediatek.c | 8 --------
 drivers/scsi/ufs/ufshcd.c       | 4 ----
 2 files changed, 12 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +0 -8
index 9a4474210627..2b26acc74efb 100644
@@ -171,7 +171,6 @@ static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba,
 				     enum ufs_notify_change_status status)
 {
 	struct ufs_mtk_host *host = ufshcd_get_variant(hba);
-	unsigned long flags;
 
 	if (status == PRE_CHANGE) {
 		if (host->unipro_lpm) {
@@ -185,12 +184,8 @@ static int ufs_mtk_hce_enable_notify(struct ufs_hba *hba,
 			ufs_mtk_crypto_enable(hba);
 
 		if (host->caps & UFS_MTK_CAP_DISABLE_AH8) {
-			spin_lock_irqsave(hba->host->host_lock, flags);
 			ufshcd_writel(hba, 0,
 				      REG_AUTO_HIBERNATE_IDLE_TIMER);
-			spin_unlock_irqrestore(hba->host->host_lock,
-					       flags);
-
 			hba->capabilities &= ~MASK_AUTO_HIBERN8_SUPPORT;
 			hba->ahit = 0;
 		}
@@ -994,13 +989,10 @@ static void ufs_mtk_vreg_set_lpm(struct ufs_hba *hba, bool lpm)
 
 static void ufs_mtk_auto_hibern8_disable(struct ufs_hba *hba)
 {
-	unsigned long flags;
 	int ret;
 
 	/* disable auto-hibern8 */
-	spin_lock_irqsave(hba->host->host_lock, flags);
 	ufshcd_writel(hba, 0, REG_AUTO_HIBERNATE_IDLE_TIMER);
-	spin_unlock_irqrestore(hba->host->host_lock, flags);
 
 	/* wait host return to idle state when auto-hibern8 off */
 	ufs_mtk_wait_idle_state(hba, 5);
drivers/scsi/ufs/ufshcd.c +0 -4
index c81b5f3f0b9a..d6af4d82dfed 100644
@@ -4207,14 +4207,10 @@ EXPORT_SYMBOL_GPL(ufshcd_auto_hibern8_update);
 
 void ufshcd_auto_hibern8_enable(struct ufs_hba *hba)
 {
-	unsigned long flags;
-
 	if (!ufshcd_is_auto_hibern8_supported(hba))
 		return;
 
-	spin_lock_irqsave(hba->host->host_lock, flags);
 	ufshcd_writel(hba, hba->ahit, REG_AUTO_HIBERNATE_IDLE_TIMER);
-	spin_unlock_irqrestore(hba->host->host_lock, flags);
 }
 
  /**
Reviewed-by on v1 20/29
#62 lore raw

RE: [PATCH 20/29] scsi: ufs: Remove locking from around single register writes

Quoted 7 lines

Single register writes are atomic and hence do not need to be surrounded by locking. Additionally, PCI bus writes are posted asynchronously and hence there is no guarantee that these have finished by the time the spin_unlock*() call has finished.

(maybe minus the pci reference)

#63 lore raw

PATCH 21/29 scsi: ufs: Introduce ufshcd_clkgate_delay_set()

In reply to Bart Van Assche

Since the code to modify delay_ms while holding the host lock occurs twice, introduce a function that performs this action.

---
 drivers/scsi/ufs/ufs-mediatek.c |  5 +----
 drivers/scsi/ufs/ufshcd.c       | 18 +++++++++++++-----
 drivers/scsi/ufs/ufshcd.h       |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +1 -4
index 2b26acc74efb..d19b35495302 100644
@@ -857,7 +857,6 @@ static int ufs_mtk_pre_link(struct ufs_hba *hba)
 
 static void ufs_mtk_setup_clk_gating(struct ufs_hba *hba)
 {
-	unsigned long flags;
 	u32 ah_ms;
 
 	if (ufshcd_is_clkgating_allowed(hba)) {
@@ -866,9 +865,7 @@ static void ufs_mtk_setup_clk_gating(struct ufs_hba *hba)
 					  hba->ahit);
 		else
 			ah_ms = 10;
-		spin_lock_irqsave(hba->host->host_lock, flags);
-		hba->clk_gating.delay_ms = ah_ms + 5;
-		spin_unlock_irqrestore(hba->host->host_lock, flags);
+		ufshcd_clkgate_delay_set(hba->dev, ah_ms + 5);
 	}
 }
 
drivers/scsi/ufs/ufshcd.c +13 -5
index d6af4d82dfed..7d04cf8d75ef 100644
@@ -1864,18 +1864,26 @@ static ssize_t ufshcd_clkgate_delay_show(struct device *dev,
 	return sysfs_emit(buf, "%lu\n", hba->clk_gating.delay_ms);
 }
 
+void ufshcd_clkgate_delay_set(struct device *dev, unsigned long value)
+{
+	struct ufs_hba *hba = dev_get_drvdata(dev);
+	unsigned long flags;
+
+	spin_lock_irqsave(hba->host->host_lock, flags);
+	hba->clk_gating.delay_ms = value;
+	spin_unlock_irqrestore(hba->host->host_lock, flags);
+}
+EXPORT_SYMBOL_GPL(ufshcd_clkgate_delay_set);
+
 static ssize_t ufshcd_clkgate_delay_store(struct device *dev,
 		struct device_attribute *attr, const char *buf, size_t count)
 {
-	struct ufs_hba *hba = dev_get_drvdata(dev);
-	unsigned long flags, value;
+	unsigned long value;
 
 	if (kstrtoul(buf, 0, &value))
 		return -EINVAL;
 
-	spin_lock_irqsave(hba->host->host_lock, flags);
-	hba->clk_gating.delay_ms = value;
-	spin_unlock_irqrestore(hba->host->host_lock, flags);
+	ufshcd_clkgate_delay_set(dev, value);
 	return count;
 }
 
drivers/scsi/ufs/ufshcd.h +2 -0
index 14414225faa1..3eb5d2c17e39 100644
@@ -1186,6 +1186,8 @@ int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
 int ufshcd_hold(struct ufs_hba *hba, bool async);
 void ufshcd_release(struct ufs_hba *hba);
 
+void ufshcd_clkgate_delay_set(struct device *dev, unsigned long value);
+
 void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id,
 				  int *desc_length);
 
#65 lore raw

PATCH 22/29 scsi: ufs: qcom: Fix ufs_qcom_resume()

In reply to Bart Van Assche

Clearing hba->is_sys_suspended if ufs_qcom_resume() succeeds is wrong. That variable must only be cleared if all actions involved in a resume succeed. Hence remove the statement that clears hba->is_sys_suspended from ufs_qcom_resume().

Fixes 81c0fc51b7a7 ("ufs-qcom: add support for Qualcomm Technologies Inc platforms")
---
 drivers/scsi/ufs/ufs-qcom.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +1 -6
index f24210652fe9..808dae751527 100644
@@ -640,12 +640,7 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 			return err;
 	}
 
-	err = ufs_qcom_ice_resume(host);
-	if (err)
-		return err;
-
-	hba->is_sys_suspended = false;
-	return 0;
+	return ufs_qcom_ice_resume(host);
 }
 
 static void ufs_qcom_dev_ref_clk_ctrl(struct ufs_qcom_host *host, bool enable)
Reviewed-by on v1 22/29
#66 lore raw

Re: [PATCH 22/29] scsi: ufs: qcom: Fix ufs_qcom_resume()

Quoted 5 lines · Bart Van Assche

Clearing hba->is_sys_suspended if ufs_qcom_resume() succeeds is wrong. That variable must only be cleared if all actions involved in a resume succeed. Hence remove the statement that clears hba->is_sys_suspended from ufs_qcom_resume().

Regards,
Bjorn

Quoted 24 lines
Fixes 81c0fc51b7a7 ("ufs-qcom: add support for Qualcomm Technologies Inc platforms")
---
 drivers/scsi/ufs/ufs-qcom.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/scsi/ufs/ufs-qcom.c +1 -6
index f24210652fe9..808dae751527 100644
@@ -640,12 +640,7 @@ static int ufs_qcom_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op)
 			return err;
 	}
 
-	err = ufs_qcom_ice_resume(host);
-	if (err)
-		return err;
-
-	hba->is_sys_suspended = false;
-	return 0;
+	return ufs_qcom_ice_resume(host);
 }
 
 static void ufs_qcom_dev_ref_clk_ctrl(struct ufs_qcom_host *host, bool enable)
#67 lore raw

PATCH 23/29 scsi: ufs: Remove unnecessary ufshcd-crypto.h include directives

In reply to Bart Van Assche

ufshcd-crypto.h declares functions that must only be called by the UFS core. Hence remove the #include "ufshcd-crypto.h" directive from UFS drivers.

---
 drivers/scsi/ufs/ufs-mediatek.c | 1 -
 drivers/scsi/ufs/ufs-qcom-ice.c | 1 -
 drivers/scsi/ufs/ufs-qcom.h     | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/ufs/ufs-mediatek.c +0 -1
index d19b35495302..84ccb5258736 100644
@@ -19,7 +19,6 @@
 #include <linux/soc/mediatek/mtk_sip_svc.h>
 
 #include "ufshcd.h"
-#include "ufshcd-crypto.h"
 #include "ufshcd-pltfrm.h"
 #include "ufs_quirks.h"
 #include "unipro.h"
drivers/scsi/ufs/ufs-qcom-ice.c +0 -1
index bbb0ad7590ec..921d6a93b653 100644
@@ -9,7 +9,6 @@
 #include <linux/platform_device.h>
 #include <linux/qcom_scm.h>
 
-#include "ufshcd-crypto.h"
 #include "ufs-qcom.h"
 
 #define AES_256_XTS_KEY_SIZE			64
drivers/scsi/ufs/ufs-qcom.h +1 -0
index 51570224a6e2..771bc95d02c7 100644
@@ -7,6 +7,7 @@
 
 #include <linux/reset-controller.h>
 #include <linux/reset.h>
+#include "ufshcd.h"
 
 #define MAX_UFS_QCOM_HOSTS	1
 #define MAX_U32                 (~(u32)0)
#68 lore raw

PATCH 24/29 scsi: ufs: Fix kernel-doc syntax in ufshcd.h

In reply to Bart Van Assche

This patch fixes all the warnings and errors reported by the following command:

scripts/kernel-doc -none drivers/scsi/ufs/ufshcd.h

---
 drivers/scsi/ufs/ufshcd.h | 89 ++++++++++++++++++++++++++++++---------
 1 file changed, 68 insertions(+), 21 deletions(-)
drivers/scsi/ufs/ufshcd.h +68 -21
index 3eb5d2c17e39..412fe43cd763 100644
@@ -236,6 +236,7 @@ struct ufs_query {
  * @type: device management command type - Query, NOP OUT
  * @lock: lock to allow one command at a time
  * @complete: internal commands completion
+ * @query: Device management query information
  */
 struct ufs_dev_cmd {
 	enum dev_cmd_type type;
@@ -253,7 +254,7 @@ struct ufs_dev_cmd {
  * @min_freq: min frequency that can be used for clock scaling
  * @curr_freq: indicates the current frequency that it is set to
  * @keep_link_active: indicates that the clk should not be disabled if
-		      link is active
+ *		      link is active
  * @enabled: variable to check against multiple enable/disable
  */
 struct ufs_clk_info {
@@ -308,11 +309,13 @@ struct ufs_pwr_mode_info {
  *                  to set some things
  * @hibern8_notify: called around hibern8 enter/exit
  * @apply_dev_quirks: called to apply device specific quirks
+ * @fixup_dev_quirks: called to modify device specific quirks
  * @suspend: called during host controller PM callback
  * @resume: called during host controller PM callback
  * @dbg_register_dump: used to dump controller debug information
  * @phy_initialization: used to initialize phys
  * @device_reset: called to issue a reset pulse on the UFS device
+ * @config_scaling_param: called to configure clock scaling parameters
  * @program_key: program or evict an inline encryption key
  * @event_notify: called to notify important events
  */
@@ -379,6 +382,7 @@ enum clk_gating_state {
  * @is_initialized: Indicates whether clock gating is initialized or not
  * @active_reqs: number of requests that are pending and should be waited for
  * completion before gating clocks.
+ * @clk_gating_workq: workqueue for clock gating work.
  */
 struct ufs_clk_gating {
 	struct delayed_work gate_work;
@@ -415,9 +419,9 @@ struct ufs_saved_pwr_info {
  * @resume_work: worker to resume devfreq
  * @min_gear: lowest HS gear to scale down to
  * @is_enabled: tracks if scaling is currently enabled or not, controlled by
-		clkscale_enable sysfs node
+ *		clkscale_enable sysfs node
  * @is_allowed: tracks if scaling is currently allowed or not, used to block
-		clock scaling which is not invoked from devfreq governor
+ *		clock scaling which is not invoked from devfreq governor
  * @is_initialized: Indicates whether clock scaling is initialized or not
  * @is_busy_started: tracks if busy period has started or not
  * @is_suspended: tracks if devfreq is suspended or not
@@ -444,7 +448,7 @@ struct ufs_clk_scaling {
 /**
  * struct ufs_event_hist - keeps history of errors
  * @pos: index to indicate cyclic buffer position
- * @reg: cyclic buffer for registers value
+ * @val: cyclic buffer for registers value
  * @tstamp: cyclic buffer for time stamp
  * @cnt: error counter
  */
@@ -463,6 +467,7 @@ struct ufs_event_hist {
  *		reset this after link-startup.
  * @last_hibern8_exit_tstamp: Set time after the hibern8 exit.
  *		Clear after the first successful command completion.
+ * @event: array with event history.
  */
 struct ufs_stats {
 	u32 last_intr_status;
@@ -733,6 +738,13 @@ struct ufs_hba_monitor {
  * @host: Scsi_Host instance of the driver
  * @dev: device handle
  * @ufs_device_wlun: WLUN that controls the entire UFS device.
+ * @hwmon_device: device instance registered with the hwmon core.
+ * @curr_dev_pwr_mode: active UFS device power mode.
+ * @uic_link_state: active state of the link to the UFS device.
+ * @rpm_lvl: desired UFS power management level during runtime PM.
+ * @spm_lvl: desired UFS power management level during system PM.
+ * @pm_op_in_progress: whether or not a PM operation is in progress.
+ * @ahit: value of Auto-Hibernate Idle Timer register.
  * @lrb: local reference block
  * @outstanding_tasks: Bits representing outstanding task requests
  * @outstanding_lock: Protects @outstanding_reqs.
@@ -743,17 +755,26 @@ struct ufs_hba_monitor {
  * @reserved_slot: Used to submit device commands. Protected by @dev_cmd.lock.
  * @ufs_version: UFS Version to which controller complies
  * @vops: pointer to variant specific operations
+ * @vps: pointer to variant specific parameters
  * @priv: pointer to variant specific private data
  * @irq: Irq number of the controller
- * @active_uic_cmd: handle of active UIC command
- * @uic_cmd_mutex: mutex for UIC command
+ * @is_irq_enabled: whether or not the UFS controller interrupt is enabled.
+ * @dev_ref_clk_freq: reference clock frequency
+ * @quirks: bitmask with information about deviations from the UFSHCI standard.
+ * @dev_quirks: bitmask with information about deviations from the UFS standard.
  * @tmf_tag_set: TMF tag set.
  * @tmf_queue: Used to allocate TMF tags.
- * @pwr_done: completion for power mode change
+ * @tmf_rqs: array with pointers to TMF requests while these are in progress.
+ * @active_uic_cmd: handle of active UIC command
+ * @uic_cmd_mutex: mutex for UIC command
+ * @uic_async_done: completion used during UIC processing
  * @ufshcd_state: UFSHCD state
  * @eh_flags: Error handling flags
  * @intr_mask: Interrupt Mask Bits
  * @ee_ctrl_mask: Exception event control mask
+ * @ee_drv_mask: Exception event mask for driver
+ * @ee_usr_mask: Exception event mask for user (set via debugfs)
+ * @ee_ctrl_mutex: Used to serialize exception event information.
  * @is_powered: flag to check if HBA is powered
  * @shutting_down: flag to check if shutdown has been invoked
  * @host_sem: semaphore used to serialize concurrent contexts
@@ -764,26 +785,52 @@ struct ufs_hba_monitor {
  * @uic_error: UFS interconnect layer error status
  * @saved_err: sticky error mask
  * @saved_uic_err: sticky UIC error mask
+ * @ufs_stats: various error counters
  * @force_reset: flag to force eh_work perform a full reset
  * @force_pmc: flag to force a power mode change
  * @silence_err_logs: flag to silence error logs
  * @dev_cmd: ufs device management command information
  * @last_dme_cmd_tstamp: time stamp of the last completed DME command
+ * @nop_out_timeout: NOP OUT timeout value
+ * @dev_info: information about the UFS device
  * @auto_bkops_enabled: to track whether bkops is enabled in device
  * @vreg_info: UFS device voltage regulator information
  * @clk_list_head: UFS host controller clocks list node head
+ * @req_abort_count: number of times ufshcd_abort() has been called
+ * @lanes_per_direction: number of lanes per data direction between the UFS
+ *	controller and the UFS device.
  * @pwr_info: holds current power mode
  * @max_pwr_info: keeps the device max valid pwm
- * @clk_scaling_lock: used to serialize device commands and clock scaling
- * @desc_size: descriptor sizes reported by device
+ * @clk_gating: information related to clock gating
+ * @caps: bitmask with information about UFS controller capabilities
+ * @devfreq: frequency scaling information owned by the devfreq core
+ * @clk_scaling: frequency scaling information owned by the UFS driver
+ * @is_sys_suspended: whether or not the entire system has been suspended
  * @urgent_bkops_lvl: keeps track of urgent bkops level for device
  * @is_urgent_bkops_lvl_checked: keeps track if the urgent bkops level for
  *  device is known or not.
+ * @clk_scaling_lock: used to serialize device commands and clock scaling
+ * @desc_size: descriptor sizes reported by device
  * @scsi_block_reqs_cnt: reference counting for scsi block requests
+ * @bsg_dev: struct device associated with the BSG queue
+ * @bsg_queue: BSG queue associated with the UFS controller
+ * @rpm_dev_flush_recheck_work: used to suspend from RPM (runtime power
+ *	management) after the UFS device has finished a WriteBooster buffer
+ *	flush or auto BKOP.
+ * @ufshpb_dev: information related to HPB (Host Performance Booster).
+ * @monitor: statistics about UFS commands
  * @crypto_capabilities: Content of crypto capabilities register (0x100)
  * @crypto_cap_array: Array of crypto capabilities
  * @crypto_cfg_register: Start of the crypto cfg array
  * @crypto_profile: the crypto profile of this hba (if applicable)
+ * @debugfs_root: UFS controller debugfs root directory
+ * @debugfs_ee_work: used to restore ee_ctrl_mask after a delay
+ * @debugfs_ee_rate_limit_ms: user configurable delay after which to restore
+ *	ee_ctrl_mask
+ * @luns_avail: number of regular and well known LUNs supported by the UFS
+ *	device
+ * @complete_put: whether or not to call ufshcd_rpm_put() from inside
+ *	ufshcd_resume_complete()
  */
 struct ufs_hba {
 	void __iomem *mmio_base;
@@ -853,9 +900,9 @@ struct ufs_hba {
 	enum ufshcd_state ufshcd_state;
 	u32 eh_flags;
 	u32 intr_mask;
-	u16 ee_ctrl_mask; /* Exception event mask */
-	u16 ee_drv_mask;  /* Exception event mask for driver */
-	u16 ee_usr_mask;  /* Exception event mask for user (via debugfs) */
+	u16 ee_ctrl_mask;
+	u16 ee_drv_mask;
+	u16 ee_usr_mask;
 	struct mutex ee_ctrl_mutex;
 	bool is_powered;
 	bool shutting_down;
@@ -996,11 +1043,11 @@ static inline bool ufshcd_is_user_access_allowed(struct ufs_hba *hba)
 	readl((hba)->mmio_base + (reg))
 
 /**
- * ufshcd_rmwl - read modify write into a register
- * @hba - per adapter instance
- * @mask - mask to apply on read value
- * @val - actual value to write
- * @reg - register address
+ * ufshcd_rmwl - perform read/modify/write for a controller register
+ * @hba: per adapter instance
+ * @mask: mask to apply on read value
+ * @val: actual value to write
+ * @reg: register address
  */
 static inline void ufshcd_rmwl(struct ufs_hba *hba, u32 mask, u32 val, u32 reg)
 {
@@ -1035,8 +1082,8 @@ static inline void check_upiu_size(void)
 
 /**
  * ufshcd_set_variant - set variant specific data to the hba
- * @hba - per adapter instance
- * @variant - pointer to variant specific data
+ * @hba: per adapter instance
+ * @variant: pointer to variant specific data
  */
 static inline void ufshcd_set_variant(struct ufs_hba *hba, void *variant)
 {
@@ -1046,7 +1093,7 @@ static inline void ufshcd_set_variant(struct ufs_hba *hba, void *variant)
 
 /**
  * ufshcd_get_variant - get variant specific data from the hba
- * @hba - per adapter instance
+ * @hba: per adapter instance
  */
 static inline void *ufshcd_get_variant(struct ufs_hba *hba)
 {
@@ -1367,7 +1414,7 @@ static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba,
 
 extern struct ufs_pm_lvl_states ufs_pm_lvl_states[];
 
-/*
+/**
  * ufshcd_scsi_to_upiu_lun - maps scsi LUN to UPIU LUN
  * @scsi_lun: scsi LUN id
  *
#70 lore raw

PATCH 25/29 scsi: ufs: Minimize #include directives

In reply to Bart Van Assche

Only include those headers of which the declarations are used directly. Sort #include directives alphabetically.

---
 drivers/scsi/ufs/cdns-pltfrm.c         |  4 ++--
 drivers/scsi/ufs/tc-dwc-g210-pci.c     |  8 +++----
 drivers/scsi/ufs/tc-dwc-g210-pltfrm.c  | 10 ++++----
 drivers/scsi/ufs/tc-dwc-g210.c         |  8 +++----
 drivers/scsi/ufs/tc-dwc-g210.h         |  2 ++
 drivers/scsi/ufs/ufs-exynos.c          |  1 +
 drivers/scsi/ufs/ufs-fault-injection.c |  4 ++--
 drivers/scsi/ufs/ufs-hisi.c            | 15 ++++++------
 drivers/scsi/ufs/ufs-mediatek.c        |  4 +++-
 drivers/scsi/ufs/ufs-qcom-ice.c        |  2 +-
 drivers/scsi/ufs/ufs-qcom.c            | 23 ++++++++++--------
 drivers/scsi/ufs/ufs-sysfs.c           |  8 +++----
 drivers/scsi/ufs/ufs-sysfs.h           |  3 ++-
 drivers/scsi/ufs/ufs_bsg.c             |  5 ++++
 drivers/scsi/ufs/ufs_bsg.h             |  7 +-----
 drivers/scsi/ufs/ufshcd-crypto.h       |  5 ++--
 drivers/scsi/ufs/ufshcd-dwc.c          |  6 ++---
 drivers/scsi/ufs/ufshcd-dwc.h          |  2 ++
 drivers/scsi/ufs/ufshcd-pci.c          | 12 ++++++----
 drivers/scsi/ufs/ufshcd-pltfrm.c       |  4 ++--
 drivers/scsi/ufs/ufshcd.c              | 24 ++++++++++++-------
 drivers/scsi/ufs/ufshcd.h              | 33 ++++----------------------
 drivers/scsi/ufs/ufshci.h              |  2 ++
 drivers/scsi/ufs/ufshpb.c              |  7 ++++--
 24 files changed, 101 insertions(+), 98 deletions(-)
drivers/scsi/ufs/cdns-pltfrm.c +2 -2
index e91cf9fd5a95..4d05a3b1e4eb 100644
@@ -9,12 +9,12 @@
  *
  */
 
+#include <linux/clk.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/of.h>
+#include <linux/platform_device.h>
 #include <linux/time.h>
-
 #include "ufshcd-pltfrm.h"
 
 #define CDNS_UFS_REG_HCLKDIV	0xFC
drivers/scsi/ufs/tc-dwc-g210-pci.c +4 -4
index 7b08e2e07cc5..d679eff3f2f0 100644
@@ -7,12 +7,12 @@
  * Authors: Joao Pinto <[email protected]>
  */
 
-#include "ufshcd.h"
-#include "ufshcd-dwc.h"
-#include "tc-dwc-g210.h"
-
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
+#include "tc-dwc-g210.h"
+#include "ufshcd-dwc.h"
+#include "ufshcd.h"
 
 /* Test Chip type expected values */
 #define TC_G210_20BIT 20
drivers/scsi/ufs/tc-dwc-g210-pltfrm.c +5 -5
index 783ec43efa78..56468268deb8 100644
@@ -7,15 +7,15 @@
  * Authors: Joao Pinto <[email protected]>
  */
 
+#include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
 #include <linux/of.h>
-#include <linux/delay.h>
-
-#include "ufshcd-pltfrm.h"
-#include "ufshcd-dwc.h"
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include "tc-dwc-g210.h"
+#include "ufshcd-dwc.h"
+#include "ufshcd-pltfrm.h"
 
 /*
  * UFS DWC specific variant operations
drivers/scsi/ufs/tc-dwc-g210.c +4 -4
index f954a68f6b4c..c1b236f09601 100644
@@ -7,12 +7,12 @@
  * Authors: Joao Pinto <[email protected]>
  */
 
-#include "ufshcd.h"
-#include "unipro.h"
-
+#include <linux/module.h>
+#include "tc-dwc-g210.h"
 #include "ufshcd-dwc.h"
+#include "ufshcd.h"
 #include "ufshci-dwc.h"
-#include "tc-dwc-g210.h"
+#include "unipro.h"
 
 /**
  * tc_dwc_g210_setup_40bit_rmmi()
drivers/scsi/ufs/tc-dwc-g210.h +2 -0
index 5a506da03f4a..f7154012f5c7 100644
@@ -10,6 +10,8 @@
 #ifndef _TC_DWC_G210_H
 #define _TC_DWC_G210_H
 
+struct ufs_hba;
+
 int tc_dwc_g210_config_40_bit(struct ufs_hba *hba);
 int tc_dwc_g210_config_20_bit(struct ufs_hba *hba);
 
drivers/scsi/ufs/ufs-exynos.c +1 -0
index 0b99c74955ef..ddb2d42605c5 100644
@@ -9,6 +9,7 @@
  */
 
 #include <linux/clk.h>
+#include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
drivers/scsi/ufs/ufs-fault-injection.c +2 -2
index 7ac7c4e7ff83..2453ea8ff265 100644
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <linux/kconfig.h>
-#include <linux/types.h>
 #include <linux/fault-inject.h>
+#include <linux/kconfig.h>
 #include <linux/module.h>
+#include <linux/types.h>
 #include "ufs-fault-injection.h"
 
 static int ufs_fault_get(char *buffer, const struct kernel_param *kp);
drivers/scsi/ufs/ufs-hisi.c +8 -7
index ab1a7ebd89b1..8f6168471464 100644
@@ -6,19 +6,20 @@
  * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.
  */
 
-#include <linux/time.h>
+#include <linux/delay.h>
+#include <linux/dma-mapping.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/reset.h>
-
-#include "ufshcd.h"
-#include "ufshcd-pltfrm.h"
-#include "unipro.h"
+#include <linux/time.h>
 #include "ufs-hisi.h"
-#include "ufshci.h"
 #include "ufs_quirks.h"
+#include "ufshcd-pltfrm.h"
+#include "ufshcd.h"
+#include "ufshci.h"
+#include "unipro.h"
 
 static int ufs_hisi_check_hibern8(struct ufs_hba *hba)
 {
drivers/scsi/ufs/ufs-mediatek.c +3 -1
index 84ccb5258736..b804e969915b 100644
@@ -8,6 +8,9 @@
 
 #include <linux/arm-smccc.h>
 #include <linux/bitfield.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
@@ -17,7 +20,6 @@
 #include <linux/reset.h>
 #include <linux/sched/clock.h>
 #include <linux/soc/mediatek/mtk_sip_svc.h>
-
 #include "ufshcd.h"
 #include "ufshcd-pltfrm.h"
 #include "ufs_quirks.h"
drivers/scsi/ufs/ufs-qcom-ice.c +1 -1
index 921d6a93b653..ee73c1b0d96b 100644
@@ -6,9 +6,9 @@
  * Copyright 2019 Google LLC
  */
 
+#include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/qcom_scm.h>
-
 #include "ufs-qcom.h"
 
 #define AES_256_XTS_KEY_SIZE			64
drivers/scsi/ufs/ufs-qcom.c +13 -10
index 808dae751527..9a390cd516bd 100644
@@ -4,21 +4,24 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/time.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/devfreq.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
 #include <linux/of.h>
-#include <linux/platform_device.h>
 #include <linux/phy/phy.h>
-#include <linux/gpio/consumer.h>
+#include <linux/platform_device.h>
 #include <linux/reset-controller.h>
-#include <linux/devfreq.h>
-
-#include "ufshcd.h"
-#include "ufshcd-pltfrm.h"
-#include "unipro.h"
+#include <linux/time.h>
 #include "ufs-qcom.h"
-#include "ufshci.h"
 #include "ufs_quirks.h"
-#define UFS_QCOM_DEFAULT_DBG_PRINT_EN	\
+#include "ufshcd-pltfrm.h"
+#include "ufshcd.h"
+#include "ufshci.h"
+#include "unipro.h"
+
+#define UFS_QCOM_DEFAULT_DBG_PRINT_EN					\
 	(UFS_QCOM_DBG_PRINT_REGS_EN | UFS_QCOM_DBG_PRINT_TEST_BUS_EN)
 
 enum {
drivers/scsi/ufs/ufs-sysfs.c +4 -4
index 5c405ff7b6ea..2bf128e4b613 100644
@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0
 // Copyright (C) 2018 Western Digital Corporation
 
+#include <asm/unaligned.h>
+#include <linux/bitfield.h>
 #include <linux/err.h>
 #include <linux/string.h>
-#include <linux/bitfield.h>
-#include <asm/unaligned.h>
-
-#include "ufs.h"
 #include "ufs-sysfs.h"
+#include "ufs.h"
+#include "ufshcd.h"
 
 static const char *ufshcd_uic_link_state_to_string(
 			enum uic_link_state state)
drivers/scsi/ufs/ufs-sysfs.h +2 -1
index 0f4e750a6748..8d94af3b8077 100644
@@ -7,11 +7,12 @@
 
 #include <linux/sysfs.h>
 
-#include "ufshcd.h"
+struct device;
 
 void ufs_sysfs_add_nodes(struct device *dev);
 void ufs_sysfs_remove_nodes(struct device *dev);
 
 extern const struct attribute_group ufs_sysfs_unit_descriptor_group;
 extern const struct attribute_group ufs_sysfs_lun_attributes_group;
+
 #endif
drivers/scsi/ufs/ufs_bsg.c +5 -0
index 39bf204c6ec3..fbcdfb713542 100644
@@ -4,7 +4,12 @@
  *
  * Copyright (C) 2018 Western Digital Corporation
  */
+
+#include <linux/bsg-lib.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_host.h>
 #include "ufs_bsg.h"
+#include "ufshcd.h"
 
 static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
 				       struct utp_upiu_query *qr)
drivers/scsi/ufs/ufs_bsg.h +1 -6
index d09918758631..57712d2656d2 100644
@@ -5,12 +5,7 @@
 #ifndef UFS_BSG_H
 #define UFS_BSG_H
 
-#include <linux/bsg-lib.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-
-#include "ufshcd.h"
-#include "ufs.h"
+struct ufs_hba;
 
 #ifdef CONFIG_SCSI_UFS_BSG
 void ufs_bsg_remove(struct ufs_hba *hba);
drivers/scsi/ufs/ufshcd-crypto.h +3 -2
index e18c01276873..57dd51256b57 100644
@@ -6,9 +6,10 @@
 #ifndef _UFSHCD_CRYPTO_H
 #define _UFSHCD_CRYPTO_H
 
-#ifdef CONFIG_SCSI_UFS_CRYPTO
+#include <scsi/scsi_cmnd.h>
 #include "ufshcd.h"
-#include "ufshci.h"
+
+#ifdef CONFIG_SCSI_UFS_CRYPTO
 
 static inline void ufshcd_prepare_lrbp_crypto(struct request *rq,
 					      struct ufshcd_lrb *lrbp)
drivers/scsi/ufs/ufshcd-dwc.c +3 -3
index 5bb9d3a88795..8f1786be3556 100644
@@ -7,11 +7,11 @@
  * Authors: Joao Pinto <[email protected]>
  */
 
-#include "ufshcd.h"
-#include "unipro.h"
-
+#include <linux/module.h>
 #include "ufshcd-dwc.h"
+#include "ufshcd.h"
 #include "ufshci-dwc.h"
+#include "unipro.h"
 
 int ufshcd_dwc_dme_set_attrs(struct ufs_hba *hba,
 				const struct ufshcd_dme_attr_val *v, int n)
drivers/scsi/ufs/ufshcd-dwc.h +2 -0
index 4268ca2eb64c..43b70794e24f 100644
@@ -10,6 +10,8 @@
 #ifndef _UFSHCD_DWC_H
 #define _UFSHCD_DWC_H
 
+#include "ufshcd.h"
+
 struct ufshcd_dme_attr_val {
 	u32 attr_sel;
 	u32 mib_val;
drivers/scsi/ufs/ufshcd-pci.c +7 -5
index d36873bc44fe..45df431c720c 100644
@@ -9,14 +9,16 @@
  *	Vinayak Holikatti <[email protected]>
  */
 
-#include "ufshcd.h"
+#include <linux/acpi.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
+#include <linux/module.h>
 #include <linux/pci.h>
-#include <linux/pm_runtime.h>
 #include <linux/pm_qos.h>
-#include <linux/debugfs.h>
+#include <linux/pm_runtime.h>
 #include <linux/uuid.h>
-#include <linux/acpi.h>
-#include <linux/gpio/consumer.h>
+#include "ufshcd.h"
 
 struct ufs_host {
 	void (*late_init)(struct ufs_hba *hba);
drivers/scsi/ufs/ufshcd-pltfrm.c +2 -2
index 81e458d31222..a1ff5bfd4f71 100644
@@ -8,10 +8,10 @@
  *	Vinayak Holikatti <[email protected]>
  */
 
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include <linux/of.h>
-
 #include "ufshcd.h"
 #include "ufshcd-pltfrm.h"
 #include "unipro.h"
drivers/scsi/ufs/ufshcd.c +16 -8
index 7d04cf8d75ef..de366247628b 100644
@@ -9,24 +9,32 @@
  *	Vinayak Holikatti <[email protected]>
  */
 
+#include <asm/unaligned.h>
 #include <linux/async.h>
-#include <linux/devfreq.h>
-#include <linux/nls.h>
-#include <linux/of.h>
 #include <linux/bitfield.h>
 #include <linux/blk-pm.h>
 #include <linux/blkdev.h>
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/devfreq.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/nls.h>
+#include <linux/of.h>
+#include <linux/regulator/consumer.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
 #include <scsi/scsi_driver.h>
-#include "ufshcd.h"
-#include "ufs_quirks.h"
-#include "unipro.h"
-#include "ufs-sysfs.h"
+#include <scsi/scsi_eh.h>
 #include "ufs-debugfs.h"
 #include "ufs-fault-injection.h"
+#include "ufs-sysfs.h"
 #include "ufs_bsg.h"
+#include "ufs_quirks.h"
 #include "ufshcd-crypto.h"
+#include "ufshcd.h"
 #include "ufshpb.h"
-#include <asm/unaligned.h>
+#include "unipro.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/ufs.h>
drivers/scsi/ufs/ufshcd.h +4 -29
index 412fe43cd763..ab0c643296c0 100644
@@ -12,38 +12,13 @@
 #ifndef _UFSHCD_H
 #define _UFSHCD_H
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/rwsem.h>
-#include <linux/workqueue.h>
-#include <linux/errno.h>
-#include <linux/types.h>
-#include <linux/wait.h>
-#include <linux/bitops.h>
-#include <linux/pm_runtime.h>
-#include <linux/clk.h>
-#include <linux/completion.h>
-#include <linux/regulator/consumer.h>
 #include <linux/bitfield.h>
-#include <linux/devfreq.h>
 #include <linux/blk-crypto-profile.h>
+#include <linux/blk-mq.h>
+#include <linux/devfreq.h>
+#include <linux/pm_runtime.h>
+#include <scsi/scsi_device.h>
 #include "unipro.h"
-
-#include <asm/irq.h>
-#include <asm/byteorder.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_host.h>
-#include <scsi/scsi_tcq.h>
-#include <scsi/scsi_dbg.h>
-#include <scsi/scsi_eh.h>
-
 #include "ufs.h"
 #include "ufs_quirks.h"
 #include "ufshci.h"
drivers/scsi/ufs/ufshci.h +2 -0
index a7ff0e5b5494..f81aa95ffbc4 100644
@@ -11,6 +11,8 @@
 #ifndef _UFSHCI_H
 #define _UFSHCI_H
 
+#include <scsi/scsi_host.h>
+
 enum {
 	TASK_REQ_UPIU_SIZE_DWORDS	= 8,
 	TASK_RSP_UPIU_SIZE_DWORDS	= 8,
drivers/scsi/ufs/ufshpb.c +5 -2
index b2bec19022cd..d456404e5c49 100644
@@ -10,10 +10,13 @@
  */
 
 #include <asm/unaligned.h>
-
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/module.h>
+#include <scsi/scsi_cmnd.h>
+#include "../sd.h"
 #include "ufshcd.h"
 #include "ufshpb.h"
-#include "../sd.h"
 
 #define ACTIVATION_THRESHOLD 8 /* 8 IOs */
 #define READ_TO_MS 1000
#71 lore raw

Re: [PATCH 25/29] scsi: ufs: Minimize #include directives

Quoted 1 line · Bart Van Assche

Sort #include directives alphabetically.

I do not think we should start the "what is the correct order for includes" debate. Can't we leave them alone.

#72 lore raw

Re: [PATCH 25/29] scsi: ufs: Minimize #include directives

Quoted 5 lines · Adrian Hunter
Quoted 1 line · Bart Van Assche

Sort #include directives alphabetically.

I do not think we should start the "what is the correct order for includes" debate. Can't we leave them alone.

Where to insert new #include directives if the existing include directives are not sorted alphabetically? Anyway, I will drop this patch.

Bart.

#73 lore raw

PATCH 26/29 scsi: ufs: Split the ufshcd.h header file

In reply to Bart Van Assche

Split the ufshcd.h header file into a header file that defines the interface used by UFS drivers and another header file with declarations and data structures only used by the UFS core.

---
 drivers/scsi/ufs/ufs-debugfs.c   |   1 +
 drivers/scsi/ufs/ufs-hwmon.c     |   1 +
 drivers/scsi/ufs/ufs-sysfs.c     |   3 +-
 drivers/scsi/ufs/ufs_bsg.c       |   1 +
 drivers/scsi/ufs/ufshcd-crypto.h |   2 +
 drivers/scsi/ufs/ufshcd-priv.h   | 277 +++++++++++++++++++++++++++++++
 drivers/scsi/ufs/ufshcd.c        |   1 +
 drivers/scsi/ufs/ufshcd.h        | 212 -----------------------
 drivers/scsi/ufs/ufshpb.c        |   1 +
 9 files changed, 285 insertions(+), 214 deletions(-)
 create mode 100644 drivers/scsi/ufs/ufshcd-priv.h
drivers/scsi/ufs/ufs-debugfs.c +1 -0
index 4a0bbcf1757a..c10a8f09682b 100644
@@ -5,6 +5,7 @@
 
 #include "ufs-debugfs.h"
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 static struct dentry *ufs_debugfs_root;
 
drivers/scsi/ufs/ufs-hwmon.c +1 -0
index 74855491dc8f..c38d9d98a86d 100644
@@ -8,6 +8,7 @@
 #include <linux/units.h>
 
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 struct ufs_hwmon_data {
 	struct ufs_hba *hba;
drivers/scsi/ufs/ufs-sysfs.c +1 -2
index 2bf128e4b613..97ab1a75e3b8 100644
@@ -6,8 +6,7 @@
 #include <linux/err.h>
 #include <linux/string.h>
 #include "ufs-sysfs.h"
-#include "ufs.h"
-#include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 static const char *ufshcd_uic_link_state_to_string(
 			enum uic_link_state state)
drivers/scsi/ufs/ufs_bsg.c +1 -0
index fbcdfb713542..9e9b93867cab 100644
@@ -10,6 +10,7 @@
 #include <scsi/scsi_host.h>
 #include "ufs_bsg.h"
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
 				       struct utp_upiu_query *qr)
drivers/scsi/ufs/ufshcd-crypto.h +2 -0
index 57dd51256b57..9f98f18f9646 100644
@@ -8,6 +8,8 @@
 
 #include <scsi/scsi_cmnd.h>
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
+#include "ufshci.h"
 
 #ifdef CONFIG_SCSI_UFS_CRYPTO
 
drivers/scsi/ufs/ufshcd-priv.h new file +277 -0

277 lines not on this page · raw message

drivers/scsi/ufs/ufshcd.c +1 -0
index de366247628b..bab0f1ee41e6 100644
@@ -32,6 +32,7 @@
 #include "ufs_bsg.h"
 #include "ufs_quirks.h"
 #include "ufshcd-crypto.h"
+#include "ufshcd-priv.h"
 #include "ufshcd.h"
 #include "ufshpb.h"
 #include "unipro.h"
drivers/scsi/ufs/ufshcd.h +0 -212

248 lines not on this page · raw message

drivers/scsi/ufs/ufshpb.c +1 -0
index d456404e5c49..daac81290f50 100644
@@ -17,6 +17,7 @@
 #include "../sd.h"
 #include "ufshcd.h"
 #include "ufshpb.h"
+#include "ufshcd-priv.h"
 
 #define ACTIVATION_THRESHOLD 8 /* 8 IOs */
 #define READ_TO_MS 1000
#74 lore raw

RE: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

Hi,

I'm seeing below build error when I applied this patch. Any baseline do I need?

In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd-priv.h:32:20: error: redefinition of 'ufs_hwmon_probe'
32 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {}

      |                    ^~~~~~~~~~~~~~~

In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd.h:1079:20: note: previous definition of 'ufs_hwmon_probe' with type 'void(struct ufs_hba *, u8)' {aka 'void(struct ufs_hba *, unsigned char)'}
1079 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {}

      |                    ^~~~~~~~~~~~~~~

In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd-priv.h:33:20: error: redefinition of 'ufs_hwmon_remove'
33 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}

      |                    ^~~~~~~~~~~~~~~~

In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd.h:1080:20: note: previous definition of 'ufs_hwmon_remove' with type 'void(struct ufs_hba *)'
1080 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}

      |                    ^~~~~~~~~~~~~~~~

Best Regards,
Chanho Park

-----Original Message-----
From: Bart Van Assche <[email protected]>
Sent: Friday, April 1, 2022 7:34 AM
To: Martin K . Petersen <[email protected]>
Cc: Jaegeuk Kim <[email protected]>; Adrian Hunter <[email protected]>; [email protected]; Bart Van Assche <[email protected]>; James E.J. Bottomley <[email protected]>; Avri Altman <[email protected]>; Can Guo <[email protected]>; Asutosh Das <[email protected]>; Daejun Park <[email protected]>; Guenter Roeck <[email protected]>; Bean Huo <[email protected]>; Keoseong Park <[email protected]>; Mike Snitzer <[email protected]>; Eric Biggers <[email protected]>; Jens Axboe <[email protected]>; Ulf Hansson <[email protected]>
Subject: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

Split the ufshcd.h header file into a header file that defines the interface used by UFS drivers and another header file with declarations and data structures only used by the UFS core.

---
 drivers/scsi/ufs/ufs-debugfs.c   |   1 +
 drivers/scsi/ufs/ufs-hwmon.c     |   1 +
 drivers/scsi/ufs/ufs-sysfs.c     |   3 +-
 drivers/scsi/ufs/ufs_bsg.c       |   1 +
 drivers/scsi/ufs/ufshcd-crypto.h |   2 +
 drivers/scsi/ufs/ufshcd-priv.h   | 277 +++++++++++++++++++++++++++++++
 drivers/scsi/ufs/ufshcd.c        |   1 +
 drivers/scsi/ufs/ufshcd.h        | 212 -----------------------
 drivers/scsi/ufs/ufshpb.c        |   1 +
 9 files changed, 285 insertions(+), 214 deletions(-)  create mode 100644

drivers/scsi/ufs/ufshcd-priv.h

drivers/scsi/ufs/ufs-debugfs.c +1 -0
index 4a0bbcf1757a..c10a8f09682b 100644
@@ -5,6 +5,7 @@
 
 #include "ufs-debugfs.h"
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 static struct dentry *ufs_debugfs_root;
 
drivers/scsi/ufs/ufs-hwmon.c +1 -0
index 74855491dc8f..c38d9d98a86d 100644
@@ -8,6 +8,7 @@
 #include <linux/units.h>
 
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 struct ufs_hwmon_data {
 	struct ufs_hba *hba;
drivers/scsi/ufs/ufs-sysfs.c +1 -2
index 2bf128e4b613..97ab1a75e3b8 100644
@@ -6,8 +6,7 @@
 #include <linux/err.h>
 #include <linux/string.h>
 #include "ufs-sysfs.h"
-#include "ufs.h"
-#include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 static const char *ufshcd_uic_link_state_to_string(
 			enum uic_link_state state)
drivers/scsi/ufs/ufs_bsg.c index renamed from drivers/scsi/ufs/ufs_bsg.c +0 -0

fbcdfb713542..9e9b93867cab 100644

drivers/scsi/ufs/ufs_bsg.c +1 -0
@@ -10,6 +10,7 @@
 #include <scsi/scsi_host.h>
 #include "ufs_bsg.h"
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
 
 static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
 				       struct utp_upiu_query *qr)
(quoted diff) +0 -0

b/drivers/scsi/ufs/ufshcd-crypto.h
index 57dd51256b57..9f98f18f9646 100644

drivers/scsi/ufs/ufshcd-crypto.h +2 -0
@@ -8,6 +8,8 @@
 
 #include <scsi/scsi_cmnd.h>
 #include "ufshcd.h"
+#include "ufshcd-priv.h"
+#include "ufshci.h"
 
 #ifdef CONFIG_SCSI_UFS_CRYPTO
 
drivers/scsi/ufs/ufshcd-priv.h new file +16 -0
new file mode 100644 index 000000000000..4ceb0c63aa15
@@ -0,0 +1,277 @@
+#ifndef _UFSHCD_PRIV_H_
+#define _UFSHCD_PRIV_H_
+
+#include <linux/pm_runtime.h>
+#include "ufshcd.h"
+
+static inline bool ufshcd_is_user_access_allowed(struct ufs_hba *hba) {
+	return !hba->shutting_down;
+}
+
+void ufshcd_schedule_eh_work(struct ufs_hba *hba);
+
+static inline bool ufshcd_keep_autobkops_enabled_except_suspend(
+							struct ufs_hba *hba)
+{
+	return hba->caps &

UFSHCD_CAP_KEEP_AUTO_BKOPS_ENABLED_EXCEPT_SUSPEND;
+}
+
+static inline u8 ufshcd_wb_get_query_index(struct ufs_hba *hba) {
+ if (hba->dev_info.wb_buffer_type == WB_BUF_MODE_LU_DEDICATED)
+ return hba->dev_info.wb_dedicated_lu;
+ return 0;
+}
+
+#ifdef CONFIG_SCSI_UFS_HWMON
+void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask); void +ufs_hwmon_remove(struct ufs_hba *hba); void +ufs_hwmon_notify_event(struct ufs_hba *hba, u8 ee_mask); #else static +inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {} static +inline void ufs_hwmon_remove(struct ufs_hba *hba) {} static inline void +ufs_hwmon_notify_event(struct ufs_hba *hba, u8 ee_mask) {} #endif +
+int ufshcd_read_desc_param(struct ufs_hba *hba,

+			   enum desc_idn desc_id,
+			   int desc_index,
+			   u8 param_offset,
+			   u8 *param_read_buf,
+			   u8 param_size);

+int ufshcd_query_attr_retry(struct ufs_hba *hba, enum query_opcode opcode,
+ enum attr_idn idn, u8 index, u8 selector,
+ u32 *attr_val);
+int ufshcd_query_attr(struct ufs_hba *hba, enum query_opcode opcode,
+ enum attr_idn idn, u8 index, u8 selector, u32
*attr_val); int
+ufshcd_query_flag(struct ufs_hba *hba, enum query_opcode opcode,
+ enum flag_idn idn, u8 index, bool *flag_res); void
+ufshcd_auto_hibern8_update(struct ufs_hba *hba, u32 ahit);
+
+#define SD_ASCII_STD true
+#define SD_RAW false
+int ufshcd_read_string_desc(struct ufs_hba *hba, u8 desc_index,
+ u8 **buf, bool ascii);
+
+int ufshcd_hold(struct ufs_hba *hba, bool async); void +ufshcd_release(struct ufs_hba *hba);
+
+void ufshcd_map_desc_id_to_length(struct ufs_hba *hba, enum desc_idn desc_id,
+ int *desc_length);
+
+int ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command +*uic_cmd);
+
+int ufshcd_exec_raw_upiu_cmd(struct ufs_hba *hba,

+			     struct utp_upiu_req *req_upiu,
+			     struct utp_upiu_req *rsp_upiu,
+			     int msgcode,
+			     u8 *desc_buff, int *buff_len,
+			     enum query_opcode desc_op);

+
+int ufshcd_wb_toggle(struct ufs_hba *hba, bool enable);
+
+/* Wrapper functions for safely calling variant operations */ static +inline const char *ufshcd_get_var_name(struct ufs_hba *hba) {
+ if (hba->vops)
+ return hba->vops->name;
+ return "";
+}
+
+static inline void ufshcd_vops_exit(struct ufs_hba *hba) {
+ if (hba->vops && hba->vops->exit)
+ return hba->vops->exit(hba);
+}
+
+static inline u32 ufshcd_vops_get_ufs_hci_version(struct ufs_hba *hba) +{
+ if (hba->vops && hba->vops->get_ufs_hci_version)
+ return hba->vops->get_ufs_hci_version(hba);
+
+ return ufshcd_readl(hba, REG_UFS_VERSION); }
+
+static inline int ufshcd_vops_clk_scale_notify(struct ufs_hba *hba,
+ bool up, enum ufs_notify_change_status status) {
+ if (hba->vops && hba->vops->clk_scale_notify)
+ return hba->vops->clk_scale_notify(hba, up, status);
+ return 0;
+}
+
+static inline void ufshcd_vops_event_notify(struct ufs_hba *hba,
+ enum ufs_event_type evt,
+ void *data)
+{
+ if (hba->vops && hba->vops->event_notify)
+ hba->vops->event_notify(hba, evt, data); }
+
+static inline int ufshcd_vops_setup_clocks(struct ufs_hba *hba, bool on,
+ enum ufs_notify_change_status
status) {
+ if (hba->vops && hba->vops->setup_clocks)
+ return hba->vops->setup_clocks(hba, on, status);
+ return 0;
+}
+
+static inline int ufshcd_vops_hce_enable_notify(struct ufs_hba *hba,
+ bool status)
+{
+ if (hba->vops && hba->vops->hce_enable_notify)
+ return hba->vops->hce_enable_notify(hba, status);
+
+ return 0;
+}
+static inline int ufshcd_vops_link_startup_notify(struct ufs_hba *hba,
+ bool status)
+{
+ if (hba->vops && hba->vops->link_startup_notify)
+ return hba->vops->link_startup_notify(hba, status);
+
+ return 0;
+}
+
+static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba,

+				  enum ufs_notify_change_status status,
+				  struct ufs_pa_layer_attr *dev_max_params,
+				  struct ufs_pa_layer_attr *dev_req_params)

{
+ if (hba->vops && hba->vops->pwr_change_notify)
+ return hba->vops->pwr_change_notify(hba, status,
+ dev_max_params, dev_req_params);
+
+ return -ENOTSUPP;
+}
+
+static inline void ufshcd_vops_setup_task_mgmt(struct ufs_hba *hba,
+ int tag, u8 tm_function)
+{
+ if (hba->vops && hba->vops->setup_task_mgmt)
+ return hba->vops->setup_task_mgmt(hba, tag, tm_function); }
+
+static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba,
+ enum uic_cmd_dme cmd,
+ enum ufs_notify_change_status
status) {
+ if (hba->vops && hba->vops->hibern8_notify)
+ return hba->vops->hibern8_notify(hba, cmd, status); }
+
+static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba) {
+ if (hba->vops && hba->vops->apply_dev_quirks)
+ return hba->vops->apply_dev_quirks(hba);
+ return 0;
+}
+
+static inline void ufshcd_vops_fixup_dev_quirks(struct ufs_hba *hba) {
+ if (hba->vops && hba->vops->fixup_dev_quirks)
+ hba->vops->fixup_dev_quirks(hba);
+}
+
+static inline int ufshcd_vops_suspend(struct ufs_hba *hba, enum ufs_pm_op op,
+ enum ufs_notify_change_status status) {
+ if (hba->vops && hba->vops->suspend)
+ return hba->vops->suspend(hba, op, status);
+
+ return 0;
+}
+
+static inline int ufshcd_vops_resume(struct ufs_hba *hba, enum +ufs_pm_op op) {
+ if (hba->vops && hba->vops->resume)
+ return hba->vops->resume(hba, op);
+
+ return 0;
+}
+
+static inline void ufshcd_vops_dbg_register_dump(struct ufs_hba *hba) {
+ if (hba->vops && hba->vops->dbg_register_dump)
+ hba->vops->dbg_register_dump(hba);
+}
+
+static inline int ufshcd_vops_device_reset(struct ufs_hba *hba) {
+ if (hba->vops && hba->vops->device_reset)
+ return hba->vops->device_reset(hba);
+
+ return -EOPNOTSUPP;
+}
+
+static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba,
+ struct devfreq_dev_profile *p,
+ struct devfreq_simple_ondemand_data *data) {
+ if (hba->vops && hba->vops->config_scaling_param)
+ hba->vops->config_scaling_param(hba, p, data); }
+
+extern struct ufs_pm_lvl_states ufs_pm_lvl_states[];
+
+/**
+ * ufshcd_scsi_to_upiu_lun - maps scsi LUN to UPIU LUN
+ * @scsi_lun: scsi LUN id
+ *
+ * Returns UPIU LUN id
+ */
+static inline u8 ufshcd_scsi_to_upiu_lun(unsigned int scsi_lun) {
+ if (scsi_is_wlun(scsi_lun))
+ return (scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID)
+ | UFS_UPIU_WLUN_ID;
+ else
+ return scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID; }
+
+int __ufshcd_write_ee_control(struct ufs_hba *hba, u32 ee_ctrl_mask); +int ufshcd_write_ee_control(struct ufs_hba *hba); int +ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, u16 *other_mask,
+ u16 set, u16 clr);
+
+static inline int ufshcd_update_ee_drv_mask(struct ufs_hba *hba,
+ u16 set, u16 clr)
+{
+ return ufshcd_update_ee_control(hba, &hba->ee_drv_mask,
+ &hba->ee_usr_mask, set, clr);
+}
+
+static inline int ufshcd_update_ee_usr_mask(struct ufs_hba *hba,
+ u16 set, u16 clr)
+{
+ return ufshcd_update_ee_control(hba, &hba->ee_usr_mask,
+ &hba->ee_drv_mask, set, clr);
+}
+
+static inline int ufshcd_rpm_get_sync(struct ufs_hba *hba) {
+ return pm_runtime_get_sync(&hba->ufs_device_wlun->sdev_gendev);
+}
+
+static inline int ufshcd_rpm_put_sync(struct ufs_hba *hba) {
+ return pm_runtime_put_sync(&hba->ufs_device_wlun->sdev_gendev);
+}
+
+static inline void ufshcd_rpm_get_noresume(struct ufs_hba *hba) {
+ pm_runtime_get_noresume(&hba->ufs_device_wlun->sdev_gendev);
+}
+
+static inline int ufshcd_rpm_resume(struct ufs_hba *hba) {
+ return pm_runtime_resume(&hba->ufs_device_wlun->sdev_gendev);
+}
+
+static inline int ufshcd_rpm_put(struct ufs_hba *hba) {
+ return pm_runtime_put(&hba->ufs_device_wlun->sdev_gendev);
+}
+
+#endif /* _UFSHCD_PRIV_H_ */

drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0 -0

de366247628b..bab0f1ee41e6 100644

drivers/scsi/ufs/ufshcd.c +1 -0
@@ -32,6 +32,7 @@
 #include "ufs_bsg.h"
 #include "ufs_quirks.h"
 #include "ufshcd-crypto.h"
+#include "ufshcd-priv.h"
 #include "ufshcd.h"
 #include "ufshpb.h"
 #include "unipro.h"
drivers/scsi/ufs/ufshcd.h index renamed from drivers/scsi/ufs/ufshcd.h +0 -0

ab0c643296c0..b13469fb1e15 100644

drivers/scsi/ufs/ufshcd.h +0 -0
@@ -1007,11 +1007,6 @@ static inline bool ufshcd_is_wb_allowed(struct

ufs_hba *hba)
return hba->caps & UFSHCD_CAP_WB_EN;
}

-static inline bool ufshcd_is_user_access_allowed(struct ufs_hba *hba) -{
- return !hba->shutting_down;
-}
-
#define ufshcd_writel(hba, val, reg) \
writel((val), (hba)->mmio_base + (reg))
#define ufshcd_readl(hba, reg) \
@@ -1075,18 +1070,6 @@ static inline void *ufshcd_get_variant(struct ufs_hba *hba)
BUG_ON(!hba);
return hba->priv;
}
-static inline bool ufshcd_keep_autobkops_enabled_except_suspend(
- struct ufs_hba *hba)
-{
- return hba->caps &
UFSHCD_CAP_KEEP_AUTO_BKOPS_ENABLED_EXCEPT_SUSPEND;
-}
-
-static inline u8 ufshcd_wb_get_query_index(struct ufs_hba *hba) -{
- if (hba->dev_info.wb_buffer_type == WB_BUF_MODE_LU_DEDICATED)
- return hba->dev_info.wb_dedicated_lu;
- return 0;
-}

#ifdef CONFIG_SCSI_UFS_HWMON
void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask); @@ -1230,13 +1213,6 @@
int __ufshcd_suspend_prepare(struct device *dev, bool rpm_ok_for_spm); void ufshcd_resume_complete(struct device *dev);

/* Wrapper functions for safely calling variant operations */ -static
inline const char *ufshcd_get_var_name(struct ufs_hba *hba) -{
- if (hba->vops)
- return hba->vops->name;
- return "";
-}
-
static inline int ufshcd_vops_init(struct ufs_hba *hba) {
if (hba->vops && hba->vops->init)
@@ -1245,61 +1221,6 @@ static inline int ufshcd_vops_init(struct ufs_hba *hba)
return 0;
}

-static inline void ufshcd_vops_exit(struct ufs_hba *hba) -{
- if (hba->vops && hba->vops->exit)
- return hba->vops->exit(hba);
-}
-
-static inline u32 ufshcd_vops_get_ufs_hci_version(struct ufs_hba *hba) -{
- if (hba->vops && hba->vops->get_ufs_hci_version)
- return hba->vops->get_ufs_hci_version(hba);
-
- return ufshcd_readl(hba, REG_UFS_VERSION);
-}
-
-static inline int ufshcd_vops_clk_scale_notify(struct ufs_hba *hba,
- bool up, enum ufs_notify_change_status status)
-{
- if (hba->vops && hba->vops->clk_scale_notify)
- return hba->vops->clk_scale_notify(hba, up, status);
- return 0;
-}
-
-static inline void ufshcd_vops_event_notify(struct ufs_hba *hba,
- enum ufs_event_type evt,
- void *data)
-{
- if (hba->vops && hba->vops->event_notify)
- hba->vops->event_notify(hba, evt, data);
-}
-
-static inline int ufshcd_vops_setup_clocks(struct ufs_hba *hba, bool on,
- enum ufs_notify_change_status
status)
-{
- if (hba->vops && hba->vops->setup_clocks)
- return hba->vops->setup_clocks(hba, on, status);
- return 0;
-}
-
-static inline int ufshcd_vops_hce_enable_notify(struct ufs_hba *hba,
- bool status)
-{
- if (hba->vops && hba->vops->hce_enable_notify)
- return hba->vops->hce_enable_notify(hba, status);
-
- return 0;
-}
-static inline int ufshcd_vops_link_startup_notify(struct ufs_hba *hba,
- bool status)
-{
- if (hba->vops && hba->vops->link_startup_notify)
- return hba->vops->link_startup_notify(hba, status);
-
- return 0;
-}
-
static inline int ufshcd_vops_phy_initialization(struct ufs_hba *hba) {
if (hba->vops && hba->vops->phy_initialization) @@ -1308,102 +1229,8
@@ static inline int ufshcd_vops_phy_initialization(struct ufs_hba *hba)
return 0;
}

-static inline int ufshcd_vops_pwr_change_notify(struct ufs_hba *hba,

-				  enum ufs_notify_change_status status,
-				  struct ufs_pa_layer_attr *dev_max_params,
-				  struct ufs_pa_layer_attr *dev_req_params)

-{
- if (hba->vops && hba->vops->pwr_change_notify)
- return hba->vops->pwr_change_notify(hba, status,
- dev_max_params, dev_req_params);
-
- return -ENOTSUPP;
-}
-
-static inline void ufshcd_vops_setup_task_mgmt(struct ufs_hba *hba,
- int tag, u8 tm_function)
-{
- if (hba->vops && hba->vops->setup_task_mgmt)
- return hba->vops->setup_task_mgmt(hba, tag, tm_function);
-}
-
-static inline void ufshcd_vops_hibern8_notify(struct ufs_hba *hba,
- enum uic_cmd_dme cmd,
- enum ufs_notify_change_status
status)
-{
- if (hba->vops && hba->vops->hibern8_notify)
- return hba->vops->hibern8_notify(hba, cmd, status);
-}
-
-static inline int ufshcd_vops_apply_dev_quirks(struct ufs_hba *hba) -{
- if (hba->vops && hba->vops->apply_dev_quirks)
- return hba->vops->apply_dev_quirks(hba);
- return 0;
-}
-
-static inline void ufshcd_vops_fixup_dev_quirks(struct ufs_hba *hba) -{
- if (hba->vops && hba->vops->fixup_dev_quirks)
- hba->vops->fixup_dev_quirks(hba);
-}
-
-static inline int ufshcd_vops_suspend(struct ufs_hba *hba, enum ufs_pm_op op,
- enum ufs_notify_change_status status)
-{
- if (hba->vops && hba->vops->suspend)
- return hba->vops->suspend(hba, op, status);
-
- return 0;
-}
-
-static inline int ufshcd_vops_resume(struct ufs_hba *hba, enum ufs_pm_op op) -{
- if (hba->vops && hba->vops->resume)
- return hba->vops->resume(hba, op);
-
- return 0;
-}
-
-static inline void ufshcd_vops_dbg_register_dump(struct ufs_hba *hba) -{
- if (hba->vops && hba->vops->dbg_register_dump)
- hba->vops->dbg_register_dump(hba);
-}
-
-static inline int ufshcd_vops_device_reset(struct ufs_hba *hba) -{
- if (hba->vops && hba->vops->device_reset)
- return hba->vops->device_reset(hba);
-
- return -EOPNOTSUPP;
-}
-
-static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba,
- struct devfreq_dev_profile *p,
- struct devfreq_simple_ondemand_data *data)
-{
- if (hba->vops && hba->vops->config_scaling_param)
- hba->vops->config_scaling_param(hba, p, data);
-}
-
extern struct ufs_pm_lvl_states ufs_pm_lvl_states[];

-/**
- * ufshcd_scsi_to_upiu_lun - maps scsi LUN to UPIU LUN
- * @scsi_lun: scsi LUN id
- *
- * Returns UPIU LUN id
- */
-static inline u8 ufshcd_scsi_to_upiu_lun(unsigned int scsi_lun) -{
- if (scsi_is_wlun(scsi_lun))
- return (scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID)
- | UFS_UPIU_WLUN_ID;
- else
- return scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID;
-}
-
int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,
const char *prefix);

@@ -1412,43 +1239,4 @@ int ufshcd_write_ee_control(struct ufs_hba *hba); int ufshcd_update_ee_control(struct ufs_hba *hba, u16 *mask, u16 *other_mask,
u16 set, u16 clr);

-static inline int ufshcd_update_ee_drv_mask(struct ufs_hba *hba,
- u16 set, u16 clr)
-{
- return ufshcd_update_ee_control(hba, &hba->ee_drv_mask,
- &hba->ee_usr_mask, set, clr);
-}
-
-static inline int ufshcd_update_ee_usr_mask(struct ufs_hba *hba,
- u16 set, u16 clr)
-{
- return ufshcd_update_ee_control(hba, &hba->ee_usr_mask,
- &hba->ee_drv_mask, set, clr);
-}
-
-static inline int ufshcd_rpm_get_sync(struct ufs_hba *hba) -{
- return pm_runtime_get_sync(&hba->ufs_device_wlun->sdev_gendev);
-}
-
-static inline int ufshcd_rpm_put_sync(struct ufs_hba *hba) -{
- return pm_runtime_put_sync(&hba->ufs_device_wlun->sdev_gendev);
-}
-
-static inline void ufshcd_rpm_get_noresume(struct ufs_hba *hba) -{
- pm_runtime_get_noresume(&hba->ufs_device_wlun->sdev_gendev);
-}
-
-static inline int ufshcd_rpm_resume(struct ufs_hba *hba) -{
- return pm_runtime_resume(&hba->ufs_device_wlun->sdev_gendev);
-}
-
-static inline int ufshcd_rpm_put(struct ufs_hba *hba) -{
- return pm_runtime_put(&hba->ufs_device_wlun->sdev_gendev);
-}
-
#endif /* End of Header */

drivers/scsi/ufs/ufshpb.c index renamed from drivers/scsi/ufs/ufshpb.c +0 -0

d456404e5c49..daac81290f50 100644

drivers/scsi/ufs/ufshpb.c +1 -0
@@ -17,6 +17,7 @@
 #include "../sd.h"
 #include "ufshcd.h"
 #include "ufshpb.h"
+#include "ufshcd-priv.h"
 
 #define ACTIVATION_THRESHOLD 8 /* 8 IOs */  #define READ_TO_MS 1000
 
#75 lore raw

Re: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

Quoted 20 lines · Chanho Park

I'm seeing below build error when I applied this patch. Any baseline do I need?

In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd-priv.h:32:20: error: redefinition of 'ufs_hwmon_probe'

    32 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {}
       |                    ^~~~~~~~~~~~~~~

In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd.h:1079:20: note: previous definition of 'ufs_hwmon_probe' with type 'void(struct ufs_hba *, u8)' {aka 'void(struct ufs_hba *, unsigned char)'}
1079 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {}

       |                    ^~~~~~~~~~~~~~~
In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd-priv.h:33:20: error: redefinition of
'ufs_hwmon_remove'
    33 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}
       |                    ^~~~~~~~~~~~~~~~
Quoted 6 lines

In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd.h:1080:20: note: previous definition of 'ufs_hwmon_remove' with type 'void(struct ufs_hba *)'
1080 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}

       |                    ^~~~~~~~~~~~~~~~

Hi Chanho,

Patch 26/29 duplicates the ufs_hwmon_remove() etc. definitions instead of moving these. The patch below needs to be applied on top of this patch to make it build. I will fix this when I repost this patch series.

Thanks,

Bart.

include/scsi/ufshcd.h +0 -10
index 946d915f5a42..3caec295d87a 100644
@@ -1071,16 +1071,6 @@ static inline void *ufshcd_get_variant(struct ufs_hba *hba)
 	return hba->priv;
 }
 
-#ifdef CONFIG_SCSI_UFS_HWMON
-void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask);
-void ufs_hwmon_remove(struct ufs_hba *hba);
-void ufs_hwmon_notify_event(struct ufs_hba *hba, u8 ee_mask);
-#else
-static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {}
-static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}
-static inline void ufs_hwmon_notify_event(struct ufs_hba *hba, u8 ee_mask) {}
-#endif
-
 #ifdef CONFIG_PM
 extern int ufshcd_runtime_suspend(struct device *dev);
 extern int ufshcd_runtime_resume(struct device *dev);
#76 lore raw

RE: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

Quoted 29 lines
Quoted 7 lines

I'm seeing below build error when I applied this patch. Any baseline do I need?

In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd-priv.h:32:20: error: redefinition of 'ufs_hwmon_probe'
32 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask)

{}

Quoted 7 lines
       |                    ^~~~~~~~~~~~~~~

In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd.h:1079:20: note: previous definition of 'ufs_hwmon_probe' with type 'void(struct ufs_hba *, u8)' {aka 'void(struct ufs_hba *, unsigned char)'}
1079 | static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask)

{}

Quoted 6 lines
       |                    ^~~~~~~~~~~~~~~
In file included from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd-priv.h:33:20: error: redefinition of
'ufs_hwmon_remove'
    33 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}
       |                    ^~~~~~~~~~~~~~~~
Quoted 6 lines

In file included from drivers/scsi/ufs/ufshcd-priv.h:5,
from drivers/scsi/ufs/ufs-sysfs.c:9:
drivers/scsi/ufs/ufshcd.h:1080:20: note: previous definition of 'ufs_hwmon_remove' with type 'void(struct ufs_hba *)'
1080 | static inline void ufs_hwmon_remove(struct ufs_hba *hba) {}

       |                    ^~~~~~~~~~~~~~~~
Quoted 5 lines

Hi Chanho,

Patch 26/29 duplicates the ufs_hwmon_remove() etc. definitions instead of moving these. The patch below needs to be applied on top of this patch to make it build. I will fix this when I repost this patch series.

Below can fix the build errors. Thanks for the update.

Best Regards,
Chanho Park

Quoted 27 lines

Thanks,

Bart.

include/scsi/ufshcd.h index renamed from include/scsi/ufshcd.h +0 -0

946d915f5a42..3caec295d87a 100644

include/scsi/ufshcd.h +0 -2
@@ -1071,16 +1071,6 @@ static inline void *ufshcd_get_variant(struct
 ufs_hba *hba)
  	return hba->priv;
  }
 
-#ifdef CONFIG_SCSI_UFS_HWMON
-void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask); -void

ufs_hwmon_remove(struct ufs_hba *hba); -void ufs_hwmon_notify_event(struct ufs_hba *hba, u8 ee_mask); -#else -static inline void ufs_hwmon_probe(struct ufs_hba *hba, u8 mask) {} -static inline void ufs_hwmon_remove(struct ufs_hba *hba) {} -static inline void ufs_hwmon_notify_event(struct ufs_hba *hba, u8
ee_mask) {}

include/scsi/ufshcd.h +0 -2
-#endif
-
  #ifdef CONFIG_PM
  extern int ufshcd_runtime_suspend(struct device *dev);
  extern int ufshcd_runtime_resume(struct device *dev);
#77 lore raw

RE: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

In reply to Bart Van Assche

drivers/scsi/ufs/ufshcd-priv.h

Quoted 5 lines
drivers/scsi/ufs/ufshcd-priv.h new file +0 -0
new file mode 100644 index 000000000000..4ceb0c63aa15
@@ -0,0 +1,277 @@

License identifier & copyright?

#78 lore raw

Re: [PATCH 26/29] scsi: ufs: Split the ufshcd.h header file

Quoted 6 lines · Avri Altman

drivers/scsi/ufs/ufshcd-priv.h

Quoted 5 lines
drivers/scsi/ufs/ufshcd-priv.h new file +0 -0
new file mode 100644 index 000000000000..4ceb0c63aa15
@@ -0,0 +1,277 @@

License identifier & copyright?

I will add the same SPDX identifier as the one that occurs in ufshcd.h.

Thanks,

Bart.

#79 lore raw

PATCH 27/29 scsi: ufs: Move the struct ufs_ref_clk definition

In reply to Bart Van Assche

Move the definition of this data structure since it is only used in a single source file.

---
 drivers/scsi/ufs/ufs.h    | 5 -----
 drivers/scsi/ufs/ufshcd.c | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufs.h +0 -5
index 225b5b4a2a7e..f52173b8ad96 100644
@@ -415,11 +415,6 @@ enum ufs_ref_clk_freq {
 	REF_CLK_FREQ_INVAL	= -1,
 };
 
-struct ufs_ref_clk {
-	unsigned long freq_hz;
-	enum ufs_ref_clk_freq val;
-};
-
 /* Query response result code */
 enum {
 	QUERY_RESULT_SUCCESS                    = 0x00,
drivers/scsi/ufs/ufshcd.c +5 -0
index bab0f1ee41e6..27738f24c4a8 100644
@@ -7959,6 +7959,11 @@ static int ufshcd_device_geo_params_init(struct ufs_hba *hba)
 	return err;
 }
 
+struct ufs_ref_clk {
+	unsigned long freq_hz;
+	enum ufs_ref_clk_freq val;
+};
+
 static struct ufs_ref_clk ufs_ref_clk_freqs[] = {
 	{19200000, REF_CLK_FREQ_19_2_MHZ},
 	{26000000, REF_CLK_FREQ_26_MHZ},
Reviewed-by on v1 27/29
#80 lore raw

RE: [PATCH 27/29] scsi: ufs: Move the struct ufs_ref_clk definition

Quoted 5 lines

Move the definition of this data structure since it is only used in a single source file.

Quoted 37 lines
---
 drivers/scsi/ufs/ufs.h    | 5 -----
 drivers/scsi/ufs/ufshcd.c | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0 -0

225b5b4a2a7e..f52173b8ad96 100644

drivers/scsi/ufs/ufs.h +0 -5
@@ -415,11 +415,6 @@ enum ufs_ref_clk_freq {
        REF_CLK_FREQ_INVAL      = -1,
 };
 
-struct ufs_ref_clk {
-       unsigned long freq_hz;
-       enum ufs_ref_clk_freq val;
-};
-
 /* Query response result code */
 enum {
        QUERY_RESULT_SUCCESS                    = 0x00,
drivers/scsi/ufs/ufshcd.c index renamed from drivers/scsi/ufs/ufshcd.c +0 -0

bab0f1ee41e6..27738f24c4a8 100644

drivers/scsi/ufs/ufshcd.c +5 -0
@@ -7959,6 +7959,11 @@ static int ufshcd_device_geo_params_init(struct
 ufs_hba *hba)
        return err;
 }
 
+struct ufs_ref_clk {
+       unsigned long freq_hz;
+       enum ufs_ref_clk_freq val;
+};
+
 static struct ufs_ref_clk ufs_ref_clk_freqs[] = {
        {19200000, REF_CLK_FREQ_19_2_MHZ},
Quoted 1 line
        {26000000, REF_CLK_FREQ_26_MHZ},

While at it, maybe also declare this struct as const?

Thanks,
Avri

#81 lore raw

PATCH 28/29 scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition

In reply to Bart Van Assche

Move the definition of this function from a public into a private header file since it is only used inside the UFS core.

---
 drivers/scsi/ufs/ufs.h         | 19 -------------------
 drivers/scsi/ufs/ufshcd-priv.h | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/scsi/ufs/ufs.h +0 -19
index f52173b8ad96..1bba3fead2ce 100644
@@ -620,23 +620,4 @@ enum ufs_trace_tsf_t {
 	UFS_TSF_CDB, UFS_TSF_OSF, UFS_TSF_TM_INPUT, UFS_TSF_TM_OUTPUT
 };
 
-/**
- * ufs_is_valid_unit_desc_lun - checks if the given LUN has a unit descriptor
- * @dev_info: pointer of instance of struct ufs_dev_info
- * @lun: LU number to check
- * @return: true if the lun has a matching unit descriptor, false otherwise
- */
-static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info,
-		u8 lun, u8 param_offset)
-{
-	if (!dev_info || !dev_info->max_lu_supported) {
-		pr_err("Max General LU supported by UFS isn't initialized\n");
-		return false;
-	}
-	/* WB is available only for the logical unit from 0 to 7 */
-	if (param_offset == UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS)
-		return lun < UFS_UPIU_MAX_WB_LUN_ID;
-	return lun == UFS_UPIU_RPMB_WLUN || (lun < dev_info->max_lu_supported);
-}
-
 #endif /* End of Header */
drivers/scsi/ufs/ufshcd-priv.h +19 -0
index 4ceb0c63aa15..de699b969aa6 100644
@@ -274,4 +274,23 @@ static inline int ufshcd_rpm_put(struct ufs_hba *hba)
 	return pm_runtime_put(&hba->ufs_device_wlun->sdev_gendev);
 }
 
+/**
+ * ufs_is_valid_unit_desc_lun - checks if the given LUN has a unit descriptor
+ * @dev_info: pointer of instance of struct ufs_dev_info
+ * @lun: LU number to check
+ * @return: true if the lun has a matching unit descriptor, false otherwise
+ */
+static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info,
+		u8 lun, u8 param_offset)
+{
+	if (!dev_info || !dev_info->max_lu_supported) {
+		pr_err("Max General LU supported by UFS isn't initialized\n");
+		return false;
+	}
+	/* WB is available only for the logical unit from 0 to 7 */
+	if (param_offset == UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS)
+		return lun < UFS_UPIU_MAX_WB_LUN_ID;
+	return lun == UFS_UPIU_RPMB_WLUN || (lun < dev_info->max_lu_supported);
+}
+
 #endif /* _UFSHCD_PRIV_H_ */
#82 lore raw

RE: [PATCH 28/29] scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition

Quoted 3 lines

Move the definition of this function from a public into a private header file since it is only used inside the UFS core.

Should be in patch 26/29?

Quoted 65 lines
---
 drivers/scsi/ufs/ufs.h         | 19 -------------------
 drivers/scsi/ufs/ufshcd-priv.h | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 19 deletions(-)
drivers/scsi/ufs/ufs.h index renamed from drivers/scsi/ufs/ufs.h +0 -0

f52173b8ad96..1bba3fead2ce 100644

drivers/scsi/ufs/ufs.h +0 -19
@@ -620,23 +620,4 @@ enum ufs_trace_tsf_t {
        UFS_TSF_CDB, UFS_TSF_OSF, UFS_TSF_TM_INPUT,
 UFS_TSF_TM_OUTPUT  };
 
-/**
- * ufs_is_valid_unit_desc_lun - checks if the given LUN has a unit descriptor
- * @dev_info: pointer of instance of struct ufs_dev_info
- * @lun: LU number to check
- * @return: true if the lun has a matching unit descriptor, false otherwise
- */
-static inline bool ufs_is_valid_unit_desc_lun(struct ufs_dev_info *dev_info,
-               u8 lun, u8 param_offset)
-{
-       if (!dev_info || !dev_info->max_lu_supported) {
-               pr_err("Max General LU supported by UFS isn't initialized\n");
-               return false;
-       }
-       /* WB is available only for the logical unit from 0 to 7 */
-       if (param_offset == UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS)
-               return lun < UFS_UPIU_MAX_WB_LUN_ID;
-       return lun == UFS_UPIU_RPMB_WLUN || (lun < dev_info-
 >max_lu_supported);
-}
-

#endif /* End of Header */

drivers/scsi/ufs/ufshcd-priv.h +19 -0
index 4ceb0c63aa15..de699b969aa6 100644
@@ -274,4 +274,23 @@ static inline int ufshcd_rpm_put(struct ufs_hba
 *hba)
        return pm_runtime_put(&hba->ufs_device_wlun->sdev_gendev);
 }
 
+/**
+ * ufs_is_valid_unit_desc_lun - checks if the given LUN has a unit
+descriptor
+ * @dev_info: pointer of instance of struct ufs_dev_info
+ * @lun: LU number to check
+ * @return: true if the lun has a matching unit descriptor, false
+otherwise  */ static inline bool ufs_is_valid_unit_desc_lun(struct
+ufs_dev_info *dev_info,
+               u8 lun, u8 param_offset) {
+       if (!dev_info || !dev_info->max_lu_supported) {
+               pr_err("Max General LU supported by UFS isn't initialized\n");
+               return false;
+       }
+       /* WB is available only for the logical unit from 0 to 7 */
+       if (param_offset == UNIT_DESC_PARAM_WB_BUF_ALLOC_UNITS)
+               return lun < UFS_UPIU_MAX_WB_LUN_ID;
+       return lun == UFS_UPIU_RPMB_WLUN || (lun <
+dev_info->max_lu_supported); }
+

#endif /* _UFSHCD_PRIV_H_ */

#83 lore raw

Re: [PATCH 28/29] scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition

Quoted 5 lines · Avri Altman
Quoted 3 lines

Move the definition of this function from a public into a private header file since it is only used inside the UFS core.

Should be in patch 26/29?

Patch 26/29 splits the ufshcd.h header file. This patch moves a definition from ufs.h into ufshcd-priv.h. I do not have a strong opinion about whether that should happen in separate patches or in a single patch.

Thanks,

Bart.

#84 lore raw

PATCH 29/29 scsi: ufs: Split the drivers/scsi/ufs directory

In reply to Bart Van Assche
---
 drivers/scsi/Kconfig                          |  3 +-
 drivers/scsi/Makefile                         |  4 +-
 drivers/scsi/ufs-core/Kconfig                 | 82 +++++++++++++++++++
 drivers/scsi/ufs-core/Makefile                | 10 +++
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c  |  3 +-
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h  |  0
 .../{ufs => ufs-core}/ufs-fault-injection.c   |  0
 .../{ufs => ufs-core}/ufs-fault-injection.h   |  0
 drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c    |  3 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c    |  1 +
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h    |  0
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.c      |  2 +-
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.h      |  0
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.c    |  2 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.h    |  4 +-
 drivers/scsi/{ufs => ufs-core}/ufshcd-priv.h  |  2 +-
 drivers/scsi/{ufs => ufs-core}/ufshcd.c       |  6 +-
 drivers/scsi/{ufs => ufs-core}/ufshpb.c       |  4 +-
 drivers/scsi/{ufs => ufs-core}/ufshpb.h       |  0
 drivers/scsi/{ufs => ufs-drivers}/Kconfig     | 71 +---------------
 drivers/scsi/{ufs => ufs-drivers}/Makefile    | 12 ---
 .../scsi/{ufs => ufs-drivers}/cdns-pltfrm.c   |  0
 .../{ufs => ufs-drivers}/tc-dwc-g210-pci.c    |  2 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c |  0
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.c   |  4 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.h   |  0
 .../scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c  |  0
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.c    | 12 ++-
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.h    |  0
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c  |  8 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h  |  0
 .../{ufs => ufs-drivers}/ufs-mediatek-trace.h |  2 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.c  |  8 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.h  |  0
 .../scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c  |  0
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c  |  8 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h  |  2 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.c    |  4 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.h    |  2 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pci.c    |  2 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c |  4 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h |  2 +-
 .../scsi/{ufs => ufs-drivers}/ufshci-dwc.h    |  0
 {drivers/scsi/ufs => include/scsi}/ufs.h      |  0
 .../scsi/ufs => include/scsi}/ufs_quirks.h    |  0
 {drivers/scsi/ufs => include/scsi}/ufshcd.h   |  8 +-
 {drivers/scsi/ufs => include/scsi}/ufshci.h   |  0
 {drivers/scsi/ufs => include/scsi}/unipro.h   |  0
 48 files changed, 144 insertions(+), 133 deletions(-)
 create mode 100644 drivers/scsi/ufs-core/Kconfig
 create mode 100644 drivers/scsi/ufs-core/Makefile
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.c (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.h (97%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-priv.h (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/Kconfig (56%)
 rename drivers/scsi/{ufs => ufs-drivers}/Makefile (56%)
 rename drivers/scsi/{ufs => ufs-drivers}/cdns-pltfrm.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pci.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek-trace.h (92%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pci.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshci-dwc.h (100%)
 rename {drivers/scsi/ufs => include/scsi}/ufs.h (100%)
 rename {drivers/scsi/ufs => include/scsi}/ufs_quirks.h (100%)
 rename {drivers/scsi/ufs => include/scsi}/ufshcd.h (99%)
 rename {drivers/scsi/ufs => include/scsi}/ufshci.h (100%)
 rename {drivers/scsi/ufs => include/scsi}/unipro.h (100%)
drivers/scsi/Kconfig +2 -1
index 6e3a04107bb6..40d493dcbcd4 100644
@@ -500,7 +500,8 @@ source "drivers/scsi/megaraid/Kconfig.megaraid"
 source "drivers/scsi/mpt3sas/Kconfig"
 source "drivers/scsi/mpi3mr/Kconfig"
 source "drivers/scsi/smartpqi/Kconfig"
-source "drivers/scsi/ufs/Kconfig"
+source "drivers/scsi/ufs-core/Kconfig"
+source "drivers/scsi/ufs-drivers/Kconfig"
 
 config SCSI_HPTIOP
 	tristate "HighPoint RocketRAID 3xxx/4xxx Controller support"
drivers/scsi/Makefile +3 -1
index 19814c26c908..b6319b6598d1 100644
@@ -101,7 +101,9 @@ obj-$(CONFIG_MEGARAID_NEWGEN)	+= megaraid/
 obj-$(CONFIG_MEGARAID_SAS)	+= megaraid/
 obj-$(CONFIG_SCSI_MPT3SAS)	+= mpt3sas/
 obj-$(CONFIG_SCSI_MPI3MR)	+= mpi3mr/
-obj-$(CONFIG_SCSI_UFSHCD)	+= ufs/
+# The link order is important here. ufshcd-core must initialize
+# before vendor drivers.
+obj-$(CONFIG_SCSI_UFSHCD)	+= ufs-core/ ufs-drivers/
 obj-$(CONFIG_SCSI_ACARD)	+= atp870u.o
 obj-$(CONFIG_SCSI_SUNESP)	+= esp_scsi.o	sun_esp.o
 obj-$(CONFIG_SCSI_INITIO)	+= initio.o
drivers/scsi/ufs-core/Kconfig new file +82 -0

82 lines not on this page · raw message

drivers/scsi/ufs-core/Makefile new file +10 -0
new file mode 100644
index 000000000000..740d22440a07
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-$(CONFIG_SCSI_UFSHCD)		+= ufshcd-core.o
+ufshcd-core-y				+= ufshcd.o ufs-sysfs.o
+ufshcd-core-$(CONFIG_DEBUG_FS)		+= ufs-debugfs.o
+ufshcd-core-$(CONFIG_SCSI_UFS_BSG)	+= ufs_bsg.o
+ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO)	+= ufshcd-crypto.o
+ufshcd-core-$(CONFIG_SCSI_UFS_HPB)	+= ufshpb.o
+ufshcd-core-$(CONFIG_SCSI_UFS_FAULT_INJECTION) += ufs-fault-injection.o
+ufshcd-core-$(CONFIG_SCSI_UFS_HWMON) += ufs-hwmon.o
drivers/scsi/ufs-core/ufs-debugfs.c renamed from drivers/scsi/ufs/ufs-debugfs.c +1 -2
similarity index 99%
rename from drivers/scsi/ufs/ufs-debugfs.c
rename to drivers/scsi/ufs-core/ufs-debugfs.c
index c10a8f09682b..2f0d30b1bed6 100644
@@ -2,9 +2,8 @@
 // Copyright (C) 2020 Intel Corporation
 
 #include <linux/debugfs.h>
-
+#include <scsi/ufshcd.h>
 #include "ufs-debugfs.h"
-#include "ufshcd.h"
 #include "ufshcd-priv.h"
 
 static struct dentry *ufs_debugfs_root;
drivers/scsi/ufs-core/ufs-debugfs.h renamed from drivers/scsi/ufs/ufs-debugfs.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-debugfs.h
rename to drivers/scsi/ufs-core/ufs-debugfs.h
drivers/scsi/ufs-core/ufs-fault-injection.c renamed from drivers/scsi/ufs/ufs-fault-injection.c +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-fault-injection.c
rename to drivers/scsi/ufs-core/ufs-fault-injection.c
drivers/scsi/ufs-core/ufs-fault-injection.h renamed from drivers/scsi/ufs/ufs-fault-injection.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-fault-injection.h
rename to drivers/scsi/ufs-core/ufs-fault-injection.h
drivers/scsi/ufs-core/ufs-hwmon.c renamed from drivers/scsi/ufs/ufs-hwmon.c +1 -2
similarity index 99%
rename from drivers/scsi/ufs/ufs-hwmon.c
rename to drivers/scsi/ufs-core/ufs-hwmon.c
index c38d9d98a86d..fe3e48d3df76 100644
@@ -6,8 +6,7 @@
 
 #include <linux/hwmon.h>
 #include <linux/units.h>
-
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 #include "ufshcd-priv.h"
 
 struct ufs_hwmon_data {
drivers/scsi/ufs-core/ufs-sysfs.c renamed from drivers/scsi/ufs/ufs-sysfs.c +1 -0
similarity index 99%
rename from drivers/scsi/ufs/ufs-sysfs.c
rename to drivers/scsi/ufs-core/ufs-sysfs.c
index 97ab1a75e3b8..4630419f326c 100644
@@ -5,6 +5,7 @@
 #include <linux/bitfield.h>
 #include <linux/err.h>
 #include <linux/string.h>
+#include <scsi/ufs.h>
 #include "ufs-sysfs.h"
 #include "ufshcd-priv.h"
 
drivers/scsi/ufs-core/ufs-sysfs.h renamed from drivers/scsi/ufs/ufs-sysfs.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-sysfs.h
rename to drivers/scsi/ufs-core/ufs-sysfs.h
drivers/scsi/ufs-core/ufs_bsg.c renamed from drivers/scsi/ufs/ufs_bsg.c +1 -1
similarity index 99%
rename from drivers/scsi/ufs/ufs_bsg.c
rename to drivers/scsi/ufs-core/ufs_bsg.c
index 9e9b93867cab..283dcdf7fceb 100644
@@ -8,8 +8,8 @@
 #include <linux/bsg-lib.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
+#include <scsi/ufshcd.h>
 #include "ufs_bsg.h"
-#include "ufshcd.h"
 #include "ufshcd-priv.h"
 
 static int ufs_bsg_get_query_desc_size(struct ufs_hba *hba, int *desc_len,
drivers/scsi/ufs-core/ufs_bsg.h renamed from drivers/scsi/ufs/ufs_bsg.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs_bsg.h
rename to drivers/scsi/ufs-core/ufs_bsg.h
drivers/scsi/ufs-core/ufshcd-crypto.c renamed from drivers/scsi/ufs/ufshcd-crypto.c +1 -1
similarity index 99%
rename from drivers/scsi/ufs/ufshcd-crypto.c
rename to drivers/scsi/ufs-core/ufshcd-crypto.c
index 67402baf6fae..f8f19d8cf4d4 100644
@@ -3,7 +3,7 @@
  * Copyright 2019 Google LLC
  */
 
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 #include "ufshcd-crypto.h"
 
 /* Blk-crypto modes supported by UFS crypto */
drivers/scsi/ufs-core/ufshcd-crypto.h renamed from drivers/scsi/ufs/ufshcd-crypto.h +2 -2
similarity index 97%
rename from drivers/scsi/ufs/ufshcd-crypto.h
rename to drivers/scsi/ufs-core/ufshcd-crypto.h
index 9f98f18f9646..0875d53728d1 100644
@@ -7,9 +7,9 @@
 #define _UFSHCD_CRYPTO_H
 
 #include <scsi/scsi_cmnd.h>
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
+#include <scsi/ufshci.h>
 #include "ufshcd-priv.h"
-#include "ufshci.h"
 
 #ifdef CONFIG_SCSI_UFS_CRYPTO
 
drivers/scsi/ufs-core/ufshcd-priv.h renamed from drivers/scsi/ufs/ufshcd-priv.h +1 -1
similarity index 99%
rename from drivers/scsi/ufs/ufshcd-priv.h
rename to drivers/scsi/ufs-core/ufshcd-priv.h
index de699b969aa6..0e094709ec98 100644
@@ -2,7 +2,7 @@
 #define _UFSHCD_PRIV_H_
 
 #include <linux/pm_runtime.h>
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 
 static inline bool ufshcd_is_user_access_allowed(struct ufs_hba *hba)
 {
drivers/scsi/ufs-core/ufshcd.c renamed from drivers/scsi/ufs/ufshcd.c +3 -3
similarity index 99%
rename from drivers/scsi/ufs/ufshcd.c
rename to drivers/scsi/ufs-core/ufshcd.c
index 27738f24c4a8..870d285d3685 100644
@@ -26,16 +26,16 @@
 #include <scsi/scsi_dbg.h>
 #include <scsi/scsi_driver.h>
 #include <scsi/scsi_eh.h>
+#include <scsi/ufs_quirks.h>
+#include <scsi/ufshcd.h>
+#include <scsi/unipro.h>
 #include "ufs-debugfs.h"
 #include "ufs-fault-injection.h"
 #include "ufs-sysfs.h"
 #include "ufs_bsg.h"
-#include "ufs_quirks.h"
 #include "ufshcd-crypto.h"
 #include "ufshcd-priv.h"
-#include "ufshcd.h"
 #include "ufshpb.h"
-#include "unipro.h"
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/ufs.h>
drivers/scsi/ufs-core/ufshpb.c renamed from drivers/scsi/ufs/ufshpb.c +2 -2
similarity index 99%
rename from drivers/scsi/ufs/ufshpb.c
rename to drivers/scsi/ufs-core/ufshpb.c
index daac81290f50..7fc0a89e8d8f 100644
@@ -14,10 +14,10 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <scsi/scsi_cmnd.h>
+#include <scsi/ufshcd.h>
 #include "../sd.h"
-#include "ufshcd.h"
-#include "ufshpb.h"
 #include "ufshcd-priv.h"
+#include "ufshpb.h"
 
 #define ACTIVATION_THRESHOLD 8 /* 8 IOs */
 #define READ_TO_MS 1000
drivers/scsi/ufs-core/ufshpb.h renamed from drivers/scsi/ufs/ufshpb.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufshpb.h
rename to drivers/scsi/ufs-core/ufshpb.h
drivers/scsi/ufs-drivers/Kconfig renamed from drivers/scsi/ufs/Kconfig +1 -70

92 lines not on this page · raw message

drivers/scsi/ufs-drivers/Makefile renamed from drivers/scsi/ufs/Makefile +0 -12
similarity index 56%
rename from drivers/scsi/ufs/Makefile
rename to drivers/scsi/ufs-drivers/Makefile
index 966048875b50..e4be54273c98 100644
@@ -1,16 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-# UFSHCD makefile
-
-# The link order is important here. ufshcd-core must initialize
-# before vendor drivers.
-obj-$(CONFIG_SCSI_UFSHCD)		+= ufshcd-core.o
-ufshcd-core-y				+= ufshcd.o ufs-sysfs.o
-ufshcd-core-$(CONFIG_DEBUG_FS)		+= ufs-debugfs.o
-ufshcd-core-$(CONFIG_SCSI_UFS_BSG)	+= ufs_bsg.o
-ufshcd-core-$(CONFIG_SCSI_UFS_CRYPTO)	+= ufshcd-crypto.o
-ufshcd-core-$(CONFIG_SCSI_UFS_HPB)	+= ufshpb.o
-ufshcd-core-$(CONFIG_SCSI_UFS_FAULT_INJECTION) += ufs-fault-injection.o
-ufshcd-core-$(CONFIG_SCSI_UFS_HWMON) += ufs-hwmon.o
 
 obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o
 obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o
drivers/scsi/ufs-drivers/cdns-pltfrm.c renamed from drivers/scsi/ufs/cdns-pltfrm.c +0 -0
similarity index 100%
rename from drivers/scsi/ufs/cdns-pltfrm.c
rename to drivers/scsi/ufs-drivers/cdns-pltfrm.c
drivers/scsi/ufs-drivers/tc-dwc-g210-pci.c renamed from drivers/scsi/ufs/tc-dwc-g210-pci.c +1 -1
similarity index 99%
rename from drivers/scsi/ufs/tc-dwc-g210-pci.c
rename to drivers/scsi/ufs-drivers/tc-dwc-g210-pci.c
index d679eff3f2f0..68c40e5b61e4 100644
@@ -10,9 +10,9 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
+#include <scsi/ufshcd.h>
 #include "tc-dwc-g210.h"
 #include "ufshcd-dwc.h"
-#include "ufshcd.h"
 
 /* Test Chip type expected values */
 #define TC_G210_20BIT 20
drivers/scsi/ufs-drivers/tc-dwc-g210-pltfrm.c renamed from drivers/scsi/ufs/tc-dwc-g210-pltfrm.c +0 -0
similarity index 100%
rename from drivers/scsi/ufs/tc-dwc-g210-pltfrm.c
rename to drivers/scsi/ufs-drivers/tc-dwc-g210-pltfrm.c
drivers/scsi/ufs-drivers/tc-dwc-g210.c renamed from drivers/scsi/ufs/tc-dwc-g210.c +2 -2
similarity index 99%
rename from drivers/scsi/ufs/tc-dwc-g210.c
rename to drivers/scsi/ufs-drivers/tc-dwc-g210.c
index c1b236f09601..14486afc42f1 100644
@@ -8,11 +8,11 @@
  */
 
 #include <linux/module.h>
+#include <scsi/ufshcd.h>
+#include <scsi/unipro.h>
 #include "tc-dwc-g210.h"
 #include "ufshcd-dwc.h"
-#include "ufshcd.h"
 #include "ufshci-dwc.h"
-#include "unipro.h"
 
 /**
  * tc_dwc_g210_setup_40bit_rmmi()
drivers/scsi/ufs-drivers/tc-dwc-g210.h renamed from drivers/scsi/ufs/tc-dwc-g210.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/tc-dwc-g210.h
rename to drivers/scsi/ufs-drivers/tc-dwc-g210.h
drivers/scsi/ufs-drivers/ti-j721e-ufs.c renamed from drivers/scsi/ufs/ti-j721e-ufs.c +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ti-j721e-ufs.c
rename to drivers/scsi/ufs-drivers/ti-j721e-ufs.c
drivers/scsi/ufs-drivers/ufs-exynos.c renamed from drivers/scsi/ufs/ufs-exynos.c +5 -7
similarity index 99%
rename from drivers/scsi/ufs/ufs-exynos.c
rename to drivers/scsi/ufs-drivers/ufs-exynos.c
index ddb2d42605c5..64f4ed3639b0 100644
@@ -10,20 +10,18 @@
 
 #include <linux/clk.h>
 #include <linux/delay.h>
+#include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/mfd/syscon.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
-
-#include "ufshcd.h"
-#include "ufshcd-pltfrm.h"
-#include "ufshci.h"
-#include "unipro.h"
-
+#include <scsi/ufshcd.h>
+#include <scsi/ufshci.h>
+#include <scsi/unipro.h>
 #include "ufs-exynos.h"
+#include "ufshcd-pltfrm.h"
 
 /*
  * Exynos's Vendor specific registers for UFSHCI
drivers/scsi/ufs-drivers/ufs-exynos.h renamed from drivers/scsi/ufs/ufs-exynos.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-exynos.h
rename to drivers/scsi/ufs-drivers/ufs-exynos.h
drivers/scsi/ufs-drivers/ufs-hisi.c renamed from drivers/scsi/ufs/ufs-hisi.c +4 -4
similarity index 99%
rename from drivers/scsi/ufs/ufs-hisi.c
rename to drivers/scsi/ufs-drivers/ufs-hisi.c
index 8f6168471464..09ac3280a73e 100644
@@ -14,12 +14,12 @@
 #include <linux/platform_device.h>
 #include <linux/reset.h>
 #include <linux/time.h>
+#include <scsi/ufs_quirks.h>
+#include <scsi/ufshcd.h>
+#include <scsi/ufshci.h>
+#include <scsi/unipro.h>
 #include "ufs-hisi.h"
-#include "ufs_quirks.h"
 #include "ufshcd-pltfrm.h"
-#include "ufshcd.h"
-#include "ufshci.h"
-#include "unipro.h"
 
 static int ufs_hisi_check_hibern8(struct ufs_hba *hba)
 {
drivers/scsi/ufs-drivers/ufs-hisi.h renamed from drivers/scsi/ufs/ufs-hisi.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-hisi.h
rename to drivers/scsi/ufs-drivers/ufs-hisi.h
drivers/scsi/ufs-drivers/ufs-mediatek-trace.h renamed from drivers/scsi/ufs/ufs-mediatek-trace.h +1 -1
similarity index 92%
rename from drivers/scsi/ufs/ufs-mediatek-trace.h
rename to drivers/scsi/ufs-drivers/ufs-mediatek-trace.h
index 895e82ea6ece..d33ffce9d01f 100644
@@ -31,6 +31,6 @@ TRACE_EVENT(ufs_mtk_event,
 
 #undef TRACE_INCLUDE_PATH
 #undef TRACE_INCLUDE_FILE
-#define TRACE_INCLUDE_PATH ../../drivers/scsi/ufs/
+#define TRACE_INCLUDE_PATH ../../drivers/scsi/ufs-drivers
 #define TRACE_INCLUDE_FILE ufs-mediatek-trace
 #include <trace/define_trace.h>
drivers/scsi/ufs-drivers/ufs-mediatek.c renamed from drivers/scsi/ufs/ufs-mediatek.c +4 -4
similarity index 99%
rename from drivers/scsi/ufs/ufs-mediatek.c
rename to drivers/scsi/ufs-drivers/ufs-mediatek.c
index b804e969915b..3207a19b900a 100644
@@ -20,11 +20,11 @@
 #include <linux/reset.h>
 #include <linux/sched/clock.h>
 #include <linux/soc/mediatek/mtk_sip_svc.h>
-#include "ufshcd.h"
-#include "ufshcd-pltfrm.h"
-#include "ufs_quirks.h"
-#include "unipro.h"
+#include <scsi/ufs_quirks.h>
+#include <scsi/ufshcd.h>
+#include <scsi/unipro.h>
 #include "ufs-mediatek.h"
+#include "ufshcd-pltfrm.h"
 
 #define CREATE_TRACE_POINTS
 #include "ufs-mediatek-trace.h"
drivers/scsi/ufs-drivers/ufs-mediatek.h renamed from drivers/scsi/ufs/ufs-mediatek.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-mediatek.h
rename to drivers/scsi/ufs-drivers/ufs-mediatek.h
drivers/scsi/ufs-drivers/ufs-qcom-ice.c renamed from drivers/scsi/ufs/ufs-qcom-ice.c +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs-qcom-ice.c
rename to drivers/scsi/ufs-drivers/ufs-qcom-ice.c
drivers/scsi/ufs-drivers/ufs-qcom.c renamed from drivers/scsi/ufs/ufs-qcom.c +4 -4
similarity index 99%
rename from drivers/scsi/ufs/ufs-qcom.c
rename to drivers/scsi/ufs-drivers/ufs-qcom.c
index 9a390cd516bd..dbfaa7ead11a 100644
@@ -14,12 +14,12 @@
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
 #include <linux/time.h>
+#include <scsi/ufs_quirks.h>
+#include <scsi/ufshcd.h>
+#include <scsi/ufshci.h>
+#include <scsi/unipro.h>
 #include "ufs-qcom.h"
-#include "ufs_quirks.h"
 #include "ufshcd-pltfrm.h"
-#include "ufshcd.h"
-#include "ufshci.h"
-#include "unipro.h"
 
 #define UFS_QCOM_DEFAULT_DBG_PRINT_EN					\
 	(UFS_QCOM_DBG_PRINT_REGS_EN | UFS_QCOM_DBG_PRINT_TEST_BUS_EN)
drivers/scsi/ufs-drivers/ufs-qcom.h renamed from drivers/scsi/ufs/ufs-qcom.h +1 -1
similarity index 99%
rename from drivers/scsi/ufs/ufs-qcom.h
rename to drivers/scsi/ufs-drivers/ufs-qcom.h
index 771bc95d02c7..ad70d425c544 100644
@@ -7,7 +7,7 @@
 
 #include <linux/reset-controller.h>
 #include <linux/reset.h>
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 
 #define MAX_UFS_QCOM_HOSTS	1
 #define MAX_U32                 (~(u32)0)
drivers/scsi/ufs-drivers/ufshcd-dwc.c renamed from drivers/scsi/ufs/ufshcd-dwc.c +2 -2
similarity index 98%
rename from drivers/scsi/ufs/ufshcd-dwc.c
rename to drivers/scsi/ufs-drivers/ufshcd-dwc.c
index 8f1786be3556..a4066373d994 100644
@@ -8,10 +8,10 @@
  */
 
 #include <linux/module.h>
+#include <scsi/ufshcd.h>
+#include <scsi/unipro.h>
 #include "ufshcd-dwc.h"
-#include "ufshcd.h"
 #include "ufshci-dwc.h"
-#include "unipro.h"
 
 int ufshcd_dwc_dme_set_attrs(struct ufs_hba *hba,
 				const struct ufshcd_dme_attr_val *v, int n)
drivers/scsi/ufs-drivers/ufshcd-dwc.h renamed from drivers/scsi/ufs/ufshcd-dwc.h +1 -1
similarity index 95%
rename from drivers/scsi/ufs/ufshcd-dwc.h
rename to drivers/scsi/ufs-drivers/ufshcd-dwc.h
index 43b70794e24f..3195002f6692 100644
@@ -10,7 +10,7 @@
 #ifndef _UFSHCD_DWC_H
 #define _UFSHCD_DWC_H
 
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 
 struct ufshcd_dme_attr_val {
 	u32 attr_sel;
drivers/scsi/ufs-drivers/ufshcd-pci.c renamed from drivers/scsi/ufs/ufshcd-pci.c +1 -1
similarity index 99%
rename from drivers/scsi/ufs/ufshcd-pci.c
rename to drivers/scsi/ufs-drivers/ufshcd-pci.c
index 45df431c720c..c82972fd4ece 100644
@@ -18,7 +18,7 @@
 #include <linux/pm_qos.h>
 #include <linux/pm_runtime.h>
 #include <linux/uuid.h>
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 
 struct ufs_host {
 	void (*late_init)(struct ufs_hba *hba);
drivers/scsi/ufs-drivers/ufshcd-pltfrm.c renamed from drivers/scsi/ufs/ufshcd-pltfrm.c +2 -2
similarity index 99%
rename from drivers/scsi/ufs/ufshcd-pltfrm.c
rename to drivers/scsi/ufs-drivers/ufshcd-pltfrm.c
index a1ff5bfd4f71..a6191e21dbbd 100644
@@ -12,9 +12,9 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
+#include <scsi/unipro.h>
 #include "ufshcd-pltfrm.h"
-#include "unipro.h"
 
 #define UFSHCD_DEFAULT_LANES_PER_DIRECTION		2
 
drivers/scsi/ufs-drivers/ufshcd-pltfrm.h renamed from drivers/scsi/ufs/ufshcd-pltfrm.h +1 -1
similarity index 98%
rename from drivers/scsi/ufs/ufshcd-pltfrm.h
rename to drivers/scsi/ufs-drivers/ufshcd-pltfrm.h
index c33e28ac6ef6..63cb306ed0ac 100644
@@ -5,7 +5,7 @@
 #ifndef UFSHCD_PLTFRM_H_
 #define UFSHCD_PLTFRM_H_
 
-#include "ufshcd.h"
+#include <scsi/ufshcd.h>
 
 #define UFS_PWM_MODE 1
 #define UFS_HS_MODE  2
drivers/scsi/ufs-drivers/ufshci-dwc.h renamed from drivers/scsi/ufs/ufshci-dwc.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufshci-dwc.h
rename to drivers/scsi/ufs-drivers/ufshci-dwc.h
include/scsi/ufs.h renamed from drivers/scsi/ufs/ufs.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs.h
rename to include/scsi/ufs.h
include/scsi/ufs_quirks.h renamed from drivers/scsi/ufs/ufs_quirks.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufs_quirks.h
rename to include/scsi/ufs_quirks.h
include/scsi/ufshcd.h renamed from drivers/scsi/ufs/ufshcd.h +4 -4
similarity index 99%
rename from drivers/scsi/ufs/ufshcd.h
rename to include/scsi/ufshcd.h
index b13469fb1e15..946d915f5a42 100644
@@ -18,10 +18,10 @@
 #include <linux/devfreq.h>
 #include <linux/pm_runtime.h>
 #include <scsi/scsi_device.h>
-#include "unipro.h"
-#include "ufs.h"
-#include "ufs_quirks.h"
-#include "ufshci.h"
+#include <scsi/ufs.h>
+#include <scsi/ufs_quirks.h>
+#include <scsi/ufshci.h>
+#include <scsi/unipro.h>
 
 #define UFSHCD "ufshcd"
 
include/scsi/ufshci.h renamed from drivers/scsi/ufs/ufshci.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/ufshci.h
rename to include/scsi/ufshci.h
include/scsi/unipro.h renamed from drivers/scsi/ufs/unipro.h +0 -0
similarity index 100%
rename from drivers/scsi/ufs/unipro.h
rename to include/scsi/unipro.h
#85 lore raw

Re: [PATCH 29/29] scsi: ufs: Split the drivers/scsi/ufs directory

This lacks a changelog. And making such a mess of the directory and creating annoyingly long paths better have a really good one.

#86 lore raw

Re: [PATCH 29/29] scsi: ufs: Split the drivers/scsi/ufs directory

Quoted 2 lines · Christoph Hellwig

This lacks a changelog. And making such a mess of the directory and creating annoyingly long paths better have a really good one.

I accidentally sent out a version of this patch series that is slightly older than the finalized patches - hence the build issue with patch 26/29 and the missing description for this patch. Anyway, how about adding the following description to this patch:

"Split the drivers/scsi/ufs directory into a ufs-core and a ufs-drivers directory. Move shared header files into the include/scsi directory. This separation makes it clear which header files UFS drivers are allowed to include (include/scsi/*.h) and which header files UFS drivers are not allowed to include (drivers/scsi/ufs-core/*.h)."

Thanks,

Bart.

#88 lore raw

Re: [PATCH 29/29] scsi: ufs: Split the drivers/scsi/ufs directory

Quoted 2 lines · Adrian Hunter

In particular drivers/ufs/core and drivers/ufs/host would seem a more typical arrangement.

Hi Adrian,

Thanks for having taken a look at this patch series. I'm open to changing the directory names. Moving the ufs directory one level up sounds like a good idea to me. However, I'm not sure that drivers/ufs/host would be a better name than drivers/ufs/drivers since all files in drivers/ufs/core also implement UFS host controller support.

Thanks,

Bart.

reviewer
#89 lore raw

RE: [PATCH 29/29] scsi: ufs: Split the drivers/scsi/ufs directory

Quoted 36 lines

-----Original Message-----
From: Bart Van Assche [mailto:[email protected]]
Sent: Friday, April 1, 2022 7:29 PM
To: Adrian Hunter <[email protected]>; Martin K . Petersen <[email protected]>
Cc: Jaegeuk Kim <[email protected]>; [email protected]; James E.J. Bottomley <[email protected]>; Krzysztof Kozlowski <[email protected]>; Stanley Chu <[email protected]>; Andy Gross <[email protected]>; Bjorn Andersson <[email protected]>; Matthias Brugger <[email protected]>; Avri Altman <[email protected]>; Can Guo <[email protected]>; Asutosh Das <[email protected]>; Bean Huo <[email protected]>; Guenter Roeck <[email protected]>; Daejun Park <[email protected]>; Keoseong Park <[email protected]>; Eric Biggers <[email protected]>; Ulf Hansson <[email protected]>; Mike Snitzer <[email protected]>; Jens Axboe <[email protected]>; Geert Uytterhoeven <[email protected]>; Anders Roxell <[email protected]>; Peter Wang <[email protected]>; Chanho Park <[email protected]>; Alim Akhtar <[email protected]>; Inki Dae <[email protected]>; Phillip Potter <[email protected]>; Greg Kroah-Hartman <[email protected]>; Ye Bin <[email protected]>; ChanWoo Lee <[email protected]>; Sergey Shtylyov <[email protected]>; Srinivas Kandagatla <[email protected]>; Xiaoke Wang <[email protected]>; Jinyoung Choi <[email protected]>; Gustavo A. R. Silva <[email protected]>; Kiwoong Kim <[email protected]>
Subject: Re: [PATCH 29/29] scsi: ufs: Split the drivers/scsi/ufs directory

Quoted 2 lines · Adrian Hunter

In particular drivers/ufs/core and drivers/ufs/host would seem a more typical arrangement.

Quoted 8 lines

Hi Adrian,

Thanks for having taken a look at this patch series. I'm open to changing the directory names. Moving the ufs directory one level up sounds like a good idea to me. However, I'm not sure that drivers/ufs/host would be a better name than drivers/ufs/drivers since all files in drivers/ufs/core also implement UFS host controller support.

Hi Bart,

Interesting, it is true that ufshcd.c does have implementation of UFS HCI specification. And since core uses a lot of vendor specific callbacks implementation, so may be drivers/ufs/core and
drivers/ufs/hci-vendor or drivers/ufs/pltfm{-vendor} might be good logical one.

Having said that, looking at mmc sub-system directory structure, it is simply drivers/mmc/core and drivers/mmc/host

Quoted 3 lines

Thanks,

Bart.

#90 lore raw

Re: [PATCH 29/29] scsi: ufs: Split the drivers/scsi/ufs directory

Quoted 2 lines · Alim Akhtar

Having said that, looking at mmc sub-system directory structure, it is simply drivers/mmc/core and drivers/mmc/host

Let's follow Adrian's proposal and use the drivers/ufs/core and drivers/ufs/host directory names.

Thanks,

Bart.

#91 lore raw
In reply to Bart Van Assche

Bart,

Agree that the current UFS driver is messy, but I don't think there was such a big structural change before UFS 4.0 was released, especially the design of the UFS CQE driver. If you already have a plan for CQE, it's best to state it in the patch. If you have made such a big change in an environment that is now very stable, do we have to make changes after UFS 4.0? ?

Kind regards,
Bean

Quoted 149 lines · Bart Van Assche

Hi Martin,

This patch series includes the following changes:
- Separation of UFS core and UFS driver source code into separate directories.
- Split the ufshcd.h header file into two header files - one file that
defines the interface with UFS drivers and another file with
definitions
only used in the core.
- Multiple source code cleanup patches.
- A few patches with minor functional changes.

Please consider these changes for kernel v5.19.

Thank you,

Bart.

Bart Van Assche (29):
scsi: ufs: Declare ufshcd_wait_for_register() static
scsi: ufs: Remove superfluous boolean conversions
scsi: ufs: Simplify statements that return a boolean
scsi: ufs: Remove ufshcd_lrb.sense_bufflen
scsi: ufs: Remove ufshcd_lrb.sense_buffer
scsi: ufs: Use get_unaligned_be16() instead of be16_to_cpup()
scsi: ufs: Remove the UFS_FIX() and END_FIX() macros
scsi: ufs: Rename struct ufs_dev_fix into ufs_dev_quirk
scsi: ufs: Declare the quirks array const
scsi: ufs: Invert the return value of ufshcd_is_hba_active()
scsi: ufs: Remove unused constants and code
scsi: ufs: Switch to aggregate initialization
scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()
scsi: ufs: Make the config_scaling_param calls type safe
scsi: ufs: Remove the driver version
scsi: ufs: Rename sdev_ufs_device into ufs_device_wlun
scsi: ufs: Use an SPDX license identifier in the Kconfig file
scsi: ufs: Remove paths from source code comments
scsi: ufs: Remove the TRUE and FALSE definitions
scsi: ufs: Remove locking from around single register writes
scsi: ufs: Introduce ufshcd_clkgate_delay_set()
scsi: ufs: qcom: Fix ufs_qcom_resume()
scsi: ufs: Remove unnecessary ufshcd-crypto.h include directives
scsi: ufs: Fix kernel-doc syntax in ufshcd.h
scsi: ufs: Minimize #include directives
scsi: ufs: Split the ufshcd.h header file
scsi: ufs: Move the struct ufs_ref_clk definition
scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition
scsi: ufs: Split the drivers/scsi/ufs directory

 drivers/scsi/Kconfig                          |   3 +-
 drivers/scsi/Makefile                         |   4 +-
 drivers/scsi/ufs-core/Kconfig                 |  82 ++++
 drivers/scsi/ufs-core/Makefile                |  10 +
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c  |   4 +-
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h  |   0
 .../{ufs => ufs-core}/ufs-fault-injection.c   |   4 +-
 .../{ufs => ufs-core}/ufs-fault-injection.h   |   0
 drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c    |   4 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c    |   8 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h    |   3 +-
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.c      |   6 +
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.h      |   7 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.c    |   2 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.h    |   7 +-
 drivers/scsi/ufs-core/ufshcd-priv.h           | 296 ++++++++++++++
 drivers/scsi/{ufs => ufs-core}/ufshcd.c       | 254 ++++++------
 drivers/scsi/{ufs => ufs-core}/ufshpb.c       |  10 +-
 drivers/scsi/{ufs => ufs-core}/ufshpb.h       |   0
 drivers/scsi/ufs-drivers/Kconfig              | 118 ++++++
 drivers/scsi/{ufs => ufs-drivers}/Makefile    |  12 -
 .../scsi/{ufs => ufs-drivers}/cdns-pltfrm.c   |   5 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pci.c    |   8 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c |  10 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.c   |   8 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.h   |   2 +
 .../scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c  |   0
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.c    |  17 +-
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.h    |   8 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c  |  17 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h  |   0
 .../{ufs => ufs-drivers}/ufs-mediatek-trace.h |   2 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.c  |  40 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.h  |   0
 .../scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c  |   3 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c  |  49 +--
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h  |   6 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.c    |   6 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.h    |   2 +
 .../scsi/{ufs => ufs-drivers}/ufshcd-pci.c    |  14 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c |  35 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h |   2 +-
 .../scsi/{ufs => ufs-drivers}/ufshci-dwc.h    |   0
 drivers/scsi/ufs/Kconfig                      | 211 ----------
 {drivers/scsi/ufs => include/scsi}/ufs.h      |  35 --
 .../scsi/ufs => include/scsi}/ufs_quirks.h    |  15 +-
 {drivers/scsi/ufs => include/scsi}/ufshcd.h   | 366 ++++----------
----
 {drivers/scsi/ufs => include/scsi}/ufshci.h   |   2 +
 {drivers/scsi/ufs => include/scsi}/unipro.h   |  16 -
 49 files changed, 856 insertions(+), 857 deletions(-)
 create mode 100644 drivers/scsi/ufs-core/Kconfig
 create mode 100644 drivers/scsi/ufs-core/Makefile
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.c (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c (98%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h (95%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.c (97%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.h (77%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.h (94%)
 create mode 100644 drivers/scsi/ufs-core/ufshcd-priv.h
 rename drivers/scsi/{ufs => ufs-core}/ufshcd.c (98%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.h (100%)
 create mode 100644 drivers/scsi/ufs-drivers/Kconfig
 rename drivers/scsi/{ufs => ufs-drivers}/Makefile (56%)
 rename drivers/scsi/{ufs => ufs-drivers}/cdns-pltfrm.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pci.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.h (97%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek-trace.h (92%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.c (97%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pci.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c (94%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshci-dwc.h (100%)
 delete mode 100644 drivers/scsi/ufs/Kconfig
 rename {drivers/scsi/ufs => include/scsi}/ufs.h (93%)
 rename {drivers/scsi/ufs => include/scsi}/ufs_quirks.h (94%)
 rename {drivers/scsi/ufs => include/scsi}/ufshcd.h (82%)
 rename {drivers/scsi/ufs => include/scsi}/ufshci.h (99%)
 rename {drivers/scsi/ufs => include/scsi}/unipro.h (98%)
#92 lore raw
Quoted 6 lines · Bean Huo

Agree that the current UFS driver is messy, but I don't think there was such a big structural change before UFS 4.0 was released, especially the design of the UFS CQE driver. If you already have a plan for CQE, it's best to state it in the patch. If you have made such a big change in an environment that is now very stable, do we have to make changes after UFS 4.0? ?

Hi Bean,

Although this patch series will make it easier to add UFSHCI 4.0 support, I think that UFSHCI 4.0 support can also be added without this patch series.

I'm not sure what CQE stands for in this context? Did you perhaps want to refer to MCQ?

The following changes will have to be made to add UFSHCI 4.0 support (this list is probably incomplete):
* At driver initialization time, query how many queues are supported by the UFS controller and set scsi_host->nr_hw_queues accordingly.
* Modify all code that submits SCSI commands to a UFS controller or that processes completions such that it uses the UFSHCI 3.0 registers for controllers that do not support MCQ and the UFSHCI 4.0 registers for controllers that do support MCQ.
* In ufshcd_queuecommand(), use blk_mq_unique_tag_to_hwq() to derive the controller queue index from the SCSI command data structure.
* In the command completion path, use scsi_host_find_tag() to convert the (MCQ index, command ID) pair into a SCSI command pointer.
* Add a mechanism to fall back to the UFSHCI 3.0 registers (no MCQ) to make it easy to test the UFSHCI 3.0 code paths with UFSHCI 4.0 controllers.

Thanks,

Bart.

#93 lore raw
Quoted 8 lines · Bean Huo
Quoted 6 lines

Agree that the current UFS driver is messy, but I don't think there was such a big structural change before UFS 4.0 was released, especially the design of the UFS CQE driver. If you already have a plan for CQE, it's best to state it in the patch. If you have made such a big change in an environment that is now very stable, do we have to make changes after UFS 4.0? ?

Quoted 4 lines

Hi Bean,

Although this patch series will make it easier to add UFSHCI 4.0 support, I think that UFSHCI 4.0 support can also be added without this patch series.

Also, UFS4.0 and its UFSHCI4.0 companion are expected to be published around end of May, right? I doubt if we'll have platforms to test those changes within the V5.19, or even V5.20 timeframe. So MCQ should not conflict with those, mostly structural, cleanups.

Thanks,
Avri

#94 lore raw
Quoted 18 lines · Avri Altman
Quoted 12 lines · Bean Huo
Quoted 10 lines

Agree that the current UFS driver is messy, but I don't think there
was such a big structural change before UFS 4.0 was released, especially the design of the UFS CQE driver. If you already have a
plan for CQE, it's best to state it in the patch. If you have made
such a big change in an environment that is now very stable, do we
have to make changes after UFS 4.0? ?

Quoted 6 lines

Hi Bean,

Although this patch series will make it easier to add UFSHCI 4.0 support, I think
that UFSHCI 4.0 support can also be added without this patch series.

Quoted 8 lines

Also, UFS4.0 and its UFSHCI4.0 companion are expected to be published around end of May, right?
I doubt if we'll have platforms to test those changes within the V5.19, or even V5.20 timeframe.
So MCQ should not conflict with those, mostly structural, cleanups.

Thanks,
Avri

Yes, I reviewed the entire series of patches and there are no significant structural changes. Still want to squeeze ufs driver under driver/scsi/ufs/. No major conflict with pending submissions. Go ahead.

Kind regards,
Bean

#95 lore raw
Quoted 3 lines · Bean Huo

Yes, I reviewed the entire series of patches and there are no significant structural changes. Still want to squeeze ufs driver under driver/scsi/ufs/. No major conflict with pending submissions. Go ahead.

Hi Bean,

It has been suggested to move the UFS driver code into the following two directories to keep paths short:
* drivers/ufs/core
* drivers/ufs/host

That approach is similar to the approach followed for the MMC and NVMe drivers.

Additionally, some other SCSI drivers already occur outside the drivers/scsi directory, e.g. the drivers/infiniband/ulp/srp/ib_srp.c driver.

Thanks,

Bart.

#96 lore raw
Quoted 7 lines · Bart Van Assche
Quoted 5 lines · Bean Huo

Yes, I reviewed the entire series of patches and there are no significant structural changes. Still want to squeeze ufs driver under
driver/scsi/ufs/. No major conflict with pending submissions. Go ahead.

Quoted 8 lines

Hi Bean,

It has been suggested to move the UFS driver code into the following two
directories to keep paths short:
* drivers/ufs/core
* drivers/ufs/host

Bart,

Very interested in this design. I'm assuming you're still going to continue parsing SCSI commands. Can we also shorten the UFS command path?

Meaning we convert block requests directly to UFS UPIU commands? instead of like the current one: block request -> CDB -> UPIU.

Quoted 7 lines

That approach is similar to the approach followed for the MMC and NVMe
drivers.

Additionally, some other SCSI drivers already occur outside the drivers/scsi directory, e.g. the drivers/infiniband/ulp/srp/ib_srp.c driver.

I'll take a look at its design, it seems to give us hope that we can make the UFS stack more vertical.

Kind regards,
Bean

Quoted 4 lines

Thanks,

Bart.

#97 lore raw
Quoted 6 lines · Bean Huo

Very interested in this design. I'm assuming you're still going to continue parsing SCSI commands. Can we also shorten the UFS command path?

Meaning we convert block requests directly to UFS UPIU commands? instead of like the current one: block request -> CDB -> UPIU.

Hi Bean,

Is there any data that shows that the benefits of shortening the UFS command path outweigh the disadvantages? For other SCSI LLDs the cost of atomic operations and memory barriers in the LLD outweighs the cost of the operations in the SCSI core and sd drivers. I'm not sure whether that's also the case for the UFS driver.

Thanks,

Bart.

#98 lore raw

Hi Bart,

Quoted 5 lines · Bart Van Assche
Quoted 4 lines · Bean Huo

Very interested in this design. I'm assuming you're still going to continue parsing SCSI commands. Can we also shorten the UFS command path?

Quoted 7 lines
Quoted 2 lines

Meaning we convert block requests directly to UFS UPIU commands? instead of like the current one: block request -> CDB -> UPIU.

Hi Bean,

Is there any data that shows that the benefits of shortening the UFS command path outweigh the disadvantages?

For performance improvement, according to my test, if we abandon SCSI command parsing, we can get 3%~5% performance improvement. Maybe this is little or no improvement? Yes, reliability issues outweigh this performance improvement. Error handling and UFS probes should also be rebuilt. But most importantly, it makes UFS more scalable. How do you think about adding an immature development driver to drever/staging first? name it driver/staging/lightweight-ufs?

Quoted 6 lines

For other SCSI LLDs the cost of
atomic operations and memory barriers in the LLD outweighs the cost of
the operations in the SCSI core and sd drivers. I'm not sure whether that's also the case for the UFS driver.

I didn't take this into account, maybe it's not a big deal, since the UFS driver might use its own lock/serialization lock.

Kind regards,
Bean.

Quoted 3 lines

Thanks,

Bart.

#99 lore raw
Quoted 7 lines · Bean Huo

For performance improvement, according to my test, if we abandon SCSI command parsing, we can get 3%~5% performance improvement. Maybe this is little or no improvement? Yes, reliability issues outweigh this performance improvement. Error handling and UFS probes should also be rebuilt. But most importantly, it makes UFS more scalable. How do you think about adding an immature development driver to drever/staging first? name it driver/staging/lightweight-ufs?

I do not understand the interest in bypassing the SCSI core. The scsi_debug driver supports more than a million IOPS on a single CPU core (see also the attached script). I think this shows that the SCSI core is not a performance bottleneck. Additionally, I think it will take a while until UFS devices scale from the current performance level (100K IOPS?) to more than a million IOPS.

Please note that bypassing the SCSI core would make it much harder than necessary to introduce zoned storage support and also that this would lead to plenty of duplicated code.

Quoted 8 lines
Quoted 5 lines

For other SCSI LLDs the cost of
atomic operations and memory barriers in the LLD outweighs the cost of
the operations in the SCSI core and sd drivers. I'm not sure whether that's also the case for the UFS driver.

I didn't take this into account, maybe it's not a big deal, since the UFS driver might use its own lock/serialization lock.

Every single atomic operation in the hot path has a measurable performance impact. That includes locking operations.

Thanks,

Bart.

#!/bin/bash

set -e

iodepth=${1:-1}
runtime=30
blocksize=512
numcpus=$(nproc)

modprobe -r scsi_debug
modprobe scsi_debug max_queue=128 submit_queues="$numcpus" delay=0 fake_rw=1 &&
udevadm settle

DEVICE=$(find /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*/block/ -maxdepth 1 -type d | grep -v 'block/$' | head -1 | xargs basename) || exit $? [ -n "$DEVICE" ] || exit $?

args=()
if [ "$iodepth" = 1 ]; then

	args+=(--ioengine=psync)
else
	args+=(--ioengine=io_uring --iodepth_batch=$((iodepth/2)) --hipri=1)
fi
args+=(
    --bs="${blocksize}"
    --direct=1
    --filename=/dev/"$DEVICE"
    --group_reporting=1
    --gtod_reduce=1
    --invalidate=1
    --iodepth="$iodepth"
    --ioscheduler=none
    --name=scsi_debug
    --numjobs=1
    --runtime="$runtime"
    --rw=read
    --thread
    --time_based=1
)
set -x
if numactl -m 0 -N 0 echo >&/dev/null; then
	numactl -m 0 -N 0 -- fio "${args[@]}"
else
	fio "${args[@]}"

fi

#100 lore raw
In reply to Bart Van Assche

Bart,

Agree that the current UFS driver is messy, but I don't think there was such a big structural change before UFS 4.0 was released, especially the design of the UFS CQE driver. If you already have a plan for CQE, it's best to state it in the patch. If you have made such a big change in an environment that is now very stable, do we have to make changes after UFS 4.0? ?

Kind regards,
Bean

Quoted 149 lines · Bart Van Assche

Hi Martin,

This patch series includes the following changes:
- Separation of UFS core and UFS driver source code into separate directories.
- Split the ufshcd.h header file into two header files - one file that
defines the interface with UFS drivers and another file with
definitions
only used in the core.
- Multiple source code cleanup patches.
- A few patches with minor functional changes.

Please consider these changes for kernel v5.19.

Thank you,

Bart.

Bart Van Assche (29):
scsi: ufs: Declare ufshcd_wait_for_register() static
scsi: ufs: Remove superfluous boolean conversions
scsi: ufs: Simplify statements that return a boolean
scsi: ufs: Remove ufshcd_lrb.sense_bufflen
scsi: ufs: Remove ufshcd_lrb.sense_buffer
scsi: ufs: Use get_unaligned_be16() instead of be16_to_cpup()
scsi: ufs: Remove the UFS_FIX() and END_FIX() macros
scsi: ufs: Rename struct ufs_dev_fix into ufs_dev_quirk
scsi: ufs: Declare the quirks array const
scsi: ufs: Invert the return value of ufshcd_is_hba_active()
scsi: ufs: Remove unused constants and code
scsi: ufs: Switch to aggregate initialization
scsi: ufs: Remove the LUN quiescing code from ufshcd_wl_shutdown()
scsi: ufs: Make the config_scaling_param calls type safe
scsi: ufs: Remove the driver version
scsi: ufs: Rename sdev_ufs_device into ufs_device_wlun
scsi: ufs: Use an SPDX license identifier in the Kconfig file
scsi: ufs: Remove paths from source code comments
scsi: ufs: Remove the TRUE and FALSE definitions
scsi: ufs: Remove locking from around single register writes
scsi: ufs: Introduce ufshcd_clkgate_delay_set()
scsi: ufs: qcom: Fix ufs_qcom_resume()
scsi: ufs: Remove unnecessary ufshcd-crypto.h include directives
scsi: ufs: Fix kernel-doc syntax in ufshcd.h
scsi: ufs: Minimize #include directives
scsi: ufs: Split the ufshcd.h header file
scsi: ufs: Move the struct ufs_ref_clk definition
scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition
scsi: ufs: Split the drivers/scsi/ufs directory

 drivers/scsi/Kconfig                          |   3 +-
 drivers/scsi/Makefile                         |   4 +-
 drivers/scsi/ufs-core/Kconfig                 |  82 ++++
 drivers/scsi/ufs-core/Makefile                |  10 +
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c  |   4 +-
 drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h  |   0
 .../{ufs => ufs-core}/ufs-fault-injection.c   |   4 +-
 .../{ufs => ufs-core}/ufs-fault-injection.h   |   0
 drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c    |   4 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c    |   8 +-
 drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h    |   3 +-
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.c      |   6 +
 drivers/scsi/{ufs => ufs-core}/ufs_bsg.h      |   7 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.c    |   2 +-
 .../scsi/{ufs => ufs-core}/ufshcd-crypto.h    |   7 +-
 drivers/scsi/ufs-core/ufshcd-priv.h           | 296 ++++++++++++++
 drivers/scsi/{ufs => ufs-core}/ufshcd.c       | 254 ++++++------
 drivers/scsi/{ufs => ufs-core}/ufshpb.c       |  10 +-
 drivers/scsi/{ufs => ufs-core}/ufshpb.h       |   0
 drivers/scsi/ufs-drivers/Kconfig              | 118 ++++++
 drivers/scsi/{ufs => ufs-drivers}/Makefile    |  12 -
 .../scsi/{ufs => ufs-drivers}/cdns-pltfrm.c   |   5 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pci.c    |   8 +-
 .../{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c |  10 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.c   |   8 +-
 .../scsi/{ufs => ufs-drivers}/tc-dwc-g210.h   |   2 +
 .../scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c  |   0
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.c    |  17 +-
 .../scsi/{ufs => ufs-drivers}/ufs-exynos.h    |   8 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c  |  17 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h  |   0
 .../{ufs => ufs-drivers}/ufs-mediatek-trace.h |   2 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.c  |  40 +-
 .../scsi/{ufs => ufs-drivers}/ufs-mediatek.h  |   0
 .../scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c  |   3 +-
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c  |  49 +--
 drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h  |   6 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.c    |   6 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-dwc.h    |   2 +
 .../scsi/{ufs => ufs-drivers}/ufshcd-pci.c    |  14 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c |  35 +-
 .../scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h |   2 +-
 .../scsi/{ufs => ufs-drivers}/ufshci-dwc.h    |   0
 drivers/scsi/ufs/Kconfig                      | 211 ----------
 {drivers/scsi/ufs => include/scsi}/ufs.h      |  35 --
 .../scsi/ufs => include/scsi}/ufs_quirks.h    |  15 +-
 {drivers/scsi/ufs => include/scsi}/ufshcd.h   | 366 ++++----------
----
 {drivers/scsi/ufs => include/scsi}/ufshci.h   |   2 +
 {drivers/scsi/ufs => include/scsi}/unipro.h   |  16 -
 49 files changed, 856 insertions(+), 857 deletions(-)
 create mode 100644 drivers/scsi/ufs-core/Kconfig
 create mode 100644 drivers/scsi/ufs-core/Makefile
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-debugfs.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.c (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-fault-injection.h (100%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-hwmon.c (98%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufs-sysfs.h (95%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.c (97%)
 rename drivers/scsi/{ufs => ufs-core}/ufs_bsg.h (77%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshcd-crypto.h (94%)
 create mode 100644 drivers/scsi/ufs-core/ufshcd-priv.h
 rename drivers/scsi/{ufs => ufs-core}/ufshcd.c (98%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.c (99%)
 rename drivers/scsi/{ufs => ufs-core}/ufshpb.h (100%)
 create mode 100644 drivers/scsi/ufs-drivers/Kconfig
 rename drivers/scsi/{ufs => ufs-drivers}/Makefile (56%)
 rename drivers/scsi/{ufs => ufs-drivers}/cdns-pltfrm.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pci.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210-pltfrm.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/tc-dwc-g210.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ti-j721e-ufs.c (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-exynos.h (97%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-hisi.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek-trace.h (92%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.c (97%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-mediatek.h (100%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom-ice.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufs-qcom.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.c (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-dwc.h (95%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pci.c (99%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.c (94%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshcd-pltfrm.h (98%)
 rename drivers/scsi/{ufs => ufs-drivers}/ufshci-dwc.h (100%)
 delete mode 100644 drivers/scsi/ufs/Kconfig
 rename {drivers/scsi/ufs => include/scsi}/ufs.h (93%)
 rename {drivers/scsi/ufs => include/scsi}/ufs_quirks.h (94%)
 rename {drivers/scsi/ufs => include/scsi}/ufshcd.h (82%)
 rename {drivers/scsi/ufs => include/scsi}/ufshci.h (99%)
 rename {drivers/scsi/ufs => include/scsi}/unipro.h (98%)