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

Merge "adsp-loader: Add support to load adsp fw name"

Browse Source
This commit is contained in:
qctecmdr
2020-06-01 10:27:01 -07:00
committed by Gerrit - the friendly Code Review server
parent 9255140167 315e4b16e2
commit 023f5dc0cb
1 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
dsp/adsp-loader.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2012-2014, 2017-2019, The Linux Foundation. All rights reserved. * Copyright (c) 2012-2014, 2017-2020, The Linux Foundation. All rights reserved.
*/ */
#include <linux/init.h> #include <linux/init.h>
@@ -333,6 +333,8 @@ static int adsp_loader_probe(struct platform_device *pdev)
int fw_name_size; int fw_name_size;
u32 adsp_var_idx = 0; u32 adsp_var_idx = 0;
int ret = 0; int ret = 0;
u32 adsp_fuse_not_supported = 0;
const char *adsp_fw_name;
ret = adsp_loader_init_sysfs(pdev); ret = adsp_loader_init_sysfs(pdev);
if (ret != 0) { if (ret != 0) {
@@ -344,7 +346,44 @@ static int adsp_loader_probe(struct platform_device *pdev)
/* get adsp variant idx */ /* get adsp variant idx */
cell = nvmem_cell_get(&pdev->dev, "adsp_variant"); cell = nvmem_cell_get(&pdev->dev, "adsp_variant");
if (IS_ERR_OR_NULL(cell)) { if (IS_ERR_OR_NULL(cell)) {
dev_dbg(&pdev->dev, "%s: FAILED to get nvmem cell \n", __func__); dev_dbg(&pdev->dev, "%s: FAILED to get nvmem cell \n",
__func__);
/*
* When ADSP variant read from fuse register is not
* supported, check if image with different fw image
* name needs to be loaded
*/
ret = of_property_read_u32(pdev->dev.of_node,
"adsp-fuse-not-supported",
&adsp_fuse_not_supported);
if (ret) {
dev_dbg(&pdev->dev,
"%s: adsp_fuse_not_supported prop not found",
__func__, ret);
goto wqueue;
}
if (adsp_fuse_not_supported) {
/* Read ADSP firmware image name */
ret = of_property_read_string(pdev->dev.of_node,
"adsp-fw-name",
&adsp_fw_name);
if (ret < 0) {
dev_dbg(&pdev->dev, "%s: unable to read fw-name\n",
__func__);
goto wqueue;
}
fw_name_size = strlen(adsp_fw_name) + 1;
priv->adsp_fw_name = devm_kzalloc(&pdev->dev,
fw_name_size,
GFP_KERNEL);
if (!priv->adsp_fw_name)
goto wqueue;
strlcpy(priv->adsp_fw_name, adsp_fw_name,
fw_name_size);
}
goto wqueue; goto wqueue;
} }
buf = nvmem_cell_read(cell, &len); buf = nvmem_cell_read(cell, &len);