From patchwork Thu Aug 19 04:05:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1518384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=nbdKsnyp; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GqrmN2nYcz9t0p; Thu, 19 Aug 2021 14:06:12 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mGZJh-0000XZ-4n; Thu, 19 Aug 2021 04:06:09 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mGZJZ-0000WG-6g for kernel-team@lists.ubuntu.com; Thu, 19 Aug 2021 04:06:01 +0000 Received: from localhost.localdomain (61-220-137-34.HINET-IP.hinet.net [61.220.137.34]) (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 3CF033F328 for ; Thu, 19 Aug 2021 04:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629345960; bh=y6FmkIRWw+636SxnG02tWFM08l1p/rYjy7H2usp7NHU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nbdKsnypkYU+9+vUfnBC13QwEDoOuN02LoPe2aEihfPAPDaPJxGJXkCBFnPYslF+e CXaeBMz0G7JuRXUvLf4MFGcsiEDLmfqum7BOgNLXwNZzEBQYRD4h+QL2hk9R3FIO3g 1tZtQStGIfCmuLLlzbuBvQS8dydFnBSj4Y+AYZp/D7XJl2FWdDmX9Wd4daSV0EnnD3 hU/MaRZ0vkII2OYUDqkBr1HK415fEz8ypD5xOghWaxG+ZvpSoKzQuPt4n2bPIxpOqI eZH09SQKGyrd3F3bH0ZnxrnYkXlmh0nFWpsAMnKQoJyi5guqUx/+cs1YILfPvQxcyy 9MqR1GQF6NbUA== From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic/dell300x][PATCH 1/1] Revert "rsi: Use resume_noirq for SDIO" Date: Thu, 19 Aug 2021 12:05:11 +0800 Message-Id: <20210819040511.7335-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210819040511.7335-1-hui.wang@canonical.com> References: <20210819040511.7335-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1940488 This reverts commit a678b251a79a7b0d9f0b04ea167c2059e3e3c841. The reverted patch introduces a crashing on rsi wifi driver after system resume, then the wifi and bluetooth don't work anymore. This issue also exists in the upstream stable kernel 4.19.191 and later. Below is the crashing log: [ 754.924185] OOM killer disabled. [ 754.924186] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done. [ 754.925446] Suspending console(s) (use no_console_suspend to debug) [ 754.926057] rsi_91x: ===> Interface DOWN <=== [ 765.045355] mmc1: Controller never released inhibit bit(s). [ 765.045364] mmc1: sdhci: ============ SDHCI REGISTER DUMP =========== [ 765.045374] mmc1: sdhci: Sys addr: 0xffffffff | Version: 0x0000ffff [ 765.045381] mmc1: sdhci: Blk size: 0x0000ffff | Blk cnt: 0x0000ffff [ 765.045388] mmc1: sdhci: Argument: 0xffffffff | Trn mode: 0x0000ffff [ 765.045395] mmc1: sdhci: Present: 0xffffffff | Host ctl: 0x000000ff [ 765.045402] mmc1: sdhci: Power: 0x000000ff | Blk gap: 0x000000ff [ 765.045409] mmc1: sdhci: Wake-up: 0x000000ff | Clock: 0x0000ffff Signed-off-by: Hui Wang --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 10a93dd4d95f..544161568b04 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1345,7 +1345,7 @@ static int rsi_restore(struct device *dev) } static const struct dev_pm_ops rsi_pm_ops = { .suspend = rsi_suspend, - .resume_noirq = rsi_resume, + .resume = rsi_resume, .freeze = rsi_freeze, .thaw = rsi_thaw, .restore = rsi_restore,