diff mbox series

[13/15] scsi: ufs: ufs-exynos: support exynosauto v9 ufs driver

Message ID 20210709065711.25195-14-chanho61.park@samsung.com (mailing list archive)
State Superseded
Headers show
Series [01/15] scsi: ufs: add quirk to handle broken UIC command | expand

Commit Message

Chanho Park July 9, 2021, 6:57 a.m. UTC
This patch adds to support ufs variant for ExynosAuto v9 SoC. This
requires control UFS IP sharability register via syscon and regmap.
Regarding uic_attr, most of values can be shared with exynos7 except
tx_dif_p_nsec value.

Signed-off-by: Chanho Park <chanho61.park@samsung.com>
---
 drivers/scsi/ufs/ufs-exynos.c | 97 +++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

Comments

Krzysztof Kozlowski July 13, 2021, 10:57 a.m. UTC | #1
-On Fri, 9 Jul 2021 at 08:59, Chanho Park <chanho61.park@samsung.com> wrote:
>
> This patch adds to support ufs variant for ExynosAuto v9 SoC. This
> requires control UFS IP sharability register via syscon and regmap.
> Regarding uic_attr, most of values can be shared with exynos7 except
> tx_dif_p_nsec value.
>
> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> ---
>  drivers/scsi/ufs/ufs-exynos.c | 97 +++++++++++++++++++++++++++++++++++
>  1 file changed, 97 insertions(+)
>
> diff --git a/drivers/scsi/ufs/ufs-exynos.c b/drivers/scsi/ufs/ufs-exynos.c
> index 9669afe8f1f4..82f915f7a447 100644
> --- a/drivers/scsi/ufs/ufs-exynos.c
> +++ b/drivers/scsi/ufs/ufs-exynos.c
> @@ -15,6 +15,7 @@
>  #include <linux/mfd/syscon.h>
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
> +#include <linux/regmap.h>
>
>  #include "ufshcd.h"
>  #include "ufshcd-pltfrm.h"
> @@ -76,6 +77,12 @@
>                                  UIC_TRANSPORT_NO_CONNECTION_RX |\
>                                  UIC_TRANSPORT_BAD_TC)
>
> +/* FSYS UFS Sharability */

Sharability -> Shareability

> +#define UFS_WR_SHARABLE                BIT(2)
> +#define UFS_RD_SHARABLE                BIT(1)
> +#define UFS_SHARABLE           (UFS_WR_SHARABLE | UFS_RD_SHARABLE)
> +#define UFS_SHARABILITY_OFFSET 0x710
> +
>  enum {
>         UNIPRO_L1_5 = 0,/* PHY Adapter */
>         UNIPRO_L2,      /* Data Link */
> @@ -151,6 +158,80 @@ static int exynos7_ufs_drv_init(struct device *dev, struct exynos_ufs *ufs)
>         return 0;
>  }
>
> +static int exynosauto_ufs_drv_init(struct device *dev, struct exynos_ufs *ufs)
> +{
> +       struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
> +
> +       /* IO Coherency setting */
> +       if (ufs->sysreg) {
> +               return regmap_update_bits(ufs->sysreg, UFS_SHARABILITY_OFFSET,
> +                                         UFS_SHARABLE, UFS_SHARABLE);
> +       }
> +
> +       attr->tx_dif_p_nsec = 3200000;
> +
> +       return 0;
> +}
> +
> +static int exynosauto_ufs_pre_link(struct exynos_ufs *ufs)
> +{
> +       struct ufs_hba *hba = ufs->hba;
> +       int i;
> +
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x40);
> +       for_each_ufs_rx_lane(ufs, i) {
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x12, i),
> +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x11, i), 0x0);
> +
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> +
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> +
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x2f, i), 0x79);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x84, i), 0x1);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x25, i), 0xf6);
> +       }
> +
> +       for_each_ufs_tx_lane(ufs, i) {
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xaa, i),
> +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xa9, i), 0x02);
> +
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xab, i), 0x8);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xac, i), 0x22);
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xad, i), 0x8);
> +
> +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x04, i), 0x1);
> +       }
> +
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x0);
> +
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE), 0x0);
> +
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(0xa011), 0x8000);
> +
> +       return 0;
> +}
> +
> +static int exynosauto_ufs_pre_pwr_change(struct exynos_ufs *ufs,
> +                                        struct ufs_pa_layer_attr *pwr)
> +{
> +       struct ufs_hba *hba = ufs->hba;
> +
> +       /* PACP_PWR_req and delivered to the remote DME */
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA0), 12000);
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA1), 32000);
> +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA2), 16000);
> +
> +       return 0;
> +}
> +

No need for double line.

> +
>  static int exynos7_ufs_pre_link(struct exynos_ufs *ufs)
>  {
>         struct ufs_hba *hba = ufs->hba;
> @@ -1305,6 +1386,20 @@ static struct exynos_ufs_uic_attr exynos7_uic_attr = {
>         .pa_dbg_option_suite            = 0x30103,
>  };
>
> +static struct exynos_ufs_drv_data exynosauto_ufs_drvs = {
> +       .uic_attr               = &exynos7_uic_attr,
> +       .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> +                                 UFSHCI_QUIRK_SKIP_RESET_INTR_AGGR |
> +                                 UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
> +                                 UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING,
> +       .opts                   = EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
> +                                 EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
> +                                 EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX,
> +       .drv_init               = exynosauto_ufs_drv_init,
> +       .pre_link               = exynosauto_ufs_pre_link,
> +       .pre_pwr_change         = exynosauto_ufs_pre_pwr_change,
> +};
> +
>  static struct exynos_ufs_drv_data exynos_ufs_drvs = {
>         .uic_attr               = &exynos7_uic_attr,
>         .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> @@ -1330,6 +1425,8 @@ static struct exynos_ufs_drv_data exynos_ufs_drvs = {
>  static const struct of_device_id exynos_ufs_of_match[] = {
>         { .compatible = "samsung,exynos7-ufs",
>           .data       = &exynos_ufs_drvs },
> +       { .compatible = "samsung,exynosautov9-ufs",
> +         .data       = &exynosauto_ufs_drvs },

This compatible is not documented. It seems that no one document
exynos7-ufs but that's not an excuse. :)

Best regards,
Krzysztof
Chanho Park July 13, 2021, 12:07 p.m. UTC | #2
> > +/* FSYS UFS Sharability */
> 
> Sharability -> Shareability

Typo. I'll correct it next patchset.

> 
> > +#define UFS_WR_SHARABLE                BIT(2)
> > +#define UFS_RD_SHARABLE                BIT(1)
> > +#define UFS_SHARABLE           (UFS_WR_SHARABLE | UFS_RD_SHARABLE)
> > +#define UFS_SHARABILITY_OFFSET 0x710
> > +
> >  enum {
> >         UNIPRO_L1_5 = 0,/* PHY Adapter */
> >         UNIPRO_L2,      /* Data Link */
> > @@ -151,6 +158,80 @@ static int exynos7_ufs_drv_init(struct device *dev,
> struct exynos_ufs *ufs)
> >         return 0;
> >  }
> >
> > +static int exynosauto_ufs_drv_init(struct device *dev, struct
> > +exynos_ufs *ufs) {
> > +       struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
> > +
> > +       /* IO Coherency setting */
> > +       if (ufs->sysreg) {
> > +               return regmap_update_bits(ufs->sysreg,
> UFS_SHARABILITY_OFFSET,
> > +                                         UFS_SHARABLE, UFS_SHARABLE);
> > +       }
> > +
> > +       attr->tx_dif_p_nsec = 3200000;
> > +
> > +       return 0;
> > +}
> > +
> > +static int exynosauto_ufs_pre_link(struct exynos_ufs *ufs) {
> > +       struct ufs_hba *hba = ufs->hba;
> > +       int i;
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x40);
> > +       for_each_ufs_rx_lane(ufs, i) {
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x12, i),
> > +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x11, i), 0x0);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x2f, i), 0x79);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x84, i), 0x1);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x25, i), 0xf6);
> > +       }
> > +
> > +       for_each_ufs_tx_lane(ufs, i) {
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xaa, i),
> > +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xa9, i), 0x02);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xab, i), 0x8);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xac, i), 0x22);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xad, i), 0x8);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x04, i), 0x1);
> > +       }
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x0);
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE), 0x0);
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0xa011), 0x8000);
> > +
> > +       return 0;
> > +}
> > +
> > +static int exynosauto_ufs_pre_pwr_change(struct exynos_ufs *ufs,
> > +                                        struct ufs_pa_layer_attr
> > +*pwr) {
> > +       struct ufs_hba *hba = ufs->hba;
> > +
> > +       /* PACP_PWR_req and delivered to the remote DME */
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA0), 12000);
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA1), 32000);
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA2), 16000);
> > +
> > +       return 0;
> > +}
> > +
> 
> No need for double line.

Will be fixed as well. :)

> 
> > +
> >  static int exynos7_ufs_pre_link(struct exynos_ufs *ufs)  {
> >         struct ufs_hba *hba = ufs->hba; @@ -1305,6 +1386,20 @@ static
> > struct exynos_ufs_uic_attr exynos7_uic_attr = {
> >         .pa_dbg_option_suite            = 0x30103,
> >  };
> >
> > +static struct exynos_ufs_drv_data exynosauto_ufs_drvs = {
> > +       .uic_attr               = &exynos7_uic_attr,
> > +       .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> > +                                 UFSHCI_QUIRK_SKIP_RESET_INTR_AGGR |
> > +                                 UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
> > +                                 UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING,
> > +       .opts                   = EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
> > +                                 EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
> > +                                 EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX,
> > +       .drv_init               = exynosauto_ufs_drv_init,
> > +       .pre_link               = exynosauto_ufs_pre_link,
> > +       .pre_pwr_change         = exynosauto_ufs_pre_pwr_change,
> > +};
> > +
> >  static struct exynos_ufs_drv_data exynos_ufs_drvs = {
> >         .uic_attr               = &exynos7_uic_attr,
> >         .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> > @@ -1330,6 +1425,8 @@ static struct exynos_ufs_drv_data
> > exynos_ufs_drvs = {  static const struct of_device_id
> exynos_ufs_of_match[] = {
> >         { .compatible = "samsung,exynos7-ufs",
> >           .data       = &exynos_ufs_drvs },
> > +       { .compatible = "samsung,exynosautov9-ufs",
> > +         .data       = &exynosauto_ufs_drvs },
> 
> This compatible is not documented. It seems that no one document exynos7-
> ufs but that's not an excuse. :)

Hmm. Let me check whether I can add ufs-exynos.yaml.

Best Regards,
Chanho Park
Alim Akhtar July 13, 2021, 12:11 p.m. UTC | #3
> -----Original Message-----
> From: Krzysztof Kozlowski <krzk@kernel.org>
> Sent: 13 July 2021 16:28
> To: Chanho Park <chanho61.park@samsung.com>
> Cc: Alim Akhtar <alim.akhtar@samsung.com>; James E . J . Bottomley
> <jejb@linux.ibm.com>; Martin K . Petersen <martin.petersen@oracle.com>;
> Can Guo <cang@codeaurora.org>; Jaegeuk Kim <jaegeuk@kernel.org>;
> Kiwoong Kim <kwmad.kim@samsung.com>; Avri Altman
> <avri.altman@wdc.com>; Adrian Hunter <adrian.hunter@intel.com>;
> Christoph Hellwig <hch@infradead.org>; Bart Van Assche
> <bvanassche@acm.org>; jongmin jeong <jjmin.jeong@samsung.com>;
> Gyunghoon Kwon <goodjob.kwon@samsung.com>; linux-samsung-
> soc@vger.kernel.org; linux-scsi@vger.kernel.org
> Subject: Re: [PATCH 13/15] scsi: ufs: ufs-exynos: support exynosauto v9 ufs
> driver
> 
> -On Fri, 9 Jul 2021 at 08:59, Chanho Park <chanho61.park@samsung.com>
> wrote:
> >
> > This patch adds to support ufs variant for ExynosAuto v9 SoC. This
> > requires control UFS IP sharability register via syscon and regmap.
> > Regarding uic_attr, most of values can be shared with exynos7 except
> > tx_dif_p_nsec value.
> >
> > Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> > ---
> >  drivers/scsi/ufs/ufs-exynos.c | 97
> > +++++++++++++++++++++++++++++++++++
> >  1 file changed, 97 insertions(+)
> >
> > diff --git a/drivers/scsi/ufs/ufs-exynos.c
> > b/drivers/scsi/ufs/ufs-exynos.c index 9669afe8f1f4..82f915f7a447
> > 100644
> > --- a/drivers/scsi/ufs/ufs-exynos.c
> > +++ b/drivers/scsi/ufs/ufs-exynos.c
> > @@ -15,6 +15,7 @@
> >  #include <linux/mfd/syscon.h>
> >  #include <linux/phy/phy.h>
> >  #include <linux/platform_device.h>
> > +#include <linux/regmap.h>
> >
> >  #include "ufshcd.h"
> >  #include "ufshcd-pltfrm.h"
> > @@ -76,6 +77,12 @@
> >                                  UIC_TRANSPORT_NO_CONNECTION_RX |\
> >                                  UIC_TRANSPORT_BAD_TC)
> >
> > +/* FSYS UFS Sharability */
> 
> Sharability -> Shareability
> 
> > +#define UFS_WR_SHARABLE                BIT(2)
> > +#define UFS_RD_SHARABLE                BIT(1)
> > +#define UFS_SHARABLE           (UFS_WR_SHARABLE | UFS_RD_SHARABLE)
> > +#define UFS_SHARABILITY_OFFSET 0x710
> > +
> >  enum {
> >         UNIPRO_L1_5 = 0,/* PHY Adapter */
> >         UNIPRO_L2,      /* Data Link */
> > @@ -151,6 +158,80 @@ static int exynos7_ufs_drv_init(struct device *dev,
> struct exynos_ufs *ufs)
> >         return 0;
> >  }
> >
> > +static int exynosauto_ufs_drv_init(struct device *dev, struct
> > +exynos_ufs *ufs) {
> > +       struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
> > +
> > +       /* IO Coherency setting */
> > +       if (ufs->sysreg) {
> > +               return regmap_update_bits(ufs->sysreg,
> UFS_SHARABILITY_OFFSET,
> > +                                         UFS_SHARABLE, UFS_SHARABLE);
> > +       }
> > +
> > +       attr->tx_dif_p_nsec = 3200000;
> > +
> > +       return 0;
> > +}
> > +
> > +static int exynosauto_ufs_pre_link(struct exynos_ufs *ufs) {
> > +       struct ufs_hba *hba = ufs->hba;
> > +       int i;
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x40);
> > +       for_each_ufs_rx_lane(ufs, i) {
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x12, i),
> > +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x11, i), 0x0);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x2f, i), 0x79);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x84, i), 0x1);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x25, i), 0xf6);
> > +       }
> > +
> > +       for_each_ufs_tx_lane(ufs, i) {
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xaa, i),
> > +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xa9, i), 0x02);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xab, i), 0x8);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xac, i), 0x22);
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xad, i), 0x8);
> > +
> > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x04, i), 0x1);
> > +       }
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x0);
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE),
> 0x0);
> > +
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0xa011), 0x8000);
> > +
> > +       return 0;
> > +}
> > +
> > +static int exynosauto_ufs_pre_pwr_change(struct exynos_ufs *ufs,
> > +                                        struct ufs_pa_layer_attr
> > +*pwr) {
> > +       struct ufs_hba *hba = ufs->hba;
> > +
> > +       /* PACP_PWR_req and delivered to the remote DME */
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA0),
> 12000);
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA1),
> 32000);
> > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA2),
> 16000);
> > +
> > +       return 0;
> > +}
> > +
> 
> No need for double line.
> 
> > +
> >  static int exynos7_ufs_pre_link(struct exynos_ufs *ufs)  {
> >         struct ufs_hba *hba = ufs->hba; @@ -1305,6 +1386,20 @@ static
> > struct exynos_ufs_uic_attr exynos7_uic_attr = {
> >         .pa_dbg_option_suite            = 0x30103,
> >  };
> >
> > +static struct exynos_ufs_drv_data exynosauto_ufs_drvs = {
> > +       .uic_attr               = &exynos7_uic_attr,
> > +       .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> > +                                 UFSHCI_QUIRK_SKIP_RESET_INTR_AGGR |
> > +                                 UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
> > +                                 UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING,
> > +       .opts                   = EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
> > +                                 EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
> > +                                 EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX,
> > +       .drv_init               = exynosauto_ufs_drv_init,
> > +       .pre_link               = exynosauto_ufs_pre_link,
> > +       .pre_pwr_change         = exynosauto_ufs_pre_pwr_change,
> > +};
> > +
> >  static struct exynos_ufs_drv_data exynos_ufs_drvs = {
> >         .uic_attr               = &exynos7_uic_attr,
> >         .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> > @@ -1330,6 +1425,8 @@ static struct exynos_ufs_drv_data
> > exynos_ufs_drvs = {  static const struct of_device_id
> exynos_ufs_of_match[] = {
> >         { .compatible = "samsung,exynos7-ufs",
> >           .data       = &exynos_ufs_drvs },
> > +       { .compatible = "samsung,exynosautov9-ufs",
> > +         .data       = &exynosauto_ufs_drvs },
> 
> This compatible is not documented. It seems that no one document
> exynos7-ufs but that's not an excuse. :)
> 
I was post along with UFS driver [1], had Rob's Reviewed-by as well, not sure why it is not merged. 
Let me ping Rob on this.
[1] https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2176074.html

> Best regards,
> Krzysztof
Rob Herring July 16, 2021, 3:03 p.m. UTC | #4
On Tue, Jul 13, 2021 at 8:58 PM Alim Akhtar <alim.akhtar@samsung.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Krzysztof Kozlowski <krzk@kernel.org>
> > Sent: 13 July 2021 16:28
> > To: Chanho Park <chanho61.park@samsung.com>
> > Cc: Alim Akhtar <alim.akhtar@samsung.com>; James E . J . Bottomley
> > <jejb@linux.ibm.com>; Martin K . Petersen <martin.petersen@oracle.com>;
> > Can Guo <cang@codeaurora.org>; Jaegeuk Kim <jaegeuk@kernel.org>;
> > Kiwoong Kim <kwmad.kim@samsung.com>; Avri Altman
> > <avri.altman@wdc.com>; Adrian Hunter <adrian.hunter@intel.com>;
> > Christoph Hellwig <hch@infradead.org>; Bart Van Assche
> > <bvanassche@acm.org>; jongmin jeong <jjmin.jeong@samsung.com>;
> > Gyunghoon Kwon <goodjob.kwon@samsung.com>; linux-samsung-
> > soc@vger.kernel.org; linux-scsi@vger.kernel.org
> > Subject: Re: [PATCH 13/15] scsi: ufs: ufs-exynos: support exynosauto v9 ufs
> > driver
> >
> > -On Fri, 9 Jul 2021 at 08:59, Chanho Park <chanho61.park@samsung.com>
> > wrote:
> > >
> > > This patch adds to support ufs variant for ExynosAuto v9 SoC. This
> > > requires control UFS IP sharability register via syscon and regmap.
> > > Regarding uic_attr, most of values can be shared with exynos7 except
> > > tx_dif_p_nsec value.
> > >
> > > Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> > > ---
> > >  drivers/scsi/ufs/ufs-exynos.c | 97
> > > +++++++++++++++++++++++++++++++++++
> > >  1 file changed, 97 insertions(+)
> > >
> > > diff --git a/drivers/scsi/ufs/ufs-exynos.c
> > > b/drivers/scsi/ufs/ufs-exynos.c index 9669afe8f1f4..82f915f7a447
> > > 100644
> > > --- a/drivers/scsi/ufs/ufs-exynos.c
> > > +++ b/drivers/scsi/ufs/ufs-exynos.c
> > > @@ -15,6 +15,7 @@
> > >  #include <linux/mfd/syscon.h>
> > >  #include <linux/phy/phy.h>
> > >  #include <linux/platform_device.h>
> > > +#include <linux/regmap.h>
> > >
> > >  #include "ufshcd.h"
> > >  #include "ufshcd-pltfrm.h"
> > > @@ -76,6 +77,12 @@
> > >                                  UIC_TRANSPORT_NO_CONNECTION_RX |\
> > >                                  UIC_TRANSPORT_BAD_TC)
> > >
> > > +/* FSYS UFS Sharability */
> >
> > Sharability -> Shareability
> >
> > > +#define UFS_WR_SHARABLE                BIT(2)
> > > +#define UFS_RD_SHARABLE                BIT(1)
> > > +#define UFS_SHARABLE           (UFS_WR_SHARABLE | UFS_RD_SHARABLE)
> > > +#define UFS_SHARABILITY_OFFSET 0x710
> > > +
> > >  enum {
> > >         UNIPRO_L1_5 = 0,/* PHY Adapter */
> > >         UNIPRO_L2,      /* Data Link */
> > > @@ -151,6 +158,80 @@ static int exynos7_ufs_drv_init(struct device *dev,
> > struct exynos_ufs *ufs)
> > >         return 0;
> > >  }
> > >
> > > +static int exynosauto_ufs_drv_init(struct device *dev, struct
> > > +exynos_ufs *ufs) {
> > > +       struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
> > > +
> > > +       /* IO Coherency setting */
> > > +       if (ufs->sysreg) {
> > > +               return regmap_update_bits(ufs->sysreg,
> > UFS_SHARABILITY_OFFSET,
> > > +                                         UFS_SHARABLE, UFS_SHARABLE);
> > > +       }
> > > +
> > > +       attr->tx_dif_p_nsec = 3200000;
> > > +
> > > +       return 0;
> > > +}
> > > +
> > > +static int exynosauto_ufs_pre_link(struct exynos_ufs *ufs) {
> > > +       struct ufs_hba *hba = ufs->hba;
> > > +       int i;
> > > +
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x40);
> > > +       for_each_ufs_rx_lane(ufs, i) {
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x12, i),
> > > +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x11, i), 0x0);
> > > +
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> > > +
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
> > > +
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x2f, i), 0x79);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x84, i), 0x1);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x25, i), 0xf6);
> > > +       }
> > > +
> > > +       for_each_ufs_tx_lane(ufs, i) {
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xaa, i),
> > > +                              DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xa9, i), 0x02);
> > > +
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xab, i), 0x8);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xac, i), 0x22);
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xad, i), 0x8);
> > > +
> > > +               ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x04, i), 0x1);
> > > +       }
> > > +
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x0);
> > > +
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE),
> > 0x0);
> > > +
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(0xa011), 0x8000);
> > > +
> > > +       return 0;
> > > +}
> > > +
> > > +static int exynosauto_ufs_pre_pwr_change(struct exynos_ufs *ufs,
> > > +                                        struct ufs_pa_layer_attr
> > > +*pwr) {
> > > +       struct ufs_hba *hba = ufs->hba;
> > > +
> > > +       /* PACP_PWR_req and delivered to the remote DME */
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA0),
> > 12000);
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA1),
> > 32000);
> > > +       ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA2),
> > 16000);
> > > +
> > > +       return 0;
> > > +}
> > > +
> >
> > No need for double line.
> >
> > > +
> > >  static int exynos7_ufs_pre_link(struct exynos_ufs *ufs)  {
> > >         struct ufs_hba *hba = ufs->hba; @@ -1305,6 +1386,20 @@ static
> > > struct exynos_ufs_uic_attr exynos7_uic_attr = {
> > >         .pa_dbg_option_suite            = 0x30103,
> > >  };
> > >
> > > +static struct exynos_ufs_drv_data exynosauto_ufs_drvs = {
> > > +       .uic_attr               = &exynos7_uic_attr,
> > > +       .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> > > +                                 UFSHCI_QUIRK_SKIP_RESET_INTR_AGGR |
> > > +                                 UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
> > > +                                 UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING,
> > > +       .opts                   = EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
> > > +                                 EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
> > > +                                 EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX,
> > > +       .drv_init               = exynosauto_ufs_drv_init,
> > > +       .pre_link               = exynosauto_ufs_pre_link,
> > > +       .pre_pwr_change         = exynosauto_ufs_pre_pwr_change,
> > > +};
> > > +
> > >  static struct exynos_ufs_drv_data exynos_ufs_drvs = {
> > >         .uic_attr               = &exynos7_uic_attr,
> > >         .quirks                 = UFSHCD_QUIRK_PRDT_BYTE_GRAN |
> > > @@ -1330,6 +1425,8 @@ static struct exynos_ufs_drv_data
> > > exynos_ufs_drvs = {  static const struct of_device_id
> > exynos_ufs_of_match[] = {
> > >         { .compatible = "samsung,exynos7-ufs",
> > >           .data       = &exynos_ufs_drvs },
> > > +       { .compatible = "samsung,exynosautov9-ufs",
> > > +         .data       = &exynosauto_ufs_drvs },
> >
> > This compatible is not documented. It seems that no one document
> > exynos7-ufs but that's not an excuse. :)
> >
> I was post along with UFS driver [1], had Rob's Reviewed-by as well, not sure why it is not merged.
> Let me ping Rob on this.
> [1] https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg2176074.html

The binding should have been applied with the driver. If you want me
to apply, resend it without my Reviewed-by tag.

Rob
diff mbox series

Patch

diff --git a/drivers/scsi/ufs/ufs-exynos.c b/drivers/scsi/ufs/ufs-exynos.c
index 9669afe8f1f4..82f915f7a447 100644
--- a/drivers/scsi/ufs/ufs-exynos.c
+++ b/drivers/scsi/ufs/ufs-exynos.c
@@ -15,6 +15,7 @@ 
 #include <linux/mfd/syscon.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
+#include <linux/regmap.h>
 
 #include "ufshcd.h"
 #include "ufshcd-pltfrm.h"
@@ -76,6 +77,12 @@ 
 				 UIC_TRANSPORT_NO_CONNECTION_RX |\
 				 UIC_TRANSPORT_BAD_TC)
 
+/* FSYS UFS Sharability */
+#define UFS_WR_SHARABLE		BIT(2)
+#define UFS_RD_SHARABLE		BIT(1)
+#define UFS_SHARABLE		(UFS_WR_SHARABLE | UFS_RD_SHARABLE)
+#define UFS_SHARABILITY_OFFSET	0x710
+
 enum {
 	UNIPRO_L1_5 = 0,/* PHY Adapter */
 	UNIPRO_L2,	/* Data Link */
@@ -151,6 +158,80 @@  static int exynos7_ufs_drv_init(struct device *dev, struct exynos_ufs *ufs)
 	return 0;
 }
 
+static int exynosauto_ufs_drv_init(struct device *dev, struct exynos_ufs *ufs)
+{
+	struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
+
+	/* IO Coherency setting */
+	if (ufs->sysreg) {
+		return regmap_update_bits(ufs->sysreg, UFS_SHARABILITY_OFFSET,
+					  UFS_SHARABLE, UFS_SHARABLE);
+	}
+
+	attr->tx_dif_p_nsec = 3200000;
+
+	return 0;
+}
+
+static int exynosauto_ufs_pre_link(struct exynos_ufs *ufs)
+{
+	struct ufs_hba *hba = ufs->hba;
+	int i;
+
+	ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x40);
+	for_each_ufs_rx_lane(ufs, i) {
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x12, i),
+			       DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x11, i), 0x0);
+
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
+
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1b, i), 0x2);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1c, i), 0x8a);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x1d, i), 0xa3);
+
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x2f, i), 0x79);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x84, i), 0x1);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x25, i), 0xf6);
+	}
+
+	for_each_ufs_tx_lane(ufs, i) {
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xaa, i),
+			       DIV_ROUND_UP(NSEC_PER_SEC, ufs->mclk_rate));
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xa9, i), 0x02);
+
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xab, i), 0x8);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xac, i), 0x22);
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0xad, i), 0x8);
+
+		ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(0x04, i), 0x1);
+	}
+
+	ufshcd_dme_set(hba, UIC_ARG_MIB(0x200), 0x0);
+
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_LOCAL_TX_LCC_ENABLE), 0x0);
+
+	ufshcd_dme_set(hba, UIC_ARG_MIB(0xa011), 0x8000);
+
+	return 0;
+}
+
+static int exynosauto_ufs_pre_pwr_change(struct exynos_ufs *ufs,
+					 struct ufs_pa_layer_attr *pwr)
+{
+	struct ufs_hba *hba = ufs->hba;
+
+	/* PACP_PWR_req and delivered to the remote DME */
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA0), 12000);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA1), 32000);
+	ufshcd_dme_set(hba, UIC_ARG_MIB(PA_PWRMODEUSERDATA2), 16000);
+
+	return 0;
+}
+
+
 static int exynos7_ufs_pre_link(struct exynos_ufs *ufs)
 {
 	struct ufs_hba *hba = ufs->hba;
@@ -1305,6 +1386,20 @@  static struct exynos_ufs_uic_attr exynos7_uic_attr = {
 	.pa_dbg_option_suite		= 0x30103,
 };
 
+static struct exynos_ufs_drv_data exynosauto_ufs_drvs = {
+	.uic_attr		= &exynos7_uic_attr,
+	.quirks			= UFSHCD_QUIRK_PRDT_BYTE_GRAN |
+				  UFSHCI_QUIRK_SKIP_RESET_INTR_AGGR |
+				  UFSHCD_QUIRK_BROKEN_OCS_FATAL_ERROR |
+				  UFSHCD_QUIRK_SKIP_DEF_UNIPRO_TIMEOUT_SETTING,
+	.opts			= EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |
+				  EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |
+				  EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX,
+	.drv_init		= exynosauto_ufs_drv_init,
+	.pre_link		= exynosauto_ufs_pre_link,
+	.pre_pwr_change		= exynosauto_ufs_pre_pwr_change,
+};
+
 static struct exynos_ufs_drv_data exynos_ufs_drvs = {
 	.uic_attr		= &exynos7_uic_attr,
 	.quirks			= UFSHCD_QUIRK_PRDT_BYTE_GRAN |
@@ -1330,6 +1425,8 @@  static struct exynos_ufs_drv_data exynos_ufs_drvs = {
 static const struct of_device_id exynos_ufs_of_match[] = {
 	{ .compatible = "samsung,exynos7-ufs",
 	  .data	      = &exynos_ufs_drvs },
+	{ .compatible = "samsung,exynosautov9-ufs",
+	  .data	      = &exynosauto_ufs_drvs },
 	{},
 };