From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58A28C3A5A0 for ; Mon, 20 Apr 2020 12:58:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B47620736 for ; Mon, 20 Apr 2020 12:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387497; bh=AOHe/n3kDDZTI78L9QgIyTTp24peUgU2CILtvhhe0Kk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XU7/brlgkRF/x9xtMJlBR/8mZaom31vuXUGegygV8EHBVn+mXmhNz3gkSfDDlDeX3 uQkG9nEnuXvAHMe5zQXX72mCHgJkVeQGLPhc4T1LUDA2d7eI91jW8qKHQjVYsylls2 c3qgR7Oml3MpH+qFp9EZT90JN8SdVD59OdOOgVJc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729701AbgDTM6Q (ORCPT ); Mon, 20 Apr 2020 08:58:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:36738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728359AbgDTMnS (ORCPT ); Mon, 20 Apr 2020 08:43:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A9CFC2075A; Mon, 20 Apr 2020 12:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386598; bh=AOHe/n3kDDZTI78L9QgIyTTp24peUgU2CILtvhhe0Kk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5La4CT2M0i1BUE+DEjbl1EGqurpYqGNdfJRRH2UjDFCA2Vvt1222bXAV4FD9uHhB bu8uvnsSRhafL1uCaM5cstX4z2D1hAUeJCKFqIxYQvW5gIjXV6pxi5Fi/u2bNWEWue ryTz4ePmFIXvEvHEUdpbhLO9YcdKxwlv8OedHmrM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Toralf=20F=C3=B6rster?= , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 5.6 22/71] Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()" Date: Mon, 20 Apr 2020 14:38:36 +0200 Message-Id: <20200420121512.763120030@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121508.491252919@linuxfoundation.org> References: <20200420121508.491252919@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman This reverts commit 281e612b4b9587c0c72e30c49ec279587b20da0f which is commit 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f upstream. Rafael writes: It has not been marked for -stable or otherwise requested to be included AFAICS. Also it depends on other mainline commits that have not been included into 5.6.5. Reported-by: Toralf Förster Reported-by: Rafael J. Wysocki Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/ec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1646,6 +1646,7 @@ static int acpi_ec_add(struct acpi_devic if (boot_ec && ec->command_addr == boot_ec->command_addr && ec->data_addr == boot_ec->data_addr) { + boot_ec_is_ecdt = false; /* * Trust PNP0C09 namespace location rather than * ECDT ID. But trust ECDT GPE rather than _GPE @@ -1665,12 +1666,9 @@ static int acpi_ec_add(struct acpi_devic if (ec == boot_ec) acpi_handle_info(boot_ec->handle, - "Boot %s EC initialization complete\n", + "Boot %s EC used to handle transactions and events\n", boot_ec_is_ecdt ? "ECDT" : "DSDT"); - acpi_handle_info(ec->handle, - "EC: Used to handle transactions and events\n"); - device->driver_data = ec; ret = !!request_region(ec->data_addr, 1, "EC data");