diff options
| author | Yan He <yanhe@codeaurora.org> | 2015-05-29 15:47:48 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:16:12 -0700 |
| commit | ce12d18898e90d574a68ae427bd34e212a94ca4a (patch) | |
| tree | 097f4fe3f16c162cbad83054eafeb2d37dc98ad2 | |
| parent | 0ce97567c51e1b664d5b3006b7dc0478ec0a4e0a (diff) | |
msm: ep_pcie: fix the bug in debugfs testing
PCIe device ID can't be got from register when the power of the
core is off. Thus, use the saved device ID so that we can turn on
link in the debugfs testing.
Change-Id: I28ec17b4fdf84b130cd32267d097b1c0d7c32aed
Signed-off-by: Yan He <yanhe@codeaurora.org>
| -rw-r--r-- | drivers/platform/msm/ep_pcie/ep_pcie_com.h | 1 | ||||
| -rw-r--r-- | drivers/platform/msm/ep_pcie/ep_pcie_core.c | 2 | ||||
| -rw-r--r-- | drivers/platform/msm/ep_pcie/ep_pcie_dbg.c | 6 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/platform/msm/ep_pcie/ep_pcie_com.h b/drivers/platform/msm/ep_pcie/ep_pcie_com.h index 6c20f7ec0842..f1350e7ca8d2 100644 --- a/drivers/platform/msm/ep_pcie/ep_pcie_com.h +++ b/drivers/platform/msm/ep_pcie/ep_pcie_com.h @@ -293,6 +293,7 @@ struct ep_pcie_dev_t { }; extern struct ep_pcie_dev_t ep_pcie_dev; +extern struct ep_pcie_hw hw_drv; static inline void ep_pcie_write_mask(void __iomem *addr, u32 clear_mask, u32 set_mask) diff --git a/drivers/platform/msm/ep_pcie/ep_pcie_core.c b/drivers/platform/msm/ep_pcie/ep_pcie_core.c index 7110b39053fc..54997b46dbca 100644 --- a/drivers/platform/msm/ep_pcie/ep_pcie_core.c +++ b/drivers/platform/msm/ep_pcie/ep_pcie_core.c @@ -1703,7 +1703,7 @@ int ep_pcie_core_config_db_routing(struct ep_pcie_db_config chdb_cfg, return 0; } -static struct ep_pcie_hw hw_drv = { +struct ep_pcie_hw hw_drv = { .register_event = ep_pcie_core_register_event, .deregister_event = ep_pcie_core_deregister_event, .get_linkstatus = ep_pcie_core_get_linkstatus, diff --git a/drivers/platform/msm/ep_pcie/ep_pcie_dbg.c b/drivers/platform/msm/ep_pcie/ep_pcie_dbg.c index 900b33b3554d..da8dfdbdaeb5 100644 --- a/drivers/platform/msm/ep_pcie/ep_pcie_dbg.c +++ b/drivers/platform/msm/ep_pcie/ep_pcie_dbg.c @@ -296,7 +296,6 @@ static ssize_t ep_pcie_cmd_debug(struct file *file, unsigned int testcase = 0; struct ep_pcie_msi_config msi_cfg; int i; - u32 device_id = 0; struct ep_pcie_hw *phandle = NULL; struct ep_pcie_iatu entries[2] = { {0x80000000, 0xbe7fffff, 0, 0}, @@ -305,10 +304,7 @@ static ssize_t ep_pcie_cmd_debug(struct file *file, struct ep_pcie_db_config chdb_cfg = {0x64, 0x6b, 0xfd4fa000}; struct ep_pcie_db_config erdb_cfg = {0x64, 0x6b, 0xfd4fa080}; - if (dev->power_on) { - device_id = readl_relaxed(dev->dm_core); - phandle = ep_pcie_get_phandle(device_id); - } + phandle = ep_pcie_get_phandle(hw_drv.device_id); memset(str, 0, sizeof(str)); ret = copy_from_user(str, buf, sizeof(str)); |