From patchwork Mon Apr 29 14:05:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13647061 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 DD3A9C19F53 for ; Mon, 29 Apr 2024 14:06:25 +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:References:In-Reply-To: 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: List-Owner; bh=S/XGbQ1wVElp7U5+BfpPoe66EyC5AHvxIt19U14Vx8c=; b=MXtNaScOtkrc0d bmT8A4s3+wppqPGonE8xnzPAIYau93W0g1beUIiOVUNKcxNffh6rG54/IMwWvL/psdvY2YlcUAQTH ez2/nSpGEyIpSpg4G1F4NrCxGo8Xhe405F1IQBS7w+FyDZqM9B8AKHDyvfoN1ydyL5iEYzLP/gMta 9zt/b3qjVOAR+1nbPxNkSA+fL0DhFji9HRWFbnYc8OgHMNW2/bcSNn5tzAvi4udddeCKno9vAF+/f jV8LtfSMIEST3nSimNPpoQV+/gk4ADzjiSKHOTOwgqv5Qpz8sXB8ZwJ1VQlGs14JHtlf83sJaD2fR 7VYA/ycv5DGi2/Tv4JQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1Rdx-000000033Oq-0txO; Mon, 29 Apr 2024 14:06:09 +0000 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1Rdl-000000033LA-2Vqb for linux-arm-kernel@lists.infradead.org; Mon, 29 Apr 2024 14:05:58 +0000 Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2d8a24f8a3cso55086051fa.1 for ; Mon, 29 Apr 2024 07:05:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714399556; x=1715004356; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NhlwXdsIIQqTLzsLYWWuKXNc3rr4XrNJUhlJgkxDb2g=; b=SKSerwK8qpkA9gBpzOIX3uK54XKoZDjNG11BmdTKd6FM0Rv3BjFS72qrEL6bxuE6kt hoXaFw0WSL5bS02RNAXd+L2T0+Vi8ibXpeYCdBhD47zoFWB3pQbQOlNKPbzqVx3mVuPm b1IYq9iPiZON8p8OM+39lijSKgmujE8CdKwH0YTORJnNiso42ZIMeF+epoQ63M6a5EzM in1gCUj5oMLvJElsLVqmbt7TI73imqSgISzUBvMmlR35omAzPl7t4s5TuPKoJlYxd+ZZ Dv5xDQLaIR9Z8BSBi+T6+O3C+wNAsR9TlA/14xHqEHCUajIYYIx4DCH96wtbJtewQCm7 FX0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714399556; x=1715004356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NhlwXdsIIQqTLzsLYWWuKXNc3rr4XrNJUhlJgkxDb2g=; b=PL5hS8hvy6SxgC7CnAOLPLnoYV7+sIZwh4vOzZ/Kq/rSd1q5iod7L2QQ7vZc+iy96V rYzhMsKwJu27bXQYT9oXisxphOZy58bEkZohGsE3Vfc2YwAAKEYrwpohARyjNWumadtM zscCcevUCdUjKdIpykRofQsr5EBIA7fqFdcy4Ukn/J/YCeZHFeF3x0bkxS9BPPNPZcu+ eynX2s6z1Ff/9f2brsKFC22tFwUihg5YscMJky+bk2bCl+RKcIcU3hFcvIGnvNK2bo6e r75FCEN8DKLTEAClRkS4+OI3BbJduR/uwkg3/X8WNeGxW9yMsubla8sA3bfU/fMqRRwy D5xw== X-Forwarded-Encrypted: i=1; AJvYcCV6F8uws12ja0qWA93VYUSkiYNsAVzfTIFsFvLhU4G36ZXjEHYiPi0dkHcb8WkElx6ImmfgWh9vJtlI7/s1JdT0y8H/7+7JU59rY9kg2E1VXE9ayT0= X-Gm-Message-State: AOJu0YyZfKu5jfDsqdapBCqXudma6cSRYOyhCSHC7wG7wP3EG6xQJAnw 7t61woUeHuaEhZw9foFe+u6tNYEl+VT6XUhaBQTp0pvR1mcbCxYxpNvEZOaLLeg= X-Google-Smtp-Source: AGHT+IHPdwyXQU3aNRNl39I+1zVVIQFncsJfd0yL3gfsj/5GlxoblfJ4b4uEsKSkTrkhND9uPVuJKw== X-Received: by 2002:a05:651c:221b:b0:2e0:752c:1f2e with SMTP id y27-20020a05651c221b00b002e0752c1f2emr2172687ljq.1.1714399553969; Mon, 29 Apr 2024 07:05:53 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id l5-20020a2e9085000000b002d7095bf808sm3636733ljg.128.2024.04.29.07.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 07:05:53 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Sudeep Holla , linux-pm@vger.kernel.org Cc: Lorenzo Pieralisi , Nikunj Kela , Prasad Sodagudi , Maulik Shah , Daniel Lezcano , Krzysztof Kozlowski , Ulf Hansson , linux-rt-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] pmdomain: core: Don't hold the genpd-lock when calling dev_pm_domain_set() Date: Mon, 29 Apr 2024 16:05:27 +0200 Message-Id: <20240429140531.210576-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240429140531.210576-1-ulf.hansson@linaro.org> References: <20240429140531.210576-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240429_070557_711995_34A27EC9 X-CRM114-Status: GOOD ( 13.82 ) 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 There is no need to hold the genpd-lock, while assigning the dev->pm_domain. In fact, it becomes a problem on a PREEMPT_RT based configuration as the genpd-lock may be a raw spinlock, while the lock acquired through the call to dev_pm_domain_set() is a regular spinlock. To fix the problem, let's simply move the calls to dev_pm_domain_set() outside the genpd-lock. Signed-off-by: Ulf Hansson --- drivers/pmdomain/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c index abd3c069df8b..1e3f8dea4654 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -1726,7 +1726,6 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, genpd_lock(genpd); genpd_set_cpumask(genpd, gpd_data->cpu); - dev_pm_domain_set(dev, &genpd->domain); genpd->device_count++; if (gd) @@ -1735,6 +1734,7 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, list_add_tail(&gpd_data->base.list_node, &genpd->dev_list); genpd_unlock(genpd); + dev_pm_domain_set(dev, &genpd->domain); out: if (ret) genpd_free_dev_data(dev, gpd_data); @@ -1791,12 +1791,13 @@ static int genpd_remove_device(struct generic_pm_domain *genpd, genpd->gd->max_off_time_changed = true; genpd_clear_cpumask(genpd, gpd_data->cpu); - dev_pm_domain_set(dev, NULL); list_del_init(&pdd->list_node); genpd_unlock(genpd); + dev_pm_domain_set(dev, NULL); + if (genpd->detach_dev) genpd->detach_dev(genpd, dev);