nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

ufs: Add conftest to check is_ufs_already_enabled

Browse Source 
Add conftest to check is_ufs_already_enabled

Change-Id: Ia830afb2a72586f4da2323a4ab7df8e7eb9cc321
Signed-off-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3312149
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: svcacv <svcacv@nvidia.com>
GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Mallikarjun Kasoju
2025-03-01 09:08:55 +00:00
committed by Jon Hunter
parent 9a4387e137
commit ae290b601b
3 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/scsi/ufs/ufs-tegra-common.c
View File

@@ -1333,9 +1333,10 @@ static int ufs_tegra_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
*/ */
ufshcd_set_link_off(hba); ufshcd_set_link_off(hba);
/* TODO: Check why disabling clocks causing crash */
if (ufs_tegra->soc->chip_id == TEGRA264) { if (ufs_tegra->soc->chip_id == TEGRA264) {
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
hba->is_ufs_already_enabled = false; hba->is_ufs_already_enabled = false;
#endif
ufs_tegra->mask_hs_mode_b = false; ufs_tegra->mask_hs_mode_b = false;
goto end; goto end;
} }
@@ -1504,10 +1505,11 @@ static int ufs_tegra_pwr_change_notify(struct ufs_hba *hba,
switch (status) { switch (status) {
case PRE_CHANGE: case PRE_CHANGE:
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
/* Return if ufs is already initialised */ /* Return if ufs is already initialised */
if (hba->is_ufs_already_enabled) if (hba->is_ufs_already_enabled)
return 0; return 0;
#endif
/* Update VS_DebugSaveConfigTime Tref */ /* Update VS_DebugSaveConfigTime Tref */
ufshcd_dme_get(hba, UIC_ARG_MIB(VS_DEBUGSAVECONFIGTIME), ufshcd_dme_get(hba, UIC_ARG_MIB(VS_DEBUGSAVECONFIGTIME),
&vs_save_config); &vs_save_config);
@@ -1594,11 +1596,11 @@ static int ufs_tegra_pwr_change_notify(struct ufs_hba *hba,
sizeof(struct ufs_pa_layer_attr)); sizeof(struct ufs_pa_layer_attr));
break; break;
case POST_CHANGE: case POST_CHANGE:
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
/* Return if ufs is already initialised */ /* Return if ufs is already initialised */
if (hba->is_ufs_already_enabled) if (hba->is_ufs_already_enabled)
return 0; return 0;
#endif
ufs_tegra_print_power_mode_config(hba, dev_req_params); ufs_tegra_print_power_mode_config(hba, dev_req_params);
ufshcd_dme_get(hba, UIC_ARG_MIB(PA_SCRAMBLING), &pa_reg_check); ufshcd_dme_get(hba, UIC_ARG_MIB(PA_SCRAMBLING), &pa_reg_check);
if (pa_reg_check & SCREN) if (pa_reg_check & SCREN)
@@ -1620,11 +1622,11 @@ static int ufs_tegra_hce_enable_notify(struct ufs_hba *hba,
switch (status) { switch (status) {
case PRE_CHANGE: case PRE_CHANGE:
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
/* Return if ufs is already initialised */ /* Return if ufs is already initialised */
if (hba->is_ufs_already_enabled) if (hba->is_ufs_already_enabled)
return 0; return 0;
#endif
if (ufs_tegra->soc->chip_id != TEGRA264) { if (ufs_tegra->soc->chip_id != TEGRA264) {
err = ufs_tegra_host_clk_enable(dev, err = ufs_tegra_host_clk_enable(dev,
"mphy_force_ls_mode", "mphy_force_ls_mode",
@@ -1638,11 +1640,11 @@ static int ufs_tegra_hce_enable_notify(struct ufs_hba *hba,
UFSHC_AUX_UFSHC_DEV_CTRL_0); UFSHC_AUX_UFSHC_DEV_CTRL_0);
break; break;
case POST_CHANGE: case POST_CHANGE:
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
/* Return if ufs is already initialised */ /* Return if ufs is already initialised */
if (hba->is_ufs_already_enabled) if (hba->is_ufs_already_enabled)
return 0; return 0;
#endif
ufs_aux_clear_bits(ufs_tegra->ufs_aux_base, ufs_aux_clear_bits(ufs_tegra->ufs_aux_base,
UFSHC_CG_SYS_CLK_OVR_ON, UFSHC_CG_SYS_CLK_OVR_ON,
UFSHC_AUX_UFSHC_SW_EN_CLK_SLCG_0); UFSHC_AUX_UFSHC_SW_EN_CLK_SLCG_0);
@@ -1712,20 +1714,22 @@ static int ufs_tegra_link_startup_notify(struct ufs_hba *hba,
switch (status) { switch (status) {
case PRE_CHANGE: case PRE_CHANGE:
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
/* Link is initialized by earlier firmware */ /* Link is initialized by earlier firmware */
if (hba->is_ufs_already_enabled) if (hba->is_ufs_already_enabled)
return 0; return 0;
#endif
ufs_tegra_mphy_rx_sync_capability(ufs_tegra); ufs_tegra_mphy_rx_sync_capability(ufs_tegra);
ufs_tegra_unipro_pre_linkup(hba); ufs_tegra_unipro_pre_linkup(hba);
/* Enable TX link calibration */ /* Enable TX link calibration */
err = ufs_tegra_mphy_tx_calibration_enable(ufs_tegra); err = ufs_tegra_mphy_tx_calibration_enable(ufs_tegra);
break; break;
case POST_CHANGE: case POST_CHANGE:
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
/* Link is initialized by earlier firmware */ /* Link is initialized by earlier firmware */
if (hba->is_ufs_already_enabled) if (hba->is_ufs_already_enabled)
return 0; return 0;
#endif
/* Check TX link calibration status */ /* Check TX link calibration status */
err = ufs_tegra_mphy_check_tx_calibration_done_status(ufs_tegra); err = ufs_tegra_mphy_check_tx_calibration_done_status(ufs_tegra);
if (err) { if (err) {
@@ -1843,8 +1847,9 @@ static int ufs_tegra_init(struct ufs_hba *hba)
resource_size_t ufs_virt_base_addr = 0, ufs_virt_addr_range = 0; resource_size_t ufs_virt_base_addr = 0, ufs_virt_addr_range = 0;
struct iommu_fwspec *fwspec; struct iommu_fwspec *fwspec;
u32 virt_ctrl_en = 0; u32 virt_ctrl_en = 0;
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
u32 val; u32 val;
#endif
ufs_tegra = devm_kzalloc(dev, sizeof(*ufs_tegra), GFP_KERNEL); ufs_tegra = devm_kzalloc(dev, sizeof(*ufs_tegra), GFP_KERNEL);
if (!ufs_tegra) { if (!ufs_tegra) {
err = -ENOMEM; err = -ENOMEM;
@@ -1859,7 +1864,9 @@ static int ufs_tegra_init(struct ufs_hba *hba)
ufs_tegra->ufshc_state = UFSHC_INIT; ufs_tegra->ufshc_state = UFSHC_INIT;
ufs_tegra->hba = hba; ufs_tegra->hba = hba;
hba->priv = (void *)ufs_tegra; hba->priv = (void *)ufs_tegra;
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
hba->is_ufs_already_enabled = false; hba->is_ufs_already_enabled = false;
#endif
err = ufs_tegra_config_soc_data(ufs_tegra); err = ufs_tegra_config_soc_data(ufs_tegra);
if (err) if (err)
@@ -2002,6 +2009,7 @@ ufs_clk_deassert:
if (tegra_sku_info.platform == TEGRA_PLATFORM_SYSTEM_FPGA) if (tegra_sku_info.platform == TEGRA_PLATFORM_SYSTEM_FPGA)
goto end; goto end;
#if defined(NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED)
val = ufshcd_readl(hba, REG_CONTROLLER_ENABLE); val = ufshcd_readl(hba, REG_CONTROLLER_ENABLE);
if (val) { if (val) {
/* If already initialised, do not configure ufs */ /* If already initialised, do not configure ufs */
@@ -2011,7 +2019,7 @@ ufs_clk_deassert:
/* ufs already initialised. Do not configure ufs */ /* ufs already initialised. Do not configure ufs */
goto end; goto end;
} }
#endif
err = ufs_tegra_mphy_rx_advgran(ufs_tegra); err = ufs_tegra_mphy_rx_advgran(ufs_tegra);
if (err) if (err)
goto out_disable_mphylane_clks; goto out_disable_mphylane_clks;

1
scripts/conftest/Makefile
View File

@@ -227,6 +227,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufs_hba_variant_ops_pwr_change_notify_has_
NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufs_hba_variant_ops_suspend_has_status_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufs_hba_variant_ops_suspend_has_status_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_quirks_enum_has_ufshcd_quirk_broken_64bit_address NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_quirks_enum_has_ufshcd_quirk_broken_64bit_address
NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_quirks_enum_has_ufshcd_quirk_broken_power_seqeunce NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_quirks_enum_has_ufshcd_quirk_broken_power_seqeunce
NV_CONFTEST_FUNCTION_COMPILE_TESTS += ufshcd_ufs_hba_struct_has_bool_is_ufs_already_enabled
NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_connection_struct_present NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_connection_struct_present
NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_match_type_enum_present NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_match_type_enum_present
NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_subdev_nf_init NV_CONFTEST_FUNCTION_COMPILE_TESTS += v4l2_async_subdev_nf_init

15
scripts/conftest/conftest.sh
View File

@@ -8783,6 +8783,21 @@ compile_test() {
compile_check_conftest "$CODE" "NV_UFSHCD_QUIRKS_ENUM_HAS_UFSHCD_QUIRK_BROKEN_POWER_SEQUENCE" "" "types" compile_check_conftest "$CODE" "NV_UFSHCD_QUIRKS_ENUM_HAS_UFSHCD_QUIRK_BROKEN_POWER_SEQUENCE" "" "types"
;; ;;
ufshcd_ufs_hba_struct_has_bool_is_ufs_already_enabled)
#
# Determine if the 'ufs_hba' structure has
# bool 'is_ufs_already_enabled'.
#
#
CODE="
#include <ufs/ufshcd.h>
int ufshcd_ufs_hba_struct_has_bool_is_ufs_already_enabled(void) {
return offsetof(struct ufs_hba, is_ufs_already_enabled);
}"
compile_check_conftest "$CODE" "NV_UFS_HBA_STRUCT_HAS_BOOL_IS_UFS_ALREADY_ENABLED" "" "types"
;;
v4l2_async_connection_struct_present) v4l2_async_connection_struct_present)
# #
# Determine if the 'struct v4l2_async_connection' present or not. # Determine if the 'struct v4l2_async_connection' present or not.