Commit 3209874a authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Jesse Barnes
Browse files

PCI: Annotate PCI quirks in initcall_debug style 



While diagnosing some boot time issues on a platform, all that I
could see in the bootgraph/dmesg was that the system was spending
a lot of time in applying one or more PCI quirks... which
was virtually undebuggable.

This patch adds printk's in "initcall_debug" style to the dmesg,
which are added when the user asks for the initcall_debug
(the nr one tool to use when debugging boot hangs or boot time issues)
kernel command line option.

v2: add #includes so quirks can build on non-x86

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 309c6651

drivers/pci/quirks.c

+22 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/dmi.h>

#include <linux/pci-aspm.h>

#include <linux/ioport.h>

#include <linux/sched.h>

#include <linux/ktime.h>

#include <asm/dma.h>	/* isa_dma_bridge_buggy */

#include "pci.h"
@@ -2906,6 +2908,22 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f8, quirk_intel_mc_errata); 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata);





static void do_one_fixup_debug(void (*fn)(struct pci_dev *dev), struct pci_dev *dev)

{

	ktime_t calltime, delta, rettime;

	unsigned long long duration;



	printk(KERN_DEBUG "calling  %pF @ %i\n", fn, task_pid_nr(current));

	calltime = ktime_get();

	fn(dev);

	rettime = ktime_get();

	delta = ktime_sub(rettime, calltime);

	duration = (unsigned long long) ktime_to_ns(delta) >> 10;

	printk(KERN_DEBUG "pci fixup %pF returned after %lld usecs\n", fn,

		duration);

}



static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f,

			  struct pci_fixup *end)

{
@@ -2913,6 +2931,9 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, 
		if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&

		    (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {

			dev_dbg(&dev->dev, "calling %pF\n", f->hook);

			if (initcall_debug)

				do_one_fixup_debug(f->hook, dev);

			else

				f->hook(dev);

		}

		f++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE