From patchwork Tue May 11 05:14:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 435950 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 6C9E4C433B4 for ; Tue, 11 May 2021 05:14:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D85261926 for ; Tue, 11 May 2021 05:14:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230198AbhEKFPo (ORCPT ); Tue, 11 May 2021 01:15:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229885AbhEKFPn (ORCPT ); Tue, 11 May 2021 01:15:43 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24C29C061574 for ; Mon, 10 May 2021 22:14:37 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id gj14so11025114pjb.5 for ; Mon, 10 May 2021 22:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=MI+V6ZShvdbkwISuLfksjDLzYwAzKXs9zAMdnm3Yy60=; b=d82t5SbHs1szecvhujWELTzUNhxydPO3pP3Nal5cdWRvlO/KXGh8mNtHWcBnKGHpsf Fi3JUhzTqih3rJuEdQPnKIvEWjn3+1PTCixG826zy7DQwAWdQ9Podiau4xbjiub3cvZI iNStYDI53+rXjsHFYwOSH1NA1w3pwKHczTfOQ= 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:mime-version :content-transfer-encoding; bh=MI+V6ZShvdbkwISuLfksjDLzYwAzKXs9zAMdnm3Yy60=; b=KEPQCZ7uhs63awEUhdTEFjYIYS/YOzmQTbzTCIT6LVzylCRDOiAQe9/OEsXZ9Bu+XT zbE7e79N4h6FugxQJBDZQG+g0+Hn5M+kUN5Z94IWEVWuvsHxomz3/77hZixMwYqtftbl U0zzYPPkmN2VjcvAR9hAAl8AcUdjin0DfN6+XoXzYtaZDU1NUb359+wWkeX8/sRtMXGx +2tXfCvLtEGyMICdQz+gv5gDkX568r2RtbaxyH+3PdpbbKMWGOFaLPwxvXzYrh9wqqeE UvWXKcO1vC2H3GTVwbjC+1sEKy0bcMdKJdstcO/6Ywuy783+t74uskD4iOuWNqWh4AFb wo3g== X-Gm-Message-State: AOAM530Y1IkQWeHv6uVxB2XN9XTb9N2o76/6DAEYwPJi3VWVQF7ru/B4 +y0//FLH9XoY5M9XNCalV7cePw== X-Google-Smtp-Source: ABdhPJy60v1x65k6zv+d9FdhbcM/hM+FaHFWvFhC8MMj4/8WxP0fzZD12H7nMT+60BVb7PCdBAabAw== X-Received: by 2002:a17:90a:b388:: with SMTP id e8mr2976456pjr.167.1620710076662; Mon, 10 May 2021 22:14:36 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:6765:417e:19fc:9756]) by smtp.gmail.com with ESMTPSA id c195sm12501075pfb.5.2021.05.10.22.14.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 22:14:36 -0700 (PDT) From: Stephen Boyd To: Dmitry Torokhov Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, Jingle Wu Subject: [PATCH v2] Input: elan_i2c: Disable irq on shutdown Date: Mon, 10 May 2021 22:14:35 -0700 Message-Id: <20210511051435.2454848-1-swboyd@chromium.org> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Touching an elan trackpad while shutting down the system sometimes leads to the following warning from i2c core. This is because the irq is still active and working, but the i2c bus for the device has been shutdown already. If the bus has been taken down then we shouldn't expect transfers to work. Disable the irq on shutdown so that this driver doesn't try to get the report in the irq handler after the i2c bus is shutdown. i2c i2c-7: Transfer while suspended WARNING: CPU: 0 PID: 196 at drivers/i2c/i2c-core.h:54 __i2c_transfer+0xb8/0x38c Modules linked in: rfcomm algif_hash algif_skcipher af_alg uinput xt_cgroup CPU: 0 PID: 196 Comm: irq/166-ekth300 Not tainted 5.4.115 #96 Hardware name: Google Lazor (rev3+) with KB Backlight (DT) pstate: 60c00009 (nZCv daif +PAN +UAO) pc : __i2c_transfer+0xb8/0x38c lr : __i2c_transfer+0xb8/0x38c sp : ffffffc011793c20 x29: ffffffc011793c20 x28: 0000000000000000 x27: ffffff85efd60348 x26: ffffff85efdb8040 x25: ffffffec39d579cc x24: ffffffec39d57bac x23: ffffffec3aab17b9 x22: ffffff85f02d6400 x21: 0000000000000001 x20: ffffff85f02aa190 x19: ffffff85f02aa100 x18: 00000000ffff0a10 x17: 0000000000000044 x16: 00000000000000ec x15: ffffffec3a0b9174 x14: 0000000000000006 x13: 00000000003fe680 x12: 0000000000000000 x11: 0000000000000000 x10: 00000000ffffffff x9 : 806da3cb9f8c1d00 x8 : 806da3cb9f8c1d00 x7 : 0000000000000000 x6 : ffffffec3afd3bef x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000 x2 : fffffffffffffcc7 x1 : 0000000000000000 x0 : 0000000000000023 Call trace: __i2c_transfer+0xb8/0x38c i2c_transfer+0xa0/0xf4 i2c_transfer_buffer_flags+0x64/0x98 elan_i2c_get_report+0x2c/0x88 elan_isr+0x68/0x3e4 irq_thread_fn+0x2c/0x70 irq_thread+0xf8/0x148 kthread+0x140/0x17c ret_from_fork+0x10/0x18 Cc: Jingle Wu Signed-off-by: Stephen Boyd --- drivers/input/mouse/elan_i2c_core.c | 7 +++++++ 1 file changed, 7 insertions(+) base-commit: 9f4ad9e425a1d3b6a34617b8ea226d56a119a717 diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index bef73822315d..2a0b54a35fc5 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1338,6 +1338,12 @@ static int elan_probe(struct i2c_client *client, return 0; } +static void elan_shutdown(struct i2c_client *client) +{ + /* Make sure we don't access i2c bus after it is shutdown. */ + disable_irq(client->irq); +} + static int __maybe_unused elan_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); @@ -1423,6 +1429,7 @@ static struct i2c_driver elan_driver = { .probe_type = PROBE_PREFER_ASYNCHRONOUS, }, .probe = elan_probe, + .shutdown = elan_shutdown, .id_table = elan_id, };