From patchwork Wed Oct 24 17:10:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1639861 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 509343FCF7 for ; Wed, 24 Oct 2012 17:10:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758643Ab2JXRKp (ORCPT ); Wed, 24 Oct 2012 13:10:45 -0400 Received: from mail-da0-f46.google.com ([209.85.210.46]:58310 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756417Ab2JXRKo (ORCPT ); Wed, 24 Oct 2012 13:10:44 -0400 Received: by mail-da0-f46.google.com with SMTP id n41so339176dak.19 for ; Wed, 24 Oct 2012 10:10:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=n00mdIrFnivvvMss/mBFYc0KZwrPmEoBKW47amXzWkM=; b=gCWl/rrL3GTsGoLGQlosdz8MgkKNkRZtmx21jmYYJSn6VP+NI02DykX0iHuLtxkwvr Re99fHLM3l28SrQvrvrgzi9M/NbLBawvMv2N9mG57pUQZssJhoN+Rjvor4z51eHmg2VY 8h6x3N88kqUSdUEpqUCbivWZ9dwV3CIp2sEa/lew3KQlmkta26keII5EqvrBFEuWgs0e AxcHCNfmndvjubbVBY/fsrlFQCwTctmlclppIfizEItNGOGVLBlO9eYK5t31nxYV1hcT 99gasYKut1Yd7kKkDW/alN67yXEd8pMsLAEAYdXZhBRXYWmu17WJwbO30gBtArt1I1s+ IWJA== Received: by 10.68.223.135 with SMTP id qu7mr51746040pbc.143.1351098644050; Wed, 24 Oct 2012 10:10:44 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id jx4sm1866488pbc.27.2012.10.24.10.10.42 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 10:10:43 -0700 (PDT) From: Kevin Hilman To: Linus Walleij , Felipe Balbi , linux-omap@vger.kernel.org Cc: Paul Walmsley , linux-arm-kernel@lists.infradead.org, Igor Grinberg , Grazvydas Ignotas Subject: [PATCH v2] gpio/omap: fix off-mode bug: clear debounce clock enable mask on free/reset Date: Wed, 24 Oct 2012 10:10:41 -0700 Message-Id: <1351098641-23917-1-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.8.0 X-Gm-Message-State: ALoCoQnpwD1JLYNKTPbn6gudRAnxXFvApbOsD2qp0nPDmYRLr+Vx98WVqlFF6mKAjoYPkOifmXpC Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Kevin Hilman When a GPIO bank is freed or shutdown, ensure that the banks dbck_enable_mask is cleared also. Otherwise, context restore on subsequent off-mode transition will restore previous value from the shadow copies (bank->context.debounce*) leading to mismatch state between driver state and hardware state. This was discovered when board code was doing gpio_request_one() gpio_set_debounce() gpio_free() which was leaving the GPIO debounce settings in a confused state. If that GPIO bank is subsequently used with off-mode enabled, bogus state would be restored, leaving GPIO debounce enabled which then prevented the CORE powerdomain from transitioning. To fix, ensure that bank->dbck_enable_mask is cleared when the bank is freed/shutdown so debounce state doesn't persist. Special thanks to Grazvydas Ignotas for pointing out a bug in an earlier version that would've disabled debounce on any runtime PM transition. Reported-by: Paul Walmsley Cc: Igor Grinberg Cc: Grazvydas Ignotas Signed-off-by: Kevin Hilman --- v2: only clear mask in free/shutdown, not in runtime PM paths, clarified changelog Applies on v3.7-rc2. drivers/gpio/gpio-omap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 94cbc84..113b167 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -539,6 +539,7 @@ static void _reset_gpio(struct gpio_bank *bank, int gpio) _set_gpio_irqenable(bank, gpio, 0); _clear_gpio_irqstatus(bank, gpio); _set_gpio_triggering(bank, GPIO_INDEX(bank, gpio), IRQ_TYPE_NONE); + bank->dbck_enable_mask = 0; } /* Use disable_irq_wake() and enable_irq_wake() functions from drivers */