From patchwork Fri Apr 27 15:16:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 155515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 84B15B6F9F for ; Sat, 28 Apr 2012 01:24:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760570Ab2D0PVX (ORCPT ); Fri, 27 Apr 2012 11:21:23 -0400 Received: from mail-pz0-f51.google.com ([209.85.210.51]:50093 "EHLO mail-pz0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760581Ab2D0PVV (ORCPT ); Fri, 27 Apr 2012 11:21:21 -0400 Received: by mail-pz0-f51.google.com with SMTP id z8so1149168dad.10 for ; Fri, 27 Apr 2012 08:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=hkEJBoI2dDHhBbQq5uXy7c+RJ7pr0J2VYZhtB8RO/dw=; b=BpoyFMoIFqyv8NZ0HogKRRjP1onf/aWvhYb4GeEvVTkU96SHuGv+9QuuobxA3fjRHx 43Tq9q6n+hOhXw0M4TvVDtL+snse1ZNId7S8U/5dYk8S7HydNRJSv2ry0sCzHjnnY6SC 1Ev7BBXC8GlRvtHafBGK8Q+4qHWXSaIfPFWRwrkjqYGxidA//2hDYW618ZnbUSkBMa5N TvBIcYeFhXp/GKHOejm9dWnO40nIK3ZqNp2NKYVtF+m04r+cQ2l5BFsChat9vUtxCwhJ 6IAfmzOxCPpAbdWTybdfZ3sRL7dOFo9GFn2saXdmlX5ioB2wV8vL9S93QmM6k+HPYdMH 4WWA== Received: by 10.68.226.99 with SMTP id rr3mr24059640pbc.48.1335540081010; Fri, 27 Apr 2012 08:21:21 -0700 (PDT) Received: from localhost.localdomain ([221.221.26.142]) by mx.google.com with ESMTPS id 2sm6743917pbw.57.2012.04.27.08.21.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Apr 2012 08:21:20 -0700 (PDT) From: Jiang Liu To: Yinghai Lu , Kenji Kaneshige , Bjorn Helgaas , Don Dutile , Greg KH Cc: Jiang Liu , Keping Chen , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Jiang Liu Subject: [PATCH v2 09/19] PCI: correctly flush workqueues and timer when destroy SHPC controller Date: Fri, 27 Apr 2012 23:16:50 +0800 Message-Id: <1335539820-11232-10-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335539820-11232-1-git-send-email-jiang.liu@huawei.com> References: <1335539820-11232-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Jiang Liu del_timer() only deactivates a timer but doesn't wait for the handler to finish, so use del_timer_sync() to deactivate a timer and wait for the handler to finish in hpc_release_ctrl(). This patch also tune the workqueue flush logic to correctly flush all work items. Signed-off-by: Jiang Liu --- drivers/pci/hotplug/shpchp_core.c | 2 +- drivers/pci/hotplug/shpchp_hpc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index aaa66be..19762b3 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -173,8 +173,8 @@ void cleanup_slots(struct controller *ctrl) list_for_each_safe(tmp, next, &ctrl->slot_list) { slot = list_entry(tmp, struct slot, slot_list); list_del(&slot->slot_list); - cancel_delayed_work(&slot->work); flush_workqueue(shpchp_wq); + cancel_delayed_work_sync(&slot->work); flush_workqueue(shpchp_ordered_wq); pci_hp_deregister(slot->hotplug_slot); } diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c index 2bc6182..ff63887 100644 --- a/drivers/pci/hotplug/shpchp_hpc.c +++ b/drivers/pci/hotplug/shpchp_hpc.c @@ -593,7 +593,7 @@ static void hpc_release_ctlr(struct controller *ctrl) } if (shpchp_poll_mode) - del_timer(&ctrl->poll_timer); + del_timer_sync(&ctrl->poll_timer); else { free_irq(ctrl->pci_dev->irq, ctrl); pci_disable_msi(ctrl->pci_dev);