From patchwork Mon Aug 5 08:54:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 2838597 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 0E518BF535 for ; Mon, 5 Aug 2013 08:56:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF4C2201F7 for ; Mon, 5 Aug 2013 08:56:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F40F201F0 for ; Mon, 5 Aug 2013 08:56:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754780Ab3HEI4G (ORCPT ); Mon, 5 Aug 2013 04:56:06 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:19029 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754938Ab3HEI4E (ORCPT ); Mon, 5 Aug 2013 04:56:04 -0400 Received: from 172.24.2.119 (EHLO szxeml209-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BGG00906; Mon, 05 Aug 2013 16:56:03 +0800 (CST) Received: from SZXEML407-HUB.china.huawei.com (10.82.67.94) by szxeml209-edg.china.huawei.com (172.24.2.184) with Microsoft SMTP Server (TLS) id 14.1.323.7; Mon, 5 Aug 2013 16:55:20 +0800 Received: from localhost (10.135.76.69) by szxeml407-hub.china.huawei.com (10.82.67.94) with Microsoft SMTP Server id 14.1.323.7; Mon, 5 Aug 2013 16:55:12 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , Rafael , Oliver Neukum , Gu Zheng , Paul Bolle , Hanjun Guo , , Yijing Wang Subject: [PATCH -v5 2/6] PCI: introduce PCIe Device Serial Number Capability support Date: Mon, 5 Aug 2013 16:54:54 +0800 Message-ID: <1375692898-27476-3-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1375692898-27476-1-git-send-email-wangyijing@huawei.com> References: <1375692898-27476-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=-6.9 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. Reviewed-by: Gu Zheng 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 | 29 +++++++++++++++++++++++++++++ drivers/pci/pci.h | 2 +- drivers/pci/probe.c | 2 ++ include/linux/pci.h | 1 + 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 84a3c09..cfc0f7f 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2048,6 +2048,35 @@ 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. + */ +static 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; +} + +void pci_dsn_init(struct pci_dev *dev) +{ + dev->sn = pci_device_serial_number(dev); +} + +/** * 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 816c297..2b2a9cc 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -207,7 +207,7 @@ void __ref __pci_bus_size_bridges(struct pci_bus *bus, void __ref __pci_bus_assign_resources(const struct pci_bus *bus, struct list_head *realloc_head, struct list_head *fail_head); - +void pci_dsn_init(struct pci_dev *dev); /** * pci_ari_enabled - query ARI forwarding status * @bus: the PCI bus diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 83172bc..0c5da76 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1325,6 +1325,8 @@ static void pci_init_capabilities(struct pci_dev *dev) /* Vital Product Data */ pci_vpd_pci22_init(dev); + pci_dsn_init(dev); + /* Alternative Routing-ID Forwarding */ pci_configure_ari(dev); diff --git a/include/linux/pci.h b/include/linux/pci.h index 0fd1f15..4354eaf 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 {