mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-22 03:27:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

soc: qcom: geni-se: Refactor geni_icc_get() and make qup-memory ICC path optional

Browse Source 
The "qup-memory" interconnect path is optional and may not be defined
in all device trees. Unroll the loop-based ICC path initialization to
allow specific error handling for each path type.

The "qup-core" and "qup-config" paths remain mandatory and will fail
probe if missing, while "qup-memory" is now handled as optional and
skipped when not present in the device tree.

Co-developed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Praveen Talari <praveen.talari@oss.qualcomm.com>
Reviewed-by: Mukesh Kumar Savaliya <mukesh.savaliya@oss.qualcomm.com>
[...]
Tested-by: Mattijs Korpershoek <mkorpershoek@kernel.org>
Link: https://lore.kernel.org/r/20260227061544.1785978-2-praveen.talari@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
This commit is contained in:
Praveen Talari
2026-02-27 11:45:32 +05:30
committed by Bjorn Andersson
parent 254f49634e
commit e231930279
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/soc/qcom/qcom-geni-se.c
View File

@@ -899,30 +899,32 @@ EXPORT_SYMBOL_GPL(geni_se_rx_dma_unprep);
int geni_icc_get(struct geni_se *se, const char *icc_ddr)
{
int i, err;
const char *icc_names[] = {"qup-core", "qup-config", icc_ddr};
struct geni_icc_path *icc_paths = se->icc_paths;
if (has_acpi_companion(se->dev))
return 0;
for (i = 0; i < ARRAY_SIZE(se->icc_paths); i++) {
if (!icc_names[i])
continue;
icc_paths[GENI_TO_CORE].path = devm_of_icc_get(se->dev, "qup-core");
if (IS_ERR(icc_paths[GENI_TO_CORE].path))
return dev_err_probe(se->dev, PTR_ERR(icc_paths[GENI_TO_CORE].path),
"Failed to get 'qup-core' ICC path\n");
se->icc_paths[i].path = devm_of_icc_get(se->dev, icc_names[i]);
if (IS_ERR(se->icc_paths[i].path))
goto err;
icc_paths[CPU_TO_GENI].path = devm_of_icc_get(se->dev, "qup-config");
if (IS_ERR(icc_paths[CPU_TO_GENI].path))
return dev_err_probe(se->dev, PTR_ERR(icc_paths[CPU_TO_GENI].path),
"Failed to get 'qup-config' ICC path\n");
/* The DDR path is optional, depending on protocol and hw capabilities */
icc_paths[GENI_TO_DDR].path = devm_of_icc_get(se->dev, "qup-memory");
if (IS_ERR(icc_paths[GENI_TO_DDR].path)) {
if (PTR_ERR(icc_paths[GENI_TO_DDR].path) == -ENODATA)
icc_paths[GENI_TO_DDR].path = NULL;
else
return dev_err_probe(se->dev, PTR_ERR(icc_paths[GENI_TO_DDR].path),
"Failed to get 'qup-memory' ICC path\n");
}
return 0;
err:
err = PTR_ERR(se->icc_paths[i].path);
if (err != -EPROBE_DEFER)
dev_err_ratelimited(se->dev, "Failed to get ICC path '%s': %d\n",
icc_names[i], err);
return err;
}
EXPORT_SYMBOL_GPL(geni_icc_get);