From patchwork Wed May 17 05:24:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 95058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp892953vqo; Tue, 16 May 2023 22:32:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5VhD30mXnC9CzzhgWUIhTKHBCpPe5gd1zBejq/MkI1V0HzUdVhxjdcj7nina6lQnqNoShj X-Received: by 2002:a05:6a20:441b:b0:101:6f3f:638c with SMTP id ce27-20020a056a20441b00b001016f3f638cmr39043127pzb.42.1684301538294; Tue, 16 May 2023 22:32:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684301538; cv=none; d=google.com; s=arc-20160816; b=dbEmVccoHOzKZMJ3P85n/L0Y0p1VFNQP99Nt8h8UmAQJQVG0m6YS8VIvMPyucvEMfJ O82zNk9DvAVULoAYPAVTbk5L2ULmmql6SgD8isJbUdPzcSyQqz/WaHp+wJdsek2mC59E iODyI/YP9ZDJGk+3EBaVPplbklXKtomVK0h6zqAxbWBlF3iLYFWvPhBZon+QyzDH4rlC 6waeFpEZUiN2ttXUb75ttYhQd35r/1z64X/ttVmglGYOJkjvVjgZoDf0qa9zuGq+0V6A eajrUmH/yhhsYHIzUs3IhSeNfe96f+w/IiWfvH3H6di9DL/v/0+uIgcj+FLvzu7HF7sd Hm0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=LN2I4rs9nd2jBQ5+AzfrrYXlbpfi5mpuUEXL2JSMY2Q=; b=ukSzOJtHW2mcxAYVbpaN30VKwpLSIKY9ykqbPttZIE9/rA9XDZdcQ6mLQr0ukp7xU0 GAO0aSR1of2T2LSnWEPzlBw1HL+QKRzZkN/nNpsNBc5FKP/EgVtXE3Ikq+WcPH7H2lmP gUgN4mVFXlsQYpHFNpEBiBQrsu2D/gjJBzvRDmdbGimxd8CmGNask6hoHy3z8MEXUUc4 O0EDjX6oHsB49ufIVTiz6nrH8nJpsaIcU3rZ6w5ZUVcqoHFOGzCsxnoxsSfU1191PqQa BLsl/Pqodorf3vTRLgACZnqfuNgH+qsDQsF86iPB16dKO9Fvh9mkgP8cAa0fabWlxLVC jUng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=cQpd5yYz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t28-20020a63955c000000b0050bebc3e35bsi20198867pgn.766.2023.05.16.22.32.03; Tue, 16 May 2023 22:32:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=cQpd5yYz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232287AbjEQFZ7 (ORCPT + 99 others); Wed, 17 May 2023 01:25:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232274AbjEQFZ4 (ORCPT ); Wed, 17 May 2023 01:25:56 -0400 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B75540C0; Tue, 16 May 2023 22:25:49 -0700 (PDT) Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id B348F42ADB; Wed, 17 May 2023 05:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1684301142; bh=LN2I4rs9nd2jBQ5+AzfrrYXlbpfi5mpuUEXL2JSMY2Q=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cQpd5yYzDuEjHhenUWYtNRvwVuiKf/eJtxodJ82UFKgmViJbA9Pdhd7R/BR68IE1b u1Adke1ERZiJiVU2P6FI0z+4meiQfNNnJm6auaw4S98bk7luthyNTCDozw7KLe3MoD hiiyByOSQzAlx7x1bOBj/BWtxHrN5A+0RLjLOBnCaSeeEcT1djLwVQ6iMzoNLaJ4Aa rdizG/XeYejpPYATyWFVvOdmQN4I3ZvqHzkLYrUvsyzYAFlB33RWLwJTe96RVO2Eo7 XZTXpPT6VSpvHvdD6TESWsA4qiiNAPEmkINWkltG23ePo1qdYAKhbJMdYB6UJrNvtp fyLVQ2ZJ9xNEA== From: Kai-Heng Feng To: chandrashekar.devegowda@intel.com, linuxwwan@intel.com, chiranjeevi.rapolu@linux.intel.com, haijun.liu@mediatek.com, m.chetan.kumar@linux.intel.com, ricardo.martinez@linux.intel.com Cc: Kai-Heng Feng , Loic Poulain , Sergey Ryazanov , Johannes Berg , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] net: wwan: t7xx: Ensure init is completed before system sleep Date: Wed, 17 May 2023 13:24:51 +0800 Message-Id: <20230517052451.398452-1-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766037630806088962?= X-GMAIL-MSGID: =?utf-8?q?1766118169292665705?= When the system attempts to sleep while mtk_t7xx is not ready, the driver cannot put the device to sleep: [ 12.472918] mtk_t7xx 0000:57:00.0: [PM] Exiting suspend, modem in invalid state [ 12.472936] mtk_t7xx 0000:57:00.0: PM: pci_pm_suspend(): t7xx_pci_pm_suspend+0x0/0x20 [mtk_t7xx] returns -14 [ 12.473678] mtk_t7xx 0000:57:00.0: PM: dpm_run_callback(): pci_pm_suspend+0x0/0x1b0 returns -14 [ 12.473711] mtk_t7xx 0000:57:00.0: PM: failed to suspend async: error -14 [ 12.764776] PM: Some devices failed to suspend, or early wake event detected Mediatek confirmed the device can take a rather long time to complete its initialization, so wait for up to 20 seconds until init is done. Signed-off-by: Kai-Heng Feng --- v2: - Define timeout value - Return error if prepare callback fails. drivers/net/wwan/t7xx/t7xx_pci.c | 18 ++++++++++++++++++ drivers/net/wwan/t7xx/t7xx_pci.h | 1 + 2 files changed, 19 insertions(+) diff --git a/drivers/net/wwan/t7xx/t7xx_pci.c b/drivers/net/wwan/t7xx/t7xx_pci.c index 226fc1703e90..91256e005b84 100644 --- a/drivers/net/wwan/t7xx/t7xx_pci.c +++ b/drivers/net/wwan/t7xx/t7xx_pci.c @@ -45,6 +45,7 @@ #define T7XX_PCI_IREG_BASE 0 #define T7XX_PCI_EREG_BASE 2 +#define T7XX_INIT_TIMEOUT 20 #define PM_SLEEP_DIS_TIMEOUT_MS 20 #define PM_ACK_TIMEOUT_MS 1500 #define PM_AUTOSUSPEND_MS 20000 @@ -96,6 +97,7 @@ static int t7xx_pci_pm_init(struct t7xx_pci_dev *t7xx_dev) spin_lock_init(&t7xx_dev->md_pm_lock); init_completion(&t7xx_dev->sleep_lock_acquire); init_completion(&t7xx_dev->pm_sr_ack); + init_completion(&t7xx_dev->init_done); atomic_set(&t7xx_dev->md_pm_state, MTK_PM_INIT); device_init_wakeup(&pdev->dev, true); @@ -124,6 +126,7 @@ void t7xx_pci_pm_init_late(struct t7xx_pci_dev *t7xx_dev) pm_runtime_mark_last_busy(&t7xx_dev->pdev->dev); pm_runtime_allow(&t7xx_dev->pdev->dev); pm_runtime_put_noidle(&t7xx_dev->pdev->dev); + complete_all(&t7xx_dev->init_done); } static int t7xx_pci_pm_reinit(struct t7xx_pci_dev *t7xx_dev) @@ -529,6 +532,20 @@ static void t7xx_pci_shutdown(struct pci_dev *pdev) __t7xx_pci_pm_suspend(pdev); } +static int t7xx_pci_pm_prepare(struct device *dev) +{ + struct pci_dev *pdev = to_pci_dev(dev); + struct t7xx_pci_dev *t7xx_dev; + + t7xx_dev = pci_get_drvdata(pdev); + if (!wait_for_completion_timeout(&t7xx_dev->init_done, T7XX_INIT_TIMEOUT * HZ)) { + dev_warn(dev, "Not ready for system sleep.\n"); + return -ETIMEDOUT; + } + + return 0; +} + static int t7xx_pci_pm_suspend(struct device *dev) { return __t7xx_pci_pm_suspend(to_pci_dev(dev)); @@ -555,6 +572,7 @@ static int t7xx_pci_pm_runtime_resume(struct device *dev) } static const struct dev_pm_ops t7xx_pci_pm_ops = { + .prepare = t7xx_pci_pm_prepare, .suspend = t7xx_pci_pm_suspend, .resume = t7xx_pci_pm_resume, .resume_noirq = t7xx_pci_pm_resume_noirq, diff --git a/drivers/net/wwan/t7xx/t7xx_pci.h b/drivers/net/wwan/t7xx/t7xx_pci.h index 112efa534eac..f08f1ab74469 100644 --- a/drivers/net/wwan/t7xx/t7xx_pci.h +++ b/drivers/net/wwan/t7xx/t7xx_pci.h @@ -69,6 +69,7 @@ struct t7xx_pci_dev { struct t7xx_modem *md; struct t7xx_ccmni_ctrl *ccmni_ctlb; bool rgu_pci_irq_en; + struct completion init_done; /* Low Power Items */ struct list_head md_pm_entities;