Received: by 10.213.65.68 with SMTP id h4csp2136470imn; Sun, 8 Apr 2018 20:37:57 -0700 (PDT) X-Google-Smtp-Source: AIpwx48DmKVuxoGBKEpGbB6MQrcdfSTV6AUHvl5D1mgLpQ9VuiN99NwIL6W6eof6fMbFdL8Kf3oI X-Received: by 2002:a17:902:6984:: with SMTP id l4-v6mr38211668plk.61.1523245077948; Sun, 08 Apr 2018 20:37:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523245077; cv=none; d=google.com; s=arc-20160816; b=VGGFpahbmism6p8RdugBOfqaWU1jm8A404JCj8HWrA6epbbOne/kC2TNAOLIOfqwgi 7rn1mpfxQXAOouyFiZJKRrNgW8lTjGdP3I37XDSUDg+R6vwkGbx9L8NJTaVhNoWhITfv vhqagArjDHuTwVKQIru+y+9oymft6QTb9nAxbIwQydRkbfSFwYQMOEWnmOn03eUiLbym 7RFrcMLD5NBkVYmH4QJSJEVWj1s6OYjGncTZkcqFiw1C1ML7eKPNx+f+MC8rZPZ3tgjQ W/ZivD1RPs4W/LePaSkGyWjiYWhNQTPP5UwZYJyguq3mECajQSxba47c0xufGKveGy6F eFXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=ySXGmQZRDsvFjApi+4/6jbRmr7Tf9gJ1HvCoySl2bvY=; b=a+AtXv+KJwxDykNuHS/6KY9T5y8/5qgUJcZpI4mZO828RoAqrNqIAnI2y1/tLfBy5z RKYZzbAOOv2p/53NqsPFFGGs9LjqpYGMMPs6TP90diGvxLC8uojrSHGjEkN4IYjhmi9B UMRdBhqQNUG/aBHprEGuH2zFGvgIyF27hhYsRp0SteFFyZIkGNBhmdx5u3nuQkeFM5vd 7kpNB6yjWoeL1VNhtdokSX9nxsyXzdhTkhrV0HXcn7hJDYQ6tapsKDs7DjwzT/Jy865n aTDSpES26UKwxJHsiXelDpWU8RLiMEHFe1DeQBV+YWFvOJhavoOxEoxm+boZnbO5mYbK tBrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=kMggU/lh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2si8008696pfh.196.2018.04.08.20.37.20; Sun, 08 Apr 2018 20:37:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=kMggU/lh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753102AbeDIDcc (ORCPT + 99 others); Sun, 8 Apr 2018 23:32:32 -0400 Received: from mail-bn3nam01on0108.outbound.protection.outlook.com ([104.47.33.108]:54803 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754368AbeDIAVX (ORCPT ); Sun, 8 Apr 2018 20:21:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ySXGmQZRDsvFjApi+4/6jbRmr7Tf9gJ1HvCoySl2bvY=; b=kMggU/lhOYFWRiFaXeM3bWJvhwxl+n6igzQTctx3L2A/LU/4Xm02EOZcrF75rNa85OnUs9lRbs4ZTodf6ueVIDdeje2NXk8h4GAFyAhxqrb3QBbYEpm9sTvVtvP1XKy0noAQbGH+2V9sNTsh/7eljKo+8gdWQpEX9IC9Z6ZctY0= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1125.namprd21.prod.outlook.com (52.132.130.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:21:15 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:21:15 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 179/189] ACPI / EC: Restore polling during noirq suspend/resume phases Thread-Topic: [PATCH AUTOSEL for 4.15 179/189] ACPI / EC: Restore polling during noirq suspend/resume phases Thread-Index: AQHTz5hhchY+FbTpc0uWp8GaH+0Rsg== Date: Mon, 9 Apr 2018 00:19:10 +0000 Message-ID: <20180409001637.162453-179-alexander.levin@microsoft.com> References: <20180409001637.162453-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001637.162453-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1125;7:ccIOBbD5AWJYWHP/+wTeVq9cn8FFa/Xz7ZtZxOy13N+qGKqJexMp0QAXWX+7d398JO4T/VzSpigcOPwgyzo3wj3mtl1sI0y7L65Pgaq1Y14XZ89fnBuQ8tDISDpk4GX6nyO5dZTM68DCS8joBPNSGgi+8LVnV6DRmwkK5S0CX+0fkA/ykK7T7ddTm5Oe9WpRxYVrwdRZTSS7ojieFINgagBFPXAdoaqjJYL8OfGRF6xnp9Xwg/F4BQ043/1pBgFV;20:ug3FRjo0yKs2Jj1NxN0sidxN8mxfJcaUzfy6fEeQHvOi7wnfTOFin2VFeX/hgyrHTXIf939aNLd0yJT0kjVVhHMPTMa9KShvKqLJdrkSvvLj1l4RDjRC5QYSKjUeiS3ix3su4lOxC6tXr7eWWiKF/dCLwZjJ16WNlBMbT67pOZ4= X-MS-Office365-Filtering-Correlation-Id: 7a90548e-5c38-4d34-076e-08d59dafcebd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020);SRVR:DM5PR2101MB1125; x-ms-traffictypediagnostic: DM5PR2101MB1125: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1125;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1125; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(376002)(396003)(39380400002)(39860400002)(346002)(199004)(189003)(105586002)(7736002)(8676002)(97736004)(81166006)(59450400001)(106356001)(966005)(81156014)(305945005)(14454004)(66066001)(1076002)(102836004)(5250100002)(478600001)(2501003)(2900100001)(22452003)(72206003)(68736007)(26005)(86362001)(8936002)(76176011)(6506007)(6116002)(6486002)(186003)(5660300001)(6306002)(3660700001)(316002)(54906003)(110136005)(15650500001)(25786009)(2906002)(10090500001)(6512007)(3280700002)(6666003)(10290500003)(53936002)(99286004)(86612001)(3846002)(6436002)(486006)(4326008)(2616005)(11346002)(107886003)(36756003)(476003)(446003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1125;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: NZWyQ0D9ODMc8dGi3C6OhtqfwZfyljK+gX1iF+a906Yi7sZx4mRan5KJBM+UKqybkym4wTWfEicpp/ry7X92jGFF4D5GtNz5S/Nfukvl2h0P/ICZLjvv8sFpIgZVm8w6IcHOfAyt8AP0Ml9hZEljEpF87UXY+YFPbOI+RhhqtzEwFaGLDigCZUWmYhMHx+T4C62e3l6+QSVBMHW/evqGPep77I63Ii5hQRmnddaMSFYgeGNS6C0/zE1MJ7GZJFFxVqIfyq0Q1IZoH3xmCRE9AgacgCNhLrJoAqPlBtqV6LQ9ur84h7IqjJrik6TQ/IF+ImvZnvubcIYfWxiSye/8LsoMe8M/xvLmg9IeGRI26k1+8Aw2dnJpRM07IU9ut8YlZS+sxQMXKEZgyqkEw+wKdb7Otp6UKfh67Sl6PVq4KfI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7a90548e-5c38-4d34-076e-08d59dafcebd X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:19:10.1270 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1125 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Rafael J. Wysocki" [ Upstream commit 3cd091a773936c54344a519f7ee1379ccb620bee ] Commit 662591461c4b (ACPI / EC: Drop EC noirq hooks to fix a regression) modified the ACPI EC driver so that it doesn't switch over to busy polling mode during noirq stages of system suspend and resume in an attempt to fix an issue resulting from that behavior. However, that modification introduced a system resume regression on Thinkpad X240, so make the EC driver switch over to the polling mode during noirq stages of system suspend and resume again, which effectively reverts the problematic commit. Fixes: 662591461c4b (ACPI / EC: Drop EC noirq hooks to fix a regression) Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D197863 Reported-by: Markus Demleitner Tested-by: Markus Demleitner Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/ec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 0252c9b9af3d..0ed52a06a224 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1927,6 +1927,9 @@ static int acpi_ec_suspend_noirq(struct device *dev) ec->reference_count >=3D 1) acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE); =20 + if (acpi_sleep_no_ec_events()) + acpi_ec_enter_noirq(ec); + return 0; } =20 @@ -1934,6 +1937,9 @@ static int acpi_ec_resume_noirq(struct device *dev) { struct acpi_ec *ec =3D acpi_driver_data(to_acpi_device(dev)); =20 + if (acpi_sleep_no_ec_events()) + acpi_ec_leave_noirq(ec); + if (ec_no_wakeup && test_bit(EC_FLAGS_STARTED, &ec->flags) && ec->reference_count >=3D 1) acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE); --=20 2.15.1