From patchwork Tue Jan 28 07:51:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Renninger X-Patchwork-Id: 3545561 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3CBC89F381 for ; Tue, 28 Jan 2014 07:51:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 702462015B for ; Tue, 28 Jan 2014 07:51:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6ECCF20154 for ; Tue, 28 Jan 2014 07:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754624AbaA1HvT (ORCPT ); Tue, 28 Jan 2014 02:51:19 -0500 Received: from cantor2.suse.de ([195.135.220.15]:52251 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092AbaA1HvT (ORCPT ); Tue, 28 Jan 2014 02:51:19 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 92BF5AC6E; Tue, 28 Jan 2014 07:51:17 +0000 (UTC) From: Thomas Renninger To: mj@ucw.cz Cc: trenn@suse.de, linux-pci@vger.kernel.org Subject: [PATCH] lspci: Show device name as exported by BIOS (sysfs label attribute) (V2) Date: Tue, 28 Jan 2014 08:51:02 +0100 Message-Id: <1390895462-60699-1-git-send-email-trenn@suse.de> X-Mailer: git-send-email 1.7.6.1 In-Reply-To: <1390856419-35985-1-git-send-email-trenn@suse.de> References: <1390856419-35985-1-git-send-email-trenn@suse.de> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Device name of a PCI or PCI Express device under OS may be exported via ACPI _DSM function with function index 7. This allows to connect a described PCI device in the platform documentation or as labeled on the chassis with PCI devices shown via lspci. The kernel already exports this string through sysfs under a PCI device through the "label" sysfs attribute. This patch reads the device name if available and shows it to the user. Real world examples: Device Name: "USB HS EHCI Controller #2 #3" Device Name: "USB HS EHCI Controller #1" Device Name: "SATA Controller #1" Device Name: "Onboard LAN #1" Device Name: "Onboard LAN #2" Device Name: "Onboard Video (PILOT-3)" Compare with PCI Firmware Spec v3.1 chapter 4.6.7 and ACPI spec v5.0 chapter 9.14.1 The DeviceName is not shown by default, but starting from first verbose parameter (-v). V2: - Free label string if allocated - Enhance changelog Signed-off-by: Thomas Renninger CC: linux-pci@vger.kernel.org --- lib/access.c | 1 + lib/pci.h | 1 + lib/sysfs.c | 4 ++++ lspci.c | 2 ++ 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/lib/access.c b/lib/access.c index 5112504..c23a2fd 100644 --- a/lib/access.c +++ b/lib/access.c @@ -60,6 +60,7 @@ void pci_free_dev(struct pci_dev *d) d->methods->cleanup_dev(d); pci_free_caps(d); pci_mfree(d->module_alias); + pci_mfree(d->label); pci_mfree(d->phy_slot); pci_mfree(d); } diff --git a/lib/pci.h b/lib/pci.h index 38e2e99..f31419d 100644 --- a/lib/pci.h +++ b/lib/pci.h @@ -131,6 +131,7 @@ struct pci_dev { struct pci_cap *first_cap; /* List of capabilities */ char *phy_slot; /* Physical slot */ char *module_alias; /* Linux kernel module alias */ + char *label; /* Device name as exported by BIOS */ /* Fields used internally: */ struct pci_access *access; diff --git a/lib/sysfs.c b/lib/sysfs.c index 5a48c0d..3a8a34f 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -199,6 +199,10 @@ static void sysfs_scan(struct pci_access *a) d->vendor_id = sysfs_get_value(d, "vendor"); d->device_id = sysfs_get_value(d, "device"); d->device_class = sysfs_get_value(d, "class") >> 8; + char buf[1024]; + if (sysfs_get_string(d, "label", buf, 0)) + d->label = pci_strdup(d->access, buf); + d->known_fields = PCI_FILL_IDENT | PCI_FILL_CLASS | PCI_FILL_IRQ | PCI_FILL_BASES | PCI_FILL_ROM_BASE | PCI_FILL_SIZES; } pci_link_dev(a, d); diff --git a/lspci.c b/lspci.c index dbba678..eb17af5 100644 --- a/lspci.c +++ b/lspci.c @@ -315,6 +315,8 @@ show_terse(struct device *d) word subsys_v, subsys_d; char ssnamebuf[256]; + if (p->label) + printf("\tDeviceName: %s", p->label); get_subid(d, &subsys_v, &subsys_d); if (subsys_v && subsys_v != 0xffff) printf("\tSubsystem: %s\n",