Skip to contentSkip to conversation

Add support for Unisoc UFS host controller

PATCH Applied Zhe Wang 4 participants 7 messages Dec 9, 2022 – Jan 14, 2023

Subsystems (4)
lore
Share & tools
lore

Zhe Wang

author
#0 lore raw

v4 cover Add support for Unisoc UFS host controller

V3 -> V4:
- Added "Reviewed-by" to the dt-bindings patch
- Addressed Alim's comments

V2 -> V3:
- Modify the clock and reset names to more appropriate names
- Use 'assigned-clock-parents' to place parent clock of 'core'
- Do some format order modification

V1 -> V2:
- Fix dt-binding doc in v2 patch
- Do some minor format changes
- Remove of_match_ptr
- Remove functions from headers

Zhe Wang (2):
dt-bindings: ufs: Add document for Unisoc UFS host controller
scsi: ufs-unisoc: Add support for Unisoc UFS host controller

 .../bindings/ufs/sprd,ums9620-ufs.yaml        |  79 +++
 drivers/ufs/host/Kconfig                      |  12 +
 drivers/ufs/host/Makefile                     |   1 +
 drivers/ufs/host/ufs-sprd.c                   | 458 ++++++++++++++++++
 drivers/ufs/host/ufs-sprd.h                   |  85 ++++
 5 files changed, 635 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml
 create mode 100644 drivers/ufs/host/ufs-sprd.c
 create mode 100644 drivers/ufs/host/ufs-sprd.h
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v4 1/2 dt-bindings: ufs: Add document for Unisoc UFS host controller

Add Unisoc ums9620 ufs host controller devicetree document.

---
 .../bindings/ufs/sprd,ums9620-ufs.yaml        | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml
Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml new file +79 -0
new file mode 100644
index 000000000000..36a8ae77949f
@@ -0,0 +1,79 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/ufs/sprd,ums9620-ufs.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Unisoc Universal Flash Storage (UFS) Controller
+
+maintainers:
+  - Zhe Wang <[email protected]>
+
+allOf:
+  - $ref: ufs-common.yaml
+
+properties:
+  compatible:
+    const: sprd,ums9620-ufs
+
+  reg:
+    maxItems: 1
+
+  clocks:
+    maxItems: 3
+
+  clock-names:
+    items:
+      - const: controller_eb
+      - const: cfg_eb
+      - const: core
+
+  resets:
+    maxItems: 2
+
+  reset-names:
+    items:
+      - const: controller
+      - const: device
+
+  vdd-mphy-supply:
+    description:
+      Phandle to vdd-mphy supply regulator node.
+
+  sprd,ufs-anlg-syscon:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: phandle of syscon used to control ufs analog regs.
+
+  sprd,aon-apb-syscon:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: phandle of syscon used to control always-on regs.
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - resets
+  - reset-names
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    ufs: ufs@22000000 {
+        compatible = "sprd,ums9620-ufs";
+        reg = <0x22000000 0x3000>;
+        interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+        vcc-supply = <&vddemmccore>;
+        vdd-mphy-supply = <&vddufs1v2>;
+        clocks = <&apahb_gate 5>, <&apahb_gate 22>, <&aonapb_clk 52>;
+        clock-names = "controller_eb", "cfg_eb", "core";
+        assigned-clocks = <&aonapb_clk 52>;
+        assigned-clock-parents = <&g5l_pll 12>;
+        resets = <&apahb_gate 4>, <&aonapb_gate 69>;
+        reset-names = "controller", "device";
+        sprd,ufs-anlg-syscon = <&anlg_phy_g12_regs>;
+        sprd,aon-apb-syscon = <&aon_apb_regs>;
+    };
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v4 2/2 scsi: ufs-unisoc: Add support for Unisoc UFS host controller

In reply to Zhe Wang

Add driver code for Unisoc ufs host controller, along with ufs initialization.

---
 drivers/ufs/host/Kconfig    |  12 +
 drivers/ufs/host/Makefile   |   1 +
 drivers/ufs/host/ufs-sprd.c | 458 ++++++++++++++++++++++++++++++++++++
 drivers/ufs/host/ufs-sprd.h |  85 +++++++
 4 files changed, 556 insertions(+)
 create mode 100644 drivers/ufs/host/ufs-sprd.c
 create mode 100644 drivers/ufs/host/ufs-sprd.h
drivers/ufs/host/Kconfig +12 -0
index 4cc2dbd79ed0..90a7142ec846 100644
@@ -124,3 +124,15 @@ config SCSI_UFS_EXYNOS
 
 	  Select this if you have UFS host controller on Samsung Exynos SoC.
 	  If unsure, say N.
+
+config SCSI_UFS_SPRD
+	tristate "Unisoc specific hooks to UFS controller platform driver"
+	depends on SCSI_UFSHCD_PLATFORM && (ARCH_SPRD || COMPILE_TEST)
+	help
+	  This selects the Unisoc specific additions to UFSHCD platform driver.
+	  UFS host on Unisoc needs some vendor specific configuration before
+	  accessing the hardware which includes PHY configuration and vendor
+	  specific registers.
+
+	  Select this if you have UFS controller on Unisoc chipset.
+	  If unsure, say N.
drivers/ufs/host/Makefile +1 -0
index 7717ca93e7d5..d7c5bf7fa512 100644
@@ -12,4 +12,5 @@ obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o
 obj-$(CONFIG_SCSI_UFS_HISI) += ufs-hisi.o
 obj-$(CONFIG_SCSI_UFS_MEDIATEK) += ufs-mediatek.o
 obj-$(CONFIG_SCSI_UFS_RENESAS) += ufs-renesas.o
+obj-$(CONFIG_SCSI_UFS_SPRD) += ufs-sprd.o
 obj-$(CONFIG_SCSI_UFS_TI_J721E) += ti-j721e-ufs.o
drivers/ufs/host/ufs-sprd.c new file +458 -0

458 lines not on this page · raw message

drivers/ufs/host/ufs-sprd.h new file +85 -0

85 lines not on this page · raw message

Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH v4 2/2] scsi: ufs-unisoc: Add support for Unisoc UFS host controller

Hi,

A gentle ping.

Best regards,
Zhe

Quoted 602 lines · Zhe Wang

Add driver code for Unisoc ufs host controller, along with ufs initialization.

---
 drivers/ufs/host/Kconfig    |  12 +
 drivers/ufs/host/Makefile   |   1 +
 drivers/ufs/host/ufs-sprd.c | 458 ++++++++++++++++++++++++++++++++++++
 drivers/ufs/host/ufs-sprd.h |  85 +++++++
 4 files changed, 556 insertions(+)
 create mode 100644 drivers/ufs/host/ufs-sprd.c
 create mode 100644 drivers/ufs/host/ufs-sprd.h
drivers/ufs/host/Kconfig +12 -0
index 4cc2dbd79ed0..90a7142ec846 100644
@@ -124,3 +124,15 @@ config SCSI_UFS_EXYNOS
 
          Select this if you have UFS host controller on Samsung Exynos SoC.
          If unsure, say N.
+
+config SCSI_UFS_SPRD
+       tristate "Unisoc specific hooks to UFS controller platform driver"
+       depends on SCSI_UFSHCD_PLATFORM && (ARCH_SPRD || COMPILE_TEST)
+       help
+         This selects the Unisoc specific additions to UFSHCD platform driver.
+         UFS host on Unisoc needs some vendor specific configuration before
+         accessing the hardware which includes PHY configuration and vendor
+         specific registers.
+
+         Select this if you have UFS controller on Unisoc chipset.
+         If unsure, say N.
drivers/ufs/host/Makefile +1 -0
index 7717ca93e7d5..d7c5bf7fa512 100644
@@ -12,4 +12,5 @@ obj-$(CONFIG_SCSI_UFSHCD_PLATFORM) += ufshcd-pltfrm.o
 obj-$(CONFIG_SCSI_UFS_HISI) += ufs-hisi.o
 obj-$(CONFIG_SCSI_UFS_MEDIATEK) += ufs-mediatek.o
 obj-$(CONFIG_SCSI_UFS_RENESAS) += ufs-renesas.o
+obj-$(CONFIG_SCSI_UFS_SPRD) += ufs-sprd.o
 obj-$(CONFIG_SCSI_UFS_TI_J721E) += ti-j721e-ufs.o
drivers/ufs/host/ufs-sprd.c new file +458 -0
new file mode 100644
index 000000000000..051f3f40d92c
@@ -0,0 +1,458 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * UNISOC UFS Host Controller driver
+ *
+ * Copyright (C) 2022 Unisoc, Inc.
+ * Author: Zhe Wang <[email protected]>
+ */
+
+#include <linux/arm-smccc.h>
+#include <linux/mfd/syscon.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/reset.h>
+#include <linux/regulator/consumer.h>
+
+#include <ufs/ufshcd.h>
+#include "ufshcd-pltfrm.h"
+#include "ufs-sprd.h"
+
+static const struct of_device_id ufs_sprd_of_match[];
+
+static struct ufs_sprd_priv *ufs_sprd_get_priv_data(struct ufs_hba *hba)
+{
+       struct ufs_sprd_host *host = ufshcd_get_variant(hba);
+
+       WARN_ON(!host->priv);
+       return host->priv;
+}
+
+static void ufs_sprd_regmap_update(struct ufs_sprd_priv *priv, unsigned int index,
+                               unsigned int reg, unsigned int bits,  unsigned int val)
+{
+       regmap_update_bits(priv->sysci[index].regmap, reg, bits, val);
+}
+
+static void ufs_sprd_regmap_read(struct ufs_sprd_priv *priv, unsigned int index,
+                               unsigned int reg, unsigned int *val)
+{
+       regmap_read(priv->sysci[index].regmap, reg, val);
+}
+
+static void ufs_sprd_get_unipro_ver(struct ufs_hba *hba)
+{
+       struct ufs_sprd_host *host = ufshcd_get_variant(hba);
+
+       if (ufshcd_dme_get(hba, UIC_ARG_MIB(PA_LOCALVERINFO), &host->unipro_ver))
+               host->unipro_ver = 0;
+}
+
+static void ufs_sprd_ctrl_uic_compl(struct ufs_hba *hba, bool enable)
+{
+       u32 set = ufshcd_readl(hba, REG_INTERRUPT_ENABLE);
+
+       if (enable == true)
+               set |= UIC_COMMAND_COMPL;
+       else
+               set &= ~UIC_COMMAND_COMPL;
+       ufshcd_writel(hba, set, REG_INTERRUPT_ENABLE);
+}
+
+static int ufs_sprd_get_reset_ctrl(struct device *dev, struct ufs_sprd_rst *rci)
+{
+       rci->rc = devm_reset_control_get(dev, rci->name);
+       if (IS_ERR(rci->rc)) {
+               dev_err(dev, "failed to get reset ctrl:%s\n", rci->name);
+               return PTR_ERR(rci->rc);
+       }
+
+       return 0;
+}
+
+static int ufs_sprd_get_syscon_reg(struct device *dev, struct ufs_sprd_syscon *sysci)
+{
+       sysci->regmap = syscon_regmap_lookup_by_phandle(dev->of_node, sysci->name);
+       if (IS_ERR(sysci->regmap)) {
+               dev_err(dev, "failed to get ufs syscon:%s\n", sysci->name);
+               return PTR_ERR(sysci->regmap);
+       }
+
+       return 0;
+}
+
+static int ufs_sprd_get_vreg(struct device *dev, struct ufs_sprd_vreg *vregi)
+{
+       vregi->vreg = devm_regulator_get(dev, vregi->name);
+       if (IS_ERR(vregi->vreg)) {
+               dev_err(dev, "failed to get vreg:%s\n", vregi->name);
+               return PTR_ERR(vregi->vreg);
+       }
+
+       return 0;
+}
+
+static int ufs_sprd_parse_dt(struct device *dev, struct ufs_hba *hba, struct ufs_sprd_host *host)
+{
+       u32 i;
+       struct ufs_sprd_priv *priv = host->priv;
+       int ret = 0;
+
+       /* Parse UFS reset ctrl info */
+       for (i = 0; i < SPRD_UFS_RST_MAX; i++) {
+               if (!priv->rci[i].name)
+                       continue;
+               ret = ufs_sprd_get_reset_ctrl(dev, &priv->rci[i]);
+               if (ret)
+                       goto out;
+       }
+
+       /* Parse UFS syscon reg info */
+       for (i = 0; i < SPRD_UFS_SYSCON_MAX; i++) {
+               if (!priv->sysci[i].name)
+                       continue;
+               ret = ufs_sprd_get_syscon_reg(dev, &priv->sysci[i]);
+               if (ret)
+                       goto out;
+       }
+
+       /* Parse UFS vreg info */
+       for (i = 0; i < SPRD_UFS_VREG_MAX; i++) {
+               if (!priv->vregi[i].name)
+                       continue;
+               ret = ufs_sprd_get_vreg(dev, &priv->vregi[i]);
+               if (ret)
+                       goto out;
+       }
+
+out:
+       return ret;
+}
+
+static int ufs_sprd_common_init(struct ufs_hba *hba)
+{
+       struct device *dev = hba->dev;
+       struct ufs_sprd_host *host;
+       struct platform_device __maybe_unused *pdev = to_platform_device(dev);
+       const struct of_device_id *of_id;
+       int ret = 0;
+
+       host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);
+       if (!host)
+               return -ENOMEM;
+
+       of_id = of_match_node(ufs_sprd_of_match, pdev->dev.of_node);
+       if (of_id->data != NULL)
+               host->priv = container_of(of_id->data, struct ufs_sprd_priv,
+                                         ufs_hba_sprd_vops);
+
+       host->hba = hba;
+       ufshcd_set_variant(hba, host);
+
+       hba->caps |= UFSHCD_CAP_CLK_GATING |
+               UFSHCD_CAP_CRYPTO |
+               UFSHCD_CAP_WB_EN;
+       hba->quirks |= UFSHCD_QUIRK_DELAY_BEFORE_DME_CMDS;
+
+       ret = ufs_sprd_parse_dt(dev, hba, host);
+
+       return ret;
+}
+
+static int sprd_ufs_pwr_change_notify(struct ufs_hba *hba,
+                                     enum ufs_notify_change_status status,
+                                     struct ufs_pa_layer_attr *dev_max_params,
+                                     struct ufs_pa_layer_attr *dev_req_params)
+{
+       struct ufs_sprd_host *host = ufshcd_get_variant(hba);
+
+       if (status == PRE_CHANGE) {
+               memcpy(dev_req_params, dev_max_params,
+                       sizeof(struct ufs_pa_layer_attr));
+               if (host->unipro_ver >= UFS_UNIPRO_VER_1_8)
+                       ufshcd_dme_configure_adapt(hba, dev_req_params->gear_tx,
+                                                  PA_INITIAL_ADAPT);
+       }
+
+       return 0;
+}
+
+static int ufs_sprd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op,
+                           enum ufs_notify_change_status status)
+{
+       unsigned long flags;
+
+       if (status == PRE_CHANGE) {
+               if (ufshcd_is_auto_hibern8_supported(hba)) {
+                       spin_lock_irqsave(hba->host->host_lock, flags);
+                       ufshcd_writel(hba, 0, REG_AUTO_HIBERNATE_IDLE_TIMER);
+                       spin_unlock_irqrestore(hba->host->host_lock, flags);
+               }
+       }
+
+       return 0;
+}
+
+static void ufs_sprd_n6_host_reset(struct ufs_hba *hba)
+{
+       struct ufs_sprd_priv *priv = ufs_sprd_get_priv_data(hba);
+
+       dev_info(hba->dev, "ufs host reset!\n");
+
+       reset_control_assert(priv->rci[SPRD_UFSHCI_SOFT_RST].rc);
+       usleep_range(1000, 1100);
+       reset_control_deassert(priv->rci[SPRD_UFSHCI_SOFT_RST].rc);
+}
+
+static int ufs_sprd_n6_device_reset(struct ufs_hba *hba)
+{
+       struct ufs_sprd_priv *priv = ufs_sprd_get_priv_data(hba);
+
+       dev_info(hba->dev, "ufs device reset!\n");
+
+       reset_control_assert(priv->rci[SPRD_UFS_DEV_RST].rc);
+       usleep_range(1000, 1100);
+       reset_control_deassert(priv->rci[SPRD_UFS_DEV_RST].rc);
+
+       return 0;
+}
+
+static void ufs_sprd_n6_key_acc_enable(struct ufs_hba *hba)
+{
+       u32 val;
+       u32 retry = 10;
+       struct arm_smccc_res res;
+
+check_hce:
+       /* Key access only can be enabled under HCE enable */
+       val = ufshcd_readl(hba, REG_CONTROLLER_ENABLE);
+       if (!(val & CONTROLLER_ENABLE)) {
+               ufs_sprd_n6_host_reset(hba);
+               val |= CONTROLLER_ENABLE;
+               ufshcd_writel(hba, val, REG_CONTROLLER_ENABLE);
+               usleep_range(1000, 1100);
+               if (retry) {
+                       retry--;
+                       goto check_hce;
+               }
+               goto disable_crypto;
+       }
+
+       arm_smccc_smc(SPRD_SIP_SVC_STORAGE_UFS_CRYPTO_ENABLE,
+                     0, 0, 0, 0, 0, 0, 0, &res);
+       if (!res.a0)
+               return;
+
+disable_crypto:
+       dev_err(hba->dev, "key reg access enable fail, disable crypto\n");
+       hba->caps &= ~UFSHCD_CAP_CRYPTO;
+}
+
+static int ufs_sprd_n6_init(struct ufs_hba *hba)
+{
+       struct ufs_sprd_priv *priv;
+       int ret = 0;
+
+       ret = ufs_sprd_common_init(hba);
+       if (ret != 0)
+               return ret;
+
+       priv = ufs_sprd_get_priv_data(hba);
+
+       ret = regulator_enable(priv->vregi[SPRD_UFS_VDD_MPHY].vreg);
+       if (ret)
+               return -ENODEV;
+
+       if (hba->caps & UFSHCD_CAP_CRYPTO)
+               ufs_sprd_n6_key_acc_enable(hba);
+
+       return 0;
+}
+
+static int ufs_sprd_n6_phy_init(struct ufs_hba *hba)
+{
+       int ret = 0;
+       uint32_t val = 0;
+       uint32_t retry = 10;
+       uint32_t offset;
+       struct ufs_sprd_priv *priv = ufs_sprd_get_priv_data(hba);
+
+       ufshcd_dme_set(hba, UIC_ARG_MIB(CBREFCLKCTRL2), 0x90);
+       ufshcd_dme_set(hba, UIC_ARG_MIB(CBCRCTRL), 0x01);
+       ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(RXSQCONTROL,
+                               UIC_ARG_MPHY_RX_GEN_SEL_INDEX(0)), 0x01);
+       ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(RXSQCONTROL,
+                               UIC_ARG_MPHY_RX_GEN_SEL_INDEX(1)), 0x01);
+       ufshcd_dme_set(hba, UIC_ARG_MIB(VS_MPHYCFGUPDT), 0x01);
+       ufshcd_dme_set(hba, UIC_ARG_MIB(CBRATESEL), 0x01);
+
+       do {
+               /* phy_sram_init_done */
+               ufs_sprd_regmap_read(priv, SPRD_UFS_ANLG, 0xc, &val);
+               if ((val & 0x1) == 0x1) {
+                       for (offset = 0x40; offset < 0x42; offset++) {
+                               /* Lane afe calibration */
+                               ufshcd_dme_set(hba, UIC_ARG_MIB(CBCREGADDRLSB), 0x1c);
+                               ufshcd_dme_set(hba, UIC_ARG_MIB(CBCREGADDRMSB), offset);
+                               ufshcd_dme_set(hba, UIC_ARG_MIB(CBCREGWRLSB), 0x04);
+                               ufshcd_dme_set(hba, UIC_ARG_MIB(CBCREGWRMSB), 0x00);
+                               ufshcd_dme_set(hba, UIC_ARG_MIB(CBCREGRDWRSEL), 0x01);
+                               ufshcd_dme_set(hba, UIC_ARG_MIB(VS_MPHYCFGUPDT), 0x01);
+                       }
+
+                       goto update_phy;
+               }
+               udelay(1000);
+               retry--;
+       } while (retry > 0);
+
+       ret = -ETIMEDOUT;
+       goto out;
+
+update_phy:
+       /* phy_sram_ext_ld_done */
+       ufs_sprd_regmap_update(priv, SPRD_UFS_ANLG, 0xc, 0x2, 0);
+       ufshcd_dme_set(hba, UIC_ARG_MIB(VS_MPHYCFGUPDT), 0x01);
+       ufshcd_dme_set(hba, UIC_ARG_MIB(VS_MPHYDISABLE), 0x0);
+out:
+       return ret;
+}
+
+
+static int sprd_ufs_n6_hce_enable_notify(struct ufs_hba *hba,
+                                        enum ufs_notify_change_status status)
+{
+       int err = 0;
+       struct ufs_sprd_priv *priv = ufs_sprd_get_priv_data(hba);
+
+       if (status == PRE_CHANGE) {
+               /* phy_sram_ext_ld_done */
+               ufs_sprd_regmap_update(priv, SPRD_UFS_ANLG, 0xc, 0x2, 0x2);
+               /* phy_sram_bypass */
+               ufs_sprd_regmap_update(priv, SPRD_UFS_ANLG, 0xc, 0x4, 0x4);
+
+               ufs_sprd_n6_host_reset(hba);
+
+               if (hba->caps & UFSHCD_CAP_CRYPTO)
+                       ufs_sprd_n6_key_acc_enable(hba);
+       }
+
+       if (status == POST_CHANGE) {
+               err = ufs_sprd_n6_phy_init(hba);
+               if (err) {
+                       dev_err(hba->dev, "Phy setup failed (%d)\n", err);
+                       goto out;
+               }
+
+               ufs_sprd_get_unipro_ver(hba);
+       }
+out:
+       return err;
+}
+
+static void sprd_ufs_n6_h8_notify(struct ufs_hba *hba,
+                                 enum uic_cmd_dme cmd,
+                                 enum ufs_notify_change_status status)
+{
+       struct ufs_sprd_priv *priv = ufs_sprd_get_priv_data(hba);
+
+       if (status == PRE_CHANGE) {
+               if (cmd == UIC_CMD_DME_HIBER_ENTER)
+                       /*
+                        * Disable UIC COMPL INTR to prevent access to UFSHCI after
+                        * checking HCS.UPMCRS
+                        */
+                       ufs_sprd_ctrl_uic_compl(hba, false);
+
+               if (cmd == UIC_CMD_DME_HIBER_EXIT) {
+                       ufs_sprd_regmap_update(priv, SPRD_UFS_AON_APB, APB_UFSDEV_REG,
+                               APB_UFSDEV_REFCLK_EN, APB_UFSDEV_REFCLK_EN);
+                       ufs_sprd_regmap_update(priv, SPRD_UFS_AON_APB, APB_USB31PLL_CTRL,
+                               APB_USB31PLLV_REF2MPHY, APB_USB31PLLV_REF2MPHY);
+               }
+       }
+
+       if (status == POST_CHANGE) {
+               if (cmd == UIC_CMD_DME_HIBER_EXIT)
+                       ufs_sprd_ctrl_uic_compl(hba, true);
+
+               if (cmd == UIC_CMD_DME_HIBER_ENTER) {
+                       ufs_sprd_regmap_update(priv, SPRD_UFS_AON_APB, APB_UFSDEV_REG,
+                               APB_UFSDEV_REFCLK_EN, 0);
+                       ufs_sprd_regmap_update(priv, SPRD_UFS_AON_APB, APB_USB31PLL_CTRL,
+                               APB_USB31PLLV_REF2MPHY, 0);
+               }
+       }
+}
+
+static struct ufs_sprd_priv n6_ufs = {
+       .rci[SPRD_UFSHCI_SOFT_RST] = { .name = "controller", },
+       .rci[SPRD_UFS_DEV_RST] = { .name = "device", },
+
+       .sysci[SPRD_UFS_ANLG] = { .name = "sprd,ufs-anlg-syscon", },
+       .sysci[SPRD_UFS_AON_APB] = { .name = "sprd,aon-apb-syscon", },
+
+       .vregi[SPRD_UFS_VDD_MPHY] = { .name = "vdd-mphy", },
+
+       .ufs_hba_sprd_vops = {
+               .name = "sprd,ums9620-ufs",
+               .init = ufs_sprd_n6_init,
+               .hce_enable_notify = sprd_ufs_n6_hce_enable_notify,
+               .pwr_change_notify = sprd_ufs_pwr_change_notify,
+               .hibern8_notify = sprd_ufs_n6_h8_notify,
+               .device_reset = ufs_sprd_n6_device_reset,
+               .suspend = ufs_sprd_suspend,
+       },
+};
+
+static const struct of_device_id __maybe_unused ufs_sprd_of_match[] = {
+       { .compatible = "sprd,ums9620-ufs", .data = &n6_ufs.ufs_hba_sprd_vops},
+       {},
+};
+MODULE_DEVICE_TABLE(of, ufs_sprd_of_match);
+
+static int ufs_sprd_probe(struct platform_device *pdev)
+{
+       int err;
+       struct device *dev = &pdev->dev;
+       const struct of_device_id *of_id;
+
+       of_id = of_match_node(ufs_sprd_of_match, dev->of_node);
+       err = ufshcd_pltfrm_init(pdev, of_id->data);
+       if (err)
+               dev_err(dev, "ufshcd_pltfrm_init() failed %d\n", err);
+
+       return err;
+}
+
+static int ufs_sprd_remove(struct platform_device *pdev)
+{
+       struct ufs_hba *hba =  platform_get_drvdata(pdev);
+
+       pm_runtime_get_sync(&(pdev)->dev);
+       ufshcd_remove(hba);
+       return 0;
+}
+
+static const struct dev_pm_ops ufs_sprd_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)
+       SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)
+       .prepare         = ufshcd_suspend_prepare,
+       .complete        = ufshcd_resume_complete,
+};
+
+static struct platform_driver ufs_sprd_pltform = {
+       .probe = ufs_sprd_probe,
+       .remove = ufs_sprd_remove,
+       .shutdown = ufshcd_pltfrm_shutdown,
+       .driver = {
+               .name = "ufshcd-sprd",
+               .pm = &ufs_sprd_pm_ops,
+               .of_match_table = of_match_ptr(ufs_sprd_of_match),
+       },
+};
+module_platform_driver(ufs_sprd_pltform);
+
+MODULE_AUTHOR("Zhe Wang <[email protected]>");
+MODULE_DESCRIPTION("Unisoc UFS Host Driver");
+MODULE_LICENSE("GPL v2");
drivers/ufs/host/ufs-sprd.h new file +85 -1
new file mode 100644
index 000000000000..d0cf4d8335d0
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * UNISOC UFS Host Controller driver
+ *
+ * Copyright (C) 2022 Unisoc, Inc.
+ * Author: Zhe Wang <[email protected]>
+ */
+
+#ifndef _UFS_SPRD_H_
+#define _UFS_SPRD_H_
+
+/* Vendor specific attributes */
+#define RXSQCONTROL    0x8009
+#define CBRATESEL      0x8114
+#define CBCREGADDRLSB  0x8116
+#define CBCREGADDRMSB  0x8117
+#define CBCREGWRLSB    0x8118
+#define CBCREGWRMSB    0x8119
+#define CBCREGRDWRSEL  0x811C
+#define CBCRCTRL       0x811F
+#define CBREFCLKCTRL2  0x8132
+#define VS_MPHYDISABLE 0xD0C1
+
+#define APB_UFSDEV_REG         0xCE8
+#define APB_UFSDEV_REFCLK_EN   0x2
+#define APB_USB31PLL_CTRL      0xCFC
+#define APB_USB31PLLV_REF2MPHY 0x1
+
+#define SPRD_SIP_SVC_STORAGE_UFS_CRYPTO_ENABLE                         \
+       ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL,                         \
+                          ARM_SMCCC_SMC_32,                            \
+                          ARM_SMCCC_OWNER_SIP,                         \
+                          0x0301)
+
+enum SPRD_UFS_RST_INDEX {
+       SPRD_UFSHCI_SOFT_RST,
+       SPRD_UFS_DEV_RST,
+
+       SPRD_UFS_RST_MAX
+};
+
+enum SPRD_UFS_SYSCON_INDEX {
+       SPRD_UFS_ANLG,
+       SPRD_UFS_AON_APB,
+
+       SPRD_UFS_SYSCON_MAX
+};
+
+enum SPRD_UFS_VREG_INDEX {
+       SPRD_UFS_VDD_MPHY,
+
+       SPRD_UFS_VREG_MAX
+};
+
+struct ufs_sprd_rst {
+       const char *name;
+       struct reset_control *rc;
+};
+
+struct ufs_sprd_syscon {
+       const char *name;
+       struct regmap *regmap;
+};
+
+struct ufs_sprd_vreg {
+       const char *name;
+       struct regulator *vreg;
+};
+
+struct ufs_sprd_priv {
+       struct ufs_sprd_rst rci[SPRD_UFS_RST_MAX];
+       struct ufs_sprd_syscon sysci[SPRD_UFS_SYSCON_MAX];
+       struct ufs_sprd_vreg vregi[SPRD_UFS_VREG_MAX];
+       const struct ufs_hba_variant_ops ufs_hba_sprd_vops;
+};
+
+struct ufs_sprd_host {
+       struct ufs_hba *hba;
+       struct ufs_sprd_priv *priv;
+       void __iomem *ufs_dbg_mmio;
+
+       enum ufs_unipro_ver unipro_ver;
+};
+
+#endif /* _UFS_SPRD_H_ */
--

2.17.1

#5 lore raw
In reply to Zhe Wang

Zhe,

Quoted 3 lines

Zhe Wang (2):
dt-bindings: ufs: Add document for Unisoc UFS host controller
scsi: ufs-unisoc: Add support for Unisoc UFS host controller

Applied to 6.3/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#6 lore raw
In reply to Zhe Wang
Quoted 10 lines · Zhe Wang

V3 -> V4:
- Added "Reviewed-by" to the dt-bindings patch
- Addressed Alim's comments

V2 -> V3:
- Modify the clock and reset names to more appropriate names
- Use 'assigned-clock-parents' to place parent clock of 'core'
- Do some format order modification

[...]

Applied to 6.3/scsi-queue, thanks!

[1/2] dt-bindings: ufs: Add document for Unisoc UFS host controller

      https://git.kernel.org/mkp/scsi/c/aa67971b2736
[2/2] scsi: ufs-unisoc: Add support for Unisoc UFS host controller
      https://git.kernel.org/mkp/scsi/c/df7320bac37e
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering