Merge "soc: qcom: Force sequential boot for MSA modem"

This commit is contained in:
qctecmdr 2021-01-15 02:01:43 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2f4da805a8
3 changed files with 6 additions and 3 deletions

View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2010-2021, The Linux Foundation. All rights reserved.
*/
#include <linux/module.h>
@ -1291,7 +1291,7 @@ int pil_boot(struct pil_desc *desc)
* Fallback to serial loading of blobs if the
* workqueue creatation failed during module init.
*/
if (pil_wq) {
if (pil_wq && !(desc->sequential_loading)) {
ret = pil_load_segs(desc);
if (ret)
goto err_deinit_image;

View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2010-2021, The Linux Foundation. All rights reserved.
*/
#ifndef __MSM_PERIPHERAL_LOADER_H
#define __MSM_PERIPHERAL_LOADER_H
@ -91,6 +91,7 @@ struct pil_desc {
bool shutdown_fail;
bool modem_ssr;
bool clear_fw_region;
bool sequential_loading;
u32 subsys_vmid;
bool signal_aop;
struct mbox_client cl;

View file

@ -580,6 +580,8 @@ static int pil_mss_loadable_init(struct modem_data *drv,
q6_desc->ops = &pil_msa_mss_ops;
q6_desc->sequential_loading = of_property_read_bool(pdev->dev.of_node,
"qcom,sequential-fw-load");
q6->reset_clk = of_property_read_bool(pdev->dev.of_node,
"qcom,reset-clk");
q6->self_auth = of_property_read_bool(pdev->dev.of_node,