From patchwork Mon Aug 5 08:54:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 2838595 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 27D67BF535 for ; Mon, 5 Aug 2013 08:55:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03ABE201F7 for ; Mon, 5 Aug 2013 08:55:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBC3A201EE for ; Mon, 5 Aug 2013 08:55:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755264Ab3HEIzf (ORCPT ); Mon, 5 Aug 2013 04:55:35 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:34388 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755217Ab3HEIze (ORCPT ); Mon, 5 Aug 2013 04:55:34 -0400 Received: from 172.24.2.119 (EHLO szxeml212-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id BFN83318; Mon, 05 Aug 2013 16:55:31 +0800 (CST) Received: from SZXEML402-HUB.china.huawei.com (10.82.67.32) by szxeml212-edg.china.huawei.com (172.24.2.181) with Microsoft SMTP Server (TLS) id 14.1.323.7; Mon, 5 Aug 2013 16:55:29 +0800 Received: from localhost (10.135.76.69) by szxeml402-hub.china.huawei.com (10.82.67.32) with Microsoft SMTP Server id 14.1.323.7; Mon, 5 Aug 2013 16:55:16 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , Rafael , Oliver Neukum , Gu Zheng , Paul Bolle , Hanjun Guo , , Yijing Wang Subject: [PATCH -v5 6/6] PCI,pciehp: identify device change during suspend Date: Mon, 5 Aug 2013 16:54:58 +0800 Message-ID: <1375692898-27476-7-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 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 | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 7fe9dbd..7c6e4a6 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); @@ -313,8 +315,33 @@ static int pciehp_resume (struct pcie_device *dev) /* Check if slot is occupied */ pciehp_get_adapter_status(slot, &status); if (status) { - if (list_empty(&pbus->devices)) + if (list_empty(&pbus->devices)) { pciehp_enable_slot(slot); + return 0; + } + + 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); + pciehp_enable_slot(slot); + } + } } else if (!list_empty(&pbus->devices)) { pciehp_disable_slot(slot); }