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

Commit 4e93c8cb authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mhi_dev: Do not enable aggregated MHI_A7 interrupt"

parents 2baec134 e3114c6c

drivers/platform/msm/ep_pcie/ep_pcie_core.c

+5 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,11 @@ int ep_pcie_core_enable_endpoint(enum ep_pcie_options opt) 
				EP_PCIE_INFO(dev,

					"PCIe V%d: link initialized by bootloader for LE PCIe endpoint; skip link training in HLOS.\n",

					dev->rev);

				/*

				 * Skip mhi mmio config for host reboot case

				 * with bios-locking enabled.

				 */

				dev->config_mmio_init = true;

				ep_pcie_core_init(dev, true);

				dev->link_status = EP_PCIE_LINK_UP;

				dev->l23_ready = false;

drivers/platform/msm/mhi_dev/mhi.c

+4 −2
Original line number Diff line number Diff line
@@ -3151,8 +3151,9 @@ static int mhi_dev_resume_mmio_mhi_reinit(struct mhi_dev *mhi_ctx) 
		EP_PCIE_EVENT_PM_D3_COLD |

		EP_PCIE_EVENT_PM_D0 |

		EP_PCIE_EVENT_PM_RST_DEAST |

		EP_PCIE_EVENT_MHI_A7 |

		EP_PCIE_EVENT_LINKDOWN;

	if (!mhi_ctx->mhi_int)

		mhi_ctx->event_reg.events |= EP_PCIE_EVENT_MHI_A7;

	mhi_ctx->event_reg.user = mhi_ctx;

	mhi_ctx->event_reg.mode = EP_PCIE_TRIGGER_CALLBACK;

	mhi_ctx->event_reg.callback = mhi_dev_sm_pcie_handler;
@@ -3314,8 +3315,9 @@ static int mhi_dev_resume_mmio_mhi_init(struct mhi_dev *mhi_ctx) 
		EP_PCIE_EVENT_PM_D3_COLD |

		EP_PCIE_EVENT_PM_D0 |

		EP_PCIE_EVENT_PM_RST_DEAST |

		EP_PCIE_EVENT_MHI_A7 |

		EP_PCIE_EVENT_LINKDOWN;

	if (!mhi_ctx->mhi_int)

		mhi_ctx->event_reg.events |= EP_PCIE_EVENT_MHI_A7;

	mhi_ctx->event_reg.user = mhi_ctx;

	mhi_ctx->event_reg.mode = EP_PCIE_TRIGGER_CALLBACK;

	mhi_ctx->event_reg.callback = mhi_dev_sm_pcie_handler;