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

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

Merge "msm: ep-pcie: Fix reset separation during warm boot"

parents cec1e767 b30e6d2c

drivers/platform/msm/ep_pcie/ep_pcie_core.c

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#define PCIE_MHI_STATUS(n)			((n) + 0x148)

#define TCSR_PERST_SEPARATION_ENABLE		0x270

#define TCSR_PCIE_RST_SEPARATION		0x3F8

#define PCIE_ISSUE_WAKE				1

#define PCIE_MHI_FWD_STATUS_MIN			5000

#define PCIE_MHI_FWD_STATUS_MAX			5100
@@ -657,6 +658,11 @@ static void ep_pcie_core_init(struct ep_pcie_dev_t *dev, bool configured) 
		EP_PCIE_DBG2(dev, "PCIe V%d: Allow L1 after D3_COLD->D0\n",

				dev->rev);

		ep_pcie_write_mask(dev->parf + PCIE20_PARF_PM_CTRL, BIT(5), 0);



		EP_PCIE_DBG2(dev, "PCIe V%d: Clear disconn_req after D3_COLD\n",

			     dev->rev);

		ep_pcie_write_reg_field(dev->tcsr_perst_en,

					TCSR_PCIE_RST_SEPARATION, BIT(5), 0);

	}



	if (dev->active_config) {
@@ -2035,6 +2041,12 @@ int ep_pcie_core_disable_endpoint(void) 
	val =  readl_relaxed(dev->elbi + PCIE20_ELBI_SYS_STTS);

	EP_PCIE_DBG(dev, "PCIe V%d: LTSSM_STATE during disable:0x%x\n",

		dev->rev, (val >> 0xC) & 0x3f);



	EP_PCIE_DBG2(dev, "PCIe V%d: Set pcie_disconnect_req during D3_COLD\n",

		     dev->rev);

	ep_pcie_write_reg_field(dev->tcsr_perst_en,

				TCSR_PCIE_RST_SEPARATION, BIT(5), 1);



	ep_pcie_pipe_clk_deinit(dev);

	ep_pcie_clk_deinit(dev);

	ep_pcie_vreg_deinit(dev);