[PATCH v4 08/11] scsi: ufs: Add NXP S32N79 UFS host controller driver

Larisa Ileana Grigore larisa.grigore at oss.nxp.com
Mon Sep 21 01:33:21 PDT 2026


On 9/17/2026 7:18 PM, Frank Li wrote:
> On Thu, Sep 17, 2026 at 11:15:52AM +0200, Larisa Grigore wrote:
>> Add support for the UFS host controller on the NXP S32N79 SoC, built on
>> the Synopsys DesignWare (DWC) UFS architecture, using the UFSHCD DWC and
>> UFSHCD platform glue.
>>
>> This controller requires S32N79-specific initialization prior to
>> UIC_LINKSTARTUP, including:
>>    - programming SCM.ONE_US_TICK and HC.HCLKDIV based on the core clock,
>>    - applying the vendor-defined M-PHY calibration sequence, and
>>    - performing post-link calibration steps needed for HS operation.
>>
>> The M-PHY supports several boot modes for loading its firmware. Only the
>> mode where the firmware runs from the internal ROM is supported for now.
>>
>> Signed-off-by: Larisa Grigore <larisa.grigore at oss.nxp.com>
>> ---
>>   drivers/ufs/host/Kconfig         |  12 +
>>   drivers/ufs/host/Makefile        |   1 +
>>   drivers/ufs/host/ufs-nxp-s32n7.c | 543 +++++++++++++++++++++++++++++++
>>   drivers/ufs/host/ufshcd-dwc.h    |  14 +-
>>   drivers/ufs/host/ufshci-dwc.h    |   6 +
>>   5 files changed, 574 insertions(+), 2 deletions(-)
>>   create mode 100644 drivers/ufs/host/ufs-nxp-s32n7.c
>>
>> diff --git a/drivers/ufs/host/Kconfig b/drivers/ufs/host/Kconfig
>> index ff170c0b6da0..e8ee7dd05f1a 100644
>> --- a/drivers/ufs/host/Kconfig
>> +++ b/drivers/ufs/host/Kconfig
>> @@ -168,3 +168,15 @@ config SCSI_UFS_AMD_VERSAL2
>>
>>   	  Select this if you have UFS controller on AMD Versal Gen 2 SoC.
>>   	  If unsure, say N.
>> +
>> +config SCSI_UFS_S32N7
>> +	tristate "NXP S32N7 platform driver"
>> +	depends on SCSI_UFSHCD_PLATFORM && (ARCH_S32 || COMPILE_TEST)
>> +	help
>> +	  This selects the S32N7 specific additions on top of the UFSHCD DWC
>> +	  and UFSHCD platform driver. UFS host on S32N79 needs some vendor
>> +	  specific configurations like PHY and vendor specific register accesses
>> +	  before accessing the hardware.
>> +
>> +	  Select this if you have UFS controller on an S32N7 based board.
>> +	  If unsure, say N.
>> diff --git a/drivers/ufs/host/Makefile b/drivers/ufs/host/Makefile
>> index 7d8db67eb23c..a2f4a1d0b3ae 100644
>> --- a/drivers/ufs/host/Makefile
>> +++ b/drivers/ufs/host/Makefile
>> @@ -4,6 +4,7 @@ CONTEXT_ANALYSIS := y
>>
>>   obj-$(CONFIG_SCSI_UFS_DWC_TC_PCI) += tc-dwc-g210-pci.o ufshcd-dwc.o tc-dwc-g210.o
>>   obj-$(CONFIG_SCSI_UFS_DWC_TC_PLATFORM) += tc-dwc-g210-pltfrm.o ufshcd-dwc.o tc-dwc-g210.o
>> +obj-$(CONFIG_SCSI_UFS_S32N7) += ufs-nxp-s32n7.o ufshcd-dwc.o
> 
> Leave it to ufs maintainer, it should existing problem.
> 
> if CONFIG_SCSI_UFS_AMD_VERSAL2 as module, and CONFIG_SCSI_UFS_S32N7 as
> build-in,
> 
> ufshcd-dwc.o will link twice. I am not sure kernel can handle by duplicate
> symbal, one in kernel and one in module.
>
I'll leave it to the UFS maintainers to decide whether any restructuring 
of the shared DWC objects is needed.

> 
>>   obj-$(CONFIG_SCSI_UFS_CDNS_PLATFORM) += cdns-pltfrm.o
>>   obj-$(CONFIG_SCSI_UFS_QCOM) += ufs-qcom.o
>>   obj-$(CONFIG_SCSI_UFS_EXYNOS) += ufs-exynos.o
>> diff --git a/drivers/ufs/host/ufs-nxp-s32n7.c b/drivers/ufs/host/ufs-nxp-s32n7.c
>> new file mode 100644
>> index 000000000000..4f9a00156202
>> --- /dev/null
>> +++ b/drivers/ufs/host/ufs-nxp-s32n7.c
>> @@ -0,0 +1,543 @@
>> +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause)
>> +/*
>> + * Copyright 2026 NXP
>> + *
>> + */
>> +
>> +#include <linux/clk.h>
>> +#include <linux/device.h>
>> +#include <linux/iopoll.h>
>> +#include <linux/kernel.h>
>> +#include <linux/module.h>
>> +#include <linux/of.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/pm.h>
>> +
>> +#include "ufshcd-pltfrm.h"
>> +#include "ufshcd-dwc.h"
>> +#include "ufshci-dwc.h"
>> +
>> +/* SCM Register Offsets. */
>> +#define SCM_ONE_US_TICK			0x2CU
>> +#define SCM_STATUS			0x30
>> +
>> +/* SCM_ONE_US_TICK Register. */
>> +#define SCM_ONE_US_TICK_MASK		GENMASK(8, 0)
>> +
>> +/* SCM_MPHY_RAM_CONFIG_STATUS Register Fields. */
>> +#define SCM_STATUS_PHY_RESET_MASK		BIT(0)
>> +#define SCM_STATUS_SRAM_BYPASS_MASK		BIT(1)
>> +#define SCM_STATUS_SRAM_INIT_DONE_MASK		BIT(16)
>> +
>> +#define SCM_STATUS_PHY_RESET(val)		\
>> +	FIELD_PREP(SCM_STATUS_PHY_RESET_MASK, val)
>> +
>> +#define SCM_STATUS_SRAM_BYPASS(val)		\
>> +	FIELD_PREP(SCM_STATUS_SRAM_BYPASS_MASK, val)
>> +
>> +/* Timeout values. */
>> +#define CFG_MPHY_INIT_TIMEOUT_VALUE_US	3000000
> 
> suggest add comments, where 300000 from? standard spec or engineer choice,
> in case need modify in future. the same for other timeout values.
> 
Thank you! I will add comments documenting the origin of these timeout 
values.

>> +
>> +/* Clock validation limits. */
>> +#define MAX_VALID_ONE_US_TICK		SCM_ONE_US_TICK_MASK
>> +
>> +/* CPort definitions */
>> +#define CPORT_0				0
>> +
>> +/* Driver-defined timeout for completing a Hibern8 transition. */
>> +#define HBRN8_POLL_TOUT_MS      1000
>> +
>> +/**
>> + * struct s32n7_phy_reg - PHY CR (config-register) write entry
>> + * @reg: Register offset/address
>> + * @val: Value to write
>> + */
>> +struct s32n7_phy_reg {
>> +	u32 reg;
>> +	u32 val;
>> +};
>> +
>> +/**
>> + * struct s32n7_soc_data - SoC-specific configuration data
>> + * @vops: UFS host controller variant operations
>> + * @reset_config: MPHY reset DME attributes (programmed while PHY held in reset)
>> + * @reset_config_count: number of entries in @reset_config
>> + * @calib_mphy_disabled: CR calibration writes performed while the MPHY is disabled
>> + * @calib_mphy_disabled_count: number of entries in @calib_mphy_disabled
>> + * @calib_mphy_enabled: CR calibration writes performed while the MPHY is enabled
>> + * @calib_mphy_enabled_count: number of entries in @calib_mphy_enabled
>> + */
>> +struct s32n7_soc_data {
>> +	const struct ufs_hba_variant_ops *vops;
>> +	const struct ufshcd_dme_attr_val *reset_config;
>> +	size_t reset_config_count;
>> +	const struct s32n7_phy_reg *calib_mphy_disabled;
>> +	size_t calib_mphy_disabled_count;
>> +	const struct s32n7_phy_reg *calib_mphy_enabled;
>> +	size_t calib_mphy_enabled_count;
>> +};
>> +
>> +/**
>> + * struct s32n7_ufs - S32N7 UFS host controller data
>> + * @hba: UFS host controller instance
>> + * @reg_scm: SCM register base address
>> + * @core_clk: core reference clock used to derive ONE_US_TICK/HCLKDIV
>> + * @soc_data: SoC-specific configuration data
>> + */
>> +struct s32n7_ufs {
>> +	struct ufs_hba *hba;
>> +	void __iomem *reg_scm;
>> +	struct clk *core_clk;
>> +	const struct s32n7_soc_data *soc_data;
>> +};
>> +
>> +/**
>> + * ufs_s32n7_phy_write_sequence - Write a sequence of PHY registers
>> + * @hba: UFS host controller instance
>> + * @cfg: Array of register configurations
>> + * @count: Number of entries in the array
>> + *
>> + * Return: 0 on success, error code on failure
>> + */
>> +static int ufs_s32n7_phy_write_sequence(struct ufs_hba *hba,
>> +				       const struct s32n7_phy_reg *cfg,
>> +				       size_t count)
>> +{
>> +	int ret;
>> +	size_t i;
>> +
>> +	for (i = 0; i < count; i++) {
>> +		ret = ufshcd_dwc_phy_reg_write(hba, cfg[i].reg, cfg[i].val);
>> +		if (ret) {
>> +			dev_err(hba->dev,
>> +				"Failed to write PHY reg 0x%x = 0x%x (step %zu)\n",
>> +				cfg[i].reg, cfg[i].val, i);
>> +			return ret;
>> +		}
>> +	}
>> +
>> +	return 0;
>> +}
>> +
>> +static unsigned long ufs_s32n7_calculate_us_tick(unsigned long clk_rate)
>> +{
>> +	return clk_rate / USEC_PER_SEC;
> 
> div64?
> 
clk_get_rate() returns an unsigned long, which is also the type used for 
clk_rate here. Since the calculation does not involve a u64 value, I 
believe a regular division should be sufficient. Do you see a reason to 
use div_u64() here?

>> +}
>> +
>> +static int ufs_s32n7_configure_clocks(struct ufs_hba *hba)
>> +{
>> +	struct s32n7_ufs *ufs = ufshcd_get_variant(hba);
>> +	struct device *dev = hba->dev;
>> +	unsigned long clk_rate = 0;
>> +	unsigned long one_us_tick;
>> +
>> +	clk_rate = clk_get_rate(ufs->core_clk);
>> +	if (!clk_rate) {
>> +		dev_err(dev, "Failed to get valid clock rate.\n");
>> +		return -EINVAL;
>> +	}
>> +
>> +	one_us_tick = ufs_s32n7_calculate_us_tick(clk_rate);
>> +	if (one_us_tick == 0 || one_us_tick > MAX_VALID_ONE_US_TICK) {
>> +		dev_err(dev, "Invalid one_us_tick value: %lu (clk_rate: %lu Hz).\n",
>> +			one_us_tick, clk_rate);
>> +		return -EINVAL;
>> +	}
>> +
>> +	dev_dbg(dev, "Core clock rate: %lu Hz, one_us_tick = %lu.\n",
>> +		 clk_rate, one_us_tick);
>> +
>> +	/*
>> +	 * Configure the micro-second tick rate generator based on core
>> +	 * clock rate.
>> +	 */
>> +	writel(one_us_tick, ufs->reg_scm + SCM_ONE_US_TICK);
>> +	ufshcd_dwc_program_clk_div(hba, one_us_tick);
>> +
>> +	return 0;
>> +}
>> +
>> +static int ufs_s32n7_hce_enable_notify(struct ufs_hba *hba,
>> +				      enum ufs_notify_change_status status)
>> +{
>> +	u32 reg;
>> +
>> +	if (status != POST_CHANGE)
>> +		return 0;
>> +
>> +	/*
>> +	 * Clear the DWC low-power gating (BUSTHRTL) so a doorbell write can
>> +	 * wake the link out of hibernate. LP_PGE (generic low-power) and
>> +	 * LP_AH8_PGE (Auto-Hibern8) both reset to 1.
>> +	 */
>> +	reg = ufshcd_readl(hba, DWC_UFS_REG_BUSTHRTL);
>> +	reg &= ~(DWC_UFS_BUSTHRTL_LP_PGE | DWC_UFS_BUSTHRTL_LP_AH8_PGE);
>> +	ufshcd_writel(hba, reg, DWC_UFS_REG_BUSTHRTL);
>> +
>> +	return 0;
>> +}
>> +
>> +static int ufs_s32n7_phy_initial_calib(struct ufs_hba *hba)
>> +{
>> +	struct s32n7_ufs *ufs = ufshcd_get_variant(hba);
>> +	int ret;
>> +
>> +	/* Calibrations that must run while the MPHY is disabled. */
>> +	ret = ufs_s32n7_phy_write_sequence(hba, ufs->soc_data->calib_mphy_disabled,
>> +					  ufs->soc_data->calib_mphy_disabled_count);
>> +	if (ret)
>> +		return ret;
>> +
>> +	ret = ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1);
>> +	if (ret)
>> +		return ret;
>> +
>> +	ret = ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYDISABLE, 0), 0x0);
>> +	if (ret)
>> +		return ret;
>> +
>> +	/* Calibrations that must run while the MPHY is enabled. */
>> +	ret = ufs_s32n7_phy_write_sequence(hba, ufs->soc_data->calib_mphy_enabled,
>> +					  ufs->soc_data->calib_mphy_enabled_count);
>> +	if (ret)
>> +		return ret;
>> +
>> +	return ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1);
>> +}
>> +
>> +static int ufs_s32n7_link_startup_pre_change(struct ufs_hba *hba)
>> +{
>> +	struct s32n7_ufs *ufs = ufshcd_get_variant(hba);
>> +	struct device *dev = hba->dev;
>> +	int ret;
>> +	u32 reg;
>> +
>> +	ret = ufs_s32n7_configure_clocks(hba);
>> +	if (ret)
>> +		return ret;
>> +
>> +	/* Reset SCM.MPHY_RAM_CONFIG_STATUS to default value; keep MPHY in reset. */
>> +	writel(SCM_STATUS_PHY_RESET(1), ufs->reg_scm + SCM_STATUS);
>> +
>> +	/*
>> +	 * The M-PHY firmware runs from the internal ROM:
>> +	 *  MPHY_RAM_CONFIG_STATUS.SRAM_BYPASS = 1
>> +	 *  MPHY_RAM_CONFIG_STATUS.SRAM_EXT_LD_DONE = 0
>> +	 */
>> +	writel(SCM_STATUS_PHY_RESET(1) | SCM_STATUS_SRAM_BYPASS(1),
>> +	       ufs->reg_scm + SCM_STATUS);
>> +
>> +	/* MPHY reset configuration: vendor attributes set while PHY in reset. */
>> +	ret = ufshcd_dwc_dme_set_attrs(hba, ufs->soc_data->reset_config,
>> +				       ufs->soc_data->reset_config_count);
>> +	if (ret)
>> +		return ret;
>> +
>> +	ret = ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1);
>> +	if (ret)
>> +		return ret;
>> +
>> +	/* Release PHY_RESET. */
>> +	writel(readl(ufs->reg_scm + SCM_STATUS) & ~SCM_STATUS_PHY_RESET_MASK,
>> +	       ufs->reg_scm + SCM_STATUS);
>> +
>> +	/* Wait until SRAM_INIT_DONE = 1. */
>> +	ret = readl_poll_timeout(ufs->reg_scm + SCM_STATUS, reg,
>> +			reg & SCM_STATUS_SRAM_INIT_DONE_MASK,
>> +			1000, CFG_MPHY_INIT_TIMEOUT_VALUE_US);
>> +	if (ret) {
>> +		dev_err(dev, "UFS MPHY init not done!\n");
>> +		return ret;
>> +	}
>> +
>> +	/* Start of initial calibration */
>> +	ret = ufs_s32n7_phy_initial_calib(hba);
>> +	if (ret) {
>> +		dev_err(dev, "UFS MPHY initial calibration failed!\n");
>> +		return ret;
>> +	}
>> +
>> +	/* End of Gear1 settings */
>> +
>> +	return ufshcd_dme_check_tx_hibern8(hba, hba->lanes_per_direction,
>> +					   HBRN8_POLL_TOUT_MS);
>> +}
>> +
>> +static int ufs_s32n7_link_startup_post_change(struct ufs_hba *hba)
>> +{
>> +	static const struct ufshcd_dme_attr_val cport_setup[] = {
>> +		{ UIC_ARG_MIB_SEL(T_CONNECTIONSTATE, CPORT_0),
>> +				CPORT_IDLE, DME_LOCAL },
>> +		{ UIC_ARG_MIB_SEL(T_CPORTFLAGS, CPORT_0),
>> +				CPORT_DEF_FLAGS, DME_LOCAL },
>> +		{ UIC_ARG_MIB_SEL(T_CONNECTIONSTATE, CPORT_0),
>> +				CPORT_CONNECTED, DME_LOCAL },
>> +	};
>> +	unsigned int data = 0;
>> +	int ret;
>> +
>> +	/* Network layer: set Local DeviceID. */
>> +	ret = ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(N_DEVICEID, 0), 0x0);
>> +	if (ret)
>> +		return ret;
>> +
>> +	/* Set Connection State to IDLE (it allows CPort Attributes to be set). */
>> +	ret = ufshcd_dwc_dme_set_attrs(hba, cport_setup, ARRAY_SIZE(cport_setup));
>> +	if (ret)
>> +		return ret;
>> +
>> +	ret = ufshcd_dme_get(hba, UIC_ARG_MIB_SEL(T_CONNECTIONSTATE, CPORT_0), &data);
>> +	if (ret)
>> +		return ret;
>> +
>> +	if (data != CPORT_CONNECTED)
>> +		return -EIO;
>> +
>> +	return 0;
>> +}
>> +
>> +static int ufs_s32n7_link_startup_notify(struct ufs_hba *hba,
>> +			     enum ufs_notify_change_status status)
>> +{
>> +	int err;
>> +
>> +	if (status == PRE_CHANGE) {
>> +		err = ufs_s32n7_link_startup_pre_change(hba);
>> +		if (err) {
>> +			dev_err(hba->dev, "MPHY setup failed (%d).\n", err);
>> +			return err;
>> +		}
>> +		return 0;
>> +	}
>> +
>> +	/* POST_CHANGE */
>> +	err = ufshcd_dwc_link_is_up(hba);
>> +	if (err) {
>> +		dev_err(hba->dev, "Link is not up.\n");
>> +		return err;
>> +	}
>> +
>> +	err = ufs_s32n7_link_startup_post_change(hba);
>> +	if (err)
>> +		dev_err(hba->dev, "Connection setup failed (%d).\n", err);
>> +
>> +	return err;
>> +}
>> +
>> +static int ufs_s32n7_pwr_change_pre_change(struct ufs_hba *hba,
>> +					  const struct ufs_pa_layer_attr *pwr)
>> +{
>> +	/*
>> +	 * RX rate-select override sequence: assert the override, then deassert
>> +	 * the value, then drop the override enable so normal operation resumes.
>> +	 */
>> +	static const struct s32n7_phy_reg pwr_change_phy_regs[] = {
>> +		{ RX_OVRD_IN_1(0), 0xc },
>> +		{ RX_OVRD_IN_1(1), 0xc },
>> +		{ RX_OVRD_IN_1(0), 0x8 },
>> +		{ RX_OVRD_IN_1(1), 0x8 },
>> +		{ RX_OVRD_IN_1(0), 0x0 },
>> +		{ RX_OVRD_IN_1(1), 0x0 },
>> +	};
>> +	u32 rate;
>> +	int ret;
>> +
>> +	/* Rate change only applies to the HS power modes. */
>> +	if (!ufshcd_is_hs_mode(pwr))
>> +		return 0;
>> +
>> +	/*
>> +	 * Select the M-PHY rate (rate series) that matches the mode the core
>> +	 * has negotiated with the device.
>> +	 */
>> +	rate = (pwr->hs_rate == PA_HS_MODE_B) ? CB_RATE_B : CB_RATE_A;
>> +
>> +	ret = ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(CBRATESEL, 0), rate);
>> +	if (ret)
>> +		return ret;
>> +
>> +	ret = ufshcd_dme_set(hba, UIC_ARG_MIB_SEL(VS_MPHYCFGUPDT, 0), 0x1);
>> +	if (ret)
>> +		return ret;
>> +
>> +	/* Apply the RX rate-select override now that the target rate is set. */
>> +	return ufs_s32n7_phy_write_sequence(hba, pwr_change_phy_regs,
>> +					   ARRAY_SIZE(pwr_change_phy_regs));
>> +}
>> +
>> +static int ufs_s32n7_pwr_change_notify(struct ufs_hba *hba,
>> +				      enum ufs_notify_change_status status,
>> +				      struct ufs_pa_layer_attr *pwr)
>> +{
>> +	int err = 0;
>> +
>> +	if (status == PRE_CHANGE) {
>> +		err = ufs_s32n7_pwr_change_pre_change(hba, pwr);
>> +		if (err)
>> +			dev_err(hba->dev, "Power mode pre-change failed (%d).\n",
>> +				err);
>> +	}
>> +
>> +	return err;
>> +}
>> +
>> +static int ufs_s32n7_init(struct ufs_hba *hba)
>> +{
>> +	struct device *dev = hba->dev;
>> +	struct platform_device *pdev = to_platform_device(dev);
>> +	struct s32n7_ufs *ufs;
>> +
>> +	ufs = devm_kzalloc(dev, sizeof(*ufs), GFP_KERNEL);
>> +	if (!ufs)
>> +		return -ENOMEM;
>> +
>> +	ufs->hba = hba;
>> +	ufs->soc_data = device_get_match_data(dev);
>> +	if (!ufs->soc_data)
>> +		return -ENODEV;
>> +
>> +	hba->quirks |= UFSHCD_QUIRK_PERFORM_LINK_STARTUP_ONCE;
>> +	hba->spm_lvl = UFS_PM_LVL_5;
>> +
>> +	ufs->reg_scm = devm_platform_ioremap_resource_byname(pdev, "scm");
>> +	if (IS_ERR(ufs->reg_scm))
>> +		return dev_err_probe(dev, PTR_ERR(ufs->reg_scm),
>> +				     "ioremap failed for SCM registers.\n");
>> +
>> +	/*
>> +	 * The core reference clock is not managed by the UFS core (the DT node
>> +	 * has no clock-names/freq-table-hz, so it is never added to
>> +	 * hba->clk_list_head).
>> +	 */
>> +	ufs->core_clk = devm_clk_get_enabled(dev, NULL);
>> +	if (IS_ERR(ufs->core_clk))
>> +		return dev_err_probe(dev, PTR_ERR(ufs->core_clk),
>> +				     "Failed to get and enable core clock.\n");
>> +
>> +	ufshcd_set_variant(hba, ufs);
>> +
>> +	return 0;
>> +}
>> +
>> +static const struct ufs_hba_variant_ops ufs_hba_s32n79_vops = {
>> +	.name = "s32n79",
>> +	.init = ufs_s32n7_init,
>> +	.link_startup_notify = ufs_s32n7_link_startup_notify,
>> +	.hce_enable_notify = ufs_s32n7_hce_enable_notify,
>> +	.pwr_change_notify = ufs_s32n7_pwr_change_notify,
>> +};
>> +
>> +/*
>> + * MPHY reset configuration: vendor DME attributes programmed while the PHY is
>> + * held in reset. Programs the reference-clock, RX squelch, RX Rhold and
>> + * CR-parallel control attributes.
>> + */
>> +static const struct ufshcd_dme_attr_val s32n79_reset_config[] = {
>> +	/*
>> +	 * Disable reference clock gating support and override the UniPro and
>> +	 * application reference clock enable inputs to 0.
>> +	 */
>> +	{ UIC_ARG_MIB_SEL(CBREFCLKCTRL2, 0), 0x8A, DME_LOCAL },
>> +	/* RX squelch control. */
>> +	{ UIC_ARG_MIB_SEL(RXSQCONTROL, SELIND_LN0_RX), 0x1, DME_LOCAL },
>> +	{ UIC_ARG_MIB_SEL(RXSQCONTROL, SELIND_LN1_RX), 0x1, DME_LOCAL },
>> +	/* RX Rhold control option. */
>> +	{ UIC_ARG_MIB_SEL(RXRHOLDCTRLOPT, SELIND_LN0_RX), 0x2, DME_LOCAL },
>> +	{ UIC_ARG_MIB_SEL(RXRHOLDCTRLOPT, SELIND_LN1_RX), 0x2, DME_LOCAL },
>> +	/* CR parallel selection. */
>> +	{ UIC_ARG_MIB_SEL(CBCRCTRL, 0), 0x1, DME_LOCAL },
>> +};
>> +
>> +/* Calibrations that must run while the MPHY is disabled. */
>> +static const struct s32n7_phy_reg s32n79_calib_mphy_disabled[] = {
>> +	/* Bypass RX AFE calibration. */
>> +	{ FAST_FLAGS(0), 0x4 },
>> +	{ FAST_FLAGS(1), 0x4 },
>> +};
>> +
>> +/* Calibrations that must run while the MPHY is enabled. */
>> +static const struct s32n7_phy_reg s32n79_calib_mphy_enabled[] = {
>> +	/* Write ATT offset compensation code to internal DAC. */
>> +	{ RX_DAC_CTRL_OVRD(0), 0x1 },
>> +	{ RX_DAC_CTRL_OVRD(1), 0x1 },
>> +	{ RX_DAC_CTRL(0), 0x8E },
>> +	{ RX_DAC_CTRL(1), 0x91 },
>> +	{ RX_DAC_CTRL_SEL(0), 0x1 },
>> +	{ RX_DAC_CTRL_SEL(1), 0x1 },
>> +	{ RX_DAC_CTRL_EN(0), 0x1 },
>> +	{ RX_DAC_CTRL_EN(1), 0x1 },
>> +	{ RX_DAC_CTRL_OVRD(0), 0x0 },
>> +	{ RX_DAC_CTRL_OVRD(1), 0x0 },
>> +	/* Write CTLE offset compensation code to internal DAC. */
>> +	{ RX_DAC_CTRL_OVRD(0), 0x1 },
>> +	{ RX_DAC_CTRL_OVRD(1), 0x1 },
>> +	{ RX_DAC_CTRL(0), 0x71 },
>> +	{ RX_DAC_CTRL(1), 0x7F },
>> +	{ RX_DAC_CTRL_SEL(0), 0x2 },
>> +	{ RX_DAC_CTRL_SEL(1), 0x2 },
>> +	{ RX_DAC_CTRL_EN(0), 0x1 },
>> +	{ RX_DAC_CTRL_EN(1), 0x1 },
>> +	{ RX_DAC_CTRL_OVRD(0), 0x0 },
>> +	{ RX_DAC_CTRL_OVRD(1), 0x0 },
>> +	/* FW Calibration configuration. */
>> +	{ FW_CALIB_CCFG(0), 0x100 },
>> +	{ FW_CALIB_CCFG(1), 0x100 },
>> +};
>> +
>> +static const struct s32n7_soc_data s32n79_soc_data = {
>> +	.vops = &ufs_hba_s32n79_vops,
>> +	.reset_config = s32n79_reset_config,
>> +	.reset_config_count = ARRAY_SIZE(s32n79_reset_config),
>> +	.calib_mphy_disabled = s32n79_calib_mphy_disabled,
>> +	.calib_mphy_disabled_count = ARRAY_SIZE(s32n79_calib_mphy_disabled),
>> +	.calib_mphy_enabled = s32n79_calib_mphy_enabled,
>> +	.calib_mphy_enabled_count = ARRAY_SIZE(s32n79_calib_mphy_enabled),
>> +};
>> +
>> +static const struct of_device_id ufs_s32n7_match[] = {
>> +	{
>> +		.compatible = "nxp,s32n79-ufshc",
>> +		.data = &s32n79_soc_data,
>> +	},
>> +	{ /* sentinel */ }
>> +};
>> +MODULE_DEVICE_TABLE(of, ufs_s32n7_match);
>> +
>> +static int ufs_s32n7_probe(struct platform_device *pdev)
>> +{
>> +	const struct s32n7_soc_data *soc_data;
>> +
>> +	soc_data = device_get_match_data(&pdev->dev);
>> +	if (!soc_data)
>> +		return -ENODEV;
>> +
>> +	return ufshcd_pltfrm_init(pdev, soc_data->vops);
>> +}
>> +
>> +static void ufs_s32n7_remove(struct platform_device *pdev)
>> +{
>> +	ufshcd_pltfrm_remove(pdev);
>> +}
>> +
>> +static const struct dev_pm_ops ufs_s32n7_pm_ops = {
>> +	SYSTEM_SLEEP_PM_OPS(ufshcd_system_suspend, ufshcd_system_resume)
>> +	RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)
>> +	.prepare	= ufshcd_suspend_prepare,
>> +	.complete	= ufshcd_resume_complete,
> 
> AI report, need pm_ptr()
> 
Thank you! I will wrap the prepare and complete callbacks with pm_ptr() 
in the next revision. I left them unchanged so far because both 
callbacks are not guarded by CONFIG_PM_SLEEP.

>> +};
>> +
>> +static struct platform_driver ufs_s32n7_driver = {
>> +	.probe = ufs_s32n7_probe,
>> +	.remove = ufs_s32n7_remove,
>> +	.driver	= {
>> +		.name	= "ufs-s32n7",
>> +		.pm	= pm_ptr(&ufs_s32n7_pm_ops),
>> +		.of_match_table	= ufs_s32n7_match,
>> +	},
>> +};
>> +
>> +module_platform_driver(ufs_s32n7_driver);
>> +
>> +MODULE_AUTHOR("Larisa Grigore <larisa.grigore at oss.nxp.com>");
>> +MODULE_DESCRIPTION("NXP S32N7 UFS Host Controller platform driver");
>> +MODULE_LICENSE("Dual BSD/GPL");
>> diff --git a/drivers/ufs/host/ufshcd-dwc.h b/drivers/ufs/host/ufshcd-dwc.h
>> index 53b523ef59df..d62cd4c085ba 100644
>> --- a/drivers/ufs/host/ufshcd-dwc.h
>> +++ b/drivers/ufs/host/ufshcd-dwc.h
>> @@ -13,8 +13,8 @@
>>   #include <ufs/ufshcd.h>
>>
>>   /* RMMI Attributes */
>> -#define CBREFCLKCTRL2		0x8132
>> -#define CBCRCTRL		0x811F
> 
> Move macro should be in sperate patch, don't mix into this patch.
> 

Thank you! I will create a new patch for this change.

Best regards,
Larisa
> Frank
>> +#define RXSQCONTROL		0x8009
>> +#define RXRHOLDCTRLOPT		0x8013
>>   #define CBC10DIRECTCONF2	0x810E
>>   #define CBRATESEL		0x8114
>>   #define CBCREGADDRLSB		0x8116
>> @@ -24,10 +24,20 @@
>>   #define CBCREGRDLSB		0x811A
>>   #define CBCREGRDMSB		0x811B
>>   #define CBCREGRDWRSEL		0x811C
>> +#define CBCRCTRL		0x811F
>> +#define CBREFCLKCTRL2		0x8132
>>
>>   #define CBREFREFCLK_GATE_OVR_EN		BIT(7)
>>
>> +/* CBRATESEL: 0 - rate A, 1 - rate B. */
>> +#define CB_RATE_A		0x0
>> +#define CB_RATE_B		0x1
>> +
>>   /* M-PHY registers */
>> +#define RX_DAC_CTRL(n)		(0x10AF + ((n) * 0x100))
>> +#define RX_DAC_CTRL_OVRD(n)	(0x10B0 + ((n) * 0x100))
>> +#define RX_DAC_CTRL_SEL(n)	(0x10B1 + ((n) * 0x100))
>> +#define RX_DAC_CTRL_EN(n)	(0x10B8 + ((n) * 0x100))
>>   #define RX_OVRD_IN_1(n)		(0x3006 + ((n) * 0x100))
>>   #define RX_PCS_OUT(n)		(0x300F + ((n) * 0x100))
>>   #define FAST_FLAGS(n)		(0x401C + ((n) * 0x100))
>> diff --git a/drivers/ufs/host/ufshci-dwc.h b/drivers/ufs/host/ufshci-dwc.h
>> index 6c290e272106..c66f33391b65 100644
>> --- a/drivers/ufs/host/ufshci-dwc.h
>> +++ b/drivers/ufs/host/ufshci-dwc.h
>> @@ -12,9 +12,15 @@
>>
>>   /* DWC HC UFSHCI specific Registers */
>>   enum dwc_specific_registers {
>> +	DWC_UFS_REG_BUSTHRTL	= 0xC0,
>>   	DWC_UFS_REG_HCLKDIV	= 0xFC,
>>   };
>>
>> +/* Low-Power Power Gating Enable. */
>> +#define DWC_UFS_BUSTHRTL_LP_PGE		BIT(16)
>> +/* Low Power - AH8 Power Gating Enable. */
>> +#define DWC_UFS_BUSTHRTL_LP_AH8_PGE	BIT(17)
>> +
>>   /* Clock Divider Values: Hex equivalent of frequency in MHz */
>>   enum clk_div_values {
>>   	DWC_UFS_REG_HCLKDIV_DIV_62_5	= 0x3e,
>> --
>> 2.43.0
>>
>>




More information about the linux-arm-kernel mailing list