scsi: ufs: Add support for sending NOP OUT UPIU

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index 60fd40c..41b9639 100644
@@ -285,6 +285,15 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance
  *

drivers/scsi/ufs/ufshcd.h +0 -9

index 6b99a42..1680394 100644
@@ -190,13 +190,4 @@ int ufshcd_init(struct device *, struct ufs_hba ** , void __iomem * ,
 			unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
-}
-
 #endif /* End of Header */

Looks good. Reviewed-by: Subhash Jadavani <[email protected]>

Quoted 47 lines · Seungwon Jeon

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index 60fd40c..41b9639 100644
@@ -285,6 +285,15 @@ static inline void ufshcd_hba_start(struct ufs_hba
 *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance

*

drivers/scsi/ufs/ufshcd.h +0 -9

index 6b99a42..1680394 100644
@@ -190,13 +190,4 @@ int ufshcd_init(struct device *, struct ufs_hba **
 , void __iomem * ,
 			unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
-}
-

Quoted 1 line

#endif /* End of Header */

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index 60fd40c..41b9639 100644
@@ -285,6 +285,15 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+       writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance
  *

drivers/scsi/ufs/ufshcd.h +0 -10

index 6b99a42..1680394 100644
@@ -190,13 +190,4 @@ int ufshcd_init(struct device *, struct ufs_hba ** , void __iomem * ,
                        unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-       writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
-}
-
 #endif /* End of Header */
--

1.7.0.4

Quoted 47 lines · Seungwon Jeon

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index 60fd40c..41b9639 100644
@@ -285,6 +285,15 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+       writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance
  *

drivers/scsi/ufs/ufshcd.h +0 -10

index 6b99a42..1680394 100644
@@ -190,13 +190,4 @@ int ufshcd_init(struct device *, struct ufs_hba ** , void __iomem * ,
                        unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-       writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
-}
-
 #endif /* End of Header */
--

Quoted 3 lines

1.7.0.4

The patch doesn't apply due to the character set.

"fatal: cannot convert from ks_c_5601-1987 to UTF-8"

--
~Santosh
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 51 lines · Seungwon Jeon

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index 60fd40c..41b9639 100644
@@ -285,6 +285,15 @@ static inline void ufshcd_hba_start(struct ufs_hba
 *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+       writel(CONTROLLER_DISABLE, (hba->mmio_base +
 REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state

* @hba: per adapter instance
*

drivers/scsi/ufs/ufshcd.h +0 -7

index 6b99a42..1680394 100644
@@ -190,13 +190,4 @@ int ufshcd_init(struct device *, struct ufs_hba **
 , void __iomem * ,
                        unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-       writel(CONTROLLER_DISABLE, (hba->mmio_base +

REG_CONTROLLER_ENABLE));

drivers/scsi/ufs/ufshcd.h +0 -3

-}
-
 #endif /* End of Header */
--

Quoted 3 lines

1.7.0.4

The patch doesn't apply due to the character set.

"fatal: cannot convert from ks_c_5601-1987 to UTF-8"

--
~Santosh
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

Reviewed-by Subhash Jadavani <[email protected]>

Tested-by Maya Erez <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index f244812..d932239 100644
@@ -280,6 +280,15 @@ static inline void ufshcd_hba_start(struct ufs_hba
 *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance

*

drivers/scsi/ufs/ufshcd.h +0 -9

index 336980b..3a1052d 100644
@@ -208,13 +208,4 @@ int ufshcd_init(struct device *, struct ufs_hba ** ,
 void __iomem * ,
 			unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
-}
-

#endif /* End of Header */
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi,

ufshcd_pci_shutdown (in ufshcd_pci.c) is using ufshcd_hba_stop so it cannot be moved to ufshcd.c.
Sorry for missing it last time I tested, I returned ufshcd_hba_stop to ufshcd.h by mistake when I resolved conflicts of the next patch so I didn't hit the compilation errors.

Thanks,
Maya

Quoted 54 lines

Move the ufshcd_hba_stop from header file.

Signed-off-by Seungwon Jeon <[email protected]>

Reviewed-by Subhash Jadavani <[email protected]>

Tested-by Maya Erez <[email protected]>

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

drivers/scsi/ufs/ufshcd.c +9 -0

index f244812..d932239 100644
@@ -280,6 +280,15 @@ static inline void ufshcd_hba_start(struct ufs_hba
 *hba)
 }
 
 /**
+ * ufshcd_hba_stop - Send controller to reset state
+ * @hba: per adapter instance
+ */
+static inline void ufshcd_hba_stop(struct ufs_hba *hba)
+{
+	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+}
+
+/**
  * ufshcd_is_hba_active - Get controller state
  * @hba: per adapter instance

*

drivers/scsi/ufs/ufshcd.h +0 -9

index 336980b..3a1052d 100644
@@ -208,13 +208,4 @@ int ufshcd_init(struct device *, struct ufs_hba ** ,
 void __iomem * ,
 			unsigned int);
 void ufshcd_remove(struct ufs_hba *);
 
-/**
- * ufshcd_hba_stop - Send controller to reset state
- * @hba: per adapter instance
- */
-static inline void ufshcd_hba_stop(struct ufs_hba *hba)
-{
-	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
-}
-

#endif /* End of Header */
--
1.7.0.4

Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Maya Erez
QUALCOMM ISRAEL, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Simplify operations with hiding mmio_base.

Signed-off-by Seungwon Jeon <[email protected]>

Tested-by Maya Erez <[email protected]>

---
 drivers/scsi/ufs/ufshcd.c |  105
+++++++++++++++++++--------------------------
 drivers/scsi/ufs/ufshcd.h |    7 +++-
 2 files changed, 50 insertions(+), 62 deletions(-)

drivers/scsi/ufs/ufshcd.c +2 -3

index f244812..cf7c8e4 100644
@@ -71,7 +71,7 @@ enum {
  */
 static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
 {
-	return readl(hba->mmio_base + REG_UFS_VERSION);
+	return ufshcd_readl(hba, REG_UFS_VERSION);
 }
 
 /**

@@ -130,8 +130,7 @@ static inline int ufshcd_get_tm_free_slot(struct
 ufs_hba *hba)
  */
 static inline void ufshcd_utrl_clear(struct ufs_hba *hba, u32 pos)
 {
-	writel(~(1 << pos),
-		(hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_CLEAR));
+	ufshcd_writel(hba, ~(1 << pos), REG_UTP_TRANSFER_REQ_LIST_CLEAR);
 }
 

/**

drivers/scsi/ufs/ufshcd.c +8 -11

@@ -165,7 +164,7 @@ static inline int ufshcd_get_lists_status(u32 reg)
  */
 static inline int ufshcd_get_uic_cmd_result(struct ufs_hba *hba)
 {
-	return readl(hba->mmio_base + REG_UIC_COMMAND_ARG_2) &
+	return ufshcd_readl(hba, REG_UIC_COMMAND_ARG_2) &
 	       MASK_UIC_COMMAND_RESULT;
 }
 

@@ -238,18 +237,15 @@ ufshcd_config_int_aggr(struct ufs_hba *hba, int
 option)
 {
 	switch (option) {
 	case INT_AGGR_RESET:
-		writel((INT_AGGR_ENABLE |
-			INT_AGGR_COUNTER_AND_TIMER_RESET),
-			(hba->mmio_base +
-			 REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL));
+		ufshcd_writel(hba, INT_AGGR_ENABLE |
+			      INT_AGGR_COUNTER_AND_TIMER_RESET,
+			      REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL);
 		break;
 	case INT_AGGR_CONFIG:
-		writel((INT_AGGR_ENABLE |
-			INT_AGGR_PARAM_WRITE |
-			INT_AGGR_COUNTER_THRESHOLD_VALUE |
-			INT_AGGR_TIMEOUT_VALUE),
-			(hba->mmio_base +
-			 REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL));
+		ufshcd_writel(hba, INT_AGGR_ENABLE | INT_AGGR_PARAM_WRITE |
+			      INT_AGGR_COUNTER_THRESHOLD_VALUE |
+			      INT_AGGR_TIMEOUT_VALUE,
+			      REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL);
 		break;
 	}

}

drivers/scsi/ufs/ufshcd.c +4 -6

@@ -262,12 +258,10 @@ ufshcd_config_int_aggr(struct ufs_hba *hba, int
 option)
  */
 static void ufshcd_enable_run_stop_reg(struct ufs_hba *hba)
 {
-	writel(UTP_TASK_REQ_LIST_RUN_STOP_BIT,
-	       (hba->mmio_base +
-		REG_UTP_TASK_REQ_LIST_RUN_STOP));
-	writel(UTP_TRANSFER_REQ_LIST_RUN_STOP_BIT,
-	       (hba->mmio_base +
-		REG_UTP_TRANSFER_REQ_LIST_RUN_STOP));
+	ufshcd_writel(hba, UTP_TASK_REQ_LIST_RUN_STOP_BIT,
+		      REG_UTP_TASK_REQ_LIST_RUN_STOP);
+	ufshcd_writel(hba, UTP_TRANSFER_REQ_LIST_RUN_STOP_BIT,
+		      REG_UTP_TRANSFER_REQ_LIST_RUN_STOP);
 }
 

/**

drivers/scsi/ufs/ufshcd.c +1 -1

@@ -276,7 +270,7 @@ static void ufshcd_enable_run_stop_reg(struct ufs_hba
 *hba)
  */
 static inline void ufshcd_hba_start(struct ufs_hba *hba)
 {
-	writel(CONTROLLER_ENABLE , (hba->mmio_base + REG_CONTROLLER_ENABLE));
+	ufshcd_writel(hba, CONTROLLER_ENABLE, REG_CONTROLLER_ENABLE);
 }
 

/**

drivers/scsi/ufs/ufshcd.c +1 -1

@@ -287,7 +281,7 @@ static inline void ufshcd_hba_start(struct ufs_hba
 *hba)
  */
 static inline int ufshcd_is_hba_active(struct ufs_hba *hba)
 {
-	return (readl(hba->mmio_base + REG_CONTROLLER_ENABLE) & 0x1) ? 0 : 1;
+	return (ufshcd_readl(hba, REG_CONTROLLER_ENABLE) & 0x1) ? 0 : 1;
 }
 

/**

drivers/scsi/ufs/ufshcd.c +2 -4

@@ -299,8 +293,7 @@ static inline
 void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag)
 {
 	__set_bit(task_tag, &hba->outstanding_reqs);
-	writel((1 << task_tag),
-	       (hba->mmio_base + REG_UTP_TRANSFER_REQ_DOOR_BELL));
+	ufshcd_writel(hba, 1 << task_tag, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 }
 
 /**

@@ -381,8 +374,7 @@ void ufshcd_copy_query_response(struct ufs_hba *hba,
 struct ufshcd_lrb *lrbp)
  */
 static inline void ufshcd_hba_capabilities(struct ufs_hba *hba)
 {
-	hba->capabilities =
-		readl(hba->mmio_base + REG_CONTROLLER_CAPABILITIES);
+	hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES);
 
 	/* nutrs and nutmrs are 0 based values */

drivers/scsi/ufs/ufshcd.c +5 -8

 	hba->nutrs = (hba->capabilities & MASK_TRANSFER_REQUESTS_SLOTS) + 1;

@@ -399,16 +391,13 @@ static inline void
 ufshcd_send_uic_command(struct ufs_hba *hba, struct uic_command
 *uic_cmnd)
 {
 	/* Write Args */
-	writel(uic_cmnd->argument1,
-	      (hba->mmio_base + REG_UIC_COMMAND_ARG_1));
-	writel(uic_cmnd->argument2,
-	      (hba->mmio_base + REG_UIC_COMMAND_ARG_2));
-	writel(uic_cmnd->argument3,
-	      (hba->mmio_base + REG_UIC_COMMAND_ARG_3));
+	ufshcd_writel(hba, uic_cmnd->argument1, REG_UIC_COMMAND_ARG_1);
+	ufshcd_writel(hba, uic_cmnd->argument2, REG_UIC_COMMAND_ARG_2);
+	ufshcd_writel(hba, uic_cmnd->argument3, REG_UIC_COMMAND_ARG_3);
 
 	/* Write UIC Cmd */
-	writel((uic_cmnd->command & COMMAND_OPCODE_MASK),
-	       (hba->mmio_base + REG_UIC_COMMAND));
+	ufshcd_writel(hba, uic_cmnd->command & COMMAND_OPCODE_MASK,
+		      REG_UIC_COMMAND);
 }
 

/**

drivers/scsi/ufs/ufshcd.c +5 -6

@@ -460,16 +449,15 @@ static void ufshcd_int_config(struct ufs_hba *hba,
 u32 option)
 {
 	switch (option) {
 	case UFSHCD_INT_ENABLE:
-		writel(hba->int_enable_mask,
-		      (hba->mmio_base + REG_INTERRUPT_ENABLE));
+		ufshcd_writel(hba, hba->int_enable_mask, REG_INTERRUPT_ENABLE);
 		break;
 	case UFSHCD_INT_DISABLE:
 		if (hba->ufs_version == UFSHCI_VERSION_10)
-			writel(INTERRUPT_DISABLE_MASK_10,
-			      (hba->mmio_base + REG_INTERRUPT_ENABLE));
+			ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_10,
+				      REG_INTERRUPT_ENABLE);
 		else
-			writel(INTERRUPT_DISABLE_MASK_11,
-			       (hba->mmio_base + REG_INTERRUPT_ENABLE));
+			ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_11,
+				      REG_INTERRUPT_ENABLE);
 		break;
 	}

}

drivers/scsi/ufs/ufshcd.c +1 -1

@@ -940,7 +928,7 @@ static int ufshcd_dme_link_startup(struct ufs_hba
 *hba)
 	unsigned long flags;
 
 	/* check if controller is ready to accept UIC commands */
-	if (((readl(hba->mmio_base + REG_CONTROLLER_STATUS)) &
+	if ((ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
 	    UIC_COMMAND_READY) == 0x0) {
 		dev_err(hba->dev,

drivers/scsi/ufs/ufshcd.c +1 -1

 			"Controller not ready"

@@ -985,7 +973,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba
 *hba)
 	u32 reg;
 
 	/* check if device present */
-	reg = readl((hba->mmio_base + REG_CONTROLLER_STATUS));
+	reg = ufshcd_readl(hba, REG_CONTROLLER_STATUS);
 	if (!ufshcd_is_device_present(reg)) {
 		dev_err(hba->dev, "cc: Device not present\n");

drivers/scsi/ufs/ufshcd.c +8 -8

 		err = -ENXIO;

@@ -1107,14 +1095,14 @@ static int ufshcd_initialize_hba(struct ufs_hba
 *hba)
 		return -EIO;
 
 	/* Configure UTRL and UTMRL base address registers */
-	writel(lower_32_bits(hba->utrdl_dma_addr),
-	       (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_BASE_L));
-	writel(upper_32_bits(hba->utrdl_dma_addr),
-	       (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_BASE_H));
-	writel(lower_32_bits(hba->utmrdl_dma_addr),
-	       (hba->mmio_base + REG_UTP_TASK_REQ_LIST_BASE_L));
-	writel(upper_32_bits(hba->utmrdl_dma_addr),
-	       (hba->mmio_base + REG_UTP_TASK_REQ_LIST_BASE_H));
+	ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
+		      REG_UTP_TRANSFER_REQ_LIST_BASE_L);
+	ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
+		      REG_UTP_TRANSFER_REQ_LIST_BASE_H);
+	ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
+		      REG_UTP_TASK_REQ_LIST_BASE_L);
+	ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
+		      REG_UTP_TASK_REQ_LIST_BASE_H);
 
 	/* Initialize unipro link startup procedure */

drivers/scsi/ufs/ufshcd.c +1 -2

 	return ufshcd_dme_link_startup(hba);

@@ -1427,8 +1415,7 @@ static void ufshcd_transfer_req_compl(struct ufs_hba
 *hba)
 	int index;
 
 	lrb = hba->lrb;
-	tr_doorbell =
-		readl(hba->mmio_base + REG_UTP_TRANSFER_REQ_DOOR_BELL);
+	tr_doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 	completed_reqs = tr_doorbell ^ hba->outstanding_reqs;
 

drivers/scsi/ufs/ufshcd.c +4 -7

 	for (index = 0; index < hba->nutrs; index++) {

@@ -1502,9 +1489,7 @@ static void ufshcd_err_handler(struct ufs_hba *hba)
 		goto fatal_eh;
 
 	if (hba->errors & UIC_ERROR) {
-
-		reg = readl(hba->mmio_base +
-			    REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
+		reg = ufshcd_readl(hba, REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
 		if (reg & UIC_DATA_LINK_LAYER_ERROR_PA_INIT)
 			goto fatal_eh;
 	}

@@ -1522,7 +1507,7 @@ static void ufshcd_tmc_handler(struct ufs_hba *hba)
 {
 	u32 tm_doorbell;
 
-	tm_doorbell = readl(hba->mmio_base + REG_UTP_TASK_REQ_DOOR_BELL);
+	tm_doorbell = ufshcd_readl(hba, REG_UTP_TASK_REQ_DOOR_BELL);
 	hba->tm_condition = tm_doorbell ^ hba->outstanding_tasks;
 	wake_up_interruptible(&hba->ufshcd_tm_wait_queue);
 }

@@ -1563,15 +1548,14 @@ static irqreturn_t ufshcd_intr(int irq, void
 *__hba)
 	struct ufs_hba *hba = __hba;
 
 	spin_lock(hba->host->host_lock);
-	intr_status = readl(hba->mmio_base + REG_INTERRUPT_STATUS);
+	intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS);
 
 	if (intr_status) {
 		ufshcd_sl_intr(hba, intr_status);
 
 		/* If UFSHCI 1.0 then clear interrupt status register */
 		if (hba->ufs_version == UFSHCI_VERSION_10)
-			writel(intr_status,
-			       (hba->mmio_base + REG_INTERRUPT_STATUS));
+			ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS);
 		retval = IRQ_HANDLED;
 	}

drivers/scsi/ufs/ufshcd.c +1 -2

 	spin_unlock(hba->host->host_lock);

@@ -1636,8 +1620,7 @@ ufshcd_issue_tm_cmd(struct ufs_hba *hba,
 
 	/* send command to the controller */
 	__set_bit(free_slot, &hba->outstanding_tasks);
-	writel((1 << free_slot),
-	       (hba->mmio_base + REG_UTP_TASK_REQ_DOOR_BELL));
+	ufshcd_writel(hba, 1 << free_slot, REG_UTP_TASK_REQ_DOOR_BELL);
 
 	spin_unlock_irqrestore(host->host_lock, flags);
 

drivers/scsi/ufs/ufshcd.h +6 -2

index 336980b..6429bed 100644
@@ -204,6 +204,11 @@ struct ufs_hba {
 	struct ufs_query query;
 };
 
+#define ufshcd_writel(hba, val, reg)	\
+	writel((val), (hba)->mmio_base + (reg))
+#define ufshcd_readl(hba, reg)	\
+	readl((hba)->mmio_base + (reg))
+
 int ufshcd_init(struct device *, struct ufs_hba ** , void __iomem * ,
 			unsigned int);
 void ufshcd_remove(struct ufs_hba *);

@@ -214,7 +219,7 @@ void ufshcd_remove(struct ufs_hba *);
  */
 static inline void ufshcd_hba_stop(struct ufs_hba *hba)
 {
-	writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+	ufshcd_writel(hba, CONTROLLER_DISABLE,  REG_CONTROLLER_ENABLE);
 }
 
 #endif /* End of Header */
--

1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Simplify operations with hiding mmio_base.

Signed-off-by Seungwon Jeon <[email protected]>

Tested-by Maya Erez <[email protected]>

---
 drivers/scsi/ufs/ufshcd.c |  105 +++++++++++++++++++--------------------------
 drivers/scsi/ufs/ufshcd.h |    7 +++-
 2 files changed, 50 insertions(+), 62 deletions(-)

drivers/scsi/ufs/ufshcd.c +44 -61

index f244812..cf7c8e4 100644
@@ -71,7 +71,7 @@ enum {
  */
 static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
 {
-       return readl(hba->mmio_base + REG_UFS_VERSION);
+       return ufshcd_readl(hba, REG_UFS_VERSION);
 }
 
 /**

@@ -130,8 +130,7 @@ static inline int ufshcd_get_tm_free_slot(struct ufs_hba *hba)
  */
 static inline void ufshcd_utrl_clear(struct ufs_hba *hba, u32 pos)
 {
-       writel(~(1 << pos),
-               (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_CLEAR));
+       ufshcd_writel(hba, ~(1 << pos), REG_UTP_TRANSFER_REQ_LIST_CLEAR);
 }
 
 /**

@@ -165,7 +164,7 @@ static inline int ufshcd_get_lists_status(u32 reg)
  */
 static inline int ufshcd_get_uic_cmd_result(struct ufs_hba *hba)
 {
-       return readl(hba->mmio_base + REG_UIC_COMMAND_ARG_2) &
+       return ufshcd_readl(hba, REG_UIC_COMMAND_ARG_2) &
               MASK_UIC_COMMAND_RESULT;
 }
 

@@ -238,18 +237,15 @@ ufshcd_config_int_aggr(struct ufs_hba *hba, int option)
 {
        switch (option) {
        case INT_AGGR_RESET:
-               writel((INT_AGGR_ENABLE |
-                       INT_AGGR_COUNTER_AND_TIMER_RESET),
-                       (hba->mmio_base +
-                        REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL));
+               ufshcd_writel(hba, INT_AGGR_ENABLE |
+                             INT_AGGR_COUNTER_AND_TIMER_RESET,
+                             REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL);
                break;
        case INT_AGGR_CONFIG:
-               writel((INT_AGGR_ENABLE |
-                       INT_AGGR_PARAM_WRITE |
-                       INT_AGGR_COUNTER_THRESHOLD_VALUE |
-                       INT_AGGR_TIMEOUT_VALUE),
-                       (hba->mmio_base +
-                        REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL));
+               ufshcd_writel(hba, INT_AGGR_ENABLE | INT_AGGR_PARAM_WRITE |
+                             INT_AGGR_COUNTER_THRESHOLD_VALUE |
+                             INT_AGGR_TIMEOUT_VALUE,
+                             REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL);
                break;
        }
 }

@@ -262,12 +258,10 @@ ufshcd_config_int_aggr(struct ufs_hba *hba, int option)
  */
 static void ufshcd_enable_run_stop_reg(struct ufs_hba *hba)
 {
-       writel(UTP_TASK_REQ_LIST_RUN_STOP_BIT,
-              (hba->mmio_base +
-               REG_UTP_TASK_REQ_LIST_RUN_STOP));
-       writel(UTP_TRANSFER_REQ_LIST_RUN_STOP_BIT,
-              (hba->mmio_base +
-               REG_UTP_TRANSFER_REQ_LIST_RUN_STOP));
+       ufshcd_writel(hba, UTP_TASK_REQ_LIST_RUN_STOP_BIT,
+                     REG_UTP_TASK_REQ_LIST_RUN_STOP);
+       ufshcd_writel(hba, UTP_TRANSFER_REQ_LIST_RUN_STOP_BIT,
+                     REG_UTP_TRANSFER_REQ_LIST_RUN_STOP);
 }
 
 /**

@@ -276,7 +270,7 @@ static void ufshcd_enable_run_stop_reg(struct ufs_hba *hba)
  */
 static inline void ufshcd_hba_start(struct ufs_hba *hba)
 {
-       writel(CONTROLLER_ENABLE , (hba->mmio_base + REG_CONTROLLER_ENABLE));
+       ufshcd_writel(hba, CONTROLLER_ENABLE, REG_CONTROLLER_ENABLE);
 }
 
 /**

@@ -287,7 +281,7 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
  */
 static inline int ufshcd_is_hba_active(struct ufs_hba *hba)
 {
-       return (readl(hba->mmio_base + REG_CONTROLLER_ENABLE) & 0x1) ? 0 : 1;
+       return (ufshcd_readl(hba, REG_CONTROLLER_ENABLE) & 0x1) ? 0 : 1;
 }
 
 /**

@@ -299,8 +293,7 @@ static inline
 void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag)
 {
        __set_bit(task_tag, &hba->outstanding_reqs);
-       writel((1 << task_tag),
-              (hba->mmio_base + REG_UTP_TRANSFER_REQ_DOOR_BELL));
+       ufshcd_writel(hba, 1 << task_tag, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 }
 
 /**

@@ -381,8 +374,7 @@ void ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
  */
 static inline void ufshcd_hba_capabilities(struct ufs_hba *hba)
 {
-       hba->capabilities =
-               readl(hba->mmio_base + REG_CONTROLLER_CAPABILITIES);
+       hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES);
 
        /* nutrs and nutmrs are 0 based values */
        hba->nutrs = (hba->capabilities & MASK_TRANSFER_REQUESTS_SLOTS) + 1;

@@ -399,16 +391,13 @@ static inline void
 ufshcd_send_uic_command(struct ufs_hba *hba, struct uic_command *uic_cmnd)
 {
        /* Write Args */
-       writel(uic_cmnd->argument1,
-             (hba->mmio_base + REG_UIC_COMMAND_ARG_1));
-       writel(uic_cmnd->argument2,
-             (hba->mmio_base + REG_UIC_COMMAND_ARG_2));
-       writel(uic_cmnd->argument3,
-             (hba->mmio_base + REG_UIC_COMMAND_ARG_3));
+       ufshcd_writel(hba, uic_cmnd->argument1, REG_UIC_COMMAND_ARG_1);
+       ufshcd_writel(hba, uic_cmnd->argument2, REG_UIC_COMMAND_ARG_2);
+       ufshcd_writel(hba, uic_cmnd->argument3, REG_UIC_COMMAND_ARG_3);
 
        /* Write UIC Cmd */
-       writel((uic_cmnd->command & COMMAND_OPCODE_MASK),
-              (hba->mmio_base + REG_UIC_COMMAND));
+       ufshcd_writel(hba, uic_cmnd->command & COMMAND_OPCODE_MASK,
+                     REG_UIC_COMMAND);
 }
 
 /**

@@ -460,16 +449,15 @@ static void ufshcd_int_config(struct ufs_hba *hba, u32 option)
 {
        switch (option) {
        case UFSHCD_INT_ENABLE:
-               writel(hba->int_enable_mask,
-                     (hba->mmio_base + REG_INTERRUPT_ENABLE));
+               ufshcd_writel(hba, hba->int_enable_mask, REG_INTERRUPT_ENABLE);
                break;
        case UFSHCD_INT_DISABLE:
                if (hba->ufs_version == UFSHCI_VERSION_10)
-                       writel(INTERRUPT_DISABLE_MASK_10,
-                             (hba->mmio_base + REG_INTERRUPT_ENABLE));
+                       ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_10,
+                                     REG_INTERRUPT_ENABLE);
                else
-                       writel(INTERRUPT_DISABLE_MASK_11,
-                              (hba->mmio_base + REG_INTERRUPT_ENABLE));
+                       ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_11,
+                                     REG_INTERRUPT_ENABLE);
                break;
        }
 }

@@ -940,7 +928,7 @@ static int ufshcd_dme_link_startup(struct ufs_hba *hba)
        unsigned long flags;
 
        /* check if controller is ready to accept UIC commands */
-       if (((readl(hba->mmio_base + REG_CONTROLLER_STATUS)) &
+       if ((ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
            UIC_COMMAND_READY) == 0x0) {
                dev_err(hba->dev,
                        "Controller not ready"

@@ -985,7 +973,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
        u32 reg;
 
        /* check if device present */
-       reg = readl((hba->mmio_base + REG_CONTROLLER_STATUS));
+       reg = ufshcd_readl(hba, REG_CONTROLLER_STATUS);
        if (!ufshcd_is_device_present(reg)) {
                dev_err(hba->dev, "cc: Device not present\n");
                err = -ENXIO;

@@ -1107,14 +1095,14 @@ static int ufshcd_initialize_hba(struct ufs_hba *hba)
                return -EIO;
 
        /* Configure UTRL and UTMRL base address registers */
-       writel(lower_32_bits(hba->utrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_BASE_L));
-       writel(upper_32_bits(hba->utrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_BASE_H));
-       writel(lower_32_bits(hba->utmrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TASK_REQ_LIST_BASE_L));
-       writel(upper_32_bits(hba->utmrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TASK_REQ_LIST_BASE_H));
+       ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
+                     REG_UTP_TRANSFER_REQ_LIST_BASE_L);
+       ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
+                     REG_UTP_TRANSFER_REQ_LIST_BASE_H);
+       ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
+                     REG_UTP_TASK_REQ_LIST_BASE_L);
+       ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
+                     REG_UTP_TASK_REQ_LIST_BASE_H);
 
        /* Initialize unipro link startup procedure */
        return ufshcd_dme_link_startup(hba);

@@ -1427,8 +1415,7 @@ static void ufshcd_transfer_req_compl(struct ufs_hba *hba)
        int index;
 
        lrb = hba->lrb;
-       tr_doorbell =
-               readl(hba->mmio_base + REG_UTP_TRANSFER_REQ_DOOR_BELL);
+       tr_doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
        completed_reqs = tr_doorbell ^ hba->outstanding_reqs;
 
        for (index = 0; index < hba->nutrs; index++) {

@@ -1502,9 +1489,7 @@ static void ufshcd_err_handler(struct ufs_hba *hba)
                goto fatal_eh;
 
        if (hba->errors & UIC_ERROR) {
-
-               reg = readl(hba->mmio_base +
-                           REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
+               reg = ufshcd_readl(hba, REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
                if (reg & UIC_DATA_LINK_LAYER_ERROR_PA_INIT)
                        goto fatal_eh;
        }

@@ -1522,7 +1507,7 @@ static void ufshcd_tmc_handler(struct ufs_hba *hba)
 {
        u32 tm_doorbell;
 
-       tm_doorbell = readl(hba->mmio_base + REG_UTP_TASK_REQ_DOOR_BELL);
+       tm_doorbell = ufshcd_readl(hba, REG_UTP_TASK_REQ_DOOR_BELL);
        hba->tm_condition = tm_doorbell ^ hba->outstanding_tasks;
        wake_up_interruptible(&hba->ufshcd_tm_wait_queue);
 }

@@ -1563,15 +1548,14 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)
        struct ufs_hba *hba = __hba;
 
        spin_lock(hba->host->host_lock);
-       intr_status = readl(hba->mmio_base + REG_INTERRUPT_STATUS);
+       intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS);
 
        if (intr_status) {
                ufshcd_sl_intr(hba, intr_status);
 
                /* If UFSHCI 1.0 then clear interrupt status register */
                if (hba->ufs_version == UFSHCI_VERSION_10)
-                       writel(intr_status,
-                              (hba->mmio_base + REG_INTERRUPT_STATUS));
+                       ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS);
                retval = IRQ_HANDLED;
        }
        spin_unlock(hba->host->host_lock);

@@ -1636,8 +1620,7 @@ ufshcd_issue_tm_cmd(struct ufs_hba *hba,
 
        /* send command to the controller */
        __set_bit(free_slot, &hba->outstanding_tasks);
-       writel((1 << free_slot),
-              (hba->mmio_base + REG_UTP_TASK_REQ_DOOR_BELL));
+       ufshcd_writel(hba, 1 << free_slot, REG_UTP_TASK_REQ_DOOR_BELL);
 
        spin_unlock_irqrestore(host->host_lock, flags);
 

drivers/scsi/ufs/ufshcd.h +6 -2

index 336980b..6429bed 100644
@@ -204,6 +204,11 @@ struct ufs_hba {
        struct ufs_query query;
 };
 
+#define ufshcd_writel(hba, val, reg)   \
+       writel((val), (hba)->mmio_base + (reg))
+#define ufshcd_readl(hba, reg) \
+       readl((hba)->mmio_base + (reg))
+
 int ufshcd_init(struct device *, struct ufs_hba ** , void __iomem * ,
                        unsigned int);
 void ufshcd_remove(struct ufs_hba *);

@@ -214,7 +219,7 @@ void ufshcd_remove(struct ufs_hba *);
  */
 static inline void ufshcd_hba_stop(struct ufs_hba *hba)
 {
-       writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+       ufshcd_writel(hba, CONTROLLER_DISABLE,  REG_CONTROLLER_ENABLE);
 }
 
 #endif /* End of Header */
--

1.7.0.4

Quoted 289 lines · Seungwon Jeon

Simplify operations with hiding mmio_base.

Signed-off-by Seungwon Jeon <[email protected]>

Tested-by Maya Erez <[email protected]>

---
 drivers/scsi/ufs/ufshcd.c |  105 +++++++++++++++++++--------------------------
 drivers/scsi/ufs/ufshcd.h |    7 +++-
 2 files changed, 50 insertions(+), 62 deletions(-)

drivers/scsi/ufs/ufshcd.c +44 -61

index f244812..cf7c8e4 100644
@@ -71,7 +71,7 @@ enum {
  */
 static inline u32 ufshcd_get_ufs_version(struct ufs_hba *hba)
 {
-       return readl(hba->mmio_base + REG_UFS_VERSION);
+       return ufshcd_readl(hba, REG_UFS_VERSION);
 }
 
 /**

@@ -130,8 +130,7 @@ static inline int ufshcd_get_tm_free_slot(struct ufs_hba *hba)
  */
 static inline void ufshcd_utrl_clear(struct ufs_hba *hba, u32 pos)
 {
-       writel(~(1 << pos),
-               (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_CLEAR));
+       ufshcd_writel(hba, ~(1 << pos), REG_UTP_TRANSFER_REQ_LIST_CLEAR);
 }
 
 /**

@@ -165,7 +164,7 @@ static inline int ufshcd_get_lists_status(u32 reg)
  */
 static inline int ufshcd_get_uic_cmd_result(struct ufs_hba *hba)
 {
-       return readl(hba->mmio_base + REG_UIC_COMMAND_ARG_2) &
+       return ufshcd_readl(hba, REG_UIC_COMMAND_ARG_2) &
               MASK_UIC_COMMAND_RESULT;
 }
 

@@ -238,18 +237,15 @@ ufshcd_config_int_aggr(struct ufs_hba *hba, int option)
 {
        switch (option) {
        case INT_AGGR_RESET:
-               writel((INT_AGGR_ENABLE |
-                       INT_AGGR_COUNTER_AND_TIMER_RESET),
-                       (hba->mmio_base +
-                        REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL));
+               ufshcd_writel(hba, INT_AGGR_ENABLE |
+                             INT_AGGR_COUNTER_AND_TIMER_RESET,
+                             REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL);
                break;
        case INT_AGGR_CONFIG:
-               writel((INT_AGGR_ENABLE |
-                       INT_AGGR_PARAM_WRITE |
-                       INT_AGGR_COUNTER_THRESHOLD_VALUE |
-                       INT_AGGR_TIMEOUT_VALUE),
-                       (hba->mmio_base +
-                        REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL));
+               ufshcd_writel(hba, INT_AGGR_ENABLE | INT_AGGR_PARAM_WRITE |
+                             INT_AGGR_COUNTER_THRESHOLD_VALUE |
+                             INT_AGGR_TIMEOUT_VALUE,
+                             REG_UTP_TRANSFER_REQ_INT_AGG_CONTROL);
                break;
        }
 }

@@ -262,12 +258,10 @@ ufshcd_config_int_aggr(struct ufs_hba *hba, int option)
  */
 static void ufshcd_enable_run_stop_reg(struct ufs_hba *hba)
 {
-       writel(UTP_TASK_REQ_LIST_RUN_STOP_BIT,
-              (hba->mmio_base +
-               REG_UTP_TASK_REQ_LIST_RUN_STOP));
-       writel(UTP_TRANSFER_REQ_LIST_RUN_STOP_BIT,
-              (hba->mmio_base +
-               REG_UTP_TRANSFER_REQ_LIST_RUN_STOP));
+       ufshcd_writel(hba, UTP_TASK_REQ_LIST_RUN_STOP_BIT,
+                     REG_UTP_TASK_REQ_LIST_RUN_STOP);
+       ufshcd_writel(hba, UTP_TRANSFER_REQ_LIST_RUN_STOP_BIT,
+                     REG_UTP_TRANSFER_REQ_LIST_RUN_STOP);
 }
 
 /**

@@ -276,7 +270,7 @@ static void ufshcd_enable_run_stop_reg(struct ufs_hba *hba)
  */
 static inline void ufshcd_hba_start(struct ufs_hba *hba)
 {
-       writel(CONTROLLER_ENABLE , (hba->mmio_base + REG_CONTROLLER_ENABLE));
+       ufshcd_writel(hba, CONTROLLER_ENABLE, REG_CONTROLLER_ENABLE);
 }
 
 /**

@@ -287,7 +281,7 @@ static inline void ufshcd_hba_start(struct ufs_hba *hba)
  */
 static inline int ufshcd_is_hba_active(struct ufs_hba *hba)
 {
-       return (readl(hba->mmio_base + REG_CONTROLLER_ENABLE) & 0x1) ? 0 : 1;
+       return (ufshcd_readl(hba, REG_CONTROLLER_ENABLE) & 0x1) ? 0 : 1;
 }
 
 /**

@@ -299,8 +293,7 @@ static inline
 void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag)
 {
        __set_bit(task_tag, &hba->outstanding_reqs);
-       writel((1 << task_tag),
-              (hba->mmio_base + REG_UTP_TRANSFER_REQ_DOOR_BELL));
+       ufshcd_writel(hba, 1 << task_tag, REG_UTP_TRANSFER_REQ_DOOR_BELL);
 }
 
 /**

@@ -381,8 +374,7 @@ void ufshcd_copy_query_response(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
  */
 static inline void ufshcd_hba_capabilities(struct ufs_hba *hba)
 {
-       hba->capabilities =
-               readl(hba->mmio_base + REG_CONTROLLER_CAPABILITIES);
+       hba->capabilities = ufshcd_readl(hba, REG_CONTROLLER_CAPABILITIES);
 
        /* nutrs and nutmrs are 0 based values */
        hba->nutrs = (hba->capabilities & MASK_TRANSFER_REQUESTS_SLOTS) + 1;

@@ -399,16 +391,13 @@ static inline void
 ufshcd_send_uic_command(struct ufs_hba *hba, struct uic_command *uic_cmnd)
 {
        /* Write Args */
-       writel(uic_cmnd->argument1,
-             (hba->mmio_base + REG_UIC_COMMAND_ARG_1));
-       writel(uic_cmnd->argument2,
-             (hba->mmio_base + REG_UIC_COMMAND_ARG_2));
-       writel(uic_cmnd->argument3,
-             (hba->mmio_base + REG_UIC_COMMAND_ARG_3));
+       ufshcd_writel(hba, uic_cmnd->argument1, REG_UIC_COMMAND_ARG_1);
+       ufshcd_writel(hba, uic_cmnd->argument2, REG_UIC_COMMAND_ARG_2);
+       ufshcd_writel(hba, uic_cmnd->argument3, REG_UIC_COMMAND_ARG_3);
 
        /* Write UIC Cmd */
-       writel((uic_cmnd->command & COMMAND_OPCODE_MASK),
-              (hba->mmio_base + REG_UIC_COMMAND));
+       ufshcd_writel(hba, uic_cmnd->command & COMMAND_OPCODE_MASK,
+                     REG_UIC_COMMAND);
 }
 
 /**

@@ -460,16 +449,15 @@ static void ufshcd_int_config(struct ufs_hba *hba, u32 option)
 {
        switch (option) {
        case UFSHCD_INT_ENABLE:
-               writel(hba->int_enable_mask,
-                     (hba->mmio_base + REG_INTERRUPT_ENABLE));
+               ufshcd_writel(hba, hba->int_enable_mask, REG_INTERRUPT_ENABLE);
                break;
        case UFSHCD_INT_DISABLE:
                if (hba->ufs_version == UFSHCI_VERSION_10)
-                       writel(INTERRUPT_DISABLE_MASK_10,
-                             (hba->mmio_base + REG_INTERRUPT_ENABLE));
+                       ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_10,
+                                     REG_INTERRUPT_ENABLE);
                else
-                       writel(INTERRUPT_DISABLE_MASK_11,
-                              (hba->mmio_base + REG_INTERRUPT_ENABLE));
+                       ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_11,
+                                     REG_INTERRUPT_ENABLE);
                break;
        }
 }

@@ -940,7 +928,7 @@ static int ufshcd_dme_link_startup(struct ufs_hba *hba)
        unsigned long flags;
 
        /* check if controller is ready to accept UIC commands */
-       if (((readl(hba->mmio_base + REG_CONTROLLER_STATUS)) &
+       if ((ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
            UIC_COMMAND_READY) == 0x0) {
                dev_err(hba->dev,
                        "Controller not ready"

@@ -985,7 +973,7 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
        u32 reg;
 
        /* check if device present */
-       reg = readl((hba->mmio_base + REG_CONTROLLER_STATUS));
+       reg = ufshcd_readl(hba, REG_CONTROLLER_STATUS);
        if (!ufshcd_is_device_present(reg)) {
                dev_err(hba->dev, "cc: Device not present\n");
                err = -ENXIO;

@@ -1107,14 +1095,14 @@ static int ufshcd_initialize_hba(struct ufs_hba *hba)
                return -EIO;
 
        /* Configure UTRL and UTMRL base address registers */
-       writel(lower_32_bits(hba->utrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_BASE_L));
-       writel(upper_32_bits(hba->utrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TRANSFER_REQ_LIST_BASE_H));
-       writel(lower_32_bits(hba->utmrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TASK_REQ_LIST_BASE_L));
-       writel(upper_32_bits(hba->utmrdl_dma_addr),
-              (hba->mmio_base + REG_UTP_TASK_REQ_LIST_BASE_H));
+       ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
+                     REG_UTP_TRANSFER_REQ_LIST_BASE_L);
+       ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
+                     REG_UTP_TRANSFER_REQ_LIST_BASE_H);
+       ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
+                     REG_UTP_TASK_REQ_LIST_BASE_L);
+       ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
+                     REG_UTP_TASK_REQ_LIST_BASE_H);
 
        /* Initialize unipro link startup procedure */
        return ufshcd_dme_link_startup(hba);

@@ -1427,8 +1415,7 @@ static void ufshcd_transfer_req_compl(struct ufs_hba *hba)
        int index;
 
        lrb = hba->lrb;
-       tr_doorbell =
-               readl(hba->mmio_base + REG_UTP_TRANSFER_REQ_DOOR_BELL);
+       tr_doorbell = ufshcd_readl(hba, REG_UTP_TRANSFER_REQ_DOOR_BELL);
        completed_reqs = tr_doorbell ^ hba->outstanding_reqs;
 
        for (index = 0; index < hba->nutrs; index++) {

@@ -1502,9 +1489,7 @@ static void ufshcd_err_handler(struct ufs_hba *hba)
                goto fatal_eh;
 
        if (hba->errors & UIC_ERROR) {
-
-               reg = readl(hba->mmio_base +
-                           REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
+               reg = ufshcd_readl(hba, REG_UIC_ERROR_CODE_PHY_ADAPTER_LAYER);
                if (reg & UIC_DATA_LINK_LAYER_ERROR_PA_INIT)
                        goto fatal_eh;
        }

@@ -1522,7 +1507,7 @@ static void ufshcd_tmc_handler(struct ufs_hba *hba)
 {
        u32 tm_doorbell;
 
-       tm_doorbell = readl(hba->mmio_base + REG_UTP_TASK_REQ_DOOR_BELL);
+       tm_doorbell = ufshcd_readl(hba, REG_UTP_TASK_REQ_DOOR_BELL);
        hba->tm_condition = tm_doorbell ^ hba->outstanding_tasks;
        wake_up_interruptible(&hba->ufshcd_tm_wait_queue);
 }

@@ -1563,15 +1548,14 @@ static irqreturn_t ufshcd_intr(int irq, void *__hba)
        struct ufs_hba *hba = __hba;
 
        spin_lock(hba->host->host_lock);
-       intr_status = readl(hba->mmio_base + REG_INTERRUPT_STATUS);
+       intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS);
 
        if (intr_status) {
                ufshcd_sl_intr(hba, intr_status);
 
                /* If UFSHCI 1.0 then clear interrupt status register */
                if (hba->ufs_version == UFSHCI_VERSION_10)
-                       writel(intr_status,
-                              (hba->mmio_base + REG_INTERRUPT_STATUS));
+                       ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS);
                retval = IRQ_HANDLED;
        }
        spin_unlock(hba->host->host_lock);

@@ -1636,8 +1620,7 @@ ufshcd_issue_tm_cmd(struct ufs_hba *hba,
 
        /* send command to the controller */
        __set_bit(free_slot, &hba->outstanding_tasks);
-       writel((1 << free_slot),
-              (hba->mmio_base + REG_UTP_TASK_REQ_DOOR_BELL));
+       ufshcd_writel(hba, 1 << free_slot, REG_UTP_TASK_REQ_DOOR_BELL);
 
        spin_unlock_irqrestore(host->host_lock, flags);
 

drivers/scsi/ufs/ufshcd.h +6 -1

index 336980b..6429bed 100644
@@ -204,6 +204,11 @@ struct ufs_hba {
        struct ufs_query query;
 };
 
+#define ufshcd_writel(hba, val, reg)   \
+       writel((val), (hba)->mmio_base + (reg))
+#define ufshcd_readl(hba, reg) \
+       readl((hba)->mmio_base + (reg))
+
 int ufshcd_init(struct device *, struct ufs_hba ** , void __iomem * ,
                        unsigned int);
 void ufshcd_remove(struct ufs_hba *);

@@ -214,7 +219,7 @@ void ufshcd_remove(struct ufs_hba *);
  */
 static inline void ufshcd_hba_stop(struct ufs_hba *hba)
 {
-       writel(CONTROLLER_DISABLE, (hba->mmio_base + REG_CONTROLLER_ENABLE));
+       ufshcd_writel(hba, CONTROLLER_DISABLE,  REG_CONTROLLER_ENABLE);
 }
 

Quoted 4 lines

drivers/scsi/ufs/ufshcd.h +0 -1

 #endif /* End of Header */
--

1.7.0.4

Still git throws the same error "fatal: cannot convert from ks_c_5601-1987 to UTF-8". Please check it for all the patches.

--
~Santosh
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

It makes interrupt setting more flexible especially for disabling. And wrong bit mask is fixed for ver 1.0. [17:16] is added for mask.

Signed-off-by Seungwon Jeon <[email protected]>

Tested-by Maya Erez <[email protected]>

---
 drivers/scsi/ufs/ufshcd.c |   84
+++++++++++++++++++++++++++++++-------------
 drivers/scsi/ufs/ufshcd.h |    4 +-
 drivers/scsi/ufs/ufshci.h |    5 ++-
 3 files changed, 64 insertions(+), 29 deletions(-)

drivers/scsi/ufs/ufshcd.c +54 -17

index cf7c8e4..feaf221 100644
@@ -35,6 +35,10 @@
 
 #include "ufshcd.h"
 
+#define UFSHCD_ENABLE_INTRS	(UTP_TRANSFER_REQ_COMPL |\
+				 UTP_TASK_REQ_COMPL |\
+				 UFSHCD_ERROR_MASK)
+
 enum {
 	UFSHCD_MAX_CHANNEL	= 0,
 	UFSHCD_MAX_ID		= 1,

@@ -64,6 +68,20 @@ enum {
 };
 
 /**
+ * ufshcd_get_intr_mask - Get the interrupt bit mask
+ * @hba - Pointer to adapter instance
+ *
+ * Returns interrupt bit mask per version
+ */
+static inline u32 ufshcd_get_intr_mask(struct ufs_hba *hba)
+{
+	if (hba->ufs_version == UFSHCI_VERSION_10)
+		return INTERRUPT_MASK_ALL_VER_10;
+	else
+		return INTERRUPT_MASK_ALL_VER_11;
+}
+
+/**
  * ufshcd_get_ufs_version - Get the UFS version supported by the HBA
  * @hba - Pointer to adapter instance
  *

@@ -441,25 +459,45 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp)
 }
 
 /**
- * ufshcd_int_config - enable/disable interrupts
+ * ufshcd_enable_intr - enable interrupts
  * @hba: per adapter instance
- * @option: interrupt option
+ * @intrs: interrupt bits
  */
-static void ufshcd_int_config(struct ufs_hba *hba, u32 option)
+static void ufshcd_enable_intr(struct ufs_hba *hba, u32 intrs)
 {
-	switch (option) {
-	case UFSHCD_INT_ENABLE:
-		ufshcd_writel(hba, hba->int_enable_mask, REG_INTERRUPT_ENABLE);
-		break;
-	case UFSHCD_INT_DISABLE:
-		if (hba->ufs_version == UFSHCI_VERSION_10)
-			ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_10,
-				      REG_INTERRUPT_ENABLE);
-		else
-			ufshcd_writel(hba, INTERRUPT_DISABLE_MASK_11,
-				      REG_INTERRUPT_ENABLE);
-		break;
+	u32 set = ufshcd_readl(hba, REG_INTERRUPT_ENABLE);
+
+	if (hba->ufs_version == UFSHCI_VERSION_10) {
+		u32 rw;
+		rw = set & INTERRUPT_MASK_RW_VER_10;
+		set = rw | ((set ^ intrs) & intrs);
+	} else {
+		set |= intrs;
+	}
+
+	ufshcd_writel(hba, set, REG_INTERRUPT_ENABLE);
+}
+
+/**
+ * ufshcd_disable_intr - disable interrupts
+ * @hba: per adapter instance
+ * @intrs: interrupt bits
+ */
+static void ufshcd_disable_intr(struct ufs_hba *hba, u32 intrs)
+{
+	u32 set = ufshcd_readl(hba, REG_INTERRUPT_ENABLE);
+
+	if (hba->ufs_version == UFSHCI_VERSION_10) {
+		u32 rw;
+		rw = (set & INTERRUPT_MASK_RW_VER_10) &
+			~(intrs & INTERRUPT_MASK_RW_VER_10);
+		set = rw | ((set & intrs) & ~INTERRUPT_MASK_RW_VER_10);
+
+	} else {
+		set &= ~intrs;
 	}
+
+	ufshcd_writel(hba, set, REG_INTERRUPT_ENABLE);
 }
 
 /**

@@ -946,8 +984,7 @@ static int ufshcd_dme_link_startup(struct ufs_hba
 *hba)
 	uic_cmd->argument3 = 0;
 
 	/* enable UIC related interrupts */
-	hba->int_enable_mask |= UIC_COMMAND_COMPL;
-	ufshcd_int_config(hba, UFSHCD_INT_ENABLE);
+	ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
 
 	/* sending UIC commands to controller */

drivers/scsi/ufs/ufshcd.c +1 -7

 	ufshcd_send_uic_command(hba, uic_cmd);

@@ -994,13 +1031,7 @@ static int ufshcd_make_hba_operational(struct
 ufs_hba *hba)
 	}
 
 	/* Enable required interrupts */
-	hba->int_enable_mask |= (UTP_TRANSFER_REQ_COMPL |
-				 UIC_ERROR |
-				 UTP_TASK_REQ_COMPL |
-				 DEVICE_FATAL_ERROR |
-				 CONTROLLER_FATAL_ERROR |
-				 SYSTEM_BUS_FATAL_ERROR);
-	ufshcd_int_config(hba, UFSHCD_INT_ENABLE);
+	ufshcd_enable_intr(hba, UFSHCD_ENABLE_INTRS);
 
 	/* Configure interrupt aggregation */

drivers/scsi/ufs/ufshcd.c +4 -1

 	ufshcd_config_int_aggr(hba, INT_AGGR_CONFIG);

@@ -1828,7 +1859,7 @@ static void ufshcd_hba_free(struct ufs_hba *hba)
 void ufshcd_remove(struct ufs_hba *hba)
 {
 	/* disable interrupts */
-	ufshcd_int_config(hba, UFSHCD_INT_DISABLE);
+	ufshcd_disable_intr(hba, hba->intr_mask);
 
 	ufshcd_hba_stop(hba);
 	ufshcd_hba_free(hba);

@@ -1886,6 +1917,9 @@ int ufshcd_init(struct device *dev, struct ufs_hba
 **hba_handle,
 	/* Get UFS version supported by the controller */
 	hba->ufs_version = ufshcd_get_ufs_version(hba);
 
+	/* Get Interrupt bit mask per version */
+	hba->intr_mask = ufshcd_get_intr_mask(hba);
+
 	/* Allocate memory for host memory space */
 	err = ufshcd_memory_alloc(hba);

drivers/scsi/ufs/ufshcd.c +0 -0

 	if (err) {

drivers/scsi/ufs/ufshcd.h +2 -2

index 6429bed..d98e046 100644
@@ -153,7 +153,7 @@ struct ufs_query {
  * @ufshcd_tm_wait_queue: wait queue for task management
  * @tm_condition: condition variable for task management
  * @ufshcd_state: UFSHCD states
- * @int_enable_mask: Interrupt Mask Bits
+ * @intr_mask: Interrupt Mask Bits
  * @uic_workq: Work queue for UIC completion handling
  * @feh_workq: Work queue for fatal controller error handling
  * @errors: HBA errors

@@ -191,7 +191,7 @@ struct ufs_hba {
 	unsigned long tm_condition;
 
 	u32 ufshcd_state;
-	u32 int_enable_mask;
+	u32 intr_mask;
 
 	/* Work Queues */
 	struct work_struct uic_workq;

drivers/scsi/ufs/ufshci.h +3 -3

index 4a86247..f1e1b74 100644
@@ -232,10 +232,11 @@ enum {
 /* Interrupt disable masks */
 enum {
 	/* Interrupt disable mask for UFSHCI v1.0 */
-	INTERRUPT_DISABLE_MASK_10	= 0xFFFF,
+	INTERRUPT_MASK_ALL_VER_10	= 0x30FFF,
+	INTERRUPT_MASK_RW_VER_10	= 0x30000,
 
 	/* Interrupt disable mask for UFSHCI v1.1 */
-	INTERRUPT_DISABLE_MASK_11	= 0x0,
+	INTERRUPT_MASK_ALL_VER_11	= 0x31FFF,
 };
 
 /*
--

1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

There is no need to check the version to clear
the interrupt status. And the order is changed
prior to actual handling.

Signed-off-by Seungwon Jeon <[email protected]>

---
 drivers/scsi/ufs/ufshcd.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

drivers/scsi/ufs/ufshcd.c +1 -4

index feaf221..e04c74e 100644
@@ -1582,11 +1582,8 @@ static irqreturn_t ufshcd_intr(int irq, void
 *__hba)
 	intr_status = ufshcd_readl(hba, REG_INTERRUPT_STATUS);
 
 	if (intr_status) {
+		ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS);
 		ufshcd_sl_intr(hba, intr_status);
-
-		/* If UFSHCI 1.0 then clear interrupt status register */
-		if (hba->ufs_version == UFSHCI_VERSION_10)
-			ufshcd_writel(hba, intr_status, REG_INTERRUPT_STATUS);
 		retval = IRQ_HANDLED;
 	}

spin_unlock(hba->host->host_lock);
--
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Link start-up requires long time with multiphase handshakes between UFS host and device. This affects driver's probe time. This patch let link start-up run asynchronously. Link start-up will be executed at the end of prove separately. Along with this change, the following is worked.

Defined completion time of uic command to avoid a permanent wait.

Added mutex to guarantee of uic command at a time. Adapted some sequence of controller initialization after link statup according to HCI standard.

Signed-off-by Seungwon Jeon <[email protected]>

Signed-off-by Sujit Reddy Thumma <[email protected]>

---
  drivers/scsi/ufs/ufshcd.c |  287 ++++++++++++++++++++++++++++++---------------
  drivers/scsi/ufs/ufshcd.h |   10 +-
  2 files changed, 200 insertions(+), 97 deletions(-)

drivers/scsi/ufs/ufshcd.c +193 -94

index e04c74e..118f104 100644
@@ -33,11 +33,15 @@
   * this program.
   */
 
+#include <linux/async.h>
+
  #include "ufshcd.h"
 
  #define UFSHCD_ENABLE_INTRS	(UTP_TRANSFER_REQ_COMPL |\
  				 UTP_TASK_REQ_COMPL |\
  				 UFSHCD_ERROR_MASK)
+/* UIC command timeout, unit: ms */
+#define UIC_CMD_TIMEOUT	500
 
  enum {
  	UFSHCD_MAX_CHANNEL	= 0,

@@ -401,24 +405,115 @@ static inline void ufshcd_hba_capabilities(struct ufs_hba *hba)
  }
 
  /**
- * ufshcd_send_uic_command - Send UIC commands to unipro layers
+ * ufshcd_ready_for_uic_cmd - Check if controller is ready
+ *                            to accept UIC commands
   * @hba: per adapter instance
- * @uic_command: UIC command
+ * Return true on success, else false
+ */
+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;
+}
+
+/**
+ * ufshcd_dispatch_uic_cmd - Dispatch UIC commands to unipro layers
+ * @hba: per adapter instance
+ * @uic_cmd: UIC command
+ *
+ * Mutex must be held.
   */
  static inline void
-ufshcd_send_uic_command(struct ufs_hba *hba, struct uic_command *uic_cmnd)
+ufshcd_dispatch_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
  {
+	hba->active_uic_cmd = uic_cmd;
+
  	/* Write Args */
-	ufshcd_writel(hba, uic_cmnd->argument1, REG_UIC_COMMAND_ARG_1);
-	ufshcd_writel(hba, uic_cmnd->argument2, REG_UIC_COMMAND_ARG_2);
-	ufshcd_writel(hba, uic_cmnd->argument3, REG_UIC_COMMAND_ARG_3);
+	ufshcd_writel(hba, uic_cmd->argument1, REG_UIC_COMMAND_ARG_1);
+	ufshcd_writel(hba, uic_cmd->argument2, REG_UIC_COMMAND_ARG_2);
+	ufshcd_writel(hba, uic_cmd->argument3, REG_UIC_COMMAND_ARG_3);
 
  	/* Write UIC Cmd */
-	ufshcd_writel(hba, uic_cmnd->command & COMMAND_OPCODE_MASK,
+	ufshcd_writel(hba, uic_cmd->command & COMMAND_OPCODE_MASK,
  		      REG_UIC_COMMAND);
  }
 
  /**
+ * ufshcd_wait_for_uic_cmd - Wait complectioin of UIC command
+ * @hba: per adapter instance
+ * @uic_command: UIC command
+ *
+ * Must be called with mutex held.
+ * Returns 0 only if success.
+ */
+static int
+ufshcd_wait_for_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
+{
+	int ret;
+
+	if (wait_for_completion_timeout(&uic_cmd->done,
+					msecs_to_jiffies(UIC_CMD_TIMEOUT)))
+		ret = uic_cmd->argument2 & MASK_UIC_COMMAND_RESULT;
+	else
+		ret = -ETIMEDOUT;
+
+	return ret;
+}
+
+/**
+ * __ufshcd_send_uic_cmd - Send UIC commands and retrieve the result
+ * @hba: per adapter instance
+ * @uic_cmd: UIC command
+ *
+ * Identical to ufshcd_send_uic_cmd() expect mutex. Must be called
+ * with mutex held.
+ * Returns 0 only if success.
+ */
+static int
+__ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
+{
+	int ret;
+	unsigned long flags;
+
+	if (!ufshcd_ready_for_uic_cmd(hba)) {
+		dev_err(hba->dev,
+			"Controller not ready to accept UIC commands\n");
+		return -EIO;
+	}
+
+	init_completion(&uic_cmd->done);
+
+	spin_lock_irqsave(hba->host->host_lock, flags);
+	ufshcd_dispatch_uic_cmd(hba, uic_cmd);
+	spin_unlock_irqrestore(hba->host->host_lock, flags);
+
+	ret = ufshcd_wait_for_uic_cmd(hba, uic_cmd);
+
+	return ret;
+}
+
+/**
+ * ufshcd_send_uic_cmd - Send UIC commands and retrieve the result
+ * @hba: per adapter instance
+ * @uic_cmd: UIC command
+ *
+ * Returns 0 only if success.
+ */
+static int
+ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
+{
+	int ret;
+
+	mutex_lock(&hba->uic_cmd_mutex);
+	ret = __ufshcd_send_uic_cmd(hba, uic_cmd);
+	mutex_unlock(&hba->uic_cmd_mutex);
+
+	return ret;
+}
+
+/**
   * ufshcd_map_sg - Map scatter-gather list to prdt
   * @lrbp - pointer to local reference block
   *

@@ -962,34 +1057,16 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba)
   */
  static int ufshcd_dme_link_startup(struct ufs_hba *hba)
  {
-	struct uic_command *uic_cmd;
-	unsigned long flags;
+	struct uic_command uic_cmd = {0};
+	int ret;
 
-	/* check if controller is ready to accept UIC commands */
-	if ((ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
-	    UIC_COMMAND_READY) == 0x0) {
-		dev_err(hba->dev,
-			"Controller not ready"
-			" to accept UIC commands\n");
-		return -EIO;
-	}
-
-	spin_lock_irqsave(hba->host->host_lock, flags);
+	uic_cmd.command = UIC_CMD_DME_LINK_STARTUP;
 
-	/* form UIC command */
-	uic_cmd = &hba->active_uic_cmd;
-	uic_cmd->command = UIC_CMD_DME_LINK_STARTUP;
-	uic_cmd->argument1 = 0;
-	uic_cmd->argument2 = 0;
-	uic_cmd->argument3 = 0;
-
-	/* enable UIC related interrupts */
-	ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
-
-	/* sending UIC commands to controller */
-	ufshcd_send_uic_command(hba, uic_cmd);
-	spin_unlock_irqrestore(hba->host->host_lock, flags);
-	return 0;
+	ret = ufshcd_send_uic_cmd(hba, &uic_cmd);
+	if (ret)
+		dev_err(hba->dev,
+			"link startup: error code %d\n", ret);
+	return ret;
  }
 
  /**

@@ -998,9 +1075,10 @@ static int ufshcd_dme_link_startup(struct ufs_hba *hba)
   *
   * To bring UFS host controller to operational state,
   * 1. Check if device is present
- * 2. Configure run-stop-registers
- * 3. Enable required interrupts
- * 4. Configure interrupt aggregation
+ * 2. Enable required interrupts
+ * 3. Configure interrupt aggregation
+ * 4. Program UTRL and UTMRL base addres
+ * 5. Configure run-stop-registers
   *
   * Returns 0 on success, non-zero value on failure
   */

@@ -1017,6 +1095,22 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
  		goto out;
  	}
 
+	/* Enable required interrupts */
+	ufshcd_enable_intr(hba, UFSHCD_ENABLE_INTRS);
+
+	/* Configure interrupt aggregation */
+	ufshcd_config_int_aggr(hba, INT_AGGR_CONFIG);
+
+	/* Configure UTRL and UTMRL base address registers */
+	ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
+			REG_UTP_TRANSFER_REQ_LIST_BASE_L);
+	ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
+			REG_UTP_TRANSFER_REQ_LIST_BASE_H);
+	ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
+			REG_UTP_TASK_REQ_LIST_BASE_L);
+	ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
+			REG_UTP_TASK_REQ_LIST_BASE_H);
+
  	/*
  	 * UCRDY, UTMRLDY and UTRLRDY bits must be 1
  	 * DEI, HEI bits must be 0

@@ -1030,17 +1124,11 @@ static int ufshcd_make_hba_operational(struct ufs_hba *hba)
  		goto out;
  	}
 
-	/* Enable required interrupts */
-	ufshcd_enable_intr(hba, UFSHCD_ENABLE_INTRS);
-
-	/* Configure interrupt aggregation */
-	ufshcd_config_int_aggr(hba, INT_AGGR_CONFIG);
-
  	if (hba->ufshcd_state == UFSHCD_STATE_RESET)
  		scsi_unblock_requests(hba->host);
 
  	hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
-	scsi_scan_host(hba->host);
+
  out:
  	return err;
  }

@@ -1109,34 +1197,29 @@ static int ufshcd_hba_enable(struct ufs_hba *hba)
  }
 
  /**
- * ufshcd_initialize_hba - start the initialization process
+ * ufshcd_link_startup - Initialize unipro link startup
   * @hba: per adapter instance
   *
- * 1. Enable the controller via ufshcd_hba_enable.
- * 2. Program the Transfer Request List Address with the starting address of
- * UTRDL.
- * 3. Program the Task Management Request List Address with starting address
- * of UTMRDL.
- *
- * Returns 0 on success, non-zero value on failure.
+ * Returns 0 for success, non-zero in case of failure
   */
-static int ufshcd_initialize_hba(struct ufs_hba *hba)
+static int ufshcd_link_startup(struct ufs_hba *hba)
  {
-	if (ufshcd_hba_enable(hba))
-		return -EIO;
+	int ret;
 
-	/* Configure UTRL and UTMRL base address registers */
-	ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
-		      REG_UTP_TRANSFER_REQ_LIST_BASE_L);
-	ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
-		      REG_UTP_TRANSFER_REQ_LIST_BASE_H);
-	ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
-		      REG_UTP_TASK_REQ_LIST_BASE_L);
-	ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
-		      REG_UTP_TASK_REQ_LIST_BASE_H);
+	/* enable UIC related interrupts */
+	ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
+
+	ret = ufshcd_dme_link_startup(hba);
+	if (ret)
+		goto out;
 
-	/* Initialize unipro link startup procedure */
-	return ufshcd_dme_link_startup(hba);
+	ret = ufshcd_make_hba_operational(hba);
+	if (ret)
+		goto out;
+
+out:
+	dev_err(hba->dev, "link startup failed %d\n", ret);
+	return ret;
  }
 
  /**

@@ -1176,12 +1259,19 @@ static int ufshcd_do_reset(struct ufs_hba *hba)
  	hba->outstanding_reqs = 0;
  	hba->outstanding_tasks = 0;
 
-	/* start the initialization process */
-	if (ufshcd_initialize_hba(hba)) {
+	/* Host controller enable */
+	if (ufshcd_hba_enable(hba)) {
  		dev_err(hba->dev,
  			"Reset: Controller initialization failed\n");
  		return FAILED;
  	}
+
+	if (ufshcd_link_startup(hba)) {
+		dev_err(hba->dev,
+			"Reset: Link start-up failed\n");
+		return FAILED;
+	}
+
  	return SUCCESS;
  }
 

@@ -1434,6 +1524,17 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
  }
 
  /**
+ * ufshcd_uic_cmd_compl - handle completion of uic command
+ * @hba: per adapter instance
+ */
+static void ufshcd_uic_cmd_compl(struct ufs_hba *hba)
+{
+	hba->active_uic_cmd->argument2 |=
+		ufshcd_get_uic_cmd_result(hba);
+	complete(&hba->active_uic_cmd->done);
+}
+
+/**
   * ufshcd_transfer_req_compl - handle SCSI and query command completion
   * @hba: per adapter instance
   */

@@ -1473,28 +1574,6 @@ static void ufshcd_transfer_req_compl(struct ufs_hba *hba)
  }
 
  /**
- * ufshcd_uic_cc_handler - handle UIC command completion
- * @work: pointer to a work queue structure
- *
- * Returns 0 on success, non-zero value on failure
- */
-static void ufshcd_uic_cc_handler (struct work_struct *work)
-{
-	struct ufs_hba *hba;
-
-	hba = container_of(work, struct ufs_hba, uic_workq);
-
-	if ((hba->active_uic_cmd.command == UIC_CMD_DME_LINK_STARTUP) &&
-	    !(ufshcd_get_uic_cmd_result(hba))) {
-
-		if (ufshcd_make_hba_operational(hba))
-			dev_err(hba->dev,
-				"cc: hba not operational state\n");
-		return;
-	}
-}
-
-/**
   * ufshcd_fatal_err_handler - handle fatal errors
   * @hba: per adapter instance
   */

@@ -1555,7 +1634,7 @@ static void ufshcd_sl_intr(struct ufs_hba *hba, u32 intr_status)
  		ufshcd_err_handler(hba);
 
  	if (intr_status & UIC_COMMAND_COMPL)
-		schedule_work(&hba->uic_workq);
+		ufshcd_uic_cmd_compl(hba);
 
  	if (intr_status & UTP_TASK_REQ_COMPL)
  		ufshcd_tmc_handler(hba);

@@ -1778,6 +1857,21 @@ out:
  	return err;
  }
 
+/**
+ * ufshcd_async_scan - asynchronous execution for link startup
+ * @data: data pointer to pass to this function
+ * @cookie: cookie data
+ */
+static void ufshcd_async_scan(void *data, async_cookie_t cookie)
+{
+	struct ufs_hba *hba = (struct ufs_hba *)data;
+	int ret;
+
+	ret = ufshcd_link_startup(hba);
+	if (!ret)
+		scsi_scan_host(hba->host);
+}
+
  static struct scsi_host_template ufshcd_driver_template = {
  	.module			= THIS_MODULE,
  	.name			= UFSHCD,

@@ -1939,12 +2033,14 @@ int ufshcd_init(struct device *dev, struct ufs_hba **hba_handle,
  	init_waitqueue_head(&hba->ufshcd_tm_wait_queue);
 
  	/* Initialize work queues */
-	INIT_WORK(&hba->uic_workq, ufshcd_uic_cc_handler);
  	INIT_WORK(&hba->feh_workq, ufshcd_fatal_err_handler);
 
  	/* Initialize mutex for query requests */
  	mutex_init(&hba->query.lock_ufs_query);
 
+	/* Initialize UIC command mutex */
+	mutex_init(&hba->uic_cmd_mutex);
+
  	/* IRQ registration */
  	err = request_irq(irq, ufshcd_intr, IRQF_SHARED, UFSHCD, hba);
  	if (err) {

@@ -1965,14 +2061,17 @@ int ufshcd_init(struct device *dev, struct ufs_hba **hba_handle,
  		goto out_free_irq;
  	}
 
-	/* Initialization routine */
-	err = ufshcd_initialize_hba(hba);
+	/* Host controller enable */
+	err = ufshcd_hba_enable(hba);
  	if (err) {
-		dev_err(hba->dev, "Initialization failed\n");
+		dev_err(hba->dev, "Host controller enable failed\n");
  		goto out_remove_scsi_host;
  	}
+
  	*hba_handle = hba;
 
+	async_schedule(ufshcd_async_scan, hba);
+
  	return 0;
 
  out_remove_scsi_host:

drivers/scsi/ufs/ufshcd.h +7 -3

index d98e046..974bd07 100644
@@ -51,6 +51,7 @@
  #include <linux/bitops.h>
  #include <linux/pm_runtime.h>
  #include <linux/clk.h>
+#include <linux/completion.h>
 
  #include <asm/irq.h>
  #include <asm/byteorder.h>

@@ -76,6 +77,7 @@
   * @argument3: UIC command argument 3
   * @cmd_active: Indicate if UIC command is outstanding
   * @result: UIC command result
+ * @done: UIC command completion
   */
  struct uic_command {
  	u32 command;

@@ -84,6 +86,7 @@ struct uic_command {
  	u32 argument3;
  	int cmd_active;
  	int result;
+	struct completion done;
  };
 
  /**

@@ -150,11 +153,11 @@ struct ufs_query {
   * @ufs_version: UFS Version to which controller complies
   * @irq: Irq number of the controller
   * @active_uic_cmd: handle of active UIC command
+ * @uic_cmd_mutex: mutex for uic command
   * @ufshcd_tm_wait_queue: wait queue for task management
   * @tm_condition: condition variable for task management
   * @ufshcd_state: UFSHCD states
   * @intr_mask: Interrupt Mask Bits
- * @uic_workq: Work queue for UIC completion handling
   * @feh_workq: Work queue for fatal controller error handling
   * @errors: HBA errors
   * @query: query request information

@@ -186,7 +189,9 @@ struct ufs_hba {
  	u32 ufs_version;
  	unsigned int irq;
 
-	struct uic_command active_uic_cmd;
+	struct uic_command *active_uic_cmd;
+	struct mutex uic_cmd_mutex;
+
  	wait_queue_head_t ufshcd_tm_wait_queue;
  	unsigned long tm_condition;
 

@@ -194,7 +199,6 @@ struct ufs_hba {
  	u32 intr_mask;
 
  	/* Work Queues */
-	struct work_struct uic_workq;
  	struct work_struct feh_workq;
 
  	/* HBA Errors */

Quoted 7 lines

Link start-up requires long time with multiphase handshakes between UFS host and device. This affects driver's probe time. This patch let link start-up run asynchronously. Link start-up will be executed at the end of prove separately. Along with this change, the following is worked.

Defined completion time of uic command to avoid a permanent wait.

We have seen a kernel crash when the timeout happens in our internal testing. This is basically because the the UIC_CMD_TIMEOUT of 500msec is less for our platform. We see UIC_COMMAND_COMPL interrupt after this timeout and since uic_cmd is freed we see a kernel crash.

[    6.026094] ufshcd 0000:01:00.0: link startup: error code -110
[    6.030886] ufshcd 0000:01:00.0: link startup failed -110

...

[    6.487288] BUG: spinlock bad magic on CPU#0, swapper/0/0
[    6.491683] Unable to handle kernel paging request at virtual address
6000012b
...
[    7.625270] [<c07c3718>] (spin_dump+0x4c/0x88) from [<c02ab9d8>]
(do_raw_spin_lock+0x20/0x154)
[    7.633877] [<c02ab9d8>] (do_raw_spin_lock+0x20/0x154) from
[<c07ccba4>] (_raw_spin_lock_irqsave+0x28/0x30)
[    7.643583] [<c07ccba4>] (_raw_spin_lock_irqsave+0x28/0x30) from
[<c00a3c98>] (complete+0x1c/0x58)
[    7.652525] [<c00a3c98>] (complete+0x1c/0x58) from [<c03d10c4>]
(ufshcd_intr+0x1a8/0x498)
[    7.660705] [<c03d10c4>] (ufshcd_intr+0x1a8/0x498) from [<c00cff48>]
(handle_irq_event_percpu+0xb0/0x290)
[    7.670227] [<c00cff48>] (handle_irq_event_percpu+0xb0/0x290) from
[<c00d0164>] (handle_irq_event+0x3c/0x5c)
[    7.680054] [<c00d0164>] (handle_irq_event+0x3c/0x5c) from
[<c00d2c50>] (handle_fasteoi_irq+0xdc/0x148)
[    7.689424] [<c00d2c50>] (handle_fasteoi_irq+0xdc/0x148) from
[<c00cf7ac>] (generic_handle_irq+0x30/0x44)
[    7.698977] [<c00cf7ac>] (generic_handle_irq+0x30/0x44) from
[<c000ee40>] (handle_IRQ+0x7c/0xc0)
[    7.707736] [<c000ee40>] (handle_IRQ+0x7c/0xc0) from [<c0008620>]
(gic_handle_irq+0x94/0x110)
[    7.716252] [<c0008620>] (gic_handle_irq+0x94/0x110) from

[<c07ccec0>] (__irq_svc+0x40/0x70)

Following would fix this. Please check. Also, we need to increase the timeout to say 5 secs to avoid such races.

drivers/scsi/ufs/ufshcd.c +6 -1

index ecbae40..ae22a8e 100644
@@ -485,6 +485,7 @@ static int
 ufshcd_wait_for_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
 {
 	int ret;
+	unsigned long flags;
 
 	if (wait_for_completion_timeout(&uic_cmd->done,
 					msecs_to_jiffies(UIC_CMD_TIMEOUT)))

@@ -492,6 +493,10 @@ ufshcd_wait_for_uic_cmd(struct ufs_hba *hba, struct
 uic_command *uic_cmd)
 	else
 		ret = -ETIMEDOUT;
 
+	spin_lock_irqsave(hba->host->host_lock, flags);
+	hba->active_uic_cmd = NULL;
+	spin_unlock_irqrestore(hba->host->host_lock, flags);
+
 	return ret;
 }

@@ -1842,7 +1847,7 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,
 struct ufshcd_lrb *lrbp)
  */
 static void ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status)
 {
-	if (intr_status & UIC_COMMAND_COMPL) {
+	if (hba->active_uic_cmd && (intr_status & UIC_COMMAND_COMPL)) {
 		hba->active_uic_cmd->argument2 |=
 			ufshcd_get_uic_cmd_result(hba);

hba->active_uic_cmd->argument3 =

Quoted 514 lines

Added mutex to guarantee of uic command at a time. Adapted some sequence of controller initialization after link statup according to HCI standard.

Signed-off-by Seungwon Jeon <[email protected]>

Signed-off-by Sujit Reddy Thumma <[email protected]>

---
  drivers/scsi/ufs/ufshcd.c |  287
++++++++++++++++++++++++++++++---------------
  drivers/scsi/ufs/ufshcd.h |   10 +-
  2 files changed, 200 insertions(+), 97 deletions(-)

drivers/scsi/ufs/ufshcd.c +38 -7

index e04c74e..118f104 100644
@@ -33,11 +33,15 @@
   * this program.
   */
 
+#include <linux/async.h>
+
  #include "ufshcd.h"
 
  #define UFSHCD_ENABLE_INTRS	(UTP_TRANSFER_REQ_COMPL |\
  				 UTP_TASK_REQ_COMPL |\
  				 UFSHCD_ERROR_MASK)
+/* UIC command timeout, unit: ms */
+#define UIC_CMD_TIMEOUT	500
 
  enum {
  	UFSHCD_MAX_CHANNEL	= 0,

@@ -401,24 +405,115 @@ static inline void ufshcd_hba_capabilities(struct
 ufs_hba *hba)
  }
 
  /**
- * ufshcd_send_uic_command - Send UIC commands to unipro layers
+ * ufshcd_ready_for_uic_cmd - Check if controller is ready
+ *                            to accept UIC commands
   * @hba: per adapter instance
- * @uic_command: UIC command
+ * Return true on success, else false
+ */
+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;
+}
+
+/**
+ * ufshcd_dispatch_uic_cmd - Dispatch UIC commands to unipro layers
+ * @hba: per adapter instance
+ * @uic_cmd: UIC command
+ *
+ * Mutex must be held.
   */
  static inline void
-ufshcd_send_uic_command(struct ufs_hba *hba, struct uic_command
 *uic_cmnd)
+ufshcd_dispatch_uic_cmd(struct ufs_hba *hba, struct uic_command
 *uic_cmd)
  {
+	hba->active_uic_cmd = uic_cmd;
+
  	/* Write Args */
-	ufshcd_writel(hba, uic_cmnd->argument1, REG_UIC_COMMAND_ARG_1);
-	ufshcd_writel(hba, uic_cmnd->argument2, REG_UIC_COMMAND_ARG_2);
-	ufshcd_writel(hba, uic_cmnd->argument3, REG_UIC_COMMAND_ARG_3);
+	ufshcd_writel(hba, uic_cmd->argument1, REG_UIC_COMMAND_ARG_1);
+	ufshcd_writel(hba, uic_cmd->argument2, REG_UIC_COMMAND_ARG_2);
+	ufshcd_writel(hba, uic_cmd->argument3, REG_UIC_COMMAND_ARG_3);
 
  	/* Write UIC Cmd */
-	ufshcd_writel(hba, uic_cmnd->command & COMMAND_OPCODE_MASK,
+	ufshcd_writel(hba, uic_cmd->command & COMMAND_OPCODE_MASK,
  		      REG_UIC_COMMAND);
  }
 
  /**
+ * ufshcd_wait_for_uic_cmd - Wait complectioin of UIC command
+ * @hba: per adapter instance
+ * @uic_command: UIC command
+ *
+ * Must be called with mutex held.
+ * Returns 0 only if success.
+ */
+static int
+ufshcd_wait_for_uic_cmd(struct ufs_hba *hba, struct uic_command

*uic_cmd)

drivers/scsi/ufs/ufshcd.c +72 -26

+{
+	int ret;
+
+	if (wait_for_completion_timeout(&uic_cmd->done,
+					msecs_to_jiffies(UIC_CMD_TIMEOUT)))
+		ret = uic_cmd->argument2 & MASK_UIC_COMMAND_RESULT;
+	else
+		ret = -ETIMEDOUT;
+
+	return ret;
+}
+
+/**
+ * __ufshcd_send_uic_cmd - Send UIC commands and retrieve the result
+ * @hba: per adapter instance
+ * @uic_cmd: UIC command
+ *
+ * Identical to ufshcd_send_uic_cmd() expect mutex. Must be called
+ * with mutex held.
+ * Returns 0 only if success.
+ */
+static int
+__ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
+{
+	int ret;
+	unsigned long flags;
+
+	if (!ufshcd_ready_for_uic_cmd(hba)) {
+		dev_err(hba->dev,
+			"Controller not ready to accept UIC commands\n");
+		return -EIO;
+	}
+
+	init_completion(&uic_cmd->done);
+
+	spin_lock_irqsave(hba->host->host_lock, flags);
+	ufshcd_dispatch_uic_cmd(hba, uic_cmd);
+	spin_unlock_irqrestore(hba->host->host_lock, flags);
+
+	ret = ufshcd_wait_for_uic_cmd(hba, uic_cmd);
+
+	return ret;
+}
+
+/**
+ * ufshcd_send_uic_cmd - Send UIC commands and retrieve the result
+ * @hba: per adapter instance
+ * @uic_cmd: UIC command
+ *
+ * Returns 0 only if success.
+ */
+static int
+ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd)
+{
+	int ret;
+
+	mutex_lock(&hba->uic_cmd_mutex);
+	ret = __ufshcd_send_uic_cmd(hba, uic_cmd);
+	mutex_unlock(&hba->uic_cmd_mutex);
+
+	return ret;
+}
+
+/**
   * ufshcd_map_sg - Map scatter-gather list to prdt
   * @lrbp - pointer to local reference block
   *

@@ -962,34 +1057,16 @@ static void ufshcd_host_memory_configure(struct
 ufs_hba *hba)
   */
  static int ufshcd_dme_link_startup(struct ufs_hba *hba)
  {
-	struct uic_command *uic_cmd;
-	unsigned long flags;
+	struct uic_command uic_cmd = {0};
+	int ret;
 
-	/* check if controller is ready to accept UIC commands */
-	if ((ufshcd_readl(hba, REG_CONTROLLER_STATUS) &
-	    UIC_COMMAND_READY) == 0x0) {
-		dev_err(hba->dev,
-			"Controller not ready"
-			" to accept UIC commands\n");
-		return -EIO;
-	}
-
-	spin_lock_irqsave(hba->host->host_lock, flags);
+	uic_cmd.command = UIC_CMD_DME_LINK_STARTUP;
 
-	/* form UIC command */
-	uic_cmd = &hba->active_uic_cmd;
-	uic_cmd->command = UIC_CMD_DME_LINK_STARTUP;
-	uic_cmd->argument1 = 0;
-	uic_cmd->argument2 = 0;
-	uic_cmd->argument3 = 0;
-
-	/* enable UIC related interrupts */
-	ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
-
-	/* sending UIC commands to controller */
-	ufshcd_send_uic_command(hba, uic_cmd);
-	spin_unlock_irqrestore(hba->host->host_lock, flags);
-	return 0;
+	ret = ufshcd_send_uic_cmd(hba, &uic_cmd);
+	if (ret)
+		dev_err(hba->dev,
+			"link startup: error code %d\n", ret);
+	return ret;
  }
 

/**

drivers/scsi/ufs/ufshcd.c +4 -3

@@ -998,9 +1075,10 @@ static int ufshcd_dme_link_startup(struct ufs_hba
 *hba)
   *
   * To bring UFS host controller to operational state,
   * 1. Check if device is present
- * 2. Configure run-stop-registers
- * 3. Enable required interrupts
- * 4. Configure interrupt aggregation
+ * 2. Enable required interrupts
+ * 3. Configure interrupt aggregation
+ * 4. Program UTRL and UTMRL base addres
+ * 5. Configure run-stop-registers
   *
   * Returns 0 on success, non-zero value on failure

   */

drivers/scsi/ufs/ufshcd.c +16 -0

@@ -1017,6 +1095,22 @@ static int ufshcd_make_hba_operational(struct
 ufs_hba *hba)
  		goto out;
  	}
 
+	/* Enable required interrupts */
+	ufshcd_enable_intr(hba, UFSHCD_ENABLE_INTRS);
+
+	/* Configure interrupt aggregation */
+	ufshcd_config_int_aggr(hba, INT_AGGR_CONFIG);
+
+	/* Configure UTRL and UTMRL base address registers */
+	ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
+			REG_UTP_TRANSFER_REQ_LIST_BASE_L);
+	ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
+			REG_UTP_TRANSFER_REQ_LIST_BASE_H);
+	ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
+			REG_UTP_TASK_REQ_LIST_BASE_L);
+	ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
+			REG_UTP_TASK_REQ_LIST_BASE_H);
+
  	/*
  	 * UCRDY, UTMRLDY and UTRLRDY bits must be 1

* DEI, HEI bits must be 0

drivers/scsi/ufs/ufshcd.c +1 -7

@@ -1030,17 +1124,11 @@ static int ufshcd_make_hba_operational(struct
 ufs_hba *hba)
  		goto out;
  	}
 
-	/* Enable required interrupts */
-	ufshcd_enable_intr(hba, UFSHCD_ENABLE_INTRS);
-
-	/* Configure interrupt aggregation */
-	ufshcd_config_int_aggr(hba, INT_AGGR_CONFIG);
-
  	if (hba->ufshcd_state == UFSHCD_STATE_RESET)
  		scsi_unblock_requests(hba->host);
 
  	hba->ufshcd_state = UFSHCD_STATE_OPERATIONAL;
-	scsi_scan_host(hba->host);
+
  out:
  	return err;

  }

drivers/scsi/ufs/ufshcd.c +1 -3

@@ -1109,34 +1197,29 @@ static int ufshcd_hba_enable(struct ufs_hba
 *hba)
  }
 
  /**
- * ufshcd_initialize_hba - start the initialization process
+ * ufshcd_link_startup - Initialize unipro link startup
   * @hba: per adapter instance
   *
- * 1. Enable the controller via ufshcd_hba_enable.
- * 2. Program the Transfer Request List Address with the starting

address of
- * UTRDL.
- * 3. Program the Task Management Request List Address with starting address
- * of UTMRDL.
- *
- * Returns 0 on success, non-zero value on failure.
+ * Returns 0 for success, non-zero in case of failure
*/

drivers/scsi/ufs/ufshcd.c +35 -16

-static int ufshcd_initialize_hba(struct ufs_hba *hba)
+static int ufshcd_link_startup(struct ufs_hba *hba)
  {
-	if (ufshcd_hba_enable(hba))
-		return -EIO;
+	int ret;
 
-	/* Configure UTRL and UTMRL base address registers */
-	ufshcd_writel(hba, lower_32_bits(hba->utrdl_dma_addr),
-		      REG_UTP_TRANSFER_REQ_LIST_BASE_L);
-	ufshcd_writel(hba, upper_32_bits(hba->utrdl_dma_addr),
-		      REG_UTP_TRANSFER_REQ_LIST_BASE_H);
-	ufshcd_writel(hba, lower_32_bits(hba->utmrdl_dma_addr),
-		      REG_UTP_TASK_REQ_LIST_BASE_L);
-	ufshcd_writel(hba, upper_32_bits(hba->utmrdl_dma_addr),
-		      REG_UTP_TASK_REQ_LIST_BASE_H);
+	/* enable UIC related interrupts */
+	ufshcd_enable_intr(hba, UIC_COMMAND_COMPL);
+
+	ret = ufshcd_dme_link_startup(hba);
+	if (ret)
+		goto out;
 
-	/* Initialize unipro link startup procedure */
-	return ufshcd_dme_link_startup(hba);
+	ret = ufshcd_make_hba_operational(hba);
+	if (ret)
+		goto out;
+
+out:
+	dev_err(hba->dev, "link startup failed %d\n", ret);
+	return ret;
  }
 
  /**

@@ -1176,12 +1259,19 @@ static int ufshcd_do_reset(struct ufs_hba *hba)
  	hba->outstanding_reqs = 0;
  	hba->outstanding_tasks = 0;
 
-	/* start the initialization process */
-	if (ufshcd_initialize_hba(hba)) {
+	/* Host controller enable */
+	if (ufshcd_hba_enable(hba)) {
  		dev_err(hba->dev,
  			"Reset: Controller initialization failed\n");
  		return FAILED;
  	}
+
+	if (ufshcd_link_startup(hba)) {
+		dev_err(hba->dev,
+			"Reset: Link start-up failed\n");
+		return FAILED;
+	}
+
  	return SUCCESS;
  }
 

@@ -1434,6 +1524,17 @@ ufshcd_transfer_rsp_status(struct ufs_hba *hba,
 struct ufshcd_lrb *lrbp)
  }
 
  /**
+ * ufshcd_uic_cmd_compl - handle completion of uic command
+ * @hba: per adapter instance
+ */
+static void ufshcd_uic_cmd_compl(struct ufs_hba *hba)
+{
+	hba->active_uic_cmd->argument2 |=
+		ufshcd_get_uic_cmd_result(hba);
+	complete(&hba->active_uic_cmd->done);
+}
+
+/**
   * ufshcd_transfer_req_compl - handle SCSI and query command

completion
* @hba: per adapter instance
*/

drivers/scsi/ufs/ufshcd.c +0 -22

@@ -1473,28 +1574,6 @@ static void ufshcd_transfer_req_compl(struct
 ufs_hba *hba)
  }
 
  /**
- * ufshcd_uic_cc_handler - handle UIC command completion
- * @work: pointer to a work queue structure
- *
- * Returns 0 on success, non-zero value on failure
- */
-static void ufshcd_uic_cc_handler (struct work_struct *work)
-{
-	struct ufs_hba *hba;
-
-	hba = container_of(work, struct ufs_hba, uic_workq);
-
-	if ((hba->active_uic_cmd.command == UIC_CMD_DME_LINK_STARTUP) &&
-	    !(ufshcd_get_uic_cmd_result(hba))) {
-
-		if (ufshcd_make_hba_operational(hba))
-			dev_err(hba->dev,
-				"cc: hba not operational state\n");
-		return;
-	}
-}
-
-/**
   * ufshcd_fatal_err_handler - handle fatal errors
   * @hba: per adapter instance

   */

drivers/scsi/ufs/ufshcd.c +1 -1

@@ -1555,7 +1634,7 @@ static void ufshcd_sl_intr(struct ufs_hba *hba,
 u32 intr_status)
  		ufshcd_err_handler(hba);
 
  	if (intr_status & UIC_COMMAND_COMPL)
-		schedule_work(&hba->uic_workq);
+		ufshcd_uic_cmd_compl(hba);
 
  	if (intr_status & UTP_TASK_REQ_COMPL)

  		ufshcd_tmc_handler(hba);

drivers/scsi/ufs/ufshcd.c +18 -1

@@ -1778,6 +1857,21 @@ out:
  	return err;
  }
 
+/**
+ * ufshcd_async_scan - asynchronous execution for link startup
+ * @data: data pointer to pass to this function
+ * @cookie: cookie data
+ */
+static void ufshcd_async_scan(void *data, async_cookie_t cookie)
+{
+	struct ufs_hba *hba = (struct ufs_hba *)data;
+	int ret;
+
+	ret = ufshcd_link_startup(hba);
+	if (!ret)
+		scsi_scan_host(hba->host);
+}
+
  static struct scsi_host_template ufshcd_driver_template = {
  	.module			= THIS_MODULE,
  	.name			= UFSHCD,

@@ -1939,12 +2033,14 @@ int ufshcd_init(struct device *dev, struct
 ufs_hba **hba_handle,
  	init_waitqueue_head(&hba->ufshcd_tm_wait_queue);
 
  	/* Initialize work queues */
-	INIT_WORK(&hba->uic_workq, ufshcd_uic_cc_handler);
  	INIT_WORK(&hba->feh_workq, ufshcd_fatal_err_handler);
 
  	/* Initialize mutex for query requests */
  	mutex_init(&hba->query.lock_ufs_query);
 
+	/* Initialize UIC command mutex */
+	mutex_init(&hba->uic_cmd_mutex);
+
  	/* IRQ registration */
  	err = request_irq(irq, ufshcd_intr, IRQF_SHARED, UFSHCD, hba);

  	if (err) {

drivers/scsi/ufs/ufshcd.c +6 -3

@@ -1965,14 +2061,17 @@ int ufshcd_init(struct device *dev, struct
 ufs_hba **hba_handle,
  		goto out_free_irq;
  	}
 
-	/* Initialization routine */
-	err = ufshcd_initialize_hba(hba);
+	/* Host controller enable */
+	err = ufshcd_hba_enable(hba);
  	if (err) {
-		dev_err(hba->dev, "Initialization failed\n");
+		dev_err(hba->dev, "Host controller enable failed\n");
  		goto out_remove_scsi_host;
  	}
+
  	*hba_handle = hba;
 
+	async_schedule(ufshcd_async_scan, hba);
+
  	return 0;
 

out_remove_scsi_host:

drivers/scsi/ufs/ufshcd.h +7 -2

index d98e046..974bd07 100644
@@ -51,6 +51,7 @@
  #include <linux/bitops.h>
  #include <linux/pm_runtime.h>
  #include <linux/clk.h>
+#include <linux/completion.h>
 
  #include <asm/irq.h>
  #include <asm/byteorder.h>

@@ -76,6 +77,7 @@
   * @argument3: UIC command argument 3
   * @cmd_active: Indicate if UIC command is outstanding
   * @result: UIC command result
+ * @done: UIC command completion
   */
  struct uic_command {
  	u32 command;

@@ -84,6 +86,7 @@ struct uic_command {
  	u32 argument3;
  	int cmd_active;
  	int result;
+	struct completion done;
  };
 
  /**

@@ -150,11 +153,11 @@ struct ufs_query {
   * @ufs_version: UFS Version to which controller complies
   * @irq: Irq number of the controller
   * @active_uic_cmd: handle of active UIC command
+ * @uic_cmd_mutex: mutex for uic command
   * @ufshcd_tm_wait_queue: wait queue for task management
   * @tm_condition: condition variable for task management
   * @ufshcd_state: UFSHCD states
   * @intr_mask: Interrupt Mask Bits
- * @uic_workq: Work queue for UIC completion handling
   * @feh_workq: Work queue for fatal controller error handling
   * @errors: HBA errors
   * @query: query request information

@@ -186,7 +189,9 @@ struct ufs_hba {
  	u32 ufs_version;
  	unsigned int irq;
 
-	struct uic_command active_uic_cmd;
+	struct uic_command *active_uic_cmd;
+	struct mutex uic_cmd_mutex;
+
  	wait_queue_head_t ufshcd_tm_wait_queue;
  	unsigned long tm_condition;
 

drivers/scsi/ufs/ufshcd.h struct ufs_hba { · line 204

Quoted 7 lines

drivers/scsi/ufs/ufshcd.h +0 -1

@@ -194,7 +199,6 @@ struct ufs_hba {
  	u32 intr_mask;
 
  	/* Work Queues */
-	struct work_struct uic_workq;
  	struct work_struct feh_workq;
 
  	/* HBA Errors */

--
Regards,
Sujit
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html