From patchwork Wed Sep 29 14:44:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 514856 Delivered-To: patches@linaro.org Received: by 2002:a05:6638:4087:0:0:0:0 with SMTP id m7csp96480jam; Wed, 29 Sep 2021 07:44:57 -0700 (PDT) X-Received: by 2002:ac2:50da:: with SMTP id h26mr56717lfm.269.1632926696952; Wed, 29 Sep 2021 07:44:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632926696; cv=none; d=google.com; s=arc-20160816; b=z55+jRPMQUzfuj4rggfOU3ZqDY55cb80wGJZy6DDpcSN5BiAcWkYyJ2xkm0ubx771T bSYpIEycwzwK6+vKTNGRo3latcfA8QG/fsGi77mGXwj9Jun1Gdl9puU3QuSSfCpfQKmq Hm3123PfBpMzecU/dgU9I9w/YIktCRpvCZP4zJgPDkc67GzBtihG8EUS6fw1jKDN1xz7 4Pw81Xq40gUleNBk78FoGgEtZpqKCFntLST2ak5XKcFoJ7XoVwxkto38JZ+laNxZK7+w W9IvnuBOP/dpxm6rUoqFkVp0c6kKp9WjmSLH9NEyuTPRVRs29Ee6rXEcc+T874nuXcRY O/4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jI512TbeQgh2FYrW2/MewJZ0e3lJuCvLMPJwgkXNatc=; b=08s1tK6ep0LzG9/lOqKtCsW9Ld6lvEoMmAz9eH5AFSOpJYKuDtc9iqn6C3bC8kOqMH cGgumbXK/Uo94YfidKtcI3S93oBEjqNl3b3AQOvbctOtpA1AjACljRVNQYZ/Pn3Pvg52 2mi16R/FwV3WAkx5oLTcUTPNoN1+F/183JhOJoYEsDKREfFnm9ry5TSK4N0dSLbnEr4x QADA6uTb39zR+EGzWMox17o3q39Efj2HsaiEhGWs4hJI43tpy/t8jhSNEAQsKJ5sLC3o mlXv6q9D3oIy/biGnhiOO14rN2CwlB/bzo0vwZtnTomeOK2XLHckxdVayuEUJtjZcRol KlUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uJy2BNUq; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id k5sor1238640ljj.71.2021.09.29.07.44.56 for (Google Transport Security); Wed, 29 Sep 2021 07:44:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uJy2BNUq; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jI512TbeQgh2FYrW2/MewJZ0e3lJuCvLMPJwgkXNatc=; b=uJy2BNUqQw+BJyvO/Zh9fJeegstwdqNEGh1Ckjo/E3TaoDaiOXk7emJ0v4f2cq+KdJ 1hyllL8m7Na7397VPTNeTYOUN0JKOnBSQqT8PXNvL6fvPM4etcvF3talSs1L4MuEOYIj ORbd+bs0RKplK3xfdWSlb2bNOVOOhgZlrmF3MBoh6zbhvqaDRNoirQ0dVCw478a/gPTD KhW6uj0uMsO19BubBS9i5MCUcjN5XHuFbSpOq8pmIR/xbQklgT2g0XgE6YslcomcAmF8 SbfkwV8g5cZcKPss9NjFJKsGNXUvNfYCRCd6i4kNP2AOIoRfLTgQ8MhZFmR4KoGMb274 b/sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jI512TbeQgh2FYrW2/MewJZ0e3lJuCvLMPJwgkXNatc=; b=muQP7RQb7WmBxQUj9Abvey/laYyRiuBvZMzO2kpbKs+Zu0wmdXW5rxEG66xyDJZsgw jeZr9G4NKDMLR5zDnDqGuSY8V8thuKlF1n4Asl60S5/gGq2TYMOYS+0BpFoVKghwUVWK tiyY4Isgu3GcAMaKvj8BM1HZF8G3kgJOPCRSot4/G5a1xB67lgOXVlWXTK2A+N0a8+29 B0nhsQHxG4lktrN1tsBUb1nj8Jvcp1tYCXFqbKdXXq+zi/AFdOWrHQkL8Vu4kyFeRPw2 cKWszd2sjIhfXOsZWag0WcTP3+e956BBgq/oRy0QrQeXJdV4BaCt5elknCQSOTGBsbIH LLLA== X-Gm-Message-State: AOAM533CwZ/JxBfOMbMmOExF7uOGU12GgNWHPXo51D0TMDlFaM0fe5ar wdNRyPQh8+Fp26cj4aX0OvBBlTFrwrRW37Vb X-Google-Smtp-Source: ABdhPJz81MaqezsB00jcBTdcVIWyNKeqSu5DcUQ8vyT5t7reV63l4XQLO+5zErmsmpzlDbBEZrvCpw== X-Received: by 2002:a2e:9a07:: with SMTP id o7mr302931lji.125.1632926696590; Wed, 29 Sep 2021 07:44:56 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id g4sm9863ljk.64.2021.09.29.07.44.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 07:44:55 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Daniel Lezcano , linux-pm@vger.kernel.org Cc: Maulik Shah , Peter Zijlstra , Vincent Guittot , Len Brown , Bjorn Andersson , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] PM: sleep: Fix runtime PM based cpuidle support Date: Wed, 29 Sep 2021 16:44:51 +0200 Message-Id: <20210929144451.113334-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210929144451.113334-1-ulf.hansson@linaro.org> References: <20210929144451.113334-1-ulf.hansson@linaro.org> MIME-Version: 1.0 In the cpuidle-psci case, runtime PM in combination with the generic PM domain (genpd), may be used when entering/exiting an idlestate. More precisely, genpd relies on runtime PM to be enabled for the attached device (in this case it belongs to a CPU), to properly manage the reference counting of its PM domain. This works fine most of the time, but during system suspend in the dpm_suspend_late() phase, the PM core disables runtime PM for all devices. Beyond this point and until runtime PM becomes re-enabled in the dpm_resume_early() phase, calls to pm_runtime_get|put*() will fail. To make sure the reference counting in genpd becomes correct, we need to prevent cpuidle-psci from using runtime PM when it has been disabled for the device. Therefore, let's move the call to cpuidle_pause() from dpm_suspend_noirq() to dpm_suspend_late() - and cpuidle_resume() from dpm_resume_noirq() into dpm_resume_early(). Diagnosed-by: Maulik Shah Suggested-by: Maulik Shah Signed-off-by: Ulf Hansson --- drivers/base/power/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.25.1 Reviewed-by: Maulik Shah diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index cbea78e79f3d..1c753b651272 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -747,8 +747,6 @@ void dpm_resume_noirq(pm_message_t state) resume_device_irqs(); device_wakeup_disarm_wake_irqs(); - - cpuidle_resume(); } /** @@ -870,6 +868,7 @@ void dpm_resume_early(pm_message_t state) } mutex_unlock(&dpm_list_mtx); async_synchronize_full(); + cpuidle_resume(); dpm_show_time(starttime, state, 0, "early"); trace_suspend_resume(TPS("dpm_resume_early"), state.event, false); } @@ -1336,8 +1335,6 @@ int dpm_suspend_noirq(pm_message_t state) { int ret; - cpuidle_pause(); - device_wakeup_arm_wake_irqs(); suspend_device_irqs(); @@ -1467,6 +1464,7 @@ int dpm_suspend_late(pm_message_t state) int error = 0; trace_suspend_resume(TPS("dpm_suspend_late"), state.event, true); + cpuidle_pause(); mutex_lock(&dpm_list_mtx); pm_transition = state; async_error = 0;