Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3017423ybt; Mon, 29 Jun 2020 13:02:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2FMqiJHs9dmnSejjq3V9xhxmwIgpMiGUT1WarEP8pclb3nQ/9JgP/Ym8njAW+p4XW0ASL X-Received: by 2002:a05:6402:3058:: with SMTP id bu24mr2689730edb.242.1593460920076; Mon, 29 Jun 2020 13:02:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593460920; cv=none; d=google.com; s=arc-20160816; b=MsQKBT/1KTL/0zIf3BLstAJpf6ukMMrXLu1jhDEp/567VvvaFFZqqlaZeOUj1FPOvD 7muFEPWO1M71aN5n9XXaQWjNz/6qYoJ8BRKpVVbFsqVF5l2smDDAkLLIGS+2F7nin85q jv3OXzaH0MnMaxq5Xqw/66+giXj0Q21KXkJVSrfZO7J+uAAv/izjfQHg5aUxEitXpDEl 2egRHmJZS6BYr668jsWlox/J+Iglr8LgVGRs8m93SO1gjZqAFJU3rW+BtijLfEzEdqds 2rryIe1oxtka3HXsrP1nVpSMmgrA03y9Qv3dELGmI3Sx08znCXL8OrPJajAewlMbtABX Mr1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CoZC34nrmyP3e83FJMfnh42HgPoYY004BYRWiVt0te4=; b=yo1d/BlujHhwfDa9KuEmyzvKweqaddK7sQf46kIA4IEju04qZ0b83YnkUAAW2O+Xad YX3Nf1CZAjY1/urjsv8yCLi5knxOYgkQfQe07JHrVpGO1E3sNcVY3OeYdfWQ3Pzg93hP wKtcNf/EPBZVEOo4cYwbc00YrZICVc/cWioBQp4lI0+NG28w/RaZfw2lCRHbLNvLnlDl payHK1TfvWVK64LGCRLYtG24el9vgwSZC9ymJwX5hYqyYbZWZN57XLC/erfPU8Xel60E /9EiufJF/Xo7wmv0zxW+DA/NrNnl0n5NuaX+X4qh+b8ICgqT1RgOnmhaK+MUHn3OVmoM GrbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TZPRF0va; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bw19si380012ejb.729.2020.06.29.13.01.36; Mon, 29 Jun 2020 13:02:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TZPRF0va; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388203AbgF2UBb (ORCPT + 99 others); Mon, 29 Jun 2020 16:01:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:47634 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387547AbgF2TkP (ORCPT ); Mon, 29 Jun 2020 15:40:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9325024840; Mon, 29 Jun 2020 15:25:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593444353; bh=HRSgkNNcN9hXr8UE2smMGJ57xFPxY2jHvMplTRcgQkE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TZPRF0vasjVlx7JUx2yay+l8bL1PPjMbwB60hh0o12hLrnSYGUtkz/evYT8h5GpiC dd2A/IbEp6wa3M+AvnnGTYkD6BNmcGqMqafV60efBLTVWxIqUn562tpK0tRZZfPdK4 bf5d8ZX9iIU++v684lib2lesHChmjHkkk2rZhjxo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thierry Reding , Sasha Levin Subject: [PATCH 5.4 028/178] Revert "i2c: tegra: Fix suspending in active runtime PM state" Date: Mon, 29 Jun 2020 11:22:53 -0400 Message-Id: <20200629152523.2494198-29-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629152523.2494198-1-sashal@kernel.org> References: <20200629152523.2494198-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.50-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.4.50-rc1 X-KernelTest-Deadline: 2020-07-01T15:25+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thierry Reding [ Upstream commit 78ad73421831247e46c31899a7bead02740e4bef ] This reverts commit 9f42de8d4ec2304f10bbc51dc0484f3503d61196. It's not safe to use pm_runtime_force_{suspend,resume}(), especially during the noirq phase of suspend. See also the guidance provided in commit 1e2ef05bb8cf ("PM: Limit race conditions between runtime PM and system sleep (v2)"). Signed-off-by: Thierry Reding Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-tegra.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index dbc43cfec19d4..331f7cca9babe 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -1719,14 +1719,9 @@ static int tegra_i2c_remove(struct platform_device *pdev) static int __maybe_unused tegra_i2c_suspend(struct device *dev) { struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev); - int err; i2c_mark_adapter_suspended(&i2c_dev->adapter); - err = pm_runtime_force_suspend(dev); - if (err < 0) - return err; - return 0; } @@ -1747,10 +1742,6 @@ static int __maybe_unused tegra_i2c_resume(struct device *dev) if (err) return err; - err = pm_runtime_force_resume(dev); - if (err < 0) - return err; - i2c_mark_adapter_resumed(&i2c_dev->adapter); return 0; -- 2.25.1