From patchwork Mon Feb 26 06:51:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Hu X-Patchwork-Id: 776127 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 822ED1805A for ; Mon, 26 Feb 2024 06:51:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708930284; cv=none; b=XVkoNizSs9hUxNVHXQgbSMZ3lh4sHO4GVa5TNNDGtremG4fpmI1q39u80DCPKXfAZiOpiffWdjE+SdOMZ4tw1F58OyiWcqRQjHyOxPk4ah1lOjbpE11U+ZI0jncovS10erx083I+Yef20eWkOaQf0WWPKCUAXW1RlQOQ4DRbMRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708930284; c=relaxed/simple; bh=9igl0TTc8CPKGpvm8BLQNXjtSohUSijnfRrE5EBWjbk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=X8xGaeNgRvnAS1V7whVB0ylIyluByx5b/NKLFVjgqhDklk7CMCxjleAJ0jG9eDKsXMpDRXQCp2g6WNgYv+VTdeb00x31BmILB0TVyptTuueiKgN2/ybN9hlz9Hl66ohXzWnjn5WvXxJ6k3paFTsRi2n5wNiVOS//F1rGx+wnMpg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com; spf=pass smtp.mailfrom=sifive.com; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b=DVxzCw5Q; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sifive.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="DVxzCw5Q" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1dc9222b337so9103725ad.2 for ; Sun, 25 Feb 2024 22:51:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1708930282; x=1709535082; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9ZJDZa4dE6I7qh1K4oWjwqQuf4TRNeOV/pDFBmxz1NI=; b=DVxzCw5Q3OOqJTa1+2R1MF9fldtWZnvoTwdmBBcMT9LpKGQ7QtYTVIa9OqdnoqrZEz SgW9zAMfRPei0QFmo4+iCh4UZIBCEOzEM4S0PY8OYDEoMzND8++hw6vUB9W+NiBep/go 0D+0GWrDkpuu+ixiSPJaHp3wlcrx5sJaSqpbgINcdFOAJE1jeBwUpdhsINfw//PeJQQz lZEKc0cDCgTGU82y6ABAz80q6ku1DspxljbDoWjchV5fELBUedeaYjlSgf12qNpCC0Oo CAvVnlzAsNsUeuoXS58dS1+gfFys8BGhc/SwmYJS+0VwJbYVDRBpSO7z5CDeo9D8+xDM FlyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708930282; x=1709535082; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9ZJDZa4dE6I7qh1K4oWjwqQuf4TRNeOV/pDFBmxz1NI=; b=UB6qxDVm3jnVbPUKd0lS/k7u6mf6Bbd9pY3F5Fkfd5YQZER8eggMgmsmpWTZtA7hGE 0cFATa+LxNo+y6tNiu5/yeQ1dlqECpLjTaN+JZ3pydHFbS1cv+TP8yriI4R94V9g2BQM ko0DXs79QGC7xHKqHSwTvnlVjWDCFV013msc6AxAQNLlu+c4HILqlM7CZ4s+YrvaZvYn UdJ9E2hGUYkm+MCopVDZxq2FPKKjJEBMkyMuJKcXm3Rb5aMAIbc0rNKmHA/D+tDz22dA 6829r/p/dtVzh/OFmGtfUiOW4ZVC/VM8jaaoqXn4hndXOJ+g3q3zQNUh/s1Q0scKul4o ngeQ== X-Forwarded-Encrypted: i=1; AJvYcCXCUoPbuNZB8ac5VhXNQsgVxhgCK4na6BJXo9uXUEkGYonxRGOFepaUHb4pbDwSdDu7YnOm3axk6u7TJcVy1934ciPq5dH15B8= X-Gm-Message-State: AOJu0YwRzm+47jfSqfPL9YztzACTuJPtmjNeaz2+0k/BVT7eGaozN/Nf fhJBnLnFqWEiS7C0Zo2KvwnaUuz2IUFoE0lK0+cSsvOZ8nApJbn1qhse//umzy4= X-Google-Smtp-Source: AGHT+IG+iLuHhzs/rqyv0mUJKiLZSB9huPbBXlKg4PKw62MWaoX8Gy2Vo+Uwin2x0VVilQL/hJd7ow== X-Received: by 2002:a17:903:189:b0:1dc:692:2843 with SMTP id z9-20020a170903018900b001dc06922843mr8971565plg.5.1708930281569; Sun, 25 Feb 2024 22:51:21 -0800 (PST) Received: from nickhu-X1C-TW.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id u11-20020a170903308b00b001d937bc5602sm3238871plc.227.2024.02.25.22.51.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 22:51:20 -0800 (PST) From: Nick Hu To: anup@brainfault.org, rafael@kernel.org, daniel.lezcano@linaro.org, paul.walmsley@sifive.com, palmer@dabbelt.com, linux-pm@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: zong.li@sifive.com, Nick Hu Subject: [PATCH] cpuidle: riscv-sbi: Add cluster_pm_enter()/exit() Date: Mon, 26 Feb 2024 14:51:13 +0800 Message-Id: <20240226065113.1690534-1-nick.hu@sifive.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When the cpus in the same cluster are all in the idle state, the kernel might put the cluster into a deeper low power state. Call the cluster_pm_enter() before entering the low power state and call the cluster_pm_exit() after the cluster woken up. Signed-off-by: Nick Hu --- drivers/cpuidle/cpuidle-riscv-sbi.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c index e8094fc92491..298dc76a00cf 100644 --- a/drivers/cpuidle/cpuidle-riscv-sbi.c +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c @@ -394,6 +394,7 @@ static int sbi_cpuidle_pd_power_off(struct generic_pm_domain *pd) { struct genpd_power_state *state = &pd->states[pd->state_idx]; u32 *pd_state; + int ret; if (!state->data) return 0; @@ -401,6 +402,10 @@ static int sbi_cpuidle_pd_power_off(struct generic_pm_domain *pd) if (!sbi_cpuidle_pd_allow_domain_state) return -EBUSY; + ret = cpu_cluster_pm_enter(); + if (ret) + return ret; + /* OSI mode is enabled, set the corresponding domain state. */ pd_state = state->data; sbi_set_domain_state(*pd_state); @@ -408,6 +413,19 @@ static int sbi_cpuidle_pd_power_off(struct generic_pm_domain *pd) return 0; } +static int sbi_cpuidle_pd_power_on(struct generic_pm_domain *pd) +{ + struct genpd_power_state *state = &pd->states[pd->state_idx]; + + if (!state->data) + return 0; + + if (!sbi_cpuidle_pd_allow_domain_state) + return -EBUSY; + + return cpu_cluster_pm_exit(); +} + struct sbi_pd_provider { struct list_head link; struct device_node *node; @@ -433,10 +451,12 @@ static int sbi_pd_init(struct device_node *np) pd->flags |= GENPD_FLAG_IRQ_SAFE | GENPD_FLAG_CPU_DOMAIN; /* Allow power off when OSI is available. */ - if (sbi_cpuidle_use_osi) + if (sbi_cpuidle_use_osi) { pd->power_off = sbi_cpuidle_pd_power_off; - else + pd->power_on = sbi_cpuidle_pd_power_on; + } else { pd->flags |= GENPD_FLAG_ALWAYS_ON; + } /* Use governor for CPU PM domains if it has some states to manage. */ pd_gov = pd->states ? &pm_domain_cpu_gov : NULL;