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

Commit f8b820e7 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: enable BME IRQ"

parents cd006d42 6ffca736
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,9 @@
#define PCIE20_PLR_IATU_LTAR           0x918
#define PCIE20_PLR_IATU_UTAR           0x91c

#define PCIE20_MHICFG                  0x110
#define PCIE20_BHI_EXECENV             0x228

#define PCIE20_AUX_CLK_FREQ_REG        0xB40

#define PERST_TIMEOUT_US_MIN	              1000
+11 −3
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static void ep_pcie_core_init(struct ep_pcie_dev_t *dev)

	/* enable debug IRQ */
	ep_pcie_write_mask(dev->parf + PCIE20_PARF_DEBUG_INT_EN,
			0, BIT(3) | BIT(1));
			0, BIT(3) | BIT(2) | BIT(1));

	/* Configure PCIe to endpoint mode */
	ep_pcie_write_reg(dev->parf, PCIE20_PARF_DEVICE_TYPE, 0x0);
@@ -558,6 +558,9 @@ static void ep_pcie_core_init(struct ep_pcie_dev_t *dev)
	/* Configure BARs */
	ep_pcie_bar_init(dev);

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

	/* Configure IRQ events */
	if (dev->aggregated_irq) {
		ep_pcie_write_reg(dev->parf, PCIE20_PARF_INT_ALL_MASK, 0);
@@ -1789,8 +1792,13 @@ int ep_pcie_core_get_msi_config(struct ep_pcie_msi_config *cfg)
					msi->start, 0, msi->end,
					lower, upper);

		if (ep_pcie_dev.active_config) {
			cfg->lower = lower;
			cfg->upper = upper;
		} else {
			cfg->lower = msi->start + (lower & 0xfff);
			cfg->upper = 0;
		}
		cfg->data = data;
		cfg->msg_num = (cap >> 20) & 0x7;
		if ((lower != ep_pcie_dev.msi_cfg.lower)