From patchwork Fri Nov 2 18:35:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 10666005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B54B015E9 for ; Fri, 2 Nov 2018 18:35:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A0B742BEE5 for ; Fri, 2 Nov 2018 18:35:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 949F82C5F1; Fri, 2 Nov 2018 18:35:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA92C2C4F1 for ; Fri, 2 Nov 2018 18:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728101AbeKCDnt (ORCPT ); Fri, 2 Nov 2018 23:43:49 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:36806 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727952AbeKCDnt (ORCPT ); Fri, 2 Nov 2018 23:43:49 -0400 Received: by mail-pl1-f196.google.com with SMTP id w24-v6so1393641plq.3 for ; Fri, 02 Nov 2018 11:35:39 -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=hw6sUa14yuSZb+R96yS8xCTMMqpc4Ng24H7iySsxoHM=; b=a6lpcvOCi2j1Y3yPA/VStN0c1FY9biEd7kfG/wXBKil4S8cdGZp94O97dONA+ufDrb fq423P9HZqTx/Rs+EU5EXOreyDk86sabMiSexvUeEZX5HjFIgRh0grLLkBvNfxjjaB4N Akz3Wt/Q8NJiKBW85SwbugM3WlL5crLOq9QL8= 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=hw6sUa14yuSZb+R96yS8xCTMMqpc4Ng24H7iySsxoHM=; b=TR4osJzAnpTDlzcXcwf4VFb0fvK4SHOk28ui4rC1EXa6uy6mYAO4wHiuBdImk5OFRh MWASu3sbS8WDFrn8C+7pkrteBSMTwH90IvPvlprvPIpj7k5BEn/vjkZHYOwr2ht/HqPI P9lV8GQvSlQP7ULlg3EGbftKPQEiMYF9dH6PfkxsjxDQfoGqdX60V1uKtkV0gMXtqd4Q LEDzlIjxcTvWAJ8A5PiGQbGRRo1DelMT6P3hpEudZe5IP/fIP/iTLMtwg5FtN+cU5pYy PqagskWwdDEA20zuQTUi62S09xfM3xhEBSHSSNkbVCqXM48MGtMXhBybOnN4xuc7VDh+ zPVw== X-Gm-Message-State: AGRZ1gLdhqPQbqZnNrhGh9DbZGIpDLefn7qzgdaOhPlTbLDFABScJ5U1 GjZ/nyHSSml9JcnxCCrMKVKSTg== X-Google-Smtp-Source: AJdET5cz/XiaE2kAWED0cKq4Em6bDvhqLKdbLkdidWnnkkXSx+A/hnKlRwDJvTw09vOZ4QCR3f8gNQ== X-Received: by 2002:a17:902:d708:: with SMTP id w8-v6mr5053676ply.72.1541183739269; Fri, 02 Nov 2018 11:35:39 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:fed3:9637:a13a:6c15]) by smtp.gmail.com with ESMTPSA id m17-v6sm2274132pfi.102.2018.11.02.11.35.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Nov 2018 11:35:38 -0700 (PDT) From: Stephen Boyd To: Wolfram Sang Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-i2c@vger.kernel.org, Douglas Anderson , Alok Chauhan Subject: [PATCH] i2c: i2c-qcom-geni: Fix runtime PM mismatch with child devices Date: Fri, 2 Nov 2018 11:35:37 -0700 Message-Id: <20181102183537.72334-1-swboyd@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We need to enable runtime PM on this i2c controller before populating child devices with i2c_add_adapter(). Otherwise, if a child device uses runtime PM and stays runtime PM enabled we'll get the following warning at boot. Enabling runtime PM for inactive device (a98000.i2c) with active children WARNING: CPU: 4 PID: 1 at drivers/base/power/runtime.c:1300 pm_runtime_enable+0xd8/0xf8 Modules linked in: CPU: 4 PID: 1 Comm: swapper/0 Not tainted 4.19.0 #6 elants_i2c 14-0010: 14-0010 supply vccio not found, using dummy regulator pstate: 60c00089 (nZCv daIf +PAN +UAO) pc : pm_runtime_enable+0xd8/0xf8 lr : pm_runtime_enable+0xd8/0xf8 sp : ffffffc0de257a30 x29: ffffffc0de257a30 x28: 0000000000061a80 x27: ffffff9008ea7118 x26: ffffffc0d718b058 x25: ffffff9008ea7000 x24: ffffffc0d718a8dc x23: ffffffc0d718a8b0 x22: ffffffc0d823dd58 x21: 0000000000000000 x20: ffffffc0d823dbc8 x19: ffffffc0d823da90 x18: 000000007f743d9a x17: 0000000000000080 x16: 0000000000000003 x15: 000000000000003f x14: 0720072007200720 x13: 0720072007200720 x12: 0720072007200720 x11: 0720072007200720 x10: 0720072007200720 x9 : 0720072007200720 x8 : 0720072007200720 x7 : ffffff900816da30 x6 : 0000000000000000 x5 : 0000000000000080 x4 : 0000000000000003 x3 : ffffff900816f304 x2 : ffffffc0de248050 x1 : 25045a74f48a7400 x0 : 25045a74f48a7400 Call trace: pm_runtime_enable+0xd8/0xf8 geni_i2c_probe+0x440/0x460 platform_drv_probe+0x74/0xc8 really_probe+0x1ac/0x35c driver_probe_device+0xd4/0x118 __driver_attach+0xc8/0x118 bus_for_each_dev+0xac/0xe8 driver_attach+0x38/0x44 bus_add_driver+0x15c/0x294 driver_register+0x13c/0x198 __platform_driver_register+0x88/0x94 geni_i2c_driver_init+0x20/0x28 do_one_initcall+0x250/0x4ec kernel_init_freeable+0x6f0/0x7c4 kernel_init+0x18/0x120 ret_from_fork+0x10/0x18 Let's move the runtime PM enabling and setup to before we add the adapter, so that this device can respond to runtime PM requests from children. Cc: Douglas Anderson Cc: Alok Chauhan Fixes: 37692de5d523 ("i2c: i2c-qcom-geni: Add bus driver for the Qualcomm GENI I2C controller") Signed-off-by: Stephen Boyd --- drivers/i2c/busses/i2c-qcom-geni.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index 527f55c8c4c7..145eb98ac8b4 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -571,18 +571,19 @@ static int geni_i2c_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "i2c fifo/se-dma mode. fifo depth:%d\n", tx_depth); - ret = i2c_add_adapter(&gi2c->adap); - if (ret) { - dev_err(&pdev->dev, "Error adding i2c adapter %d\n", ret); - return ret; - } - gi2c->suspended = 1; pm_runtime_set_suspended(gi2c->se.dev); pm_runtime_set_autosuspend_delay(gi2c->se.dev, I2C_AUTO_SUSPEND_DELAY); pm_runtime_use_autosuspend(gi2c->se.dev); pm_runtime_enable(gi2c->se.dev); + ret = i2c_add_adapter(&gi2c->adap); + if (ret) { + dev_err(&pdev->dev, "Error adding i2c adapter %d\n", ret); + pm_runtime_disable(gi2c->se.dev); + return ret; + } + return 0; }