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

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

Merge "msm: ep_pcie: Initialize MHI MMIO once"

parents f9549d93 57439e13

drivers/platform/msm/ep_pcie/ep_pcie_com.h

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ struct ep_pcie_dev_t { 
	ulong                        global_irq_counter;



	bool                         dump_conf;



	bool                         config_mmio_init;

	bool                         enumerated;

	enum ep_pcie_link_status     link_status;

	bool                         perst_deast;

drivers/platform/msm/ep_pcie/ep_pcie_core.c

+9 −0
Original line number Diff line number Diff line
@@ -503,6 +503,13 @@ static void ep_pcie_config_mmio(struct ep_pcie_dev_t *dev) 
		"Initial version of MMIO is:0x%x\n",

		readl_relaxed(dev->mmio + PCIE20_MHIVER));



	if (dev->config_mmio_init) {

		EP_PCIE_DBG(dev,

			"PCIe V%d: MMIO already initialized, return\n",

				dev->rev);

		return;

	}



	ep_pcie_write_reg(dev->mmio, PCIE20_MHICFG, 0x02800880);

	ep_pcie_write_reg(dev->mmio, PCIE20_BHI_EXECENV, 0x2);

	ep_pcie_write_reg(dev->mmio, PCIE20_MHICTRL, 0x0);
@@ -511,6 +518,8 @@ static void ep_pcie_config_mmio(struct ep_pcie_dev_t *dev) 
	ep_pcie_write_reg(dev->mmio, PCIE20_BHI_VERSION_LOWER, 0x2);

	ep_pcie_write_reg(dev->mmio, PCIE20_BHI_VERSION_UPPER, 0x1);

	ep_pcie_write_reg(dev->mmio, PCIE20_BHI_INTVEC, 0xffffffff);



	dev->config_mmio_init = true;

}



static void ep_pcie_core_init(struct ep_pcie_dev_t *dev, bool configured)