From patchwork Tue Jul 9 07:55:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 2825160 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D6AC9C0AB2 for ; Tue, 9 Jul 2013 07:56:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C0552016A for ; Tue, 9 Jul 2013 07:56:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C231020163 for ; Tue, 9 Jul 2013 07:56:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752858Ab3GIH4Y (ORCPT ); Tue, 9 Jul 2013 03:56:24 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:6586 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752701Ab3GIH4L (ORCPT ); Tue, 9 Jul 2013 03:56:11 -0400 Received: from 172.24.2.119 (EHLO szxeml205-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BEI67339; Tue, 09 Jul 2013 15:56:07 +0800 (CST) Received: from SZXEML403-HUB.china.huawei.com (10.82.67.35) by szxeml205-edg.china.huawei.com (172.24.2.58) with Microsoft SMTP Server (TLS) id 14.1.323.7; Tue, 9 Jul 2013 15:56:06 +0800 Received: from localhost (10.135.76.69) by szxeml403-hub.china.huawei.com (10.82.67.35) with Microsoft SMTP Server id 14.1.323.7; Tue, 9 Jul 2013 15:55:58 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , Rafael , Hanjun Guo , , Yijing Wang , Oliver Neukum , Paul Bolle , Gu Zheng Subject: [PATCH 1/2] PCI: introduce PCIe Device Serial NUmber Capability support Date: Tue, 9 Jul 2013 15:55:45 +0800 Message-ID: <1373356545-45944-1-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected 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.2 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 Introduce PCIe Ext Capability Device Serial Number support, so we can use the unique device serial number to identify the physical device. During system suspend, if the PCIe device was removed and inserted a new same device, after system resume there is no good way to identify it, maybe Device Serial Number is a good choice if device support. Signed-off-by: Yijing Wang Cc: "Rafael J. Wysocki" Cc: Oliver Neukum Cc: Paul Bolle Cc: Gu Zheng Cc: linux-pci@vger.kernel.org Reviewed-by: Gu Zheng --- drivers/pci/pci.c | 33 +++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 1 + drivers/pci/probe.c | 3 +++ include/linux/pci.h | 4 ++++ 4 files changed, 41 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e37fea6..d08df2b 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2048,6 +2048,39 @@ void pci_free_cap_save_buffers(struct pci_dev *dev) } /** + * pci_get_dsn - get device serial number + * @dev: the PCI device + * @sn: saved device serial number + */ +void pci_get_dsn(struct pci_dev *dev, u64 *sn) +{ + int pos; + u32 lo, hi; + + if (!pci_is_pcie(dev)) + goto out; + + pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DSN); + if (!pos) + goto out; + + pci_read_config_dword(dev, pos + 4, &lo); + pci_read_config_dword(dev, pos + 8, &hi); + *sn = ((u64)hi << 32) | lo; + return; + +out: + *sn = 0; + return; +} +EXPORT_SYMBOL(pci_get_dsn); + +void pci_dsn_init(struct pci_dev *dev) +{ + return pci_get_dsn(dev, &dev->sn); +} + +/** * pci_configure_ari - enable or disable ARI forwarding * @dev: the PCI device * diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 68678ed..f626006 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -202,6 +202,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, struct resource *res, unsigned int reg); int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type); void pci_configure_ari(struct pci_dev *dev); +void pci_dsn_init(struct pci_dev *dev); /** * pci_ari_enabled - query ARI forwarding status diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 46ada5c..d4c6e7e 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1322,6 +1322,9 @@ static void pci_init_capabilities(struct pci_dev *dev) /* Power Management */ pci_pm_init(dev); + /* Device Serial Number */ + pci_dsn_init(dev); + /* Vital Product Data */ pci_vpd_pci22_init(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 0fd1f15..59cd205 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -342,6 +342,7 @@ struct pci_dev { struct list_head msi_list; struct kset *msi_kset; #endif + u64 sn; /* device serieal number, 0 if not support */ struct pci_vpd *vpd; #ifdef CONFIG_PCI_ATS union { @@ -995,6 +996,9 @@ ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf); ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); int pci_vpd_truncate(struct pci_dev *dev, size_t size); +/* Device Serial Number */ +void pci_get_dsn(struct pci_dev *dev, u64 *sn); + /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx); void pci_bus_assign_resources(const struct pci_bus *bus);