From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ie0-f176.google.com ([209.85.223.176]:56370 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753706AbaD1XWZ (ORCPT ); Mon, 28 Apr 2014 19:22:25 -0400 Received: by mail-ie0-f176.google.com with SMTP id rd18so7344564iec.35 for ; Mon, 28 Apr 2014 16:22:25 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20140426060130.GA1698@gmail.com> References: <20140425171144.312.9601.stgit@bhelgaas-glaptop.roam.corp.google.com> <20140425171655.312.97511.stgit@bhelgaas-glaptop.roam.corp.google.com> <20140426060130.GA1698@gmail.com> From: Bjorn Helgaas Date: Mon, 28 Apr 2014 17:22:04 -0600 Message-ID: Subject: Re: [PATCH 4/4] x86/gart: Tidy messages and add bridge device info To: Ingo Molnar Cc: "linux-pci@vger.kernel.org" , David Airlie , Bodo Eggert <7eggert@gmx.de>, "x86@kernel.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-pci-owner@vger.kernel.org List-ID: On Sat, Apr 26, 2014 at 12:01 AM, Ingo Molnar wrote: > > * Bjorn Helgaas 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 >> --- >> 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. > ... > Also, you could add: > > #define PREFIX "PCI/gart: " > > or something like that, to define a standard prefix for these > messages. I converted to pr_info(), etc. and added pr_fmt for an "AGP: " prefix. > Btw., this file could be moved to arch/x86/pci/? Yes, I'd be glad to do this. It looks like all the following files might be candidates: amd_gart_64.c (CONFIG_GART_IOMMU) aperture_64.c (CONFIG_GART_IOMMU) pci-calgary_64.c (CONFIG_CALGARY_IOMMU) tce_64.c (CONFIG_CALGARY_IOMMU) mmconf-fam10h_64.c (CONFIG_PCI_MMCONFIG) What do you think? Move all, move none, move only aperture_64.c? Thanks for your comments! Bjorn