add support for DWC UFS Controller

Add UFS 2.0 to the ufshcd-pltfrm devicetree binding.

Signed-off-by Joao Pinto <[email protected]>

---
Changes v0->v12 (Tomas Winkler):
- This patch only appeared in v12

 Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Adding UFS 2.0 support to the UFS core driver.

Signed-off-by Joao Pinto <[email protected]>

---
Changes v11->v12 (Tomas Winkler):
- devicetree binding tweak was moved to a separated patch
- unipro tweaks were moved to a separated patch
- ufshcd_compose_upiu was decomposed in 2 functions
- UTP_CMD_TYPE_UFS_STORAGE is now 0x1 (previously was 0x11) Changes v8->v11:
- Nothing changed (just to keep up with patch set version). Changes v7->v8:
- Added "jedec, ufs-2.0" to the ufschd-platform compatibility strings Changes v0->v7:
- Nothing changed (just to keep up with patch set version).

 drivers/scsi/ufs/ufshcd.c | 90 ++++++++++++++++++++++++++-----------
----------
 drivers/scsi/ufs/ufshci.h |  5 +++
 2 files changed, 54 insertions(+), 41 deletions(-)

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

index 9c1b94b..a69d637 100644
@@ -1127,7 +1127,7 @@ static void ufshcd_disable_intr(struct ufs_hba
 *hba, u32 intrs)
  * @cmd_dir: requests data direction
  */
 static void ufshcd_prepare_req_desc_hdr(struct ufshcd_lrb *lrbp,
-		u32 *upiu_flags, enum dma_data_direction cmd_dir)
+			u32 *upiu_flags, enum dma_data_direction
 cmd_dir)
 {

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

 	struct utp_transfer_req_desc *req_desc = lrbp
->utr_descriptor_ptr;
 	u32 data_direction;

@@ -1253,47 +1253,55 @@ static inline void
 ufshcd_prepare_utp_nop_upiu(struct ufshcd_lrb *lrbp)
 }
 
 /**
- * ufshcd_compose_upiu - form UFS Protocol Information Unit(UPIU)
+ * ufshcd_comp_devman_upiu - UFS Protocol Information Unit(UPIU) 
+ *			     for Device Management Purposes
  * @hba - per adapter instance
  * @lrb - pointer to local reference block
  */
-static int ufshcd_compose_upiu(struct ufs_hba *hba, struct
 ufshcd_lrb *lrbp)
+static int ufshcd_comp_devman_upiu(struct ufs_hba *hba, struct
 ufshcd_lrb *lrbp)
 {
 	u32 upiu_flags;
 	int ret = 0;
 
-	switch (lrbp->command_type) {
-	case UTP_CMD_TYPE_SCSI:
-		if (likely(lrbp->cmd)) {
-			ufshcd_prepare_req_desc_hdr(lrbp,
 &upiu_flags,
-					lrbp->cmd
->sc_data_direction);
-			ufshcd_prepare_utp_scsi_cmd_upiu(lrbp,
 upiu_flags);
-		} else {
-			ret = -EINVAL;
-		}
-		break;
-	case UTP_CMD_TYPE_DEV_MANAGE:
-		ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags,
 DMA_NONE);
-		if (hba->dev_cmd.type == DEV_CMD_TYPE_QUERY)
-			ufshcd_prepare_utp_query_req_upiu(
-					hba, lrbp, upiu_flags);
-		else if (hba->dev_cmd.type == DEV_CMD_TYPE_NOP)
-			ufshcd_prepare_utp_nop_upiu(lrbp);
-		else
-			ret = -EINVAL;
-		break;
-	case UTP_CMD_TYPE_UFS:
-		/* For UFS native command implementation */
-		ret = -ENOTSUPP;
-		dev_err(hba->dev, "%s: UFS native command are not
 supported\n",
-			__func__);
-		break;
-	default:
-		ret = -ENOTSUPP;
-		dev_err(hba->dev, "%s: unknown command type:

0x%x\n",

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

-				__func__, lrbp->command_type);
-		break;
-	} /* end of switch */
+	if (hba->ufs_version == UFSHCI_VERSION_20)
+		lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;
+	else
+		lrbp->command_type = UTP_CMD_TYPE_DEV_MANAGE;
+
+	ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags, DMA_NONE);
+	if (hba->dev_cmd.type == DEV_CMD_TYPE_QUERY)
+		ufshcd_prepare_utp_query_req_upiu(hba, lrbp,

upiu_flags);

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

+	else if (hba->dev_cmd.type == DEV_CMD_TYPE_NOP)
+		ufshcd_prepare_utp_nop_upiu(lrbp);
+	else
+		ret = -EINVAL;
+
+	return ret;
+}
+
+/**
+ * ufshcd_comp_scsi_upiu - UFS Protocol Information Unit(UPIU) 
+ *			   for SCSI Purposes
+ * @hba - per adapter instance
+ * @lrb - pointer to local reference block
+ */
+static int ufshcd_comp_scsi_upiu(struct ufs_hba *hba, struct

ufshcd_lrb *lrbp)

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

+{
+	u32 upiu_flags;
+	int ret = 0;
+
+	if (hba->ufs_version == UFSHCI_VERSION_20)
+		lrbp->command_type = UTP_CMD_TYPE_UFS_STORAGE;
+	else
+		lrbp->command_type = UTP_CMD_TYPE_SCSI;
+
+	if (likely(lrbp->cmd)) {
+		ufshcd_prepare_req_desc_hdr(lrbp, &upiu_flags,
+						lrbp->cmd
->sc_data_direction);
+		ufshcd_prepare_utp_scsi_cmd_upiu(lrbp, upiu_flags);
+	} else {
+		ret = -EINVAL;
+	}
 
 	return ret;
 }

@@ -1405,10 +1414,9 @@ static int ufshcd_queuecommand(struct
 Scsi_Host *host, struct scsi_cmnd *cmd)
 	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->command_type = UTP_CMD_TYPE_SCSI;
 
-	/* form UPIU before issuing the command */
-	ufshcd_compose_upiu(hba, lrbp);
+	ufshcd_comp_scsi_upiu(hba, lrbp);
+
 	err = ufshcd_map_sg(lrbp);

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

 	if (err) {
 		lrbp->cmd = NULL;

@@ -1433,11 +1441,10 @@ static int ufshcd_compose_dev_cmd(struct
 ufs_hba *hba,
 	lrbp->sense_buffer = NULL;
 	lrbp->task_tag = tag;
 	lrbp->lun = 0; /* device management cmd is not specific to

any LUN */

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

-	lrbp->command_type = UTP_CMD_TYPE_DEV_MANAGE;
 	lrbp->intr_cmd = true; /* No interrupt aggregation */
 	hba->dev_cmd.type = cmd_type;
 
-	return ufshcd_compose_upiu(hba, lrbp);
+	return ufshcd_comp_devman_upiu(hba, lrbp);
 }
 
 static int

@@ -3403,7 +3410,8 @@ static void ufshcd_transfer_req_compl(struct
 ufs_hba *hba)
 			/* Do not touch lrbp after scsi done */
 			cmd->scsi_done(cmd);
 			__ufshcd_release(hba);
-		} else if (lrbp->command_type ==
 UTP_CMD_TYPE_DEV_MANAGE) {
+		} else if (lrbp->command_type ==

UTP_CMD_TYPE_DEV_MANAGE ||

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

+			lrbp->command_type ==

UTP_CMD_TYPE_UFS_STORAGE) {

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

 			if (hba->dev_cmd.complete)
 				complete(hba->dev_cmd.complete);
 		}

drivers/scsi/ufs/ufshci.h +5 -0

index 0ae0967..20ece18 100644
@@ -275,6 +275,11 @@ enum {
 	UTP_CMD_TYPE_DEV_MANAGE		= 0x2,
 };
 
+/* To accomodate UFS2.0 required Command type */
+enum {
+	UTP_CMD_TYPE_UFS_STORAGE	= 0x1,
+};
+
 enum {
 	UTP_SCSI_COMMAND		= 0x00000000,
 	UTP_NATIVE_UFS_COMMAND		= 0x10000000,

Quoted 3 lines · Joao Pinto

Adding UFS 2.0 support to the UFS core driver.

Signed-off-by Joao Pinto <[email protected]>

Looks good to me, though not tested yet
Tomas

Quoted 6 lines

---
Changes v11->v12 (Tomas Winkler):
- devicetree binding tweak was moved to a separated patch
- unipro tweaks were moved to a separated patch
- ufshcd_compose_upiu was decomposed in 2 functions

drivers/scsi/ufs/ufshci.h enum { · line 285

Quoted 7 lines

drivers/scsi/ufs/ufshci.h +4 -0

+enum {
+	UTP_CMD_TYPE_UFS_STORAGE	= 0x1,
+};
+
 enum {
 	UTP_SCSI_COMMAND		= 0x00000000,
 	UTP_NATIVE_UFS_COMMAND		= 0x10000000,

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

index e3931d0..c780d14 100644
@@ -263,6 +263,7 @@ struct ufs_pwr_mode_info {
  * @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
  */
 struct ufs_hba_variant_ops {
        const char *name;

Hi Joao,

2016-04-13 18:04 GMT+09:00 Joao Pinto <[email protected]>:

Quoted 14 lines

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

index e3931d0..c780d14 100644
@@ -263,6 +263,7 @@ struct ufs_pwr_mode_info {
  * @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
  */
 struct ufs_hba_variant_ops {
        const char *name;

@@ -284,6 +285,7 @@ struct ufs_hba_variant_ops {
        int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);

drivers/scsi/ufs/ufshcd.h struct ufs_hba_variant_ops { · line 289

Quoted 4 lines

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

        int     (*resume)(struct ufs_hba *, enum ufs_pm_op);
        void    (*dbg_register_dump)(struct ufs_hba *hba);
+       int     (*phy_initialization)(struct ufs_hba *);
 };

This vops->phy_initialization is only called from ufs dwc specific source files and not called from ufs core. So this should not belong to ufs_hba_variant_ops.

You can use hba->priv to put the controller specific data structure including phy_initialization and you also need to define vops->init callback which allocates and initialize the data structure.

Hi Akinobu,

Quoted 18 lines · Akinobu Mita

Hi Joao,

2016-04-13 18:04 GMT+09:00 Joao Pinto <[email protected]>:

Quoted 14 lines

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

index e3931d0..c780d14 100644
@@ -263,6 +263,7 @@ struct ufs_pwr_mode_info {
  * @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
  */
 struct ufs_hba_variant_ops {
        const char *name;

@@ -284,6 +285,7 @@ struct ufs_hba_variant_ops {
        int     (*suspend)(struct ufs_hba *, enum ufs_pm_op);

Quoted 8 lines

drivers/scsi/ufs/ufshcd.h struct ufs_hba_variant_ops { · line 289

Quoted 4 lines

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

        int     (*resume)(struct ufs_hba *, enum ufs_pm_op);
        void    (*dbg_register_dump)(struct ufs_hba *hba);
+       int     (*phy_initialization)(struct ufs_hba *);
 };

This vops->phy_initialization is only called from ufs dwc specific source files and not called from ufs core. So this should not belong to ufs_hba_variant_ops.

At this time only DWC specific uses the phy_initialization, but can be used by others in the future when the same necessity comes.

Quoted 3 lines

You can use hba->priv to put the controller specific data structure including phy_initialization and you also need to define vops->init callback which allocates and initialize the data structure.

This patch adds a glue platform driver for the Synopsys G210 Test Chip.

Signed-off-by Joao Pinto <[email protected]>

---
Changes v11->v12 (Tomas Winkler):
- custom_phy_initialization replaced by phy_initialization Changes v10->v11 (Arnd Bergmann):
- vops structs are now passed in .data
Changes v0->v10:
- This patch only appeared in v10

 .../devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt |  26 +++++
 drivers/scsi/ufs/Kconfig                           |   9 ++
 drivers/scsi/ufs/Makefile                          |   1 +
 drivers/scsi/ufs/tc-dwc-g210-pltfrm.c              | 113 +++++++++++++++++++++
 4 files changed, 149 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt
 create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pltfrm.c

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +0 -0

new file mode 100644
index 0000000..6ec9647

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +6 -0

+		compatible = "snps, g210-tc-6.00-40bit",
+			     "snps, dwc-ufshcd-1.40a",
+			     "jedec,ufs-2.0";
+		reg = < 0xd0000000 0x10000 >;
+		interrupts = < 24 >;
+	};

Quoted 4 lines · Joao Pinto

This patch adds a glue platform driver for the Synopsys G210 Test Chip.

Signed-off-by Joao Pinto <[email protected]>

---

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 9

Quoted 5 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +5 -0

+
+Required properties:
+- compatible	: compatible list must contain the PHY type & version:
+			"snps, g210-tc-6.00-20bit"
+			"snps, g210-tc-6.00-40bit"

Remove the space ^

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 11

Quoted 2 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +2 -0

+		  complemented with the Controller IP version:
+			"snps, dwc-ufshcd-1.40a"

ditto

Combining the phy and controller compatible strings is a bit strange. Generally, they would be separate nodes using the common phy binding.

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 20

Quoted 9 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +9 -0

+		  complemented with the JEDEC version:
+			"jedec,ufs-1.1"
+			"jedec,ufs-2.0"
+
+- reg		: <registers mapping>
+- interrupts	: <interrupt mapping for UFS host controller IRQ>
+
+Example for a setup using a 1.40a DWC Controller with a 6.00 G210 40-bit TC:
+	dwc_ufs@d0000000 {

No underscores please.

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 26

Quoted 7 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +6 -0

+		compatible = "snps, g210-tc-6.00-40bit",
+			     "snps, dwc-ufshcd-1.40a",
+			     "jedec,ufs-2.0";
+		reg = < 0xd0000000 0x10000 >;
+		interrupts = < 24 >;
+	};

Hi Rob,

Quoted 5 lines · Rob Herring

Quoted 4 lines · Joao Pinto

This patch adds a glue platform driver for the Synopsys G210 Test Chip.

Signed-off-by Joao Pinto <[email protected]>

---

[snip]

Quoted 11 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 9

Quoted 5 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +5 -0

+
+Required properties:
+- compatible	: compatible list must contain the PHY type & version:
+			"snps, g210-tc-6.00-20bit"
+			"snps, g210-tc-6.00-40bit"

Remove the space ^

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 11

Quoted 2 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +2 -0

+		  complemented with the Controller IP version:
+			"snps, dwc-ufshcd-1.40a"

ditto

Ok, will do that!

Quoted 1 line

Quoted 3 lines

Combining the phy and controller compatible strings is a bit strange. Generally, they would be separate nodes using the common phy binding.

Correct, but in this case is just the compatibility string is just to tell the dw ufs host that it has a 40-bit or a 20-bit test chip connected. The Test chip is initialized by a unipro command sequence and there is no more ops related to it.

Quoted 31 lines · Joao Pinto

Hi Rob,

Quoted 5 lines · Rob Herring

Quoted 4 lines · Joao Pinto

This patch adds a glue platform driver for the Synopsys G210 Test Chip.

Signed-off-by Joao Pinto <jpinto-HKixBCOQz3hWk0Htik3J/[email protected]>

---

[snip]

Quoted 11 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 9

Quoted 5 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +5 -0

+
+Required properties:
+- compatible	: compatible list must contain the PHY type & version:
+			"snps, g210-tc-6.00-20bit"
+			"snps, g210-tc-6.00-40bit"

Remove the space ^

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt line 11

Quoted 2 lines

Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt new file +2 -0

+		  complemented with the Controller IP version:
+			"snps, dwc-ufshcd-1.40a"

ditto

Ok, will do that!

Quoted 4 lines

Combining the phy and controller compatible strings is a bit strange. Generally, they would be separate nodes using the common phy binding.

Quoted 3 lines

Correct, but in this case is just the compatibility string is just to tell the dw ufs host that it has a 40-bit or a 20-bit test chip connected. The Test chip is initialized by a unipro command sequence and there is no more ops related to it.

Okay. In that case, I think it should be a separate property unless the controller h/w is synthesized for one or the other.

Rob

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Joao" == Joao Pinto <[email protected]> writes:

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Joao" == Joao Pinto <[email protected]> writes:

Joao,

Joao> The work consisted of: - Fixed typo in ufshcd-pltfrm.c - Tweak Joao> ufshcd.c for UFS 2.0 support - Implement ufshcd-dwc which contains Joao> all DWC HW specific code - Unipro attributes were added and new Joao> registers were added to the driver - Implement a tc-dwc-g210 Joao> containing G210 MPHY specific code - Implement a tc-dwc-g210 glue Joao> platform driver - Implement a tc-dwc-g210 glue pci driver - Joao> Documentation update

You really need to keep track of which Acked-by: and Reviewed-by: tags you have gotten from people and apply them to patches that you haven't changed. Otherwise we start from scratch every time you resubmit.

Thanks!

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Joao" == Joao Pinto <[email protected]> writes:

Joao,

Joao> The work consisted of: - Fixed typo in ufshcd-pltfrm.c - Tweak Joao> ufshcd.c for UFS 2.0 support - Implement ufshcd-dwc which Joao> contains all DWC HW specific code - Unipro attributes were added Joao> and new registers were added to the driver - Implement a Joao> tc-dwc-g210 containing G210 MPHY specific code - Implement a Joao> tc-dwc-g210 glue platform driver - Implement a tc-dwc-g210 glue Joao> pci driver - Documentation update

You really need to keep track of which Acked-by: and Reviewed-by: tags you have gotten from people and apply them to patches that you haven't changed. Otherwise we start from scratch every time you resubmit.

Thanks!

Hi,

Quoted 16 lines · Martin K. Petersen

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

"Joao" == Joao Pinto <Joao.Pinto-HKixBCOQz3hWk0Htik3J/[email protected]> writes:

Joao,

Joao> The work consisted of: - Fixed typo in ufshcd-pltfrm.c - Tweak Joao> ufshcd.c for UFS 2.0 support - Implement ufshcd-dwc which Joao> contains all DWC HW specific code - Unipro attributes were added Joao> and new registers were added to the driver - Implement a Joao> tc-dwc-g210 containing G210 MPHY specific code - Implement a Joao> tc-dwc-g210 glue platform driver - Implement a tc-dwc-g210 glue Joao> pci driver - Documentation update

You really need to keep track of which Acked-by: and Reviewed-by: tags you have gotten from people and apply them to patches that you haven't changed. Otherwise we start from scratch every time you resubmit.

Quoted 2 lines

Thanks!

It's ok to submit the same v13 with the ACK tags?

You can add my Ack on the core patches, not DWC specific, I didn't really look at those properly. Thanks
Tomas

As requested, I am sending v14 to be included in the SCSI patchwork.

The work consisted of:
- Fixed typo in ufshcd-pltfrm.c
- Tweak ufshcd.c for UFS 2.0 support
- Implement ufshcd-dwc which contains all DWC HW specific code
- Unipro attributes were added and new registers were added to the driver
- Implement a tc-dwc-g210 containing G210 MPHY specific code
- Implement a tc-dwc-g210 glue platform driver
- Implement a tc-dwc-g210 glue pci driver
- Documentation update

Joao Pinto (9):
fixed typo in ufshcd-pltfrm
add UFS 2.0 to ufshcd-pltfrm bindings
added UFS 2.0 capabilities
added unipro attributes
added link status to ufshci
added support for DesignWare Controller
added support for Synopsys G210 Test Chip
add TC G210 platform driver
add TC G210 pci driver