Re: [PATCH 4/4] x86/gart: Tidy messages and add bridge device info

[Bjorn Helgaas]

On Sat, Apr 26, 2014 at 12:01 AM, Ingo Molnar <mingo@xxxxxxxxxx> wrote:
>
> * Bjorn Helgaas <bhelgaas@xxxxxxxxxx> 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@xxxxxxxxxx>
>> ---
>>  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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/