* [PATCH] PCI probing debug message uniformization @ 2008-09-29 21:03 Vincent Legoll 2008-10-02 18:46 ` Jesse Barnes 0 siblings, 1 reply; 10+ messages in thread From: Vincent Legoll @ 2008-09-29 21:03 UTC (permalink / raw) To: jbarnes, linux-pci, linux-kernel Hello, Here is a patch to uniformize PCI probing debug messages at boot with dev_printk() intead of manual printk() for example, it goes from the mixed-style: PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold to uniform: pci 0000:00:1b.0: reg 10 64bit mmio: [f4280000, f4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold If people prefer the UPPERCASE "PCI:" prefix from dev_printk(), that would be matter for another patch... I'm currently running the kernel with that patch applied, and diffed bootlog, everything looks OK Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com> -- Vincent Legoll diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 36698e5..2acb43d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -304,8 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, } else { res->start = l64; res->end = l64 + sz64; - printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", - pci_name(dev), pos, (unsigned long long)res->start, + dev_printk(KERN_DEBUG, &dev->dev, + "reg %x 64bit mmio: [%llx, %llx]\n", pos, + (unsigned long long)res->start, (unsigned long long)res->end); } } else { @@ -316,8 +317,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->start = l; res->end = l + sz; - printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev), - pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio", + dev_printk(KERN_DEBUG, &dev->dev, "reg %x %s: [%llx, %llx]\n", pos, + (res->flags & IORESOURCE_IO) ? "io port" : "32bit mmio", (unsigned long long)res->start, (unsigned long long)res->end); } @@ -389,8 +390,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->start = base; if (!res->end) res->end = limit + 0xfff; - printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge io port: [%llx, %llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -403,8 +404,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge 32bit mmio: [%llx, %llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -441,8 +442,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", - pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", + dev_printk(KERN_DEBUG, &dev->dev, "bridge %sbit mmio pref: [%llx, %llx]\n", + (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", (unsigned long long) res->start, (unsigned long long) res->end); } } ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-09-29 21:03 [PATCH] PCI probing debug message uniformization Vincent Legoll @ 2008-10-02 18:46 ` Jesse Barnes 2008-10-02 18:59 ` Bjorn Helgaas 0 siblings, 1 reply; 10+ messages in thread From: Jesse Barnes @ 2008-10-02 18:46 UTC (permalink / raw) To: Vincent Legoll; +Cc: linux-pci, linux-kernel, Bjorn Helgaas On Monday, September 29, 2008 2:03 pm Vincent Legoll wrote: > Hello, > > Here is a patch to uniformize PCI probing debug messages at > boot with dev_printk() intead of manual printk() > > for example, it goes from the mixed-style: > > PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff] > pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold > > to uniform: > > pci 0000:00:1b.0: reg 10 64bit mmio: [f4280000, f4283fff] > pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold > > If people prefer the UPPERCASE "PCI:" prefix from dev_printk(), > that would be matter for another patch... > > I'm currently running the kernel with that patch applied, and > diffed bootlog, everything looks OK > > Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com> Bjorn, how does this jive with the various other debug harmonization patches you've been putting together & reviewing? Thanks, Jesse -- Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-02 18:46 ` Jesse Barnes @ 2008-10-02 18:59 ` Bjorn Helgaas 2008-10-03 9:14 ` Vincent Legoll 0 siblings, 1 reply; 10+ messages in thread From: Bjorn Helgaas @ 2008-10-02 18:59 UTC (permalink / raw) To: Jesse Barnes; +Cc: Vincent Legoll, linux-pci, linux-kernel On Thursday 02 October 2008 12:46:28 pm Jesse Barnes wrote: > On Monday, September 29, 2008 2:03 pm Vincent Legoll wrote: > > Hello, > > > > Here is a patch to uniformize PCI probing debug messages at > > boot with dev_printk() intead of manual printk() > > > > for example, it goes from the mixed-style: > > > > PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff] > > pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold > > > > to uniform: > > > > pci 0000:00:1b.0: reg 10 64bit mmio: [f4280000, f4283fff] > > pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold > > > > If people prefer the UPPERCASE "PCI:" prefix from dev_printk(), > > that would be matter for another patch... > > > > I'm currently running the kernel with that patch applied, and > > diffed bootlog, everything looks OK > > > > Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com> > > Bjorn, how does this jive with the various other debug harmonization patches > you've been putting together & reviewing? I think it's great. The only nit I would change is to use "[%#llx-%#llx]" as we do in pci_request_region(). Bjorn ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-02 18:59 ` Bjorn Helgaas @ 2008-10-03 9:14 ` Vincent Legoll 2008-10-03 18:13 ` Vincent Legoll 0 siblings, 1 reply; 10+ messages in thread From: Vincent Legoll @ 2008-10-03 9:14 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: Jesse Barnes, linux-pci, linux-kernel On Thu, Oct 2, 2008 at 8:59 PM, Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > On Thursday 02 October 2008 12:46:28 pm Jesse Barnes wrote: >> Bjorn, how does this jive with the various other debug harmonization patches >> you've been putting together & reviewing? > > I think it's great. The only nit I would change is to use > "[%#llx-%#llx]" as we do in pci_request_region(). > > Bjorn Thanks for the review, I'll post an updated version this evening. -- Vincent Legoll ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-03 9:14 ` Vincent Legoll @ 2008-10-03 18:13 ` Vincent Legoll 2008-10-03 18:57 ` Bjorn Helgaas 0 siblings, 1 reply; 10+ messages in thread From: Vincent Legoll @ 2008-10-03 18:13 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: Jesse Barnes, linux-pci, linux-kernel On Fri, Oct 3, 2008 at 11:14 AM, Vincent Legoll <vincent.legoll@gmail.com> wrote: > On Thu, Oct 2, 2008 at 8:59 PM, Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: >> On Thursday 02 October 2008 12:46:28 pm Jesse Barnes wrote: >>> Bjorn, how does this jive with the various other debug harmonization patches >>> you've been putting together & reviewing? >> >> I think it's great. The only nit I would change is to use >> "[%#llx-%#llx]" as we do in pci_request_region(). >> >> Bjorn > > Thanks for the review, I'll post an updated version this evening. Here is the updated version, with an extra case from drivers/pci/pcie/aspm.c, please review for the slight wording change in the message. It's currently running, so is partly tested (It didn't ran through all cases on my HW) Producing the following dmesg extract: [ 0.330756] pci 0000:00:02.0: reg 10 32bit mmio: [0xf4200000-0xf427ffff] [ 0.330762] pci 0000:00:02.0: reg 14 io port: [0xe100-0xe107] [ 0.330768] pci 0000:00:02.0: reg 18 32bit mmio: [0xe0000000-0xefffffff] [ 0.330773] pci 0000:00:02.0: reg 1c 32bit mmio: [0xf4000000-0xf40fffff] [ 0.330875] pci 0000:00:1a.0: reg 20 io port: [0xe200-0xe21f] [ 0.330953] pci 0000:00:1a.1: reg 20 io port: [0xe600-0xe61f] [ 0.331025] pci 0000:00:1a.2: reg 20 io port: [0xe000-0xe01f] [ 0.331090] pci 0000:00:1a.7: reg 10 32bit mmio: [0xf4285000-0xf42853ff] [ 0.331179] pci 0000:00:1b.0: reg 10 64bit mmio: [0xf4280000-0xf4283fff] [ 0.331222] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold [ 0.332010] pci 0000:00:1b.0: PME# disabled [ 0.332165] pci 0000:00:1c.0: PME# supported from D0 D3hot D3cold [ 0.332256] pci 0000:00:1c.0: PME# disabled [ 0.332401] pci 0000:00:1c.3: PME# supported from D0 D3hot D3cold [ 0.333004] pci 0000:00:1c.3: PME# disabled [ 0.333146] pci 0000:00:1c.4: PME# supported from D0 D3hot D3cold [ 0.333238] pci 0000:00:1c.4: PME# disabled [ 0.333417] pci 0000:00:1d.0: reg 20 io port: [0xe300-0xe31f] [ 0.333495] pci 0000:00:1d.1: reg 20 io port: [0xe400-0xe41f] [ 0.333571] pci 0000:00:1d.2: reg 20 io port: [0xe500-0xe51f] [ 0.333637] pci 0000:00:1d.7: reg 10 32bit mmio: [0xf4284000-0xf42843ff] [ 0.333820] pci 0000:00:1f.0: quirk: region 0400-047f claimed by ICH6 ACPI/GPIO/TCO [ 0.334004] pci 0000:00:1f.0: quirk: region 0480-04bf claimed by ICH6 GPIO [ 0.334152] pci 0000:00:1f.2: reg 10 io port: [0xe700-0xe707] [ 0.334159] pci 0000:00:1f.2: reg 14 io port: [0xe800-0xe803] [ 0.334165] pci 0000:00:1f.2: reg 18 io port: [0xe900-0xe907] [ 0.334172] pci 0000:00:1f.2: reg 1c io port: [0xea00-0xea03] [ 0.334178] pci 0000:00:1f.2: reg 20 io port: [0xeb00-0xeb1f] [ 0.334185] pci 0000:00:1f.2: reg 24 32bit mmio: [0xf4286000-0xf42867ff] [ 0.334212] pci 0000:00:1f.2: PME# supported from D3hot [ 0.334301] pci 0000:00:1f.2: PME# disabled [ 0.334449] pci 0000:00:1f.3: reg 10 64bit mmio: [0xf4287000-0xf42870ff] [ 0.334465] pci 0000:00:1f.3: reg 20 io port: [0x500-0x51f] [ 0.334538] pci 0000:00:1c.0: bridge io port: [0xa000-0xafff] [ 0.334655] pci 0000:02:00.0: reg 24 32bit mmio: [0xf4100000-0xf4101fff] [ 0.334688] pci 0000:02:00.0: PME# supported from D3hot [ 0.334779] pci 0000:02:00.0: PME# disabled [ 0.334909] pci 0000:02:00.1: reg 10 io port: [0xb000-0xb007] [ 0.334919] pci 0000:02:00.1: reg 14 io port: [0xb100-0xb103] [ 0.334929] pci 0000:02:00.1: reg 18 io port: [0xb200-0xb207] [ 0.335006] pci 0000:02:00.1: reg 1c io port: [0xb300-0xb303] [ 0.335015] pci 0000:02:00.1: reg 20 io port: [0xb400-0xb40f] [ 0.335089] pci 0000:02:00.0: disabling ASPM on pre-1.1 PCIe device. It can be enabled forcedly with 'pcie_aspm=force' [ 0.335282] pci 0000:00:1c.3: bridge io port: [0xb000-0xbfff] [ 0.335286] pci 0000:00:1c.3: bridge 32bit mmio: [0xf4100000-0xf41fffff] [ 0.335365] pci 0000:03:00.0: reg 10 io port: [0xc000-0xc0ff] [ 0.335390] pci 0000:03:00.0: reg 18 64bit mmio: [0xf1000000-0xf1000fff] [ 0.335415] pci 0000:03:00.0: reg 30 32bit mmio: [0x0-0x1ffff] [ 0.336044] pci 0000:03:00.0: supports D1 [ 0.336046] pci 0000:03:00.0: supports D2 [ 0.336048] pci 0000:03:00.0: PME# supported from D1 D2 D3hot D3cold [ 0.336145] pci 0000:03:00.0: PME# disabled [ 0.336250] pci 0000:03:00.0: disabling ASPM on pre-1.1 PCIe device. It can be enabled forcedly with 'pcie_aspm=force' [ 0.337041] pci 0000:00:1c.4: bridge io port: [0xc000-0xcfff] [ 0.337046] pci 0000:00:1c.4: bridge 32bit mmio: [0xf0000000-0xf1ffffff] [ 0.337111] pci 0000:04:00.0: reg 10 io port: [0xd000-0xd01f] [ 0.338077] pci 0000:04:00.1: reg 10 io port: [0xd100-0xd107] [ 0.338170] pci 0000:04:01.0: reg 10 io port: [0xd200-0xd207] [ 0.338178] pci 0000:04:01.0: reg 14 io port: [0xd300-0xd303] [ 0.338185] pci 0000:04:01.0: reg 18 io port: [0xd400-0xd407] [ 0.338192] pci 0000:04:01.0: reg 1c io port: [0xd500-0xd503] [ 0.338200] pci 0000:04:01.0: reg 20 io port: [0xd600-0xd60f] [ 0.338207] pci 0000:04:01.0: reg 24 32bit mmio: [0xf3000000-0xf30000ff] [ 0.338215] pci 0000:04:01.0: reg 30 32bit mmio: [0x0-0x7ffff] [ 0.338231] pci 0000:04:01.0: supports D1 [ 0.338233] pci 0000:04:01.0: supports D2 [ 0.338279] pci 0000:00:1e.0: transparent bridge [ 0.338366] pci 0000:00:1e.0: bridge io port: [0xd000-0xdfff] [ 0.338370] pci 0000:00:1e.0: bridge 32bit mmio: [0xf2000000-0xf3ffffff] Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com> -- Vincent Legoll --- diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 851f5b8..9675dc3 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -528,9 +528,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP, ®32); if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) { - printk("Pre-1.1 PCIe device detected, " - "disable ASPM for %s. It can be enabled forcedly" - " with 'pcie_aspm=force'\n", pci_name(pdev)); + dev_printk(KERN_INFO, &child_dev->dev, "disabling ASPM" + " on pre-1.1 PCIe device. It can be enabled" + " forcedly with 'pcie_aspm=force'\n"); return -EINVAL; } } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 36698e5..0ae65bf 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -304,8 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, } else { res->start = l64; res->end = l64 + sz64; - printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", - pci_name(dev), pos, (unsigned long long)res->start, + dev_printk(KERN_DEBUG, &dev->dev, + "reg %x 64bit mmio: [%#llx-%#llx]\n", pos, + (unsigned long long)res->start, (unsigned long long)res->end); } } else { @@ -316,8 +317,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->start = l; res->end = l + sz; - printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev), - pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio", + dev_printk(KERN_DEBUG, &dev->dev, "reg %x %s: [%#llx-%#llx]\n", pos, + (res->flags & IORESOURCE_IO) ? "io port" : "32bit mmio", (unsigned long long)res->start, (unsigned long long)res->end); } @@ -389,8 +390,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->start = base; if (!res->end) res->end = limit + 0xfff; - printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge io port: [%#llx-%#llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -403,8 +404,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge 32bit mmio: [%#llx-%#llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -441,8 +442,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", - pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", + dev_printk(KERN_DEBUG, &dev->dev, "bridge %sbit mmio pref: [%#llx-%#llx]\n", + (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", (unsigned long long) res->start, (unsigned long long) res->end); } } ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-03 18:13 ` Vincent Legoll @ 2008-10-03 18:57 ` Bjorn Helgaas 2008-10-03 22:50 ` Vincent Legoll 0 siblings, 1 reply; 10+ messages in thread From: Bjorn Helgaas @ 2008-10-03 18:57 UTC (permalink / raw) To: Vincent Legoll; +Cc: Jesse Barnes, linux-pci, linux-kernel On Friday 03 October 2008 12:13:14 pm Vincent Legoll wrote: > On Fri, Oct 3, 2008 at 11:14 AM, Vincent Legoll > <vincent.legoll@gmail.com> wrote: > > On Thu, Oct 2, 2008 at 8:59 PM, Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > >> On Thursday 02 October 2008 12:46:28 pm Jesse Barnes wrote: > >>> Bjorn, how does this jive with the various other debug harmonization patches > >>> you've been putting together & reviewing? > >> > >> I think it's great. The only nit I would change is to use > >> "[%#llx-%#llx]" as we do in pci_request_region(). > >> > >> Bjorn > > > > Thanks for the review, I'll post an updated version this evening. > > Here is the updated version, with an extra case from drivers/pci/pcie/aspm.c, > please review for the slight wording change in the message. It's currently > running, so is partly tested (It didn't ran through all cases on my HW) It'll be easier for Jesse if you include the proper changelog again with just a 1-2 line sample of the changed messages. BTW, the "--" before your sig confused my mailer into not quoting the patch itself, hence the screwed up formatting below. > - printk("Pre-1.1 PCIe device detected, " > - "disable ASPM for %s. It can be > enabled forcedly" - " with > 'pcie_aspm=force'\n", pci_name(pdev)); > + dev_printk(KERN_INFO, &child_dev->dev, > "disabling ASPM" + " on pre-1.1 PCIe > device. It can be enabled" + " > forcedly with 'pcie_aspm=force'\n"); dev_info() is exactly equivalent to dev_printk(KERN_INFO). I usually use dev_info(), though I'm a bit ambivalent because it's nice to be able to grep for "printk". Anyway, maybe you can correct the grammar of "enabled forcedly" to something like "you can enable with ..." when you re-post with the changelog. (Note that dev_dbg() is NOT exactly equivalent to dev_printk(KERN_DEBUG), so you can't change all of them. dev_printk(KERN_DEBUG) is always compiled in, while dev_dbg() is only compiled in when "DEBUG" is defined.) Bjorn ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-03 18:57 ` Bjorn Helgaas @ 2008-10-03 22:50 ` Vincent Legoll 2008-10-10 16:07 ` Jesse Barnes 0 siblings, 1 reply; 10+ messages in thread From: Vincent Legoll @ 2008-10-03 22:50 UTC (permalink / raw) To: Bjorn Helgaas; +Cc: Jesse Barnes, linux-pci, linux-kernel On Fri, Oct 3, 2008 at 8:57 PM, Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > It'll be easier for Jesse if you include the proper changelog again > with just a 1-2 line sample of the changed messages. BTW, the "--" > before your sig confused my mailer into not quoting the patch itself, > hence the screwed up formatting below. The "-- " line is the start-of-.sig marker have I been taught in my school days, I think they then spoke about netiquette... > dev_info() is exactly equivalent to dev_printk(KERN_INFO). I usually > use dev_info(), though I'm a bit ambivalent because it's nice to be > able to grep for "printk". I left dev_printk(KERN_INFO, ...) for grepability > Anyway, maybe you can correct the grammar > of "enabled forcedly" to something like "you can enable with ..." when > you re-post with the changelog. I've used "You can enable it back with", hoping the gramar is right > (Note that dev_dbg() is NOT exactly equivalent to dev_printk(KERN_DEBUG), > so you can't change all of them. dev_printk(KERN_DEBUG) is always > compiled in, while dev_dbg() is only compiled in when "DEBUG" is defined.) Thanks for the hint, for I may have jumped the gun on those "other" cleanups ;-) So here is the new version cut'n'pasted from git-format-patch ######################### CUT HERE ##################### >From 6250265aded9adcc2bdd5f62977c02a936b641f0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll <vincent.legoll@gmail.com> Date: Fri, 3 Oct 2008 23:56:02 +0200 Subject: [PATCH] PCI probing debug message uniformization This patch uniformizes PCI probing debug boot messages with dev_printk() intead of manual printk() It changes adress range output from [%llx, %llx] to [%#llx-%#llx], like in pci_request_region(). For example, it goes from the mixed-style: PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold to uniform: pci 0000:00:1b.0: reg 10 64bit mmio: [0xf4280000-0xf4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold This patch has been runtime tested, boot log messages diffed, everything looks OK. Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com> --- drivers/pci/pcie/aspm.c | 6 +++--- drivers/pci/probe.c | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 851f5b8..fa0d1a4 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -528,9 +528,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP, ®32); if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) { - printk("Pre-1.1 PCIe device detected, " - "disable ASPM for %s. It can be enabled forcedly" - " with 'pcie_aspm=force'\n", pci_name(pdev)); + dev_printk(KERN_INFO, &child_dev->dev, "disabling ASPM" + " on pre-1.1 PCIe device. You can enable it" + " back with 'pcie_aspm=force'\n"); return -EINVAL; } } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 36698e5..0ae65bf 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -304,8 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, } else { res->start = l64; res->end = l64 + sz64; - printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", - pci_name(dev), pos, (unsigned long long)res->start, + dev_printk(KERN_DEBUG, &dev->dev, + "reg %x 64bit mmio: [%#llx-%#llx]\n", pos, + (unsigned long long)res->start, (unsigned long long)res->end); } } else { @@ -316,8 +317,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->start = l; res->end = l + sz; - printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev), - pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio", + dev_printk(KERN_DEBUG, &dev->dev, "reg %x %s: [%#llx-%#llx]\n", pos, + (res->flags & IORESOURCE_IO) ? "io port" : "32bit mmio", (unsigned long long)res->start, (unsigned long long)res->end); } @@ -389,8 +390,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->start = base; if (!res->end) res->end = limit + 0xfff; - printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge io port: [%#llx-%#llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -403,8 +404,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge 32bit mmio: [%#llx-%#llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -441,8 +442,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", - pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", + dev_printk(KERN_DEBUG, &dev->dev, "bridge %sbit mmio pref: [%#llx-%#llx]\n", + (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", (unsigned long long) res->start, (unsigned long long) res->end); } } -- 1.6.0.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-03 22:50 ` Vincent Legoll @ 2008-10-10 16:07 ` Jesse Barnes 2008-10-12 10:26 ` Vincent Legoll 0 siblings, 1 reply; 10+ messages in thread From: Jesse Barnes @ 2008-10-10 16:07 UTC (permalink / raw) To: Vincent Legoll; +Cc: Bjorn Helgaas, linux-pci, linux-kernel On Friday, October 3, 2008 3:50 pm Vincent Legoll wrote: > On Fri, Oct 3, 2008 at 8:57 PM, Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > > It'll be easier for Jesse if you include the proper changelog again > > with just a 1-2 line sample of the changed messages. BTW, the "--" > > before your sig confused my mailer into not quoting the patch itself, > > hence the screwed up formatting below. > > The "-- " line is the start-of-.sig marker have I been taught in my > school days, I think they then spoke about netiquette... > > > dev_info() is exactly equivalent to dev_printk(KERN_INFO). I usually > > use dev_info(), though I'm a bit ambivalent because it's nice to be > > able to grep for "printk". > > I left dev_printk(KERN_INFO, ...) for grepability > > > Anyway, maybe you can correct the grammar > > of "enabled forcedly" to something like "you can enable with ..." when > > you re-post with the changelog. > > I've used "You can enable it back with", hoping the gramar is right > > > (Note that dev_dbg() is NOT exactly equivalent to dev_printk(KERN_DEBUG), > > so you can't change all of them. dev_printk(KERN_DEBUG) is always > > compiled in, while dev_dbg() is only compiled in when "DEBUG" is > > defined.) > > Thanks for the hint, for I may have jumped the gun on those "other" > cleanups ;-) > > So here is the new version cut'n'pasted from git-format-patch Can you respin against linux-next and send me a fresh copy? This one seems to have been corrupted somehow (sorry for the slow reply, it's been sitting in my 'to apply' mbox for awhile now). Thanks, Jesse ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-10 16:07 ` Jesse Barnes @ 2008-10-12 10:26 ` Vincent Legoll 2008-10-15 10:49 ` Jesse Barnes 0 siblings, 1 reply; 10+ messages in thread From: Vincent Legoll @ 2008-10-12 10:26 UTC (permalink / raw) To: Jesse Barnes; +Cc: Bjorn Helgaas, linux-pci, linux-kernel [-- Attachment #1: Type: text/plain, Size: 411 bytes --] On Fri, Oct 10, 2008 at 6:07 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: >> So here is the new version cut'n'pasted from git-format-patch > > Can you respin against linux-next and send me a fresh copy? This one seems to > have been corrupted somehow (sorry for the slow reply, it's been sitting in > my 'to apply' mbox for awhile now). Here it is, attached, rebased on top of -next -- Vincent Legoll [-- Attachment #2: 0001-PCI-probing-debug-message-uniformization.patch --] [-- Type: application/octet-stream, Size: 4248 bytes --] From d7c4c4e0a8571fded1f48480184fbdd8b9247fb1 Mon Sep 17 00:00:00 2001 From: Vincent Legoll <vincent.legoll@gmail.com> Date: Fri, 3 Oct 2008 23:56:02 +0200 Subject: [PATCH] PCI probing debug message uniformization This patch uniformizes PCI probing debug boot messages with dev_printk() intead of manual printk() It changes adress range output from [%llx, %llx] to [%#llx-%#llx], like in pci_request_region(). For example, it goes from the mixed-style: PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold to uniform: pci 0000:00:1b.0: reg 10 64bit mmio: [0xf4280000-0xf4283fff] pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold This patch has been runtime tested, boot log messages diffed, everything looks OK. Signed-off-by: Vincent Legoll <vincent.legoll@gmail.com> --- drivers/pci/pcie/aspm.c | 6 +++--- drivers/pci/probe.c | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 851f5b8..fa0d1a4 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -528,9 +528,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP, ®32); if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) { - printk("Pre-1.1 PCIe device detected, " - "disable ASPM for %s. It can be enabled forcedly" - " with 'pcie_aspm=force'\n", pci_name(pdev)); + dev_printk(KERN_INFO, &child_dev->dev, "disabling ASPM" + " on pre-1.1 PCIe device. You can enable it" + " back with 'pcie_aspm=force'\n"); return -EINVAL; } } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 7878a19..c143dd6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -304,8 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, } else { res->start = l64; res->end = l64 + sz64; - printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n", - pci_name(dev), pos, (unsigned long long)res->start, + dev_printk(KERN_DEBUG, &dev->dev, + "reg %x 64bit mmio: [%#llx-%#llx]\n", pos, + (unsigned long long)res->start, (unsigned long long)res->end); } } else { @@ -316,8 +317,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, res->start = l; res->end = l + sz; - printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev), - pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio", + dev_printk(KERN_DEBUG, &dev->dev, "reg %x %s: [%#llx-%#llx]\n", pos, + (res->flags & IORESOURCE_IO) ? "io port" : "32bit mmio", (unsigned long long)res->start, (unsigned long long)res->end); } @@ -389,8 +390,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->start = base; if (!res->end) res->end = limit + 0xfff; - printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge io port: [%#llx-%#llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -403,8 +404,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", - pci_name(dev), (unsigned long long) res->start, + dev_printk(KERN_DEBUG, &dev->dev, "bridge 32bit mmio: [%#llx-%#llx]\n", + (unsigned long long) res->start, (unsigned long long) res->end); } @@ -441,8 +442,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; res->start = base; res->end = limit + 0xfffff; - printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", - pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", + dev_printk(KERN_DEBUG, &dev->dev, "bridge %sbit mmio pref: [%#llx-%#llx]\n", + (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32", (unsigned long long) res->start, (unsigned long long) res->end); } } -- 1.6.0.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] PCI probing debug message uniformization 2008-10-12 10:26 ` Vincent Legoll @ 2008-10-15 10:49 ` Jesse Barnes 0 siblings, 0 replies; 10+ messages in thread From: Jesse Barnes @ 2008-10-15 10:49 UTC (permalink / raw) To: Vincent Legoll; +Cc: Bjorn Helgaas, linux-pci, linux-kernel On Sunday, October 12, 2008 3:26 am Vincent Legoll wrote: > On Fri, Oct 10, 2008 at 6:07 PM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > >> So here is the new version cut'n'pasted from git-format-patch > > > > Can you respin against linux-next and send me a fresh copy? This one > > seems to have been corrupted somehow (sorry for the slow reply, it's been > > sitting in my 'to apply' mbox for awhile now). > > Here it is, attached, rebased on top of -next Applied, thanks. Jesse ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2008-10-15 10:49 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-09-29 21:03 [PATCH] PCI probing debug message uniformization Vincent Legoll 2008-10-02 18:46 ` Jesse Barnes 2008-10-02 18:59 ` Bjorn Helgaas 2008-10-03 9:14 ` Vincent Legoll 2008-10-03 18:13 ` Vincent Legoll 2008-10-03 18:57 ` Bjorn Helgaas 2008-10-03 22:50 ` Vincent Legoll 2008-10-10 16:07 ` Jesse Barnes 2008-10-12 10:26 ` Vincent Legoll 2008-10-15 10:49 ` Jesse Barnes
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox