From patchwork Wed Dec 13 11:32:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13490753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E321AC4332F for ; Wed, 13 Dec 2023 11:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=+gzEW+94E83CnYYBDlrYvo1fdYd6PjWo5zCuvKUC7uQ=; b=tHwiNCXoyDQdrY g2aHHRy0cIozQ1NQEV5lzwm5uJLi8B5HrMXvTgZJxPnRNRAuaOcFb2J6BwBx7q+qnaCpcCO5hGxNh agWssYT1CFN+CaYDLrVoDDXJlJNxRINrJHlfV5JdcWv1YzO7IjMlz0CymO19WMVVECbTAxL/cyInt dMWgBED9t7uJ69nmH1MS0e27rAgwiMoNG/gnSLBVonGOC2yBl7IakDQwTH/60P/imapfESqJeb6+m wsepwCrEA/5jclwu3sdtqii0lzX2Lzu2JxxZ7MkFwvyqPlvSY6qPbTsHv1OxgVXs1YIyvozJ61ifP 3GRZ3IFZshoovvXfohkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNUG-00ET0u-1K; Wed, 13 Dec 2023 11:33:12 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNUB-00ESzU-0P for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 11:33:10 +0000 Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2ca03103155so86211321fa.0 for ; Wed, 13 Dec 2023 03:33:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702467181; x=1703071981; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=mSuSsAGCz1bsucla0R6QxbX9WoW2LywF9inDSTsLob4=; b=nTISlu4DElon8rR47aiVT8xhSk4pvb1pms0KMRmAH9RYFc6qLHGGG31TShJZHETRNJ 5xzSD63xC1lNQ2DMauw/LI3E8RJLHAMu4NmY8LjMTNBagZ00G0+ceiS6c07kiIunR84l OglTClDY8+Km8isZs61HSfptgI2ujO/HgsHHCS3op5BhMl5VX+P6OTPBFm8RG3f9AsIw uxC+8C8A4fK8gqROSM6WZGuxPRNM9Rnrju7QLujX4VGu1DoYnrRakS94lGmmOL6bdcop f3ALbq+tCjqthjtwTh7IqgMbQhdmzmtKAGD1bgZb+X9gEswWvnWqUH/sV5rF9CGsA+wu tLdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702467181; x=1703071981; 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=mSuSsAGCz1bsucla0R6QxbX9WoW2LywF9inDSTsLob4=; b=uGkFR9B+ZMrCte9kAKhcCIQE0y51LBdIfebta8AkUutbAAZXb1w4TnngKmAbxPrjOq eL2M6Jz1EJQzlPfihbOgy9m6F/x07MC16txZW+2to75fA6x2lMxsf0HaLoBXko5DePIS TPqqsR9rCkLoX3qb0BZ5iSceQOPnRIh6O82INN+lqr7i+Aq7IAAQ05ySGdJXfdd+D2+N CophjrXahjYFOfY5qgX6F+I4NQkfNRrp9V2SZVgK2qDp5Sjydo9Nx75yIlKDDpELf3BA i/xwilIotwtoHiJKzHIE3d6WF4V77ZH7UjMorUjwuDqO0eSDptFAQdjbfXq8AlQ260VA s/cA== X-Gm-Message-State: AOJu0YwAEuOHC9bsa6wYFwilCAuSv6iacjA7w9eYoUUNU9fUUfa1HOMc LU3HmBeOO54R2YUmiG6lHX1fvptJLCZApfeRtGg= X-Google-Smtp-Source: AGHT+IFfjiu96YZAhVw8RGb9KnLHzIXPeGt+cwOiHP2URRoBPSCcNNJIUlGsZdw4q0wcKrg5WYPNmw== X-Received: by 2002:a05:651c:1a24:b0:2cb:28f3:244d with SMTP id by36-20020a05651c1a2400b002cb28f3244dmr2529901ljb.6.1702467181130; Wed, 13 Dec 2023 03:33:01 -0800 (PST) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id r6-20020a2e9946000000b002c9f71e61f3sm1812273ljj.6.2023.12.13.03.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:33:00 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Kevin Hilman , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] PM: domains: Drop redundant header for genpd Date: Wed, 13 Dec 2023 12:32:45 +0100 Message-Id: <20231213113245.29075-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_033307_190437_7518F3EC X-CRM114-Status: UNSURE ( 9.19 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The "power.h" is no longer needed by genpd, so let's simply drop the include of it. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index cf65b5a9783c..9ee1bf2ece10 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -23,8 +23,6 @@ #include #include -#include "power.h" - #define GENPD_RETRY_MAX_MS 250 /* Approximate */ #define GENPD_DEV_CALLBACK(genpd, type, callback, dev) \ From patchwork Wed Dec 13 11:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13490754 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2A77DC4167D for ; Wed, 13 Dec 2023 11:33:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=kk9YseRncVcpwMahFR3W7rFFQV6mS1jg/MimltemMfw=; b=R0AAY8nvra3t86 E8p+kJsGIpgXl8P6hZBLSwpOufDYvhABYF+OLslX5g7RFAtF+7GWkhftWhOCj2MtKe76NLcUUbyPi MSt+/P99Liq+ilmut8DDqqOQQH9muy3MwxbLuLJJvjMwIP5wGH7AvUEGBaHKQzbp5n0cfD9DAFfIU xcwpo+jsg+xOxcU6SI4z+VGfq471S/hjFkcazDWmI6njNEV2mbe3JR5rNoSmL2l61EGanmGEDqh+w FvgwKtkC+YnN1M70Co2M/oPmIkPn8eOS6aHL6rWQQbaRc0arcZHq82AFeEdzxowW0x9zgTD4WMS/e AetYzYwAqrbTXUyARRRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNUS-00ET80-0i; Wed, 13 Dec 2023 11:33:24 +0000 Received: from mail-lj1-x22b.google.com ([2a00:1450:4864:20::22b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNUN-00ET0c-0Z for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 11:33:20 +0000 Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2cc3647bf06so7165021fa.2 for ; Wed, 13 Dec 2023 03:33:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702467189; x=1703071989; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=htZ0z29JSHaeYwcbtg65xi6QGYr+mWu8yuJLXo0qg0Q=; b=cGKYJoRdL6piQcm7+DMl7FXi9aFCEVDq+CCwCeO0kySx3Zh0ryx/4GRBqMK9jzw0Eq 7lOFwBsqRdtkix6FHVoTaYaCjO+L27QxS3ZxcYl7yxtjZ/1YFg/yFiGCZA0PgElZkKFN Dll7m4OGawWmjl+3WlIlj8HCS1fArIQft0Jw+gGG+mdQCILynK2NtWqpLg7L8nL1V3Mf RvRXUN4yQ0GVryGskSabEtxDl9UQgGcmSX1TX5N01WJNnDZFPPTr43PrVLfxzTFwpsnf H1e62tTm6+v0ny1mXSD5lLFnbBLe6HmPF8qeIfCthlbUyr74AbuGmusqMGLUyidRcpsu 4TIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702467189; x=1703071989; 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=htZ0z29JSHaeYwcbtg65xi6QGYr+mWu8yuJLXo0qg0Q=; b=MhzUQqmy5FLwMbh15eC53lgS8JmT/VnCKW+hQcuKi425mWJ6cO4KnMgLH4BlqEEcJ6 W0E2y6DFT6qJiGfOJI9Jv/Ugwhg8giWDHBdXgXk7CxB6bwDMcG08afSsoUgKx5j6wpEr zP0HE4p3DVHjSyWWi0gA2z1aHjskJ7sP8z/71p89YYt4Uwu/UcxfxTRwfK+LLr1QqLLD UvJRpX/J7uR7fkt5iQqr6o3ekZ3JuJZG9jgOs+aVPEK7Imo5dD4QZQbEEGOR93eFNLz6 xGY0TfQ31mtFl5BR0vuflDxpfTMk2gror71344/0clwkFvJSSqzIb8zvJTE+EPXsOTvq 64zQ== X-Gm-Message-State: AOJu0Yy2gXYpq+v5qpLWfnRXyzx0Cw2MDLLn+jYy5WAEw0Bn0c4d2I/h XaLy0ciP95MXs2N57nNyXiiI8g== X-Google-Smtp-Source: AGHT+IEYU8QnX1qYGV0hcMy23DhWt+J8l2mgG2U1R7ZB+WwMmxmp0UT250v/mB4bMySh4QlUHetkoA== X-Received: by 2002:a05:6512:368d:b0:50b:ec26:7c56 with SMTP id d13-20020a056512368d00b0050bec267c56mr2054856lfs.50.1702467188879; Wed, 13 Dec 2023 03:33:08 -0800 (PST) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id fc18-20020a056512139200b0050bda0f8835sm1594955lfb.119.2023.12.13.03.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:33:08 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Kevin Hilman , Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] PM: domains: Move genpd and its governor to the pmdomain subsystem Date: Wed, 13 Dec 2023 12:33:05 +0100 Message-Id: <20231213113305.29098-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_033319_232031_AB34E63B X-CRM114-Status: GOOD ( 10.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It seems reasonable to collect the core parts for the generic PM domain, along with its corresponding provider drivers. Therefore let's move the files from drivers/base/power/ to drivers/pmdomain/ and while at it, let's also rename the files accordingly. Moreover, let's also update MAINTAINERS to reflect the update. Cc: Kevin Hilman Signed-off-by: Ulf Hansson Acked-by: Rafael J. Wysocki Acked-by: Kevin Hilman --- MAINTAINERS | 10 +--------- drivers/base/power/Makefile | 1 - drivers/pmdomain/Makefile | 1 + drivers/{base/power/domain.c => pmdomain/core.c} | 0 .../power/domain_governor.c => pmdomain/governor.c} | 0 5 files changed, 2 insertions(+), 10 deletions(-) rename drivers/{base/power/domain.c => pmdomain/core.c} (100%) rename drivers/{base/power/domain_governor.c => pmdomain/governor.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ea790149af79..ab4b0aed34f9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8878,21 +8878,13 @@ F: Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml F: drivers/i2c/muxes/i2c-demux-pinctrl.c GENERIC PM DOMAINS -M: "Rafael J. Wysocki" -M: Kevin Hilman M: Ulf Hansson L: linux-pm@vger.kernel.org S: Supported F: Documentation/devicetree/bindings/power/power?domain* -F: drivers/base/power/domain*.c -F: include/linux/pm_domain.h - -GENERIC PM DOMAIN PROVIDERS -M: Ulf Hansson -L: linux-pm@vger.kernel.org -S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git F: drivers/pmdomain/ +F: include/linux/pm_domain.h GENERIC RADIX TREE M: Kent Overstreet diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index 8fdd0073eeeb..01f11629d241 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile @@ -2,7 +2,6 @@ obj-$(CONFIG_PM) += sysfs.o generic_ops.o common.o qos.o runtime.o wakeirq.o obj-$(CONFIG_PM_SLEEP) += main.o wakeup.o wakeup_stats.o obj-$(CONFIG_PM_TRACE_RTC) += trace.o -obj-$(CONFIG_PM_GENERIC_DOMAINS) += domain.o domain_governor.o obj-$(CONFIG_HAVE_CLK) += clock_ops.o obj-$(CONFIG_PM_QOS_KUNIT_TEST) += qos-test.o diff --git a/drivers/pmdomain/Makefile b/drivers/pmdomain/Makefile index f0326b27b30b..a68ece2f4c68 100644 --- a/drivers/pmdomain/Makefile +++ b/drivers/pmdomain/Makefile @@ -16,3 +16,4 @@ obj-y += sunxi/ obj-y += tegra/ obj-y += ti/ obj-y += xilinx/ +obj-y += core.o governor.o diff --git a/drivers/base/power/domain.c b/drivers/pmdomain/core.c similarity index 100% rename from drivers/base/power/domain.c rename to drivers/pmdomain/core.c diff --git a/drivers/base/power/domain_governor.c b/drivers/pmdomain/governor.c similarity index 100% rename from drivers/base/power/domain_governor.c rename to drivers/pmdomain/governor.c