From patchwork Tue Jul 7 12:58:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 234992 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp889105ilg; Tue, 7 Jul 2020 05:58:21 -0700 (PDT) X-Received: by 2002:a2e:97ce:: with SMTP id m14mr28922496ljj.87.1594126701582; Tue, 07 Jul 2020 05:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126701; cv=none; d=google.com; s=arc-20160816; b=dLlLu+9OboNrEa3fn85NL7lZ5ft3GH+yhXWMsUFDfS0q5DH6Nk4ffER1GCsR2gPNsy C1JigwIxmtVcQ5IfQxpGjZTsMBAIQmAPgCjKrr+A5THpR66s8sfjlDoOSc5PnePdgKCh 5S81QrAZPaed573Py4np9omI8iwUVAJa8oDWxennMEItqLNM0gz5s5zT14U0LWTy5YRP iAWTZoHaxl1Na64l7sN/Ab6QD7SkomtpiasRPkp5rlT5/AxDbqEMYz0rvAqdPZnz1qvF 8QHXvGQISLOXzsZcAvDiwJTBiIo7W6N4RZnYuENE2HMJE7DSu5xYHmv662gl8JtdkGBs p8Gg== 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=JmH1BfPiU4RoSWuHQPEJ8Sx4+RN7bhXBUvJ2uLAr9qM=; b=iLpsGwaxWgFV8DrM+wpjxypwm/EJDudF5rsUyMB/BkUgU+SXBHstmhTBtvq8M5o938 bfu6oPCY25Dk+6ZzGLOYdUSSvaAntMMXXO3Vuj1QCs7FXoJBq9wYvdnXEYdTnFpmXyXY k0YMlktYM7uTFLnAHAmfrDhf70hDRx+xSkw5792xLD4vFB3tB0iFL5CdsJDXi4eu2SwY +CucKFS+Wo3ylC6ObGjI4jbT7eL72dIN7WKawezkVoIhZAsN3KJXPNVGim0T46/V/Rex gPCgv4v1yqNiNMA40O6Z+aQOWsK8LSMIHERTHl4k1PfkT2Qgt3fWmweDxEqdfG6Uvwlb YnJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ad7XXos1; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id z11sor322570ljj.47.2020.07.07.05.58.21 for (Google Transport Security); Tue, 07 Jul 2020 05:58:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ad7XXos1; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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=JmH1BfPiU4RoSWuHQPEJ8Sx4+RN7bhXBUvJ2uLAr9qM=; b=Ad7XXos1cMmY+GKjq/D9UtSBmDNPOeVXkEk3XQ8wQl0QlkUWtCwInOmjZmoDIncBHb XK6+h7K+uqUHqZXaTO/qeFFYBZ/TGnH2PC2189v/S6CCjKuMkMGXkOhaIB+GjZsRkXGP sZlwnSie+aPey2AKnh2JAKCuFh3oGUOu0n2/RvUWQQHtCbS+yFnqUaLPv6igWPkwW4Oj 6MnRpJOehFo5cmYc6/vsfoQuy25/s4gsoreVtAlkV5pLjTpOhJxullGUTeW+KgwGcki6 vEDYWNZL4eOuJ4W7a8oOxNgk29NhvZA+uOHbJI5AmMwuTcfOIe8DqXORy5X+/1bnSSOl e8yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JmH1BfPiU4RoSWuHQPEJ8Sx4+RN7bhXBUvJ2uLAr9qM=; b=fqkNRzjiSRP1voc1u64r3h6nw7QmrPFNoh0QRjjT1GkBft8oyd5bkq3z7XOcHFhapU K0L89HUEqfFWUxAstfYbcrG0VJkNwlaEgV1dCK73qAD+B9O8G8Hg0iCc0tnL5gwXE9cX DKP/nPwDF7rihezNGFxavv1QWQrtS6lsPtIWInRe38sVvpY0mS8bJfRx8nAXazBxqR62 P9B9+1wNh1bEoV1ChMa16hbl03sZ3idofx5qY9IbdfVcOrpxdTXuIInrJfWEP/UMPCGq 0WSoFmxCXLs4B1NbUqt1G6YIkZKsbYjrKlITkVEYz7aSLRXIrwTBSBMgy2Z59oAe96rN mUeg== X-Gm-Message-State: AOAM531y9y5u7LNFjmKTBTxyW4zW21ymMqKyKKxj+edEW9zB0L6rssAc wBmf5A8ulamPTieWfdhSHQkn5oVs X-Google-Smtp-Source: ABdhPJzUlqKwp5fDTuJIhcklcQOJEemZfGYMUbMkILw8e1U/ymMGmHmpI3jEkHFPEWctxqwO/X56vg== X-Received: by 2002:a05:651c:21a:: with SMTP id y26mr14747466ljn.106.1594126701205; Tue, 07 Jul 2020 05:58:21 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id 11sm9554395lfz.78.2020.07.07.05.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 05:58:20 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Saravana Kannan , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/5] cpuidle: psci: Split into two separate build objects Date: Tue, 7 Jul 2020 14:58:00 +0200 Message-Id: <20200707125804.13030-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707125804.13030-1-ulf.hansson@linaro.org> References: <20200707125804.13030-1-ulf.hansson@linaro.org> MIME-Version: 1.0 The combined build object for the PSCI cpuidle driver and the PSCI PM domain, is a bit messy. Therefore let's split it up by adding a new Kconfig ARM_PSCI_CPUIDLE_DOMAIN and convert into two separate objects. Reviewed-by: Lina Iyer Reviewed-by: Sudeep Holla Signed-off-by: Ulf Hansson --- drivers/cpuidle/Kconfig.arm | 10 ++++++++++ drivers/cpuidle/Makefile | 5 ++--- drivers/cpuidle/cpuidle-psci.h | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) -- 2.20.1 diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 51a7e89085c0..0844fadc4be8 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -23,6 +23,16 @@ config ARM_PSCI_CPUIDLE It provides an idle driver that is capable of detecting and managing idle states through the PSCI firmware interface. +config ARM_PSCI_CPUIDLE_DOMAIN + bool "PSCI CPU idle Domain" + depends on ARM_PSCI_CPUIDLE + depends on PM_GENERIC_DOMAINS_OF + default y + help + Select this to enable the PSCI based CPUidle driver to use PM domains, + which is needed to support the hierarchical DT based layout of the + idle states. + config ARM_BIG_LITTLE_CPUIDLE bool "Support for ARM big.LITTLE processors" depends on ARCH_VEXPRESS_TC2_PM || ARCH_EXYNOS || COMPILE_TEST diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index f07800cbb43f..26bbc5e74123 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -21,9 +21,8 @@ obj-$(CONFIG_ARM_U8500_CPUIDLE) += cpuidle-ux500.o obj-$(CONFIG_ARM_AT91_CPUIDLE) += cpuidle-at91.o obj-$(CONFIG_ARM_EXYNOS_CPUIDLE) += cpuidle-exynos.o obj-$(CONFIG_ARM_CPUIDLE) += cpuidle-arm.o -obj-$(CONFIG_ARM_PSCI_CPUIDLE) += cpuidle_psci.o -cpuidle_psci-y := cpuidle-psci.o -cpuidle_psci-$(CONFIG_PM_GENERIC_DOMAINS_OF) += cpuidle-psci-domain.o +obj-$(CONFIG_ARM_PSCI_CPUIDLE) += cpuidle-psci.o +obj-$(CONFIG_ARM_PSCI_CPUIDLE_DOMAIN) += cpuidle-psci-domain.o obj-$(CONFIG_ARM_TEGRA_CPUIDLE) += cpuidle-tegra.o obj-$(CONFIG_ARM_QCOM_SPM_CPUIDLE) += cpuidle-qcom-spm.o diff --git a/drivers/cpuidle/cpuidle-psci.h b/drivers/cpuidle/cpuidle-psci.h index 7299a04dd467..ac8170684d4f 100644 --- a/drivers/cpuidle/cpuidle-psci.h +++ b/drivers/cpuidle/cpuidle-psci.h @@ -8,7 +8,7 @@ struct device_node; void psci_set_domain_state(u32 state); int __init psci_dt_parse_state_node(struct device_node *np, u32 *state); -#ifdef CONFIG_PM_GENERIC_DOMAINS_OF +#ifdef CONFIG_ARM_PSCI_CPUIDLE_DOMAIN struct device __init *psci_dt_attach_cpu(int cpu); #else static inline struct device __init *psci_dt_attach_cpu(int cpu) { return NULL; } From patchwork Tue Jul 7 12:58:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 234993 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp889135ilg; Tue, 7 Jul 2020 05:58:23 -0700 (PDT) X-Received: by 2002:a19:8c47:: with SMTP id i7mr19656025lfj.32.1594126703496; Tue, 07 Jul 2020 05:58:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126703; cv=none; d=google.com; s=arc-20160816; b=g7nbTsuSkkT4GuPHdpiK4bvgCxxCxGrm5fLWr/VU2lh034U63ypwF8h6tQHc/fm9e4 zlo3AzthRoRAS0wO0ffYPS6NgnxbpqJA7NIOLdjyMrpn3IYBsUfUN4vj+qrtABeslzRq JtGe3fOvI7NH9dgK/mExk8Dm7sjDSd7J90MP8xK7n8RZ2UHY5HOT7POCFfHzpzJVd+FT cyuFNSo5I34Xfo52BwPVfBzL1uCRVmSKb3/QpWvVcBT/bgm/al/Qus5pRS1qZR68GIib L+IaON4uuMfNcK8wF3496plAWM9B+cnBCUsors9qI5HqJP//ulTiEuXN/iGdDqWkJbQV b+Rg== 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=Tyb4FTg+dS/M/U030tOYrYBkxinzi9TyZY+2pXYSj8s=; b=m86cxDUDznS8e+fQk1IAfUAAIl1X5fLAZ42TTCZhPJLq6pCU5zsaYksWF7sO/Di6LR Z8aOxf3B6N2ciLgkNp42F+hq/jmjrXWsNwdb/2bmIGjgbEXhJUzDIf7gv4fPkIrqIAcX y/EGf1at41aqo9vBC162YeR6Df2bMHqGq/ouUSKGkgW3EjsEqhgp2U8a7xLAGvQBMcj5 m6H3VTXrdWVfeAStGJ3fbyr7oG4jcXwZX0fCKSOpCnZjyRGRRtauTj706lJPUbsVm495 hwvO36eTscdDwlii4ap0Ecd9f38Owy2UfhirXFuK8zvRY0DKEGfzPLsCndsV9cQpDi0l M9Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WcTZPDyr; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j19sor7680205lja.25.2020.07.07.05.58.23 for (Google Transport Security); Tue, 07 Jul 2020 05:58:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WcTZPDyr; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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=Tyb4FTg+dS/M/U030tOYrYBkxinzi9TyZY+2pXYSj8s=; b=WcTZPDyrGuD+JpLr2CvFSOW4wI/84AB9XBsPM+jNP55/QXFFMDJ2Kcuad7JKSuEgl4 CMsJcDQJheQ23rJe96pFp9zvexdXKEVqmJE+BhjbytMKWA3ME0ZHKt6RLTMMacnHJqX2 eHz9Jr/J9Itm7q4oL7NVLhg9l448S2Q49iTD4WdSJCSYCeU5QUE0K3iXcaJ0Y2WYHFGZ XQj2KfRpp0yZshd2s60tgduYEi8cCEBXVk/68tYWIKGTQCdf3nT3UUM+49atzgZzQd/F NEWIC0yJKMlERT7u2126WmBfK+sVr1OqaCYc11UQHPCZl/pL+tJtV+RipTMslbw9Rv7W GhPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Tyb4FTg+dS/M/U030tOYrYBkxinzi9TyZY+2pXYSj8s=; b=EPS3WDv5YpgjcyQWVSwRFAzF5M8YPMHzeDGEw7hhbC+b/ppj8Lht2jIhN8CUoJ9aTu T+GMK5+jGb2hMExbJGbD+EqtyhachzZRLPr2gr0QGwUuqlsZckviwbWnWpBfK1x28Su1 +7a/rsFWvM2F8DoxFIWu4jBZtWHwwgHO4QKQtMWsCgB0TfCpdWqTcKJTAAuZaK1h/qFA AK9gK+tVV3fQmi3MuYNLMTCPAAqp+3ILrwpRU+D2tRt1jqFbcsrb1K8UAHQ2A55z/O/I ytHg4RoP2BweURb094UMpD+eY80mCKUO3v1BH8psO7UiJGHRt498SOi9dJUawMN1Bwwb 6L+A== X-Gm-Message-State: AOAM530Ge5SDnrDbu0A2yg+jsqatCes3xvnyVkWvGJ8Kw6l8scMB+4M9 B45WbcVDFGeXbvs0dgZUDQfeNFSQ X-Google-Smtp-Source: ABdhPJylq0jjpwH2fsuo8vkN+Gf9ZYpUxI0iRGTwMhIxlrERcqaj5/+hQ1rGx4VxvHtG/4ViNKkMrA== X-Received: by 2002:a2e:9a8d:: with SMTP id p13mr6597746lji.36.1594126703088; Tue, 07 Jul 2020 05:58:23 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id 11sm9554395lfz.78.2020.07.07.05.58.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 05:58:21 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Saravana Kannan , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/5] cpuidle: psci: Fail cpuidle registration if set OSI mode failed Date: Tue, 7 Jul 2020 14:58:01 +0200 Message-Id: <20200707125804.13030-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707125804.13030-1-ulf.hansson@linaro.org> References: <20200707125804.13030-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Currently we allow the cpuidle driver registration to succeed, even if we failed to enable the OSI mode when the hierarchical DT layout is used. This means running in a degraded mode, by using the available idle states per CPU, while also preventing the domain idle states. Moving forward, this behaviour looks quite questionable to maintain, as complexity seems to grow around it, especially when trying to add support for deferred probe, for example. Therefore, let's make the cpuidle driver registration to fail in this situation, thus relying on the default architectural cpuidle backend for WFI to be used. Reviewed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/cpuidle/cpuidle-psci-domain.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.20.1 diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index 423f03bbeb74..f07786aad673 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -26,7 +26,6 @@ struct psci_pd_provider { }; static LIST_HEAD(psci_pd_providers); -static bool osi_mode_enabled __initdata; static int psci_pd_power_off(struct generic_pm_domain *pd) { @@ -272,7 +271,6 @@ static int __init psci_idle_init_domains(void) goto remove_pd; } - osi_mode_enabled = true; of_node_put(np); pr_info("Initialized CPU PM domain topology\n"); return pd_count; @@ -293,9 +291,6 @@ struct device __init *psci_dt_attach_cpu(int cpu) { struct device *dev; - if (!osi_mode_enabled) - return NULL; - dev = dev_pm_domain_attach_by_name(get_cpu_device(cpu), "psci"); if (IS_ERR_OR_NULL(dev)) return dev; From patchwork Tue Jul 7 12:58:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 234994 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp889158ilg; Tue, 7 Jul 2020 05:58:25 -0700 (PDT) X-Received: by 2002:ac2:4c09:: with SMTP id t9mr32908505lfq.34.1594126705558; Tue, 07 Jul 2020 05:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126705; cv=none; d=google.com; s=arc-20160816; b=AUmPsjNKDzUB7sV4uUkn5x0fqF44K+m3fSvSxnj05271n667qfuu8dRFAO9MUhKjLN Qy6SfWJM6JAVZ1l6oT/8nmRWhlCfzJzgAmgdRts43F4qBY+L078xcQCXcR4+YQwKe2NB 9hH2JLEyWVthlp2bBFs2mKNYmkRdJFLygsfpD0zwVSADblUoaZygxhQuoRCd1ZiFfH/1 UfoTLR5pbXCM1xeGylBtEF4pVsJplLYpUtkBkPh0opJsm6lbc0qvBy7kOd7MRP3lunYO YK3RoQHeLKfTNI0v4uefWWHTj6FJQkdPnhx4cPORqtjzzdvkqcTDuVJ7VlTONzikwf5P DIqw== 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=RKH4B95PNXl3C5rwhY+t4SQh2JqyVx0OlVSkqz5kPHs=; b=G9kIY8Ho8G2woHehkBbHD7lIKayTnaKhxGs/SUdv81W9mqECCbWhcuq7ZDav6eKOzH 9EUrufTVCnAGiP5p8Luq7/4FaRt04yrmx9qxpRlUOOSXz5GY6uogsmV4R/DBF0U7Jk48 0+GgbkaFEryAHIzeSckCT0J3I7udhQybn2IzLcFk/TUXzCyB3BTPDfGQ6iNX0OTFXKId iK3rCdKKOPohQSAq3V0py1dI9R2Vq5WlHkomzQCQspRVFzbHrOsYYylTYdDTBwhQ32Qw HN7xU3xcysuqvo6naFb6bUHPJ1AGRFEJMjjIFlPpraog3duHexOegGl+baD2XNvMqqx7 EvOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hv99sK4G; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id 16sor6461445lfa.10.2020.07.07.05.58.25 for (Google Transport Security); Tue, 07 Jul 2020 05:58:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hv99sK4G; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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=RKH4B95PNXl3C5rwhY+t4SQh2JqyVx0OlVSkqz5kPHs=; b=Hv99sK4GX66OYmzNN/mEh9xlA+DDTCwCLlBG5kGfxyjuko2fDS6BSlh+9GHNw8ogI/ Dm0Gm46ZPEl+WbrqtaLmYkFCM7hYB4Rts5P5tlQ5osV5ge6xL0TYOrs1AUUVOcBV0Uu9 c7G8TwmhtEE3ZGHZtWwE3UXmYY/H0Jypwh5c45AfMNZVFNz/gvVIQPRMqpSe5NDv7rmA x8Aujq7snYVNU77w/ImuyyEO9zRRxVxhf9Mlm/ngIlBnd7rQPTmNzWHo0DvORcXhXGDW oa3/pKdTbCzSgzwIM7UGJLo2Qij/XbyxJZYmvOzgrGiM50EBzHIy0yMb3/vOOrOEH5R5 TLcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RKH4B95PNXl3C5rwhY+t4SQh2JqyVx0OlVSkqz5kPHs=; b=AwNTevLTwMppWypANun+5StqgvGcChd+KCsRPnuF7NenQX/6s3OiAn7pKas3QeFJPQ gTVND+p0oI7ITQ+llxpBcByVmXPDcu6cIvf9LuW+nfDHLVo6+S2EIs4sq4tjQr1H7TDK bqQLRdvZ7aajBBL+z/9hgE+eB4L78JD2nCvWaHFmmFFlj/Ugz/uDIH9O8Hv+5Qq7vbfv gIvTEt6nAuZnjIsQZcAgTSTZzZ9pb/Gq/oKAwNUMjRWv+QTDU6AsTyzI7cFD+UHGCasY mzCQKgdDF2EGaKudAb2GBDzKe6dGWqanR4Ee7sAQUMOPt0J28SGOhKBjxtSz4GRmrO/N BvoQ== X-Gm-Message-State: AOAM533+jOXAeMuGSBZYNvMFNt3S3eZJefqS3FscrKe8w4Y+TZOR5AsT aqxVXqjhlYZga9JqDMqVMeWAzllW X-Google-Smtp-Source: ABdhPJzIpVTax+5kAioAX4RqrgRCu+Xj7+WatOE8BSD5lfOa9jEpdAJbBThTKEv2VFEfxhud6CQZkg== X-Received: by 2002:a19:c194:: with SMTP id r142mr32487669lff.87.1594126705082; Tue, 07 Jul 2020 05:58:25 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id 11sm9554395lfz.78.2020.07.07.05.58.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 05:58:23 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Saravana Kannan , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/5] cpuidle: psci: Fix error path via converting to a platform driver Date: Tue, 7 Jul 2020 14:58:02 +0200 Message-Id: <20200707125804.13030-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707125804.13030-1-ulf.hansson@linaro.org> References: <20200707125804.13030-1-ulf.hansson@linaro.org> MIME-Version: 1.0 The current error paths for the cpuidle-psci driver, may leak memory or possibly leave CPU devices attached to their PM domains. These are quite harmless issues, but still deserves to be taken care of. Although, rather than fixing them by keeping track of allocations that needs to be freed, which tends to become a bit messy, let's convert into a platform driver. In this way, it gets easier to fix the memory leaks as we can rely on the devm_* functions. Moreover, converting to a platform driver also enables support for deferred probe, which subsequent changes takes benefit from. Signed-off-by: Ulf Hansson --- drivers/cpuidle/cpuidle-psci-domain.c | 10 +- drivers/cpuidle/cpuidle-psci.c | 141 +++++++++++++++----------- drivers/cpuidle/cpuidle-psci.h | 9 +- 3 files changed, 95 insertions(+), 65 deletions(-) -- 2.20.1 Reviewed-by: Lukasz Luba diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index f07786aad673..e48e578aaa7d 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -287,7 +287,7 @@ static int __init psci_idle_init_domains(void) } subsys_initcall(psci_idle_init_domains); -struct device __init *psci_dt_attach_cpu(int cpu) +struct device *psci_dt_attach_cpu(int cpu) { struct device *dev; @@ -301,3 +301,11 @@ struct device __init *psci_dt_attach_cpu(int cpu) return dev; } + +void psci_dt_detach_cpu(struct device *dev) +{ + if (IS_ERR_OR_NULL(dev)) + return; + + dev_pm_domain_detach(dev, false); +} diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c index 3806f911b61c..74463841805f 100644 --- a/drivers/cpuidle/cpuidle-psci.c +++ b/drivers/cpuidle/cpuidle-psci.c @@ -17,9 +17,11 @@ #include #include #include +#include #include #include #include +#include #include @@ -33,7 +35,7 @@ struct psci_cpuidle_data { static DEFINE_PER_CPU_READ_MOSTLY(struct psci_cpuidle_data, psci_cpuidle_data); static DEFINE_PER_CPU(u32, domain_state); -static bool psci_cpuidle_use_cpuhp __initdata; +static bool psci_cpuidle_use_cpuhp; void psci_set_domain_state(u32 state) { @@ -104,7 +106,7 @@ static int psci_idle_cpuhp_down(unsigned int cpu) return 0; } -static void __init psci_idle_init_cpuhp(void) +static void psci_idle_init_cpuhp(void) { int err; @@ -127,30 +129,13 @@ static int psci_enter_idle_state(struct cpuidle_device *dev, return psci_enter_state(idx, state[idx]); } -static struct cpuidle_driver psci_idle_driver __initdata = { - .name = "psci_idle", - .owner = THIS_MODULE, - /* - * PSCI idle states relies on architectural WFI to - * be represented as state index 0. - */ - .states[0] = { - .enter = psci_enter_idle_state, - .exit_latency = 1, - .target_residency = 1, - .power_usage = UINT_MAX, - .name = "WFI", - .desc = "ARM WFI", - } -}; - -static const struct of_device_id psci_idle_state_match[] __initconst = { +static const struct of_device_id psci_idle_state_match[] = { { .compatible = "arm,idle-state", .data = psci_enter_idle_state }, { }, }; -int __init psci_dt_parse_state_node(struct device_node *np, u32 *state) +int psci_dt_parse_state_node(struct device_node *np, u32 *state) { int err = of_property_read_u32(np, "arm,psci-suspend-param", state); @@ -167,9 +152,9 @@ int __init psci_dt_parse_state_node(struct device_node *np, u32 *state) return 0; } -static int __init psci_dt_cpu_init_topology(struct cpuidle_driver *drv, - struct psci_cpuidle_data *data, - unsigned int state_count, int cpu) +static int psci_dt_cpu_init_topology(struct cpuidle_driver *drv, + struct psci_cpuidle_data *data, + unsigned int state_count, int cpu) { /* Currently limit the hierarchical topology to be used in OSI mode. */ if (!psci_has_osi_support()) @@ -190,9 +175,9 @@ static int __init psci_dt_cpu_init_topology(struct cpuidle_driver *drv, return 0; } -static int __init psci_dt_cpu_init_idle(struct cpuidle_driver *drv, - struct device_node *cpu_node, - unsigned int state_count, int cpu) +static int psci_dt_cpu_init_idle(struct device *dev, struct cpuidle_driver *drv, + struct device_node *cpu_node, + unsigned int state_count, int cpu) { int i, ret = 0; u32 *psci_states; @@ -200,7 +185,8 @@ static int __init psci_dt_cpu_init_idle(struct cpuidle_driver *drv, struct psci_cpuidle_data *data = per_cpu_ptr(&psci_cpuidle_data, cpu); state_count++; /* Add WFI state too */ - psci_states = kcalloc(state_count, sizeof(*psci_states), GFP_KERNEL); + psci_states = devm_kcalloc(dev, state_count, sizeof(*psci_states), + GFP_KERNEL); if (!psci_states) return -ENOMEM; @@ -213,32 +199,26 @@ static int __init psci_dt_cpu_init_idle(struct cpuidle_driver *drv, of_node_put(state_node); if (ret) - goto free_mem; + return ret; pr_debug("psci-power-state %#x index %d\n", psci_states[i], i); } - if (i != state_count) { - ret = -ENODEV; - goto free_mem; - } + if (i != state_count) + return -ENODEV; /* Initialize optional data, used for the hierarchical topology. */ ret = psci_dt_cpu_init_topology(drv, data, state_count, cpu); if (ret < 0) - goto free_mem; + return ret; /* Idle states parsed correctly, store them in the per-cpu struct. */ data->psci_states = psci_states; return 0; - -free_mem: - kfree(psci_states); - return ret; } -static __init int psci_cpu_init_idle(struct cpuidle_driver *drv, - unsigned int cpu, unsigned int state_count) +static int psci_cpu_init_idle(struct device *dev, struct cpuidle_driver *drv, + unsigned int cpu, unsigned int state_count) { struct device_node *cpu_node; int ret; @@ -254,14 +234,22 @@ static __init int psci_cpu_init_idle(struct cpuidle_driver *drv, if (!cpu_node) return -ENODEV; - ret = psci_dt_cpu_init_idle(drv, cpu_node, state_count, cpu); + ret = psci_dt_cpu_init_idle(dev, drv, cpu_node, state_count, cpu); of_node_put(cpu_node); return ret; } -static int __init psci_idle_init_cpu(int cpu) +static void psci_cpu_deinit_idle(int cpu) +{ + struct psci_cpuidle_data *data = per_cpu_ptr(&psci_cpuidle_data, cpu); + + psci_dt_detach_cpu(data->dev); + psci_cpuidle_use_cpuhp = false; +} + +static int psci_idle_init_cpu(struct device *dev, int cpu) { struct cpuidle_driver *drv; struct device_node *cpu_node; @@ -284,17 +272,26 @@ static int __init psci_idle_init_cpu(int cpu) if (ret) return ret; - drv = kmemdup(&psci_idle_driver, sizeof(*drv), GFP_KERNEL); + drv = devm_kzalloc(dev, sizeof(*drv), GFP_KERNEL); if (!drv) return -ENOMEM; + drv->name = "psci_idle"; + drv->owner = THIS_MODULE; drv->cpumask = (struct cpumask *)cpumask_of(cpu); /* - * Initialize idle states data, starting at index 1, since - * by default idle state 0 is the quiescent state reached - * by the cpu by executing the wfi instruction. - * + * PSCI idle states relies on architectural WFI to be represented as + * state index 0. + */ + drv->states[0].enter = psci_enter_idle_state; + drv->states[0].exit_latency = 1; + drv->states[0].target_residency = 1; + drv->states[0].power_usage = UINT_MAX; + strcpy(drv->states[0].name, "WFI"); + strcpy(drv->states[0].desc, "ARM WFI"); + + /* * If no DT idle states are detected (ret == 0) let the driver * initialization fail accordingly since there is no reason to * initialize the idle driver if only wfi is supported, the @@ -302,48 +299,45 @@ static int __init psci_idle_init_cpu(int cpu) * on idle entry. */ ret = dt_init_idle_driver(drv, psci_idle_state_match, 1); - if (ret <= 0) { - ret = ret ? : -ENODEV; - goto out_kfree_drv; - } + if (ret <= 0) + return ret ? : -ENODEV; /* * Initialize PSCI idle states. */ - ret = psci_cpu_init_idle(drv, cpu, ret); + ret = psci_cpu_init_idle(dev, drv, cpu, ret); if (ret) { pr_err("CPU %d failed to PSCI idle\n", cpu); - goto out_kfree_drv; + return ret; } ret = cpuidle_register(drv, NULL); if (ret) - goto out_kfree_drv; + goto deinit; cpuidle_cooling_register(drv); return 0; - -out_kfree_drv: - kfree(drv); +deinit: + psci_cpu_deinit_idle(cpu); return ret; } /* - * psci_idle_init - Initializes PSCI cpuidle driver + * psci_idle_probe - Initializes PSCI cpuidle driver * * Initializes PSCI cpuidle driver for all CPUs, if any CPU fails * to register cpuidle driver then rollback to cancel all CPUs * registration. */ -static int __init psci_idle_init(void) +static int psci_cpuidle_probe(struct platform_device *pdev) { int cpu, ret; struct cpuidle_driver *drv; struct cpuidle_device *dev; for_each_possible_cpu(cpu) { - ret = psci_idle_init_cpu(cpu); + ret = psci_idle_init_cpu(&pdev->dev, cpu); if (ret) goto out_fail; } @@ -356,9 +350,34 @@ static int __init psci_idle_init(void) dev = per_cpu(cpuidle_devices, cpu); drv = cpuidle_get_cpu_driver(dev); cpuidle_unregister(drv); - kfree(drv); + psci_cpu_deinit_idle(cpu); } return ret; } + +static struct platform_driver psci_cpuidle_driver = { + .probe = psci_cpuidle_probe, + .driver = { + .name = "psci-cpuidle", + }, +}; + +static int __init psci_idle_init(void) +{ + struct platform_device *pdev; + int ret; + + ret = platform_driver_register(&psci_cpuidle_driver); + if (ret) + return ret; + + pdev = platform_device_register_simple("psci-cpuidle", -1, NULL, 0); + if (IS_ERR(pdev)) { + platform_driver_unregister(&psci_cpuidle_driver); + return PTR_ERR(pdev); + } + + return 0; +} device_initcall(psci_idle_init); diff --git a/drivers/cpuidle/cpuidle-psci.h b/drivers/cpuidle/cpuidle-psci.h index ac8170684d4f..d8e925e84c27 100644 --- a/drivers/cpuidle/cpuidle-psci.h +++ b/drivers/cpuidle/cpuidle-psci.h @@ -3,15 +3,18 @@ #ifndef __CPUIDLE_PSCI_H #define __CPUIDLE_PSCI_H +struct device; struct device_node; void psci_set_domain_state(u32 state); -int __init psci_dt_parse_state_node(struct device_node *np, u32 *state); +int psci_dt_parse_state_node(struct device_node *np, u32 *state); #ifdef CONFIG_ARM_PSCI_CPUIDLE_DOMAIN -struct device __init *psci_dt_attach_cpu(int cpu); +struct device *psci_dt_attach_cpu(int cpu); +void psci_dt_detach_cpu(struct device *dev); #else -static inline struct device __init *psci_dt_attach_cpu(int cpu) { return NULL; } +static inline struct device *psci_dt_attach_cpu(int cpu) { return NULL; } +static inline void psci_dt_detach_cpu(struct device *dev) { } #endif #endif /* __CPUIDLE_PSCI_H */ From patchwork Tue Jul 7 12:58:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 234995 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp889181ilg; Tue, 7 Jul 2020 05:58:27 -0700 (PDT) X-Received: by 2002:a2e:8e97:: with SMTP id z23mr19265276ljk.288.1594126707835; Tue, 07 Jul 2020 05:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126707; cv=none; d=google.com; s=arc-20160816; b=pTOW/Q7pQxqt/xRWa3TQVRGKy6oRrTKuJA44YiBeVrvrx0WXrLf/Qb4my2N82oKj3T Vsa0VtuNS3z4r5DFFyI8ppwWPEDHM+2IQSuvJDTjaOnQCts8ehWAYxcQb90iOOLpcAU/ gQqtZRRO1YX0Jjfe/LOVTOgJdPNlAflqH7E6pGdrqa2VgieJ8Oir9bZjUHxMtfSNIV5k aUdMwC7pL3QQOvtmoe7my5JvqCDaJG2wFsSL0dUg1P5YKz78L5POVxC2NFIxbK1OlDrk 2bpjU9GxGB+t6Dd17HryMAphIFat+RxQRY+QZI4fEr7lLXLwEyCl3mojP4fV9CTjx9Yt UhXw== 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=EkXZj4/pMT9pPcwacUaB98YwreiOuCxYZG9xrLmembw=; b=n6kAD4V5ip3TLS5sualKE+gGLh9Ap1WwyKU64wRkfpm6Tk3n4c5hWnshViIofj+trK wSuJF8MaejqmBbHw4n0sbPmYWA3qBTJRWHc4BJ/LefDgStm+vV8blUI9ocCLrixKKqpY wloghY8lpY8ZNVy1+NCvPCrKGN8KANmoM0RfvKXuug/MzWNynB9/aaQB1r8+ezlZ0402 fzssHjzYX+7ybABsru9eLvyg7oJMM3kSTHjbMIBitjXxAhoW3M33tSdayTFXEILId6Bd 98MscXHlg2RFJwlj9r/OlL2HHzQ6kFfNPVQ9zig+FyGx9v/2GJcZNt7psxEv9ahrwNrQ bkrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A88VM81I; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x11sor11949433lji.36.2020.07.07.05.58.27 for (Google Transport Security); Tue, 07 Jul 2020 05:58:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A88VM81I; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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=EkXZj4/pMT9pPcwacUaB98YwreiOuCxYZG9xrLmembw=; b=A88VM81IK+t1ZB6Q06hKJOLn4l/0OxUy5gRIgQgiNvaI4lyYmybOHoi/Kq63L95xjX gvrkw8iwNxowjbR//1jD2C9h/2B+2Y7lMHhfflH1wkEMCNxGZ4zpTDUMSuNHMJfydVGL H+QNZxR3i8p13BIcbZS2lymhDrCnxZEThXWkx8xn0eZsbHjtBOQ5XlisMuOq+IcPN1x9 Ex5iWq77Zn4FWWNlbIThuGbV76s0DBIw1XeLaWo0DHMA4AWPHKFim5m7DuY2k9syFmEq o4IwrkUrIPDk7gR9hjW3FFC2DOwDjCRSzJWl8DkMPvg/1NUqpxhF9Zru8ZCwIC53Dghd wbbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EkXZj4/pMT9pPcwacUaB98YwreiOuCxYZG9xrLmembw=; b=bJ/k8XmK9v8TKIIaTxiY6XK0ljfuOFCAxUDpFY2uUfmAcUQwJW9+Y3LFTGZ0SC/IfB kNUzY8w8f95z2UP8VZ728XUBeVb7xSOxu1vTbAv4XBB0zqtcLzSHlJhpec3MUTZ8I9za 3GOlYxsTXMUcJ7LdZVVuMvUC4QpJccrfyZT/xtmgptMuIRL+McxABoWy1elpUevibAV9 ncRgJdO5jKLivcV346k14/+WGfiGg0xrOzHo0mwAthPc9jgi7KJSjuN18x2dQDlPJRnU uUDYY3ryzijKNtoTmPRsck/4GVGcmiHai0kna/vEB5sLI2hiL41IpHM0Op7dP1pRpfVQ ql2A== X-Gm-Message-State: AOAM533LzvtP2h+CQBmfym9P6cTslBAWgsf/usCQOeUGKO2//06lXb/U b88AwZhCHFkOUztr4ASwdEbhwN2N X-Google-Smtp-Source: ABdhPJyBSriC7tiBtcgSZ/HW3ozSjjB3SMNR1qyrVjRG5PFGhtQNnT1gJ+8CVfwWMf7aVvGYjk6GIw== X-Received: by 2002:a2e:9883:: with SMTP id b3mr23503453ljj.390.1594126707435; Tue, 07 Jul 2020 05:58:27 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id 11sm9554395lfz.78.2020.07.07.05.58.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 05:58:26 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Saravana Kannan , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/5] cpuidle: psci: Convert PM domain to platform driver Date: Tue, 7 Jul 2020 14:58:03 +0200 Message-Id: <20200707125804.13030-5-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707125804.13030-1-ulf.hansson@linaro.org> References: <20200707125804.13030-1-ulf.hansson@linaro.org> MIME-Version: 1.0 To enable support for deferred probing and to allow implementation of the ->sync_state() callback from subsequent changes, let's convert into a platform driver. Reviewed-by: Lina Iyer Signed-off-by: Ulf Hansson --- drivers/cpuidle/cpuidle-psci-domain.c | 45 +++++++++++++++++---------- 1 file changed, 28 insertions(+), 17 deletions(-) -- 2.20.1 diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index e48e578aaa7d..bf527d2bb4b6 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -42,8 +43,8 @@ static int psci_pd_power_off(struct generic_pm_domain *pd) return 0; } -static int __init psci_pd_parse_state_nodes(struct genpd_power_state *states, - int state_count) +static int psci_pd_parse_state_nodes(struct genpd_power_state *states, + int state_count) { int i, ret; u32 psci_state, *psci_state_buf; @@ -72,7 +73,7 @@ static int __init psci_pd_parse_state_nodes(struct genpd_power_state *states, return ret; } -static int __init psci_pd_parse_states(struct device_node *np, +static int psci_pd_parse_states(struct device_node *np, struct genpd_power_state **states, int *state_count) { int ret; @@ -100,7 +101,7 @@ static void psci_pd_free_states(struct genpd_power_state *states, kfree(states); } -static int __init psci_pd_init(struct device_node *np) +static int psci_pd_init(struct device_node *np) { struct generic_pm_domain *pd; struct psci_pd_provider *pd_provider; @@ -167,7 +168,7 @@ static int __init psci_pd_init(struct device_node *np) return ret; } -static void __init psci_pd_remove(void) +static void psci_pd_remove(void) { struct psci_pd_provider *pd_provider, *it; struct generic_pm_domain *genpd; @@ -185,7 +186,7 @@ static void __init psci_pd_remove(void) } } -static int __init psci_pd_init_topology(struct device_node *np, bool add) +static int psci_pd_init_topology(struct device_node *np, bool add) { struct device_node *node; struct of_phandle_args child, parent; @@ -211,24 +212,24 @@ static int __init psci_pd_init_topology(struct device_node *np, bool add) return 0; } -static int __init psci_pd_add_topology(struct device_node *np) +static int psci_pd_add_topology(struct device_node *np) { return psci_pd_init_topology(np, true); } -static void __init psci_pd_remove_topology(struct device_node *np) +static void psci_pd_remove_topology(struct device_node *np) { psci_pd_init_topology(np, false); } -static const struct of_device_id psci_of_match[] __initconst = { +static const struct of_device_id psci_of_match[] = { { .compatible = "arm,psci-1.0" }, {} }; -static int __init psci_idle_init_domains(void) +static int psci_cpuidle_domain_probe(struct platform_device *pdev) { - struct device_node *np = of_find_matching_node(NULL, psci_of_match); + struct device_node *np = pdev->dev.of_node; struct device_node *node; int ret = 0, pd_count = 0; @@ -237,7 +238,7 @@ static int __init psci_idle_init_domains(void) /* Currently limit the hierarchical topology to be used in OSI mode. */ if (!psci_has_osi_support()) - goto out; + return 0; /* * Parse child nodes for the "#power-domain-cells" property and @@ -256,7 +257,7 @@ static int __init psci_idle_init_domains(void) /* Bail out if not using the hierarchical CPU topology. */ if (!pd_count) - goto out; + return 0; /* Link genpd masters/subdomains to model the CPU topology. */ ret = psci_pd_add_topology(np); @@ -271,9 +272,8 @@ static int __init psci_idle_init_domains(void) goto remove_pd; } - of_node_put(np); pr_info("Initialized CPU PM domain topology\n"); - return pd_count; + return 0; put_node: of_node_put(node); @@ -281,10 +281,21 @@ static int __init psci_idle_init_domains(void) if (pd_count) psci_pd_remove(); pr_err("failed to create CPU PM domains ret=%d\n", ret); -out: - of_node_put(np); return ret; } + +static struct platform_driver psci_cpuidle_domain_driver = { + .probe = psci_cpuidle_domain_probe, + .driver = { + .name = "psci-cpuidle-domain", + .of_match_table = psci_of_match, + }, +}; + +static int __init psci_idle_init_domains(void) +{ + return platform_driver_register(&psci_cpuidle_domain_driver); +} subsys_initcall(psci_idle_init_domains); struct device *psci_dt_attach_cpu(int cpu) From patchwork Tue Jul 7 12:58:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 234996 Delivered-To: patches@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp889211ilg; Tue, 7 Jul 2020 05:58:29 -0700 (PDT) X-Received: by 2002:a2e:b892:: with SMTP id r18mr31952778ljp.319.1594126709777; Tue, 07 Jul 2020 05:58:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594126709; cv=none; d=google.com; s=arc-20160816; b=Dsa9ONnLY9euGLWZG8ozvN1VkAAlCdfpfcQ/We5lgQgrRaAGbppAjNNxHnd38gKvpK /VpjDo70aHUSG9mtzai2moM0zk8tDxxifX84i0bQclAlBmnDqPnYtm5JqHR+gDyIpyOs jo2KEsEqBjcPDjOR2yso3mYk2247H+QQo3aa2g8Xo9eg3DCLibXS6nAA3Z2rQJrVjaw2 7ZW+KSmWUfDqI4xpeoDMGgP3R1x4M0rcTNZ0h1SYNOsambWfhMmNa9QC7YTH1VlanhsF oKsCxXaaO6bFVNTn/hjSYchgD3TROacBcnrhSVTd6EilMl22ZjjarQlbuZfHjdaTuWRJ Q69g== 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=CYhuF0zVY5i8kQEARQ65YbwasNE9FCG8p/MJLf/CDkM=; b=lNzb1SOe3umipd6vq87aRghleh+9bDg0ahdF+0r79okU50ZjFm/m6TY9sCbr4gs+dQ vQoSeUK8ZZL+BK0GNeanIN+PPnk9oScw4yq+ZzEg3G8NAKyb+/e5FS6rVgmy2U/ZwFi8 ld+ShHkyXSLDUfgr/8J0EAozqpL6tuGewOefoTJXceQ6ONHtBG2IfV7EpkEwAUn0SDMe m9a0Exkahi6Z5n/oGCBcU1Zs3URNPtBPmzxKQgBUhnCgx4vUYmNnxFVfEWIcdv6AMICQ mJGLK1zSEmBEtdD874PXtj+iHQYgOqfFqslZ+zDws+NWtChOy+3gUsGJf6X3PGgVXeXX PKuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XRKE1m42; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j8sor12166557ljo.65.2020.07.07.05.58.29 for (Google Transport Security); Tue, 07 Jul 2020 05:58:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XRKE1m42; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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=CYhuF0zVY5i8kQEARQ65YbwasNE9FCG8p/MJLf/CDkM=; b=XRKE1m42wozCzlMVoYCRUQuqeOC9av7JxEB0gwGu6watUzk7LuG9aJ/E6jKGbRvkPf lu+/bZqn3eoofwBRRy6Kb2FRSiGWl7+BlPuBspBCydJFUTN6aXo5mOUABE8Xb62Sqc0q PElQwHWDYxvQXUUwipKFhU6k/MdymHIo4xd16Srh65KoyBXb5a3p+vvoTCH1TyzitwkI 0lhh/qL0W69CpnF8Hv7TFmkHA7lf4oDTGeErnaSb5PVXiL9KebNEjbSpZIrK76ZwSlz0 E1O4cn1fnbBkVATsvl9XuczLYbOuF/jm0yuOMyykFxBPDxn6SOQfbqxnP7aIGeF6pbFR fYoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CYhuF0zVY5i8kQEARQ65YbwasNE9FCG8p/MJLf/CDkM=; b=uASKw4oiQ2jTV4VCPR66dD5n8yGIGLeDMkt0pir9TMATew82ly6fhUzCNPzh2FSu3J SMk/ct/tGBGAeQmSYlw6mzvwR0ANEdf9FjNiU0dLQHM03rMNPjpZ31IOsjvbFqVS96S2 NxgMPQfvs3zGe4VS6MIhZgEcRgTJdamy2sxRSwh7qYp3S+toWGUzkiohkppDyJRbqw5N N4Aqvk4pr+UCZ10DkzMo2+KJLEQd+nWKis60i4HVg94WKn8Mv5L5b10SOkB7RGEYnokA aOfEWSct1PJbzyD2MZ7DPFtIQmN+VzhTD+VU15Yt/hgkLHtNyyyu0+AB3p0YxLsK/DL+ 9ZNw== X-Gm-Message-State: AOAM533KJfNBdjNx0J92WU7RzDzBDhN2dOWy4EcN3Worv4wyDf3eUZ7e /Ny901u58A++if3MSdYVGdeoZ3A4 X-Google-Smtp-Source: ABdhPJxbyT/FghZpCKz9xb09tQjwD2xzc8YuE3qmmbt66tP8td4H3OMfxh3JHoGmbJoHRbHEExwVww== X-Received: by 2002:a05:651c:2043:: with SMTP id t3mr30863147ljo.0.1594126709210; Tue, 07 Jul 2020 05:58:29 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-98-128-181-7.NA.cust.bahnhof.se. [98.128.181.7]) by smtp.gmail.com with ESMTPSA id 11sm9554395lfz.78.2020.07.07.05.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 05:58:28 -0700 (PDT) From: Ulf Hansson To: Sudeep Holla , Lorenzo Pieralisi , linux-pm@vger.kernel.org Cc: "Rafael J . Wysocki" , Daniel Lezcano , Lina Iyer , Lukasz Luba , Vincent Guittot , Stephen Boyd , Bjorn Andersson , Benjamin Gaignard , Saravana Kannan , Ulf Hansson , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 5/5] cpuidle: psci: Prevent domain idlestates until consumers are ready Date: Tue, 7 Jul 2020 14:58:04 +0200 Message-Id: <20200707125804.13030-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707125804.13030-1-ulf.hansson@linaro.org> References: <20200707125804.13030-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Depending on the SoC/platform, additional devices may be part of the PSCI PM domain topology. This is the case with 'qcom,rpmh-rsc' device, for example, even if this is not yet visible in the corresponding DTS-files. Without going into too much details, a device like the 'qcom,rpmh-rsc' may have HW constraints that needs to be obeyed to, before a domain idlestate can be picked. Therefore, let's implement the ->sync_state() callback to receive a notification when all consumers of the PSCI PM domain providers have been attached/probed to it. In this way, we can make sure all constraints from all relevant devices, are taken into account before allowing a domain idlestate to be picked. Acked-by: Saravana Kannan Signed-off-by: Ulf Hansson --- drivers/cpuidle/cpuidle-psci-domain.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.20.1 Reviewed-by: Lukasz Luba diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c index bf527d2bb4b6..b6e9649ab0da 100644 --- a/drivers/cpuidle/cpuidle-psci-domain.c +++ b/drivers/cpuidle/cpuidle-psci-domain.c @@ -27,6 +27,7 @@ struct psci_pd_provider { }; static LIST_HEAD(psci_pd_providers); +static bool psci_pd_allow_domain_state; static int psci_pd_power_off(struct generic_pm_domain *pd) { @@ -36,6 +37,9 @@ static int psci_pd_power_off(struct generic_pm_domain *pd) if (!state->data) return 0; + if (!psci_pd_allow_domain_state) + return -EBUSY; + /* OSI mode is enabled, set the corresponding domain state. */ pd_state = state->data; psci_set_domain_state(*pd_state); @@ -222,6 +226,15 @@ static void psci_pd_remove_topology(struct device_node *np) psci_pd_init_topology(np, false); } +static void psci_cpuidle_domain_sync_state(struct device *dev) +{ + /* + * All devices have now been attached/probed to the PM domain topology, + * hence it's fine to allow domain states to be picked. + */ + psci_pd_allow_domain_state = true; +} + static const struct of_device_id psci_of_match[] = { { .compatible = "arm,psci-1.0" }, {} @@ -289,6 +302,7 @@ static struct platform_driver psci_cpuidle_domain_driver = { .driver = { .name = "psci-cpuidle-domain", .of_match_table = psci_of_match, + .sync_state = psci_cpuidle_domain_sync_state, }, };