Merge branch 'pci/virtualization'

[muen/linux.git] / drivers / pci / quirks.c

diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index ffdfaac116b2ef73d24df9e528166502dd5ca351..df75bc8ed40d080f4876f323f69d71259d4e2c21 100644 (file)
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
 // SPDX-License-Identifier: GPL-2.0
 /*

- *  This file contains work-arounds for many known PCI hardware
- *  bugs.  Devices present only on certain architectures (host
- *  bridges et cetera) should be handled in arch-specific code.
+ * This file contains work-arounds for many known PCI hardware bugs.
+ * Devices present only on certain architectures (host bridges et cetera)
+ * should be handled in arch-specific code.

  *
  *

- *  Note: any quirks for hotpluggable devices must _NOT_ be declared __init.
+ * Note: any quirks for hotpluggable devices must _NOT_ be declared __init.

  *
  *

- *  Copyright (c) 1999 Martin Mares <mj@ucw.cz>
+ * Copyright (c) 1999 Martin Mares <mj@ucw.cz>

  *
  *

- *  Init/reset quirks for USB host controllers should be in the
- *  USB quirks file, where their drivers can access reuse it.
+ * Init/reset quirks for USB host controllers should be in the USB quirks
+ * file, where their drivers can use them.

  */
 
 #include <linux/types.h>
  */
 
 #include <linux/types.h>


@@ -3104,16 +3104,10 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb);
 static ktime_t fixup_debug_start(struct pci_dev *dev,
                                 void (*fn)(struct pci_dev *dev))
 {
 static ktime_t fixup_debug_start(struct pci_dev *dev,
                                 void (*fn)(struct pci_dev *dev))
 {

-       ktime_t calltime = 0;
+       if (initcall_debug)
+               pci_info(dev, "calling  %pF @ %i\n", fn, task_pid_nr(current));

 
 

-       pci_dbg(dev, "calling %pF\n", fn);
-       if (initcall_debug) {
-               pr_debug("calling  %pF @ %i for %s\n",
-                        fn, task_pid_nr(current), dev_name(&dev->dev));
-               calltime = ktime_get();
-       }
-
-       return calltime;
+       return ktime_get();

 }
 
 static void fixup_debug_report(struct pci_dev *dev, ktime_t calltime,
 }
 
 static void fixup_debug_report(struct pci_dev *dev, ktime_t calltime,


@@ -3122,13 +3116,11 @@ static void fixup_debug_report(struct pci_dev *dev, ktime_t calltime,
        ktime_t delta, rettime;
        unsigned long long duration;
 
        ktime_t delta, rettime;
        unsigned long long duration;
 

-       if (initcall_debug) {
-               rettime = ktime_get();
-               delta = ktime_sub(rettime, calltime);
-               duration = (unsigned long long) ktime_to_ns(delta) >> 10;
-               pr_debug("pci fixup %pF returned after %lld usecs for %s\n",
-                        fn, duration, dev_name(&dev->dev));
-       }
+       rettime = ktime_get();
+       delta = ktime_sub(rettime, calltime);
+       duration = (unsigned long long) ktime_to_ns(delta) >> 10;
+       if (initcall_debug || duration > 10000)
+               pci_info(dev, "%pF took %lld usecs\n", fn, duration);

 }
 
 /*
 }
 
 /*