From patchwork Fri Apr 12 06:41:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 788753 Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (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 6D65346426 for ; Fri, 12 Apr 2024 06:41:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712904082; cv=none; b=iFmo527Yf04ApdIkSU+HTUPX2BZlwyKiL5B7bALMLZ8FP7af06mmKWoymImG2VoFwAxcn+MSg113eyEoYWcdwLVCQcbTQNabJbwPavo2lfYmLOyQLc043ILJZ3mynBlzaAHLiXyEWrZOoU42DgQvmZp0BYD0MH7V0VM6/cHBdSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712904082; c=relaxed/simple; bh=m7pKDrYga2gbTAdKQCqTuI7axWf7A1B7kNQ/eadgX08=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=bsKpTaxJiw4WCHVU+bLT7mS3vBIy22mWycIJoLZf1bt/B1uc8bR9lsEOKhInPJQJeauoQDczbswvd/kll/EMMQyILS03oSC7uY1FHMFK4VyYnQ+caB+ohc9US8fXCfn06AaRnfG5KEsM6QyhM30vAmE2HvX5Kk0Tm58/bogTLEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=FEXCuH0k; arc=none smtp.client-ip=209.85.160.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="FEXCuH0k" Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-2228c4c5ac3so366755fac.0 for ; Thu, 11 Apr 2024 23:41:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712904078; x=1713508878; 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=UiaQ+iCBsBW1064aL5cRxOlJgLtaI/KNe1W4qG45Tis=; b=FEXCuH0kwNUKPOx++wzmjp16l5THVC7WE0GIJpMwTPJsZQf7d0zPRtB+lh8F9jgCT7 cEVP3wD34dD7xk3p0R89S8CxyTtpue4dU1uadTJaMSIHVYk8bomy0atb9AeWjOuuvhq0 CCT+0SCjDyvkSo3ztPVJAUNOTh4chRXviY7coerP/g6Z7Wc7KEx/MQQvflBJqyfyLAFC 1MoeF9wSG42yLIu86/bKslmxJz6oISFv+WhTjmsxd7JDUaSW4Wa6aOjUcIWLRJXDTBgi 8vosKlQO/co1YjDBu8VXDMZ70VN38JId5dM5rgr3PhvUkDKxadXseO20Y6F6FsM9rsXj m5gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712904078; x=1713508878; 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=UiaQ+iCBsBW1064aL5cRxOlJgLtaI/KNe1W4qG45Tis=; b=HZXYzclFIAsiSvmo5BgHQEx1HXdKiZTLPvfpELOc4vl1eNoDprjZZqHUjEOa4RxPLO /Ow2fmoQthdtFQKfVe3nLBx0Ic8I1JMCL4j33XatBGgn6pGSJld3l/rtYxNPpUE+shsw CnkI6qFIp7xAFrts2F1icSOg9TVVARf3PATXltcVGZ4lXwXkAwuO8uYM3/NI2KGuNXGY gqPLlRljNSamOK9uahZU8vEgipYdi9qfHlRnFcw6D+u1fO4VklVv9ZdTxLtEIIVBmZYb pLNyV+rSUjQqghp67Zt3XkGEBiBqWLuBtV1cOLfIdUd9seXv+ldSvw7EYFudQsDaU0Qe CKOg== X-Forwarded-Encrypted: i=1; AJvYcCW48y57iljGYo6LWfAzG7GxAJx5ZH7CJH+32woX1jNNrTn13byRNue6Y5MRGlfbMeaY2Y+cVWzPDPTEGXLJfpKcYApQc+e5kII= X-Gm-Message-State: AOJu0Yxhljokhp8a0XWmx4JDwRh8ua2rk9zATGQnCrFh5hqy1dZPbEZA jwUM1TLxnD+ge/TXiIwhKzT1m89BVBZwGbhoiahSwGVEiU0s0f3HHL2LBTREgLM= X-Google-Smtp-Source: AGHT+IGhXLKIVJAVcYVe9Su6xebSXosIe9oKNvMHq69VsegpumGuzgTzXIEpEa9N3vOembun61CVGQ== X-Received: by 2002:a05:6870:a453:b0:22e:de07:84a8 with SMTP id n19-20020a056870a45300b0022ede0784a8mr1962568oal.0.1712904078367; Thu, 11 Apr 2024 23:41:18 -0700 (PDT) Received: from localhost ([122.172.85.136]) by smtp.gmail.com with ESMTPSA id g21-20020aa78755000000b006ead618c010sm2196079pfo.192.2024.04.11.23.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Apr 2024 23:41:17 -0700 (PDT) From: Viresh Kumar To: Viresh Kumar , Nishanth Menon , Stephen Boyd , Ulf Hansson , "Rafael J. Wysocki" Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Vladimir Lypak , Thorsten Leemhuis , linux-kernel@vger.kernel.org Subject: [PATCH V2] OPP: Fix required_opp_tables for multiple genpds using same table Date: Fri, 12 Apr 2024 12:11:10 +0530 Message-Id: <2eb72832e852c80e5c11cd69e7d2f14cefd8b1cb.1712903998.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The required_opp_tables parsing is not perfect, as the OPP core does the parsing solely based on the DT node pointers. The core sets the required_opp_tables entry to the first OPP table in the "opp_tables" list, that matches with the node pointer. If the target DT OPP table is used by multiple devices and they all create separate instances of 'struct opp_table' from it, then it is possible that the required_opp_tables entry may be set to the incorrect sibling device. Unfortunately, there is no clear way to initialize the right values during the initial parsing and we need to do this at a later point of time. Cross check the OPP table again while the genpds are attached and fix them if required. Also add a new API for the genpd core to fetch the device pointer for the genpd. Cc: Thorsten Leemhuis Reported-by: Vladimir Lypak Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218682 Co-developed-by: Vladimir Lypak Signed-off-by: Viresh Kumar Reviewed-by: Ulf Hansson --- V2: - Fix an `if` condition. - s/Bugzilla/Closes/ and change ordering. drivers/opp/core.c | 31 ++++++++++++++++++++++++++++++- drivers/pmdomain/core.c | 10 ++++++++++ include/linux/pm_domain.h | 6 ++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index e233734b7220..cb4611fe1b5b 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -2394,7 +2394,8 @@ static void _opp_detach_genpd(struct opp_table *opp_table) static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev, const char * const *names, struct device ***virt_devs) { - struct device *virt_dev; + struct device *virt_dev, *gdev; + struct opp_table *genpd_table; int index = 0, ret = -EINVAL; const char * const *name = names; @@ -2427,6 +2428,34 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev, goto err; } + /* + * The required_opp_tables parsing is not perfect, as the OPP + * core does the parsing solely based on the DT node pointers. + * The core sets the required_opp_tables entry to the first OPP + * table in the "opp_tables" list, that matches with the node + * pointer. + * + * If the target DT OPP table is used by multiple devices and + * they all create separate instances of 'struct opp_table' from + * it, then it is possible that the required_opp_tables entry + * may be set to the incorrect sibling device. + * + * Cross check it again and fix if required. + */ + gdev = dev_to_genpd_dev(virt_dev); + if (IS_ERR(gdev)) + return PTR_ERR(gdev); + + genpd_table = _find_opp_table(gdev); + if (!IS_ERR(genpd_table)) { + if (genpd_table != opp_table->required_opp_tables[index]) { + dev_pm_opp_put_opp_table(opp_table->required_opp_tables[index]); + opp_table->required_opp_tables[index] = genpd_table; + } else { + dev_pm_opp_put_opp_table(genpd_table); + } + } + /* * Add the virtual genpd device as a user of the OPP table, so * we can call dev_pm_opp_set_opp() on it directly. diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c index 4215ffd9b11c..c40eda92a85a 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -184,6 +184,16 @@ static struct generic_pm_domain *dev_to_genpd(struct device *dev) return pd_to_genpd(dev->pm_domain); } +struct device *dev_to_genpd_dev(struct device *dev) +{ + struct generic_pm_domain *genpd = dev_to_genpd(dev); + + if (IS_ERR(genpd)) + return ERR_CAST(genpd); + + return &genpd->dev; +} + static int genpd_stop_dev(const struct generic_pm_domain *genpd, struct device *dev) { diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 772d3280d35f..f24546a3d3db 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -260,6 +260,7 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, int pm_genpd_init(struct generic_pm_domain *genpd, struct dev_power_governor *gov, bool is_off); int pm_genpd_remove(struct generic_pm_domain *genpd); +struct device *dev_to_genpd_dev(struct device *dev); int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state); int dev_pm_genpd_add_notifier(struct device *dev, struct notifier_block *nb); int dev_pm_genpd_remove_notifier(struct device *dev); @@ -307,6 +308,11 @@ static inline int pm_genpd_remove(struct generic_pm_domain *genpd) return -EOPNOTSUPP; } +static inline struct device *dev_to_genpd_dev(struct device *dev) +{ + return ERR_PTR(-EOPNOTSUPP); +} + static inline int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state) {