evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: ep_pcie: fix duplicated counter increment

Browse source 
The logging macro has multiple outputs. If we increase the counter
as a parameter to the logging macro, the counter will be increased
for multiple times. The change here fixes this bug.

Change-Id: I321e281b506e35770e222def86f5b04ae0bfdce2
Signed-off-by: Yan He <yanhe@codeaurora.org>
This commit is contained in:
Yan He 2015-04-10 17:01:11 -07:00 • committed by David Keitel
parent f7fa70a57d
commit 3e255410ad
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/platform/msm/ep_pcie/ep_pcie_core.c
View file

@ -1632,9 +1632,10 @@ int ep_pcie_core_trigger_msi(u32 idx)
data = readl_relaxed(ep_pcie_dev.dm_core + PCIE20_MSI_DATA); data = readl_relaxed(ep_pcie_dev.dm_core + PCIE20_MSI_DATA);
if (addr && data) { if (addr && data) {
ep_pcie_dev.msi_counter++;
EP_PCIE_DUMP(&ep_pcie_dev, EP_PCIE_DUMP(&ep_pcie_dev,
"PCIe V%d: No. %ld MSI fired for IRQ %d; index from client:%d\n", "PCIe V%d: No. %ld MSI fired for IRQ %d; index from client:%d\n",
ep_pcie_dev.rev, ep_pcie_dev.msi_counter++, ep_pcie_dev.rev, ep_pcie_dev.msi_counter,
data + idx, idx); data + idx, idx);
ep_pcie_write_reg(ep_pcie_dev.msi, addr & 0xfff, data + idx); ep_pcie_write_reg(ep_pcie_dev.msi, addr & 0xfff, data + idx);
return 0; return 0;
@ -1656,9 +1657,10 @@ int ep_pcie_core_wakeup_host(void)
dev->rev); dev->rev);
return EP_PCIE_ERROR; return EP_PCIE_ERROR;
} else { } else {
dev->wake_counter++;
EP_PCIE_DBG(dev, EP_PCIE_DBG(dev,
"PCIe V%d: No. %ld to assert PCIe WAKE#; perst is %s de-asserted; D3hot is %s received.\n", "PCIe V%d: No. %ld to assert PCIe WAKE#; perst is %s de-asserted; D3hot is %s received.\n",
dev->rev, ++dev->wake_counter, dev->rev, dev->wake_counter,
dev->perst_deast ? "" : "not", dev->perst_deast ? "" : "not",
dev->l23_ready ? "" : "not"); dev->l23_ready ? "" : "not");
gpio_set_value(dev->gpio[EP_PCIE_GPIO_WAKE].num, gpio_set_value(dev->gpio[EP_PCIE_GPIO_WAKE].num,