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

Commit d433889c authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Fix wait time in timeout message 



When we warned about a timeout on a hotplug command, we previously printed
the time between calls to pcie_write_cmd(), without accounting for any time
spent actually waiting.  Consider this sequence:

  pcie_write_cmd
    write SLTCTL
    cmd_started = jiffies          # T1

  pcie_write_cmd
    pcie_wait_cmd
      now = jiffies                # T2
      wait_event_timeout           # we may wait here
      if (timeout)
        ctrl_info("Timeout on command issued %u msec ago",
                  jiffies_to_msecs(now - cmd_started))

We previously printed (T2 - T1), but that doesn't include the time spent in
wait_event_timeout().

Fix this by using the current jiffies value, not the one cached before
calling wait_event_timeout().

[bhelgaas: changelog, use current jiffies instead of adding timeout]
Fixes: 40b96083 ("PCI: pciehp: Compute timeout from hotplug command start time")
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent bceee4a9

drivers/pci/hotplug/pciehp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void pcie_wait_cmd(struct controller *ctrl) 
	if (!rc)

		ctrl_info(ctrl, "Timeout on hotplug command %#06x (issued %u msec ago)\n",

			  ctrl->slot_ctrl,

			  jiffies_to_msecs(now - ctrl->cmd_started));

			  jiffies_to_msecs(jiffies - ctrl->cmd_started));

}



/**