Merge "msm: ipa: Vote for IPA clocks before SMMU attach" (80b49b8d) · Commits · e / devices / android_kernel_fairphone_FP4

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

+4 −3

Original line number	Original line	Diff line number	Diff line
	// SPDX-License-Identifier: GPL-2.0		// SPDX-License-Identifier: GPL-2.0
	/*		/*
	* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.		* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
	*/		*/

	#include <linux/clk.h>		#include <linux/clk.h>
	@@ -4901,14 +4901,15 @@ static void ipa3_load_ipa_fw(struct work_struct *work)

	IPADBG("Entry\n");		IPADBG("Entry\n");

			IPA_ACTIVE_CLIENTS_INC_SIMPLE();

	result = ipa3_attach_to_smmu();		result = ipa3_attach_to_smmu();
	if (result) {		if (result) {
	IPAERR("IPA attach to smmu failed %d\n", result);		IPAERR("IPA attach to smmu failed %d\n", result);
			IPA_ACTIVE_CLIENTS_DEC_SIMPLE();
	return;		return;
	}		}

	IPA_ACTIVE_CLIENTS_INC_SIMPLE();

	if (ipa3_ctx->ipa3_hw_mode != IPA_HW_MODE_EMULATION &&		if (ipa3_ctx->ipa3_hw_mode != IPA_HW_MODE_EMULATION &&
	((ipa3_ctx->platform_type != IPA_PLAT_TYPE_MDM) \|\|		((ipa3_ctx->platform_type != IPA_PLAT_TYPE_MDM) \|\|
	(ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5)))		(ipa3_ctx->ipa_hw_type >= IPA_HW_v3_5)))