Commit 68f5ef7e authored by Peter Griffin's avatar Peter Griffin Committed by Martin K. Petersen
Browse files

scsi: ufs: exynos: Move UFS shareability value to drvdata 



gs101 I/O coherency shareability bits differ from exynosauto SoC. To
support both SoCs move this info the SoC drvdata.

Currently both the value and mask are the same for both gs101 and
exynosauto, thus we use the same value.

Signed-off-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Link: https://lore.kernel.org/r/20250319-exynos-ufs-stability-fixes-v2-2-96722cc2ba1b@linaro.org


Fixes: d11e0a31 ("scsi: ufs: exynos: Add support for Tensor gs101 SoC")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3d101165

drivers/ufs/host/ufs-exynos.c

+14 −6
Original line number Diff line number Diff line
@@ -92,10 +92,15 @@ 
				 UIC_TRANSPORT_NO_CONNECTION_RX |\

				 UIC_TRANSPORT_BAD_TC)



/* FSYS UFS Shareability */

#define UFS_WR_SHARABLE		BIT(2)

#define UFS_RD_SHARABLE		BIT(1)

#define UFS_SHARABLE		(UFS_WR_SHARABLE | UFS_RD_SHARABLE)

/* UFS Shareability */

#define UFS_EXYNOSAUTO_WR_SHARABLE	BIT(2)

#define UFS_EXYNOSAUTO_RD_SHARABLE	BIT(1)

#define UFS_EXYNOSAUTO_SHARABLE		(UFS_EXYNOSAUTO_WR_SHARABLE | \

					 UFS_EXYNOSAUTO_RD_SHARABLE)

#define UFS_GS101_WR_SHARABLE		BIT(1)

#define UFS_GS101_RD_SHARABLE		BIT(0)

#define UFS_GS101_SHARABLE		(UFS_GS101_WR_SHARABLE | \

					 UFS_GS101_RD_SHARABLE)

#define UFS_SHAREABILITY_OFFSET		0x710



/* Multi-host registers */
@@ -210,7 +215,7 @@ static int exynos_ufs_shareability(struct exynos_ufs *ufs) 
	if (ufs->sysreg) {

		return regmap_update_bits(ufs->sysreg,

					  ufs->shareability_reg_offset,

					  UFS_SHARABLE, UFS_SHARABLE);

					  ufs->iocc_mask, ufs->iocc_mask);

	}



	return 0;
@@ -1174,6 +1179,7 @@ static int exynos_ufs_parse_dt(struct device *dev, struct exynos_ufs *ufs) 
		}

	}



	ufs->iocc_mask = ufs->drv_data->iocc_mask;

	ufs->pclk_avail_min = PCLK_AVAIL_MIN;

	ufs->pclk_avail_max = PCLK_AVAIL_MAX;
@@ -2034,6 +2040,7 @@ static const struct exynos_ufs_drv_data exynosauto_ufs_drvs = { 
	.opts			= EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |

				  EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |

				  EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX,

	.iocc_mask		= UFS_EXYNOSAUTO_SHARABLE,

	.drv_init		= exynosauto_ufs_drv_init,

	.post_hce_enable	= exynosauto_ufs_post_hce_enable,

	.pre_link		= exynosauto_ufs_pre_link,
@@ -2135,6 +2142,7 @@ static const struct exynos_ufs_drv_data gs101_ufs_drvs = { 
	.opts			= EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |

				  EXYNOS_UFS_OPT_UFSPR_SECURE |

				  EXYNOS_UFS_OPT_TIMER_TICK_SELECT,

	.iocc_mask		= UFS_GS101_SHARABLE,

	.drv_init		= gs101_ufs_drv_init,

	.pre_link		= gs101_ufs_pre_link,

	.post_link		= gs101_ufs_post_link,

drivers/ufs/host/ufs-exynos.h

+2 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ struct exynos_ufs_drv_data { 
	struct exynos_ufs_uic_attr *uic_attr;

	unsigned int quirks;

	unsigned int opts;

	u32 iocc_mask;

	/* SoC's specific operations */

	int (*drv_init)(struct exynos_ufs *ufs);

	int (*pre_link)(struct exynos_ufs *ufs);
@@ -231,6 +232,7 @@ struct exynos_ufs { 
	const struct exynos_ufs_drv_data *drv_data;

	struct regmap *sysreg;

	u32 shareability_reg_offset;

	u32 iocc_mask;



	u32 opts;

#define EXYNOS_UFS_OPT_HAS_APB_CLK_CTRL		BIT(0)