Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0c45d0c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa: move panic handler registration to probe"

parents d1770f2d 7cb85d42

drivers/platform/msm/ipa/ipa.c

+2 −0
Original line number Diff line number Diff line
@@ -3027,6 +3027,8 @@ static int ipa_init(const struct ipa_plat_drv_res *resource_p, 


	ipa_ctx->q6_proxy_clk_vote_valid = true;



	ipa_register_panic_hdlr();



	pr_info("IPA driver initialization was successful.\n");



	return 0;

drivers/platform/msm/ipa/ipa_client.c

+6 −2
Original line number Diff line number Diff line
@@ -1916,6 +1916,12 @@ static struct notifier_block ipa_uc_panic_blk = { 
	.notifier_call  = ipa_uc_panic_notifier,

};



void ipa_register_panic_hdlr(void)

{

	atomic_notifier_chain_register(&panic_notifier_list,

			&ipa_uc_panic_blk);

}



static void ipa_uc_response_hdlr(enum ipa_irq_type interrupt,

				void *private_data,

				void *interrupt_data)
@@ -1930,8 +1936,6 @@ static void ipa_uc_response_hdlr(enum ipa_irq_type interrupt, 
	if (ipa_ctx->uc_ctx.uc_sram_mmio->responseOp ==

			IPA_HW_2_CPU_RESPONSE_INIT_COMPLETED) {

		ipa_ctx->uc_ctx.uc_loaded = true;

		atomic_notifier_chain_register(&panic_notifier_list,

			&ipa_uc_panic_blk);

		IPADBG("IPA uC loaded\n");

	} else if (ipa_ctx->uc_ctx.uc_sram_mmio->responseOp ==

		   IPA_HW_2_CPU_RESPONSE_CMD_COMPLETED) {

drivers/platform/msm/ipa/ipa_i.h

+1 −0
Original line number Diff line number Diff line
@@ -1047,4 +1047,5 @@ int ipa_sps_connect_safe(struct sps_pipe *h, struct sps_connect *connect, 
			 enum ipa_client_type ipa_client);

int ipa_uc_interface_init(void);

int ipa_uc_reset_pipe(enum ipa_client_type ipa_client);

void ipa_register_panic_hdlr(void);

#endif /* _IPA_I_H_ */