From patchwork Tue Nov 14 10:41:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 837793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=endlessm-com.20150623.gappssmtp.com header.i=@endlessm-com.20150623.gappssmtp.com header.b="UEQoESMO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ybkZw67C5z9s9Y for ; Tue, 14 Nov 2017 21:41:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752567AbdKNKln (ORCPT ); Tue, 14 Nov 2017 05:41:43 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:52981 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750828AbdKNKlm (ORCPT ); Tue, 14 Nov 2017 05:41:42 -0500 Received: by mail-pg0-f67.google.com with SMTP id j16so9518496pgn.9 for ; Tue, 14 Nov 2017 02:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessm-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=TtQl8HatGot/iKtQRr2WqXz6kTQjKiO91NDx7VdSO04=; b=UEQoESMOWX6eF/0nWjB2jRqY9stXc7LhTjNoCKvn1AS5JEZ8JmaEXI0kjCpWf8yEBr QlJoQFGRoYjjrMemKfhNS3cyMLsFl0OB1wrP1SFSSyzPA14AKuDKZqIYLwUFnnmsIkzu dC5olbxoEuQ9ZeHQcTM2lJ/1HSl4Jj8fTdHyTCCgM+vcpxC2C3UXpxxtj3QFNm9sNiQc ZdVQzR9ucdS5g3fOj5kvlwrNZefEopGqvFnV0eDgXU3kJUzFhCxWVZUl1JiPMLE5dq0N K7YB7WjnDyPzhAY3UJ4QEodARph25Nhbd+Q4R5QLLuFxGaeyUWs4ACAtteStTTFNk75M dW+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TtQl8HatGot/iKtQRr2WqXz6kTQjKiO91NDx7VdSO04=; b=OByB1dW++ocULBOiOlrEUHdZcXqTwY+op5npNP0E9QjCy3D2OtIdrQXHBhTvNAYjft dSMBLc8j3SMi24wY9zJ058uhrUMvwsYCUCw7f3Vj2ZTuSz8cdZO2ww2h7+mAoFVu3Zng sgDT9K+Aur0I4WgG3Ep/dUgUYBG+oBTnX+GK1epsz3sKBuK/P3Pjpw+2eU7Kb1nv6vO1 5OZz0TJbDm3SObpu/JuTuWVJOQ0XxHk56ZShr8Y+uLZnO0nOdOINZwnpQg7J9eI0vosl tRqHV1b39cURsd/0XV75wFVM3PPWRZpVsPL1jap5bvoHjGshWYWGYW+86xxho74LK0m1 MTyQ== X-Gm-Message-State: AJaThX7OTAuSHHAw4zNI8AxXhA5zx8ZftRITamxgZN6qd8Rr8/n5eWdV G3+QVQQq3r5hYmIvTwgTvuW/0w== X-Google-Smtp-Source: AGs4zMbypeN3205t3isME/FWL1Lim0kQRLVbsA9lNtghv4bBzLZa3/aXuVVFHyG5BLFeykBTVJjKIA== X-Received: by 10.84.214.150 with SMTP id j22mr12055397pli.408.1510656101980; Tue, 14 Nov 2017 02:41:41 -0800 (PST) Received: from endless.endlessm-sf.com ([175.182.128.23]) by smtp.gmail.com with ESMTPSA id z8sm30753302pgs.41.2017.11.14.02.41.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Nov 2017 02:41:41 -0800 (PST) From: Chris Chiu To: mika.westerberg@linux.intel.com, heikki.krogerus@linux.intel.com, linus.walleij@linaro.org Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux@endlessm.com Subject: [PATCH] pinctrl: intel: save HOSTSW_OWN register over suspend/resume Date: Tue, 14 Nov 2017 18:41:36 +0800 Message-Id: <20171114104136.25595-1-chiu@endlessm.com> X-Mailer: git-send-email 2.11.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The touchpad in the Asus laptop model X540NA is unresponsive after suspend/resume. The following error appears during resume: i2c_hid i2c-ELAN1200:00: failed to reset device. The problem here is that i2c_hid does not notice the interrupt being generated at this point. Because the GPIO which connects to touchpad interrupt is in ACPI mode after resume and no longer work as IRQ. Fix this by saving HOSTSW_OWN register during suspend and restore them at resume. Signed-off-by: Chris Chiu --- drivers/pinctrl/intel/pinctrl-intel.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 6dc1096d3d34..eaafa0e534f3 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -83,6 +83,7 @@ struct intel_pad_context { struct intel_community_context { u32 *intmask; + u32 *modemask; }; struct intel_pinctrl_context { @@ -1158,6 +1159,7 @@ static int intel_pinctrl_pm_init(struct intel_pinctrl *pctrl) for (i = 0; i < pctrl->ncommunities; i++) { struct intel_community *community = &pctrl->communities[i]; u32 *intmask; + u32 *modemask; intmask = devm_kcalloc(pctrl->dev, community->ngpps, sizeof(*intmask), GFP_KERNEL); @@ -1165,6 +1167,13 @@ static int intel_pinctrl_pm_init(struct intel_pinctrl *pctrl) return -ENOMEM; communities[i].intmask = intmask; + + modemask = devm_kcalloc(pctrl->dev, community->ngpps, + sizeof(*modemask), GFP_KERNEL); + if (!modemask) + return -ENOMEM; + + communities[i].modemask = modemask; } pctrl->context.pads = pads; @@ -1329,6 +1338,10 @@ int intel_pinctrl_suspend(struct device *dev) base = community->regs + community->ie_offset; for (gpp = 0; gpp < community->ngpps; gpp++) communities[i].intmask[gpp] = readl(base + gpp * 4); + + base = community->regs + community->hostown_offset; + for (gpp = 0; gpp < community->ngpps; gpp++) + communities[i].modemask[gpp] = readl(base + gpp * 4); } return 0; @@ -1411,7 +1424,14 @@ int intel_pinctrl_resume(struct device *dev) base = community->regs + community->ie_offset; for (gpp = 0; gpp < community->ngpps; gpp++) { writel(communities[i].intmask[gpp], base + gpp * 4); - dev_dbg(dev, "restored mask %d/%u %#08x\n", i, gpp, + dev_dbg(dev, "restored intmask %d/%u %#08x\n", i, gpp, + readl(base + gpp * 4)); + } + + base = community->regs + community->hostown_offset; + for (gpp = 0; gpp < community->ngpps; gpp++) { + writel(communities[i].modemask[gpp], base + gpp * 4); + dev_dbg(dev, "restored modemask %d/%u %#08x\n", i, gpp, readl(base + gpp * 4)); } }