From patchwork Fri Jul 12 09:32:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 2826893 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 6ACB39F968 for ; Fri, 12 Jul 2013 09:40:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 18255201C0 for ; Fri, 12 Jul 2013 09:40:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABA5F201BD for ; Fri, 12 Jul 2013 09:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757381Ab3GLJkE (ORCPT ); Fri, 12 Jul 2013 05:40:04 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:7973 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757350Ab3GLJkD (ORCPT ); Fri, 12 Jul 2013 05:40:03 -0400 Received: from 172.24.2.119 (EHLO szxeml211-edg.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.2a-FCS FastPath queued) with ESMTP id ABX73176; Fri, 12 Jul 2013 17:36:46 +0800 (CST) Received: from SZXEML413-HUB.china.huawei.com (10.82.67.152) by szxeml211-edg.china.huawei.com (172.24.2.182) with Microsoft SMTP Server (TLS) id 14.1.323.7; Fri, 12 Jul 2013 17:36:46 +0800 Received: from localhost (10.135.76.69) by szxeml413-hub.china.huawei.com (10.82.67.152) with Microsoft SMTP Server id 14.1.323.7; Fri, 12 Jul 2013 17:36:36 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , Don Dutile , Paul Bolle , , Rafael , Hanjun Guo , , Yijing Wang , Oliver Neukum , Gu Zheng Subject: [PATCH -v3 1/3] PCI: introduce PCIe Device Serial Number Capability support Date: Fri, 12 Jul 2013 17:32:21 +0800 Message-ID: <1373621543-54836-2-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1373621543-54836-1-git-send-email-wangyijing@huawei.com> References: <1373621543-54836-1-git-send-email-wangyijing@huawei.com> 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=ham 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 reinserted a new same device, during 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: Paul Bolle Cc: "Rafael J. Wysocki" Cc: Oliver Neukum Cc: Gu Zheng Cc: linux-pci@vger.kernel.org --- drivers/pci/pci.c | 30 ++++++++++++++++++++++++++++++ drivers/pci/pci.h | 1 + drivers/pci/probe.c | 2 ++ include/linux/pci.h | 3 +++ 4 files changed, 36 insertions(+), 0 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e37fea6..156e251 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1985,6 +1985,11 @@ void pci_pm_init(struct pci_dev *dev) } } +void pci_dsn_init(struct pci_dev *dev) +{ + dev->sn = pci_device_serial_number(dev); +} + static void pci_add_saved_cap(struct pci_dev *pci_dev, struct pci_cap_saved_state *new_cap) { @@ -2048,6 +2053,31 @@ void pci_free_cap_save_buffers(struct pci_dev *dev) } /** + * pci_device_serial_number - get device serial number + * @dev: the PCI device + * + * return the device serial number if device support, + * otherwise return 0. + */ +u64 pci_device_serial_number(struct pci_dev *dev) +{ + int pos; + u32 lo, hi; + + if (!pci_is_pcie(dev)) + return 0; + + pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DSN); + if (!pos) + return 0; + + pci_read_config_dword(dev, pos + 4, &lo); + pci_read_config_dword(dev, pos + 8, &hi); + return ((u64)hi << 32) | lo; +} +EXPORT_SYMBOL(pci_device_serial_number); + +/** * 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..b37534f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1322,6 +1322,8 @@ static void pci_init_capabilities(struct pci_dev *dev) /* Power Management */ pci_pm_init(dev); + 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..f2c6ed9 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 serial number, 0 if not support */ struct pci_vpd *vpd; #ifdef CONFIG_PCI_ATS union { @@ -995,6 +996,8 @@ 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); +u64 pci_device_serial_number(struct pci_dev *dev); + /* 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);