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

Commit 72136842 authored by Tony Truong's avatar Tony Truong
Browse files

msm: msi: allow accesses to device MSI registers when using QGIC 



Accessing device MSI registers is also needed when using QGIC
mask/unmask. Allow PCIe bus driver to configure device MSI
registers.

Change-Id: I2c9247f69149f37ae015e1271eac3854bda24549
Signed-off-by: default avatarTony Truong <truong@codeaurora.org>
parent 2c840c5f

drivers/pci/host/pci-msm-msi.c

+6 −9
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ struct msm_msi { 
	phys_addr_t msi_addr;

	phys_addr_t msi_addr;

	enum msi_type type;

	enum msi_type type;

	spinlock_t cfg_lock; /* lock for configuring Synopsys MSI registers */

	spinlock_t cfg_lock; /* lock for configuring Synopsys MSI registers */

	bool cfg_access; /* control access to Synopsys MSI registers */

	bool cfg_access; /* control access to MSI registers */

	void __iomem *pcie_cfg;

	void __iomem *pcie_cfg;





	void (*mask_irq)(struct irq_data *data);

	void (*mask_irq)(struct irq_data *data);
@@ -483,35 +483,32 @@ static int msm_msi_alloc_domains(struct msm_msi *msi) 
	return 0;

	return 0;

}

}





/* control access to Synopsys PCIe MSI registers */

/* control access to PCIe MSI registers */

void msm_msi_config_access(struct irq_domain *domain, bool allow)

void msm_msi_config_access(struct irq_domain *domain, bool allow)

{

{

	struct msm_msi *msi = domain->parent->host_data;

	struct msm_msi *msi = domain->parent->host_data;

	unsigned long flags;

	unsigned long flags;





	if (msi->type == MSM_MSI_TYPE_QCOM)

		return;



	spin_lock_irqsave(&msi->cfg_lock, flags);

	spin_lock_irqsave(&msi->cfg_lock, flags);

	msi->cfg_access = allow;

	msi->cfg_access = allow;

	spin_unlock_irqrestore(&msi->cfg_lock, flags);

	spin_unlock_irqrestore(&msi->cfg_lock, flags);

}

}

EXPORT_SYMBOL(msm_msi_config_access);

EXPORT_SYMBOL(msm_msi_config_access);





/* configure Synopsys PCIe MSI registers */

void msm_msi_config(struct irq_domain *domain)

void msm_msi_config(struct irq_domain *domain)

{

{

	struct msm_msi *msi;

	struct msm_msi *msi;

	int i;

	int i;





	msi = domain->parent->host_data;

	msi = domain->parent->host_data;

	if (msi->type == MSM_MSI_TYPE_QCOM)

		return;





	/* PCIe core driver sets to false during LPM */

	/* PCIe core driver sets to false during LPM */

	msm_msi_config_access(domain, true);

	msm_msi_config_access(domain, true);





	/* program MSI termination address */

	if (msi->type == MSM_MSI_TYPE_QCOM)

		return;



	/* program Synopsys MSI termination address */

	writel_relaxed(msi->msi_addr, msi->pcie_cfg + PCIE_MSI_CTRL_ADDR_OFFS);

	writel_relaxed(msi->msi_addr, msi->pcie_cfg + PCIE_MSI_CTRL_ADDR_OFFS);

	writel_relaxed(0, msi->pcie_cfg + PCIE_MSI_CTRL_UPPER_ADDR_OFFS);

	writel_relaxed(0, msi->pcie_cfg + PCIE_MSI_CTRL_UPPER_ADDR_OFFS);