From 3aeb7e379a683cb5bbd5691a1be4539843b14d2d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 12 Aug 2012 23:41:13 +0000 Subject: [PATCH] PCI/PM/Runtime: make PCI traces quieter (Closes: #684049) svn path=/dists/sid/linux/; revision=19320 --- debian/changelog | 1 + ...I-PM-Runtime-make-PCI-traces-quieter.patch | 87 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 89 insertions(+) create mode 100644 debian/patches/bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch diff --git a/debian/changelog b/debian/changelog index 7b0dbaeea..5f116f7d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -89,6 +89,7 @@ linux (3.2.27-1) UNRELEASED; urgency=low - time/rt: Fix up leap-second backport for RT changes * rds: set correct msg_namelen (CVE-2012-3430) * e1000: add dropped DMA receive enable back in for WoL (Closes: #684618) + * PCI/PM/Runtime: make PCI traces quieter (Closes: #684049) -- Ben Hutchings Tue, 24 Jul 2012 02:20:37 +0100 diff --git a/debian/patches/bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch b/debian/patches/bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch new file mode 100644 index 000000000..fc71d64d2 --- /dev/null +++ b/debian/patches/bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch @@ -0,0 +1,87 @@ +From: Vincent Palatin +Date: Mon, 5 Dec 2011 11:51:18 -0800 +Subject: PCI/PM/Runtime: make PCI traces quieter + +commit 85b8582d7ca516030efb84d94fa29a73c1d9a125 upstream. + +When the runtime PM is activated on PCI, if a device switches state +frequently (e.g. an EHCI controller with autosuspending USB devices +connected) the PCI configuration traces might be very verbose in the +kernel log. Let's guard those traces with DEBUG condition. + +Acked-by: "Rafael J. Wysocki" +Signed-off-by: Vincent Palatin +Signed-off-by: Jesse Barnes +--- + drivers/acpi/pci_irq.c | 10 +++++----- + drivers/pci/pci.c | 5 ++--- + drivers/pci/setup-res.c | 6 +++--- + 3 files changed, 10 insertions(+), 11 deletions(-) + +diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c +index 7f9eba9..0eefa12 100644 +--- a/drivers/acpi/pci_irq.c ++++ b/drivers/acpi/pci_irq.c +@@ -487,10 +487,10 @@ int acpi_pci_irq_enable(struct pci_dev *dev) + else + link_desc[0] = '\0'; + +- dev_info(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n", +- pin_name(pin), link_desc, gsi, +- (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge", +- (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq); ++ dev_dbg(&dev->dev, "PCI INT %c%s -> GSI %u (%s, %s) -> IRQ %d\n", ++ pin_name(pin), link_desc, gsi, ++ (triggering == ACPI_LEVEL_SENSITIVE) ? "level" : "edge", ++ (polarity == ACPI_ACTIVE_LOW) ? "low" : "high", dev->irq); + + return 0; + } +@@ -524,6 +524,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev) + * (e.g. PCI_UNDEFINED_IRQ). + */ + +- dev_info(&dev->dev, "PCI INT %c disabled\n", pin_name(pin)); ++ dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin)); + acpi_unregister_gsi(gsi); + } +diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c +index 5c5adef..54343aa 100644 +--- a/drivers/pci/pci.c ++++ b/drivers/pci/pci.c +@@ -973,7 +973,7 @@ void pci_restore_state(struct pci_dev *dev) + for (i = 15; i >= 0; i--) { + pci_read_config_dword(dev, i * 4, &val); + if (val != dev->saved_config_space[i]) { +- dev_printk(KERN_DEBUG, &dev->dev, "restoring config " ++ dev_dbg(&dev->dev, "restoring config " + "space at offset %#x (was %#x, writing %#x)\n", + i, val, (int)dev->saved_config_space[i]); + pci_write_config_dword(dev,i * 4, +@@ -1542,8 +1542,7 @@ void pci_pme_active(struct pci_dev *dev, bool enable) + } + + out: +- dev_printk(KERN_DEBUG, &dev->dev, "PME# %s\n", +- enable ? "enabled" : "disabled"); ++ dev_dbg(&dev->dev, "PME# %s\n", enable ? "enabled" : "disabled"); + } + + /** +diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c +index 5717509b..b66bfdb 100644 +--- a/drivers/pci/setup-res.c ++++ b/drivers/pci/setup-res.c +@@ -85,9 +85,9 @@ void pci_update_resource(struct pci_dev *dev, int resno) + } + } + res->flags &= ~IORESOURCE_UNSET; +- dev_info(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n", +- resno, res, (unsigned long long)region.start, +- (unsigned long long)region.end); ++ dev_dbg(&dev->dev, "BAR %d: set to %pR (PCI address [%#llx-%#llx])\n", ++ resno, res, (unsigned long long)region.start, ++ (unsigned long long)region.end); + } + + int pci_claim_resource(struct pci_dev *dev, int resource) diff --git a/debian/patches/series b/debian/patches/series index 1d6ef6bd1..1c7095e36 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -389,3 +389,4 @@ features/all/bql/skge-add-byte-queue-limit-support.patch bugfix/all/rds-set-correct-msg_namelen.patch bugfix/all/e1000-add-dropped-DMA-receive-enable-back-in-for-WoL.patch +bugfix/all/PCI-PM-Runtime-make-PCI-traces-quieter.patch