From: Yan He <yanhe@codeaurora.org>
Date: Sat, 5 Dec 2015 02:29:36 +0000 (-0800)
Subject: msm: ep_pcie: update MSI address for PCIe clients
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=161d538a829379d59af2d6d9194bb163efb7e900;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

msm: ep_pcie: update MSI address for PCIe clients

The PCIe clients will utilize the original MSI address instead of
mapped local address when active config is enabled. The change here
provides the original address to the clients.

Change-Id: I0d35fa9508d7c3ec2e97bd7d61754974e798bf8a
Signed-off-by: Yan He <yanhe@codeaurora.org>
---

diff --git a/drivers/platform/msm/ep_pcie/ep_pcie_core.c b/drivers/platform/msm/ep_pcie/ep_pcie_core.c
index a109197b1a19..c8399388c823 100644
--- a/drivers/platform/msm/ep_pcie/ep_pcie_core.c
+++ b/drivers/platform/msm/ep_pcie/ep_pcie_core.c
@@ -1768,8 +1768,13 @@ int ep_pcie_core_get_msi_config(struct ep_pcie_msi_config *cfg)
 					msi->start, 0, msi->end,
 					lower, upper);
 
-		cfg->lower = msi->start + (lower & 0xfff);
-		cfg->upper = 0;
+		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)