samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cnss2: Add wrapper to get SoC info before registering MHI controller

Browse Source 
Add wrapper __cnss_get_mhi_soc_info() to get SoC info
before registering MHI controller.
It calls mhi_get_soc_info() if downstream MHI bus driver
is enabled(CONFIG_MHI_BUS_MISC is enabled), while reads
register for SoC hardware version directly if not.

Change-Id: I97e53bf0a7e28b2b1027d8de5eaf9fc82bcd5cee
CRs-Fixed: 3712133
This commit is contained in:
Yu Wang
2024-01-05 11:23:38 +08:00
committed by Ravindra Konda
parent 05dba07d27
commit f554c1a9b4
1 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
cnss2/pci.c
View File

@@ -6931,14 +6931,61 @@ static void cnss_mhi_write_reg(struct mhi_controller *mhi_ctrl,
writel_relaxed(val, addr);
}
#if IS_ENABLED(CONFIG_MHI_BUS_MISC)
/**
* __cnss_get_mhi_soc_info - Get SoC info before registering mhi controller
* @mhi_ctrl: MHI controller
*
* Return: 0 for success, error code on failure
*/
static inline int __cnss_get_mhi_soc_info(struct mhi_controller *mhi_ctrl)
{
return mhi_get_soc_info(mhi_ctrl);
}
#else
#define SOC_HW_VERSION_OFFS (0x224)
#define SOC_HW_VERSION_FAM_NUM_BMSK (0xF0000000)
#define SOC_HW_VERSION_FAM_NUM_SHFT (28)
#define SOC_HW_VERSION_DEV_NUM_BMSK (0x0FFF0000)
#define SOC_HW_VERSION_DEV_NUM_SHFT (16)
#define SOC_HW_VERSION_MAJOR_VER_BMSK (0x0000FF00)
#define SOC_HW_VERSION_MAJOR_VER_SHFT (8)
#define SOC_HW_VERSION_MINOR_VER_BMSK (0x000000FF)
#define SOC_HW_VERSION_MINOR_VER_SHFT (0)
static int __cnss_get_mhi_soc_info(struct mhi_controller *mhi_ctrl)
{
u32 soc_info;
int ret;
ret = mhi_ctrl->read_reg(mhi_ctrl,
mhi_ctrl->regs + SOC_HW_VERSION_OFFS,
&soc_info);
if (ret)
return ret;
mhi_ctrl->family_number = (soc_info & SOC_HW_VERSION_FAM_NUM_BMSK) >>
SOC_HW_VERSION_FAM_NUM_SHFT;
mhi_ctrl->device_number = (soc_info & SOC_HW_VERSION_DEV_NUM_BMSK) >>
SOC_HW_VERSION_DEV_NUM_SHFT;
mhi_ctrl->major_version = (soc_info & SOC_HW_VERSION_MAJOR_VER_BMSK) >>
SOC_HW_VERSION_MAJOR_VER_SHFT;
mhi_ctrl->minor_version = (soc_info & SOC_HW_VERSION_MINOR_VER_BMSK) >>
SOC_HW_VERSION_MINOR_VER_SHFT;
return 0;
}
#endif
static int cnss_get_mhi_soc_info(struct cnss_plat_data *plat_priv,
struct mhi_controller *mhi_ctrl)
{
int ret = 0;
ret = mhi_get_soc_info(mhi_ctrl);
if (ret)
ret = __cnss_get_mhi_soc_info(mhi_ctrl);
if (ret) {
cnss_pr_err("failed to get mhi soc info, ret %d\n", ret);
goto exit;
}
plat_priv->device_version.family_number = mhi_ctrl->family_number;
plat_priv->device_version.device_number = mhi_ctrl->device_number;