From patchwork Thu Aug 1 13:06:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 2836980 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 CF938C0319 for ; Thu, 1 Aug 2013 13:07:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88A30202B7 for ; Thu, 1 Aug 2013 13:07:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 513522022A for ; Thu, 1 Aug 2013 13:07:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754688Ab3HANHK (ORCPT ); Thu, 1 Aug 2013 09:07:10 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:35955 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754957Ab3HANHJ (ORCPT ); Thu, 1 Aug 2013 09:07:09 -0400 Received: from 172.24.2.119 (EHLO szxeml211-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BFK33538; Thu, 01 Aug 2013 21:07:02 +0800 (CST) Received: from SZXEML412-HUB.china.huawei.com (10.82.67.91) by szxeml211-edg.china.huawei.com (172.24.2.182) with Microsoft SMTP Server (TLS) id 14.1.323.7; Thu, 1 Aug 2013 21:07:02 +0800 Received: from localhost (10.135.76.69) by szxeml412-hub.china.huawei.com (10.82.67.91) with Microsoft SMTP Server id 14.1.323.7; Thu, 1 Aug 2013 21:06:54 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , Hanjun Guo , , Yijing Wang , Paul Bolle , "Rafael J. Wysocki" , Oliver Neukum , Gu Zheng Subject: [PATCH -v4 6/6] PCI,pciehp: identify device change during suspend Date: Thu, 1 Aug 2013 21:06:29 +0800 Message-ID: <1375362389-26096-7-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1375362389-26096-1-git-send-email-wangyijing@huawei.com> References: <1375362389-26096-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=-8.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 If device was removed from slot and reinsert a new device during suspend, pciehp can not identify the physical device change now. So the old driver .resume() method will be called for the new device, this is bad. If device support device serial number capability, we can identify this by DSN. So the reasonable way is first remove the old device, then enable the new device. 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/hotplug/pciehp_core.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 7fe9dbd..db5f597 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c @@ -301,6 +301,8 @@ static int pciehp_resume (struct pcie_device *dev) struct controller *ctrl; struct slot *slot; struct pci_bus *pbus = dev->port->subordinate; + struct pci_dev *pdev; + int ret = 0; u8 status; ctrl = get_service_data(dev); @@ -315,10 +317,36 @@ static int pciehp_resume (struct pcie_device *dev) if (status) { if (list_empty(&pbus->devices)) pciehp_enable_slot(slot); - } else if (!list_empty(&pbus->devices)) { - pciehp_disable_slot(slot); + + pdev = pci_get_slot(pbus, PCI_DEVFN(0, 0)); + if (!pdev) + return 0; + ret = pci_serial_number_changed(pdev); + pci_dev_put(pdev); + if (ret) { + /* + * first power off slot, avoid the old driver + * .remove() method touch the new hardware + */ + if (POWER_CTRL(ctrl)) { + ret = pciehp_power_off_slot(slot); + if (ret) { + ctrl_err(ctrl, + "Issue of Slot Disable command failed\n"); + return 0; + } + msleep(1000); + pciehp_unconfigure_device(slot); + /* call child devices driver->suspend() for symmetry */ + list_for_each_entry(pdev, &pbus->devices, bus_list) + if (pdev->driver) + pdev->driver->driver.pm->suspend(&pdev->dev); + pciehp_enable_slot(slot); + } + } else if (!list_empty(&pbus->devices)) { + pciehp_disable_slot(slot); + } } - return 0; } #endif /* PM */