From: Ingo Molnar <mingo@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, David Airlie <airlied@linux.ie>,
Bodo Eggert <7eggert@gmx.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/4] x86/gart: Tidy messages and add bridge device info
Date: Sat, 26 Apr 2014 08:01:30 +0200 [thread overview]
Message-ID: <20140426060130.GA1698@gmail.com> (raw)
In-Reply-To: <20140425171655.312.97511.stgit@bhelgaas-glaptop.roam.corp.google.com>
* Bjorn Helgaas <bhelgaas@google.com> wrote:
> Print the AGP bridge info the same way as the rest of the kernel, e.g.,
> "0000:00:04.0" instead of "00:04:00".
>
> Also print the AGP aperture address range the same way we print resources,
> and label it explicitly as a bus address range.
>
> No functional change.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> arch/x86/kernel/aperture_64.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
> index 9fa8aa051f54..4dd76d3df056 100644
> --- a/arch/x86/kernel/aperture_64.c
> +++ b/arch/x86/kernel/aperture_64.c
> @@ -126,10 +126,12 @@ static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order)
> u64 aper;
> u32 old_order;
>
> - printk(KERN_INFO "AGP bridge at %02x:%02x:%02x\n", bus, slot, func);
> + printk(KERN_INFO "pci 0000:%02x:%02x.%d: AGP bridge\n", bus, slot,
> + func);
Please leave it on a single line - checkpatch warning nonwithstanding.
pr_info() is also useful.
> apsizereg = read_pci_config_16(bus, slot, func, cap + 0x14);
> if (apsizereg == 0xffffffff) {
> - printk(KERN_ERR "APSIZE in AGP bridge unreadable\n");
> + printk(KERN_ERR "pci 0000:%02x:%02x.%d: APSIZE unreadable\n",
> + bus, slot, func);
Here too you can also use pr_err() to shorten the line.
> return 0;
> }
>
> @@ -153,16 +155,18 @@ static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order)
> * On some sick chips, APSIZE is 0. It means it wants 4G
> * so let double check that order, and lets trust AMD NB settings:
> */
> - printk(KERN_INFO "Aperture from AGP @ %Lx old size %u MB\n",
> - aper, 32 << old_order);
> + printk(KERN_INFO "pci 0000:%02x:%02x.%d: AGP aperture [bus %Lx-%Lx] old size %u MB\n",
> + bus, slot, func, aper, aper + (32 << old_order) - 1,
> + 32 << old_order);
> if (aper + (32ULL<<(20 + *order)) > 0x100000000ULL) {
> - printk(KERN_INFO "Aperture size %u MB (APSIZE %x) is not right, using settings from NB\n",
> - 32 << *order, apsizereg);
> + printk(KERN_INFO "pci 0000:%02x:%02x.%d: AGP aperture size %u MB (APSIZE %x) is not right, using settings from NB\n",
> + bus, slot, func, 32 << *order, apsizereg);
> *order = old_order;
> }
>
> - printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n",
> - aper, 32 << *order, apsizereg);
> + printk(KERN_INFO "pci 0000:%02x:%02x.%d: AGP aperture [bus %Lx-%Lx] size %u MB (APSIZE %x)\n",
> + bus, slot, func, aper, aper + (32 << *order) - 1, 32 << *order,
> + apsizereg);
>
> if (!aperture_valid(aper, (32*1024*1024) << *order, 32<<20))
> return 0;
Also, you could add:
#define PREFIX "PCI/gart: "
or something like that, to define a standard prefix for these
messages.
Btw., this file could be moved to arch/x86/pci/?
Otherwise:
Acked-by: Ingo Molnar <mingo@kernel.org>
Thanks,
Ingo
next prev parent reply other threads:[~2014-04-26 6:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 17:16 [PATCH 0/4] x86/PCI HPET bugfix and other cleanups Bjorn Helgaas
2014-04-25 17:16 ` [PATCH 1/4] x86/PCI: Don't try to move IORESOURCE_PCI_FIXED resources Bjorn Helgaas
2014-04-25 17:16 ` [PATCH 2/4] x86/PCI: Mark HPET BAR as IORESOURCE_PCI_FIXED Bjorn Helgaas
2014-04-25 17:16 ` [PATCH 3/4] x86/PCI: Move pcibios_assign_resources() annotation to definition Bjorn Helgaas
2014-04-25 17:16 ` [PATCH 4/4] x86/gart: Tidy messages and add bridge device info Bjorn Helgaas
2014-04-26 6:01 ` Ingo Molnar [this message]
2014-04-28 23:22 ` Bjorn Helgaas
2014-05-07 18:00 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140426060130.GA1698@gmail.com \
--to=mingo@kernel.org \
--cc=7eggert@gmx.de \
--cc=airlied@linux.ie \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).