Merge "msm: ipa3: add check to load gsi fw once" (14a951df) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/platform/msm/ipa/ipa_v3/ipa.c

+10 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -4934,6 +4934,15 @@ static ssize_t ipa3_write(struct file file, const char __user buf,
		}
		}

		/* Prevent multiple calls from trying to load the FW again. */
		if (ipa3_ctx->fw_loaded) {
		IPAERR("not load FW again\n");
		return count;
		}

		/* Schedule WQ to load ipa-fws */
		ipa3_ctx->fw_loaded = true;

		queue_work(ipa3_ctx->transport_power_mgmt_wq,
		&ipa3_fw_loading_work);

+2 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -1607,6 +1607,7 @@ struct ipa3_context {
		bool use_ipa_pm;
		bool vlan_mode_iface[IPA_VLAN_IF_MAX];
		bool wdi_over_pcie;
		bool fw_loaded;
		};

		struct ipa3_plat_drv_res {