From 9a29af615f5975b49947982c48d12ba162a97576 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Mon, 30 Jan 2012 20:52:07 -0800 Subject: [PATCH] --- yaml --- r: 294719 b: refs/heads/master c: 3209874a1da2c51c7325e601d9634189ee178ad6 h: refs/heads/master i: 294717: 4096a8c823c1085e03b508933bdf7f272d88a538 294715: 2d4ce4973a92b805f3b1bae5836cef3a6af87297 294711: b2e0a52154543dbfe7b7569fa16c3e9c2a1d6079 294703: dbd097ead22b0640007e2a20e9af460d0af48a16 294687: ba17b23bb7c63283acb7cc70dacbf62e1ac7a635 294655: ea89e9ecf2eb54f4da1fcf3627d6280b50e88ff6 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f95631e53d9a..05da2b97a5c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 309c665110ee6a8d9a28f802c41eaab50ceebbf7 +refs/heads/master: 3209874a1da2c51c7325e601d9634189ee178ad6 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 64765474676f..f5d09f4066f3 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include /* 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,7 +2931,10 @@ 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); - f->hook(dev); + if (initcall_debug) + do_one_fixup_debug(f->hook, dev); + else + f->hook(dev); } f++; }