From patchwork Fri Apr 25 17:16:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 342945 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E4FE3140159 for ; Sat, 26 Apr 2014 03:17:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753473AbaDYRRH (ORCPT ); Fri, 25 Apr 2014 13:17:07 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:40926 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753405AbaDYRRB (ORCPT ); Fri, 25 Apr 2014 13:17:01 -0400 Received: by mail-pd0-f179.google.com with SMTP id g10so3340161pdj.24 for ; Fri, 25 Apr 2014 10:17:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=q+Qaw3FM/bAK89jAfyCnIQ+MqIsZC5+wIKXVycSqUfY=; b=aaeqG6iHtTQmsdm2GKszpPo9doEhXHBAgzd5yhEiWTthczlXlylkvWLS+a1JeOMgpi C41Ugx0fOQqDYiJzmQDMB/kKb5zMGWUMtcjK0iK3bqxacL1rfJ7NkIvz/q1eK+WDR6gv /20NpP5pJrpsi86zMs/d95VDVSpkcQVo4D7gk1Jz+G8mqsDf/3lW5PDpadnzD5xq+AuC sDe/XhGlos9p4wPkPLyGLmNZjBOtNXdDhrbmuZTZpndhHnfawRTwAe7Fw1AzgtLKGvBz Yad2qAjUyp1hTigfSd6RBIMSVvUEuKuwQ5joU0/oj1F0Ht1uBsAZafLYmtaqJ3EWrkES wfcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=q+Qaw3FM/bAK89jAfyCnIQ+MqIsZC5+wIKXVycSqUfY=; b=OotaJRHNV728br8eCaEFQ8GmMJJpsPh6MYRPE8k+Ydg2yoBSxzHYRVV3nTQe8BFyPs 8rFMW1fwAXvSl6RfiS7DstNdIemk0zzzLVAku4q01mpZa52IlLDPUkgaXh5v0KTpJtqo QpowRO3tlR43vdJROOu+6lOOBbwglk+7nGArMOPC5ndphrJ0LQdecxJrBiulXIF18KVt /2FZud/KjgF4qAYBoIrI/oh+Bx/rWNw++F6q+am86n2hWP1eSCq/jLrOCJ0XZaMQMING oM+2f7WtobDze0sPPsVZnHd/X856pT/D6amd1Vf4y2w61ZpqXefUPzANtOz9GYUH7Lrg Mrww== X-Gm-Message-State: ALoCoQk67du7RroPJYri48C0EkBmlUbtPEEKti31D8XM4SJ8vANfAC9trP/6toz1ikotUzuVFUbXGJxYJ58ijI8ZNAQt8/hLpsky2pttbjhz0c82mZdObFyei63H4VIH3U4r41GZ+9qZBZ7QZJGbL6eOMWka388VGRB6VjIIAyIu/AB4+rmcaANhEEQm2cdqKCa0WDXAIUW7Xym4vWwNzOoDbwcFBcwOiaG+7MBXWFuPBt4/vZerOus= X-Received: by 10.69.0.198 with SMTP id ba6mr12922315pbd.16.1398446220288; Fri, 25 Apr 2014 10:17:00 -0700 (PDT) Received: from localhost ([172.19.243.187]) by mx.google.com with ESMTPSA id ba5sm17119540pbc.61.2014.04.25.10.16.58 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Apr 2014 10:16:59 -0700 (PDT) Subject: [PATCH 4/4] x86/gart: Tidy messages and add bridge device info To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: David Airlie , Bodo Eggert <7eggert@gmx.de>, x86@kernel.org, linux-kernel@vger.kernel.org Date: Fri, 25 Apr 2014 11:16:55 -0600 Message-ID: <20140425171655.312.97511.stgit@bhelgaas-glaptop.roam.corp.google.com> In-Reply-To: <20140425171144.312.9601.stgit@bhelgaas-glaptop.roam.corp.google.com> References: <20140425171144.312.9601.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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); 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); 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;