From patchwork Thu Dec 13 15:31:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 206121 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 C8B0E2C009F for ; Fri, 14 Dec 2012 02:31:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755968Ab2LMPbX (ORCPT ); Thu, 13 Dec 2012 10:31:23 -0500 Received: from mga02.intel.com ([134.134.136.20]:15922 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755811Ab2LMPbW (ORCPT ); Thu, 13 Dec 2012 10:31:22 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 13 Dec 2012 07:31:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,274,1355126400"; d="scan'208";a="233501415" Received: from blue.fi.intel.com ([10.237.72.156]) by orsmga001.jf.intel.com with ESMTP; 13 Dec 2012 07:31:15 -0800 Received: by blue.fi.intel.com (Postfix, from userid 1000) id AA79FE0083; Thu, 13 Dec 2012 17:31:55 +0200 (EET) From: "Kirill A. Shutemov" To: Greg KH Cc: Miles J Penner , John Ronciak , Mika Westerberg , Tushar N Dave , "Kirill A. Shutemov" , "Kirill A. Shutemov" , Bjorn Helgaas , Yinghai Lu , Jesse Barnes , Amos Kong , "Rafael J. Wysocki" , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] PCI Hotplug: workaround for Thunderbolt on Intel DZ77RE-75K motherboard Date: Thu, 13 Dec 2012 17:31:48 +0200 Message-Id: <1355412708-20046-4-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355412708-20046-1-git-send-email-kirill.shutemov@linux.intel.com> References: <1355412708-20046-1-git-send-email-kirill.shutemov@linux.intel.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: "Kirill A. Shutemov" BIOS on Intel DZ77RE-75K motherboard notifies OS about Thunderbolt hotplug before devices behind Thunderbolt are ready to be enumerated. Let's delay enumeration by 2 seconds. Signed-off-by: Kirill A. Shutemov --- drivers/pci/hotplug/acpiphp_glue.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 1a2b3ca..165987a 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -49,6 +49,7 @@ #include #include #include +#include #include "../pci.h" #include "acpiphp.h" @@ -1327,6 +1328,19 @@ out: static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, void *context) { + unsigned long delay = 0; + const char *board_name; + + board_name = dmi_get_system_info(DMI_BOARD_NAME); + /* + * BIOS on Intel DZ77RE-75K motherboard notifies OS about Thunderbolt + * hotplug before devices behind Thunderbolt are ready to be + * enumerated. + * Let's delay enumeration by 2 seconds. + */ + if (board_name && !strcmp(board_name, "DZ77RE-75K")) + delay = 2 * HZ; + /* * Currently the code adds all hotplug events to the kacpid_wq * queue when it should add hotplug events to the kacpi_hotplug_wq. @@ -1336,7 +1350,7 @@ static void handle_hotplug_event_bridge(acpi_handle handle, u32 type, * don't deadlock on hotplug actions. */ alloc_acpiphp_hp_work(handle, type, context, - _handle_hotplug_event_bridge, 0); + _handle_hotplug_event_bridge, delay); } static void _handle_hotplug_event_func(struct work_struct *work)