From patchwork Thu Nov 12 19:24:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Bainbridge X-Patchwork-Id: 7605011 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4E3EE9F1C2 for ; Thu, 12 Nov 2015 19:24:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4EC3C2081B for ; Thu, 12 Nov 2015 19:24:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D29B205B8 for ; Thu, 12 Nov 2015 19:24:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752872AbbKLTYx (ORCPT ); Thu, 12 Nov 2015 14:24:53 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36907 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752340AbbKLTYw (ORCPT ); Thu, 12 Nov 2015 14:24:52 -0500 Received: by wmww144 with SMTP id w144so968768wmw.0; Thu, 12 Nov 2015 11:24:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=gQSs/M8zDFGNCrQvMcyLDDH5vDMqWduRHDnMd5DMN/8=; b=fa7sYvrE+cBfMgm3s47XE0KTiboLrmReYw2DWPTmAA2M6AX+3UePfrUMF2uoirSL6N 52c+p+MkLP0gMi42nxJhKBMFm5TI29m9njnODztw8hpol4f8oOtr4iieIc4i0xLNqXK8 EqjZJjvQ6VWNdx9HK4xiQ+n7MpAN6O2CNzD7uILspEiFwkTuxWgM/UxJ/e05xxmYNKQ0 MmNNZROwSW+R/QV+DHeTPVsvCl2YXNnueRtN917rT22Ui+e2Vvc4kbJoFdGdnQ/BnSMn YYT+5vZOpwJP0iyql8V5NEpmBEgFU/UtjJT3MKSa876oy1vWzQ4cfStOuJ/0m2SCaDdN tqgA== X-Received: by 10.28.216.196 with SMTP id p187mr50539645wmg.14.1447356291159; Thu, 12 Nov 2015 11:24:51 -0800 (PST) Received: from localhost (cpc2-sgyl32-2-0-cust142.sgyl.cable.virginm.net. [77.97.242.143]) by smtp.gmail.com with ESMTPSA id at4sm16006223wjc.9.2015.11.12.11.24.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2015 11:24:49 -0800 (PST) Date: Thu, 12 Nov 2015 19:24:47 +0000 From: Chris Bainbridge To: "Rafael J. Wysocki" Cc: peterz@infradead.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, lv.zheng@intel.com, aaron.lu@intel.com, aystarik@gmail.com Subject: [PATCH] Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook" Message-ID: <20151112192447.GA4564@localhost> References: <20151106204408.GA11609@localhost> <53589361.gQMCOa1UoV@vostro.rjw.lan> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <53589361.gQMCOa1UoV@vostro.rjw.lan> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 This reverts commit 3349fb64b2927407017d970dd5c4daf3c5ad69f8. After commit 8848d20cf09c ("ACPI / SMBus: Fix boot stalls / high CPU caused by reentrant code") the delay is no longer necessary. Signed-off-by: Chris Bainbridge --- drivers/acpi/sbshc.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index e2900518cf7e..2fa8304171e0 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c @@ -14,7 +14,6 @@ #include #include #include -#include #include "sbshc.h" #define PREFIX "ACPI: " @@ -89,8 +88,6 @@ enum acpi_smb_offset { ACPI_SMB_ALARM_DATA = 0x26, /* 2 bytes alarm data */ }; -static bool macbook; - static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data) { return ec_read(hc->offset + address, data); @@ -121,8 +118,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, mutex_lock(&hc->lock); hc->done = false; - if (macbook) - udelay(5); if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp)) goto end; if (temp) { @@ -250,29 +245,12 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit, acpi_handle handle, acpi_ec_query_func func, void *data); -static int macbook_dmi_match(const struct dmi_system_id *d) -{ - pr_debug("Detected MacBook, enabling workaround\n"); - macbook = true; - return 0; -} - -static struct dmi_system_id acpi_smbus_dmi_table[] = { - { macbook_dmi_match, "Apple MacBook", { - DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), - DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") }, - }, - { }, -}; - static int acpi_smbus_hc_add(struct acpi_device *device) { int status; unsigned long long val; struct acpi_smb_hc *hc; - dmi_check_system(acpi_smbus_dmi_table); - if (!device) return -EINVAL;