From patchwork Tue Jun 29 20:39:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 468380 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5298173jao; Tue, 29 Jun 2021 13:39:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9Gl3hEjYEGtenbLkWJ4ew9YtcoglYYDDlIUhqam+G4NQ/fV3eCkmL+cuplxbK54VMYjsh X-Received: by 2002:a92:c68c:: with SMTP id o12mr13122250ilg.21.1624999164603; Tue, 29 Jun 2021 13:39:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624999164; cv=none; d=google.com; s=arc-20160816; b=S3G/VjDXrWDPGY8AnMu5RSg9kZKx/zBvy44xgiOKfOGhB/mMLOcy6rxiS78VS/TMPz KRYyioolp7k5lUk1rRUKaAQbwrzHufqwCPMzIyzqthVM8NaYQIQeCYj/ImIYfKGaSPAT zSgFT9q6xUNJBhXN2o79+uqtxEHcYd0uUOPUnVwbAWryFOHG5utqGvT5ulo9BDBKwbLh OunJu8T/5sA+XiELsN6QREvRKVJ18daWgFhsJJ06Um0PUz9j438T3OG6S+22yI7EdKvS /CCa6993htUE2FDYlMAg2vFit5St2L944yq4I7vwDbSTmn+fky0OTc/51PraTpeJOMf1 /8Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=/0DsRwiemWRcUIuwueb9Y8X2gyBHPUAig9IO+tLNZso=; b=C9rdPVLk7KMDaUy7BmGQ3geH5Yp+FmYNi0io/xfgLGlNA8A2KBUf9iMv/9B6As8b4j Ci9an2fElVNL/IsbrlH5L2ZuGX+ft+ge8HyPt+Gzjc+c+La5T6CHbKCFzWLU0nTORLzn abusm0q/H5VqFsXHMV5iuyTX4aAk6LrA8XbiM5HVicflXYv/Uc5+GA5kXob+085WtVJu k+LsHLgw20NWSsN3OzshVadfg6DnIGxK4DTAp8+5Vxd0bPeWwZscZvxG11Hz7Y8bQLQV JkETpL5knUsrdKL1UBO7QTYMapp7Nm0mKghRhhHy8HigYSEPSjPl/7MKh4DP7s48ovHn UuCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DtQ968WY; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t15si16403176jal.92.2021.06.29.13.39.24; Tue, 29 Jun 2021 13:39:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DtQ968WY; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235159AbhF2Ulv (ORCPT + 17 others); Tue, 29 Jun 2021 16:41:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234874AbhF2Ulu (ORCPT ); Tue, 29 Jun 2021 16:41:50 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA3B8C061760 for ; Tue, 29 Jun 2021 13:39:22 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id u25so17190963ljj.11 for ; Tue, 29 Jun 2021 13:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/0DsRwiemWRcUIuwueb9Y8X2gyBHPUAig9IO+tLNZso=; b=DtQ968WYHX1WBnYz8tnoM7YDFgGL1mPoNpZYeuTd/coFfF3UD6xShQ2+4GR5W8m3ci XKjN3E0SxbtkK0ra/p03svxawz81nGTNFt5MLG0HjQjhsQlRjWrJ1DwLk2uTKQ0dBF/Z KqAZKBuWNfKBMUApUwtMZzla6xmeaJNNs/zobnrrhLWPq89ZWtTmf9Wctc9iBmxtNelI dOxj+RKU9XtYYC5hWixwF43MOQRn7qeDXyQ22Crk/8lq0LGEPrIqQJR9y2AlO4OyRYVj e4JYuxrDbVN8Jd94NbHPzfvYXHQFZnnh5vF1jCqsvzrt2W+cx5Ogby9+fHNejo1ZGJvg DoNQ== 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:mime-version :content-transfer-encoding; bh=/0DsRwiemWRcUIuwueb9Y8X2gyBHPUAig9IO+tLNZso=; b=Nf5OhQXIiQerUlU3+a0EAbqNhWDYWx0org0u/C1sr9VFOCwTEh864p5JSyXOT+oAky DwiZpe0RmSm1sXyq9N0zdWZ7OodCmTu4sxzBVkGUU0UKL7dJRFnWpgsbJIqBQ3qOgIQP 8SpOcy7c9ndfV0IrzcM6twADE0v5p1pRLVkvxeZ4qkjoozWBfjHApw0GsuK6B2rgDdUd zsBg3vPbWdz0XCqhysP+GnBK38/iXETVvcHedK7gqvOoySJi6yOSjE4EamXj9tgBsrbf ouPYVpNRmEgVwLzEPE8gq4GILtUtPWH3Pv+diLG7xUf2ewigfDeSzzxwlvZHv1W02mkZ XVBw== X-Gm-Message-State: AOAM531YBchOoScDIYF2d2BsmOAK7RJt6H1UyapL+5gNqiJOuUvjLjjL ZHhVFWab+IsosIsijcM9oCETtQ== X-Received: by 2002:a2e:a786:: with SMTP id c6mr5298466ljf.96.1624999161108; Tue, 29 Jun 2021 13:39:21 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id bp34sm1716902lfb.125.2021.06.29.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 13:39:20 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Stephen Boyd , Michael Turquette Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH 1/2] clk: qcom: fix error_path in gdsc_register Date: Tue, 29 Jun 2021 23:39:18 +0300 Message-Id: <20210629203919.2956918-1-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Properly handle and cleanup errors in gdsc_register() instead of just returning an error and leaving some of resources registered/hanging in the system. Signed-off-by: Dmitry Baryshkov --- drivers/clk/qcom/gdsc.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index 51ed640e527b..241186d9d08c 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -429,7 +429,7 @@ int gdsc_register(struct gdsc_desc *desc, scs[i]->rcdev = rcdev; ret = gdsc_init(scs[i]); if (ret) - return ret; + goto err_init; data->domains[i] = &scs[i]->pd; } @@ -437,11 +437,35 @@ int gdsc_register(struct gdsc_desc *desc, for (i = 0; i < num; i++) { if (!scs[i]) continue; - if (scs[i]->parent) - pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd); + if (scs[i]->parent) { + ret = pm_genpd_add_subdomain(scs[i]->parent, &scs[i]->pd); + if (ret) + goto err_subdomain; + } } - return of_genpd_add_provider_onecell(dev->of_node, data); + ret = of_genpd_add_provider_onecell(dev->of_node, data); + if (!ret) + return 0; + +err_subdomain: + i--; + for (; i >= 0; i--) { + if (!scs[i] || !scs[i]->parent) + continue; + pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd); + } + i = num; + +err_init: + i--; + for (; i >= 0; i--) { + if (!scs[i]) + continue; + pm_genpd_remove(&scs[i]->pd); + } + + return ret; } void gdsc_unregister(struct gdsc_desc *desc) From patchwork Tue Jun 29 20:39:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 468381 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5298192jao; Tue, 29 Jun 2021 13:39:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOB8tMsbyIaxLoZ5n4RjM+ERp1zax303tbzJBnhMP3OIpmvgs5308PRbBfwdDvk+5qPRk5 X-Received: by 2002:a92:ddc6:: with SMTP id d6mr22360096ilr.51.1624999165751; Tue, 29 Jun 2021 13:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624999165; cv=none; d=google.com; s=arc-20160816; b=dc9GdgEMCEMslyNbFaRZDsuFZyaL8NDAqVCRVEO5q+fam66m2IrtqrrUehBNdxGF8i rtEnYHJHejPPpKgIbwyrjoHstq0YbSotdsCOSPu4OMtBdUPsfCaae7jv/BPkfeSub/B0 B4AI4DqZVzQysqafdZU/qFvTNPrQCUTifvtofboIL8UA2uKqMoy4a1jKIooD8hal90bO AODDqqqArreRd0zVmpn2BPqGlmv5xdveeBe3G6C+v/NVHcpBq85gzagLPhqtLtyCI00R uYQddxx+9PqgRBDjTpWQx4PnwWWssLI38/+svxVJRxNj6LFQqqfhcOcmRcRhJgR4ereL dSjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hGGdhrQRxRIwpexQ026nf1QwSjPosmBJCMufHDMbnLc=; b=ZB+NGr4P3fDwNVVte2jAle23WzR44UJtDb3COyT/lyQf5yATNJc0ZgurrVgB4yUsqR tdX8cdSu7SbJc9oWhlHy0eIbJl7tlAuKKg2m8jArWwvsS/jC0kYYbTUttJXakfv7U04B t2J71H/ZOuhpp09BRQLGm4nVzyhB1blwgZiKpr1R5t3/I5bqejribXoRJzVEKLL8dxut GaYRrTLsMSSbLTZedjf2HGRI/sNQ26NM1Qv275NzV6zfbbp35B5xNrNI5vXl+yPkBoOQ dOazpekAnupDkVIYqrUPGMCw7etojDQHkx46MINc9hGaTpoHx4KTZFe0y8vDRjnpWtZk uAyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZHes7vTF; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t15si16403176jal.92.2021.06.29.13.39.25; Tue, 29 Jun 2021 13:39:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZHes7vTF; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234874AbhF2Ulv (ORCPT + 17 others); Tue, 29 Jun 2021 16:41:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235316AbhF2Ulv (ORCPT ); Tue, 29 Jun 2021 16:41:51 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FBB1C061760 for ; Tue, 29 Jun 2021 13:39:23 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id f13so32826754ljp.10 for ; Tue, 29 Jun 2021 13:39:23 -0700 (PDT) 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=hGGdhrQRxRIwpexQ026nf1QwSjPosmBJCMufHDMbnLc=; b=ZHes7vTF6ekSlCjtih4vBw3PMWUUnp5NLHqOUsSxFK/fKLA/GQCgT8SRgufgTC/sSn pNF9hu/hYIbDZH4Pu+lNgGmp0frywk9rtmmD1UDri+A0W1bOGhLWn6/deAbzOikj3Z76 zzGfykPrcLYqtdYbk79HJarMA5emMrCH63C6rGYY2uxILrQk0ZqnzkXG5t+Mud+pEnIV hyd8t8tMPmbVkq7ej/thFDUM1gTer0YbIssINjQtu2oqRSbDlc1I4eIZpuu72TXGqU82 BTzGraItHp0s3/FNZb6zjcXAVdfFmnKUYSLeHp/mfo9pB3qLLmx9RvlH92q3jVdj9mc6 7M2A== 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=hGGdhrQRxRIwpexQ026nf1QwSjPosmBJCMufHDMbnLc=; b=BcWGAQl1WGVs3rggGz131HXMIS61MPGTpptkdUwTHA4l6B/KgG9RqE5wGKccPTH9UJ tHkqL9XhU6UGc3PctOtyJldunfkWKfyl5b/9w/8dF1pQsdG9AZwqRos7Lmj4a/OaH0Ng ln4nEsu1Zj0U9GAQalfH0Zysza5ro7QDf8KgEjZ1bKek5O5I2QoEqOkmz6R1/yiyMEBk YWFgpgSYKjl2HgE8EWY9AO+90hjL51dfIV+Z7ia7qBtkUE7p3OhtwPlP+wMyjfRCUxEU ye+eW/qCpkFYWNyZYVdceFUNNvWOHj6n7C9ITOmdIxHdYd2xLzko2yxzETdx8iNVD9TU KM6w== X-Gm-Message-State: AOAM533VDyhzmphpRJUxYWbi1bkZWmUHDtPuA0BGNSmrXov5mBjpi2pV nMm4Q/8Ww09vN1I4K40qOkAMQA== X-Received: by 2002:a2e:894e:: with SMTP id b14mr5392588ljk.112.1624999161861; Tue, 29 Jun 2021 13:39:21 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id bp34sm1716902lfb.125.2021.06.29.13.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 13:39:21 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Stephen Boyd , Michael Turquette Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH 2/2] clk: qcom: fix domains cleanup in gdsc_unregister Date: Tue, 29 Jun 2021 23:39:19 +0300 Message-Id: <20210629203919.2956918-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210629203919.2956918-1-dmitry.baryshkov@linaro.org> References: <20210629203919.2956918-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Properly remove registered genpds. Also remove the provider before breaking parent/child links, so that the system is consistent at remove time. Signed-off-by: Dmitry Baryshkov --- drivers/clk/qcom/gdsc.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index 241186d9d08c..4b211dd1764d 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -475,6 +475,9 @@ void gdsc_unregister(struct gdsc_desc *desc) struct gdsc **scs = desc->scs; size_t num = desc->num; + /* Remove provider first */ + of_genpd_del_provider(dev->of_node); + /* Remove subdomains */ for (i = 0; i < num; i++) { if (!scs[i]) @@ -482,7 +485,13 @@ void gdsc_unregister(struct gdsc_desc *desc) if (scs[i]->parent) pm_genpd_remove_subdomain(scs[i]->parent, &scs[i]->pd); } - of_genpd_del_provider(dev->of_node); + + /* Remove domains themselves */ + for (i = 0; i < num; i++) { + if (!scs[i]) + continue; + pm_genpd_remove(&scs[i]->pd); + } } /*