From patchwork Mon Mar 13 08:49:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 68708 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1085070wrd; Mon, 13 Mar 2023 02:38:09 -0700 (PDT) X-Google-Smtp-Source: AK7set8RS3bVdNcP3GGH6Zk4Mq5vXmkeBHyJZmXKSd0xwiIw+YdVTHz17lN0KZa33gVHyOORg3NE X-Received: by 2002:a17:902:dac8:b0:19a:9833:6f8 with SMTP id q8-20020a170902dac800b0019a983306f8mr40189719plx.35.1678700288920; Mon, 13 Mar 2023 02:38:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678700288; cv=none; d=google.com; s=arc-20160816; b=n6lHWWNCg06FE7P7l9opiSkT7Fekl+m7/X+rZTpJw2A8gLEL59Q6k09yR+tpRM3/HT iphZg8R9OAvhJsV9TwsJ3WpgqZh3s9/NeCnZvSDjkscKh4/sV6NfnIhB7j4UFZAhAv/I gd8m1Y80IrV1SsFq2JeLpbWo+wrZVr0VyTDDKVsYfbLyXO8T6gHNd79WJuEQeZUKx9Pn 3sEmWcVyudHkArEhGIsKbhAGy/Xd7Exg2hwVkzHlExTMrUWS1c6ws2IR+ztuiufbZNbu fbiW+A4ibdwwQMistBmjgDPoPxm9RHuxMzvi4y4Oqj334NSyHawJEBPIf7krMhHAQMRZ mFSA== 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=m9a1zs4q40VaWqP3eRjVDLbSf0QW87CCqwaeUwfmvWY=; b=oYwFWCQJMzc40PxthCbcWHLPkJISTgDoRu2287Y2NCCWBcKGp7suWxSETGwH9s6eeB KwVCtvtNak8PosjG5VkcS1p57OpHXf5+FYcTZon3Z+XyBaP7hR5qDNKhcA63fTsTLLci GhjjdBO4CCqCUaHt0F88rcPWn7lVOhRJvYEQ9/5ziaKVKFmXn0T2eF1u9Rn28wMdnE/c LPM3QTi/9zqcIpziD0Cvk6zAieQEOailfVSFPz1USpY3DFDk0oRuPNFlkJEws7un1K8K Ljyb7e+L5GB1CR5q/womxAE8wFUUVJeae/1pLW5LJUr2xTK9G7mWoP1mDBKNkxec7ZRk 0ofw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=d2yww4Oe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u14-20020a63d34e000000b00476e640ddfesi5999904pgi.80.2023.03.13.02.37.54; Mon, 13 Mar 2023 02:38:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=d2yww4Oe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230429AbjCMIyF (ORCPT + 99 others); Mon, 13 Mar 2023 04:54:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230230AbjCMIxi (ORCPT ); Mon, 13 Mar 2023 04:53:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D77B4FF2D; Mon, 13 Mar 2023 01:51:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D518561149; Mon, 13 Mar 2023 08:50:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BFB5C433EF; Mon, 13 Mar 2023 08:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678697456; bh=UTxAK37bDA3EVcUJ2I3cJfHTWjh0McAXEajETjzOVq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d2yww4OelgDzAjGUZXFWezscNGRWs+NxhWiIpHVNVTJqzgh1hChaDrJTlEHIfsvfW WxpiTngKuBp/IYlB5ACOY8Sz7/SjSOCQjL3Z+RMoZchNNKkepo6S2ghlug2zfJyzWG 6R8XoC8gI5RHt9gyKAKv8IukPPrI0jNwfLS5f9hNXWOFSji+vwzHHrr5iRahFOyME7 8tutOqENoqBo6Hn4spl53Qlae7nDXLKvmWQkbevu/mc29XcMrSPzwShdhoDDc6IEhK K65J2mMPGUoxxNv9EugoTqwFKyokhrFmU4QoCD75EQrMzeLXSkpKmn4cRCqRAm9U2U KmWqwRhP/e1Dg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pbduO-0006Hu-LH; Mon, 13 Mar 2023 09:51:56 +0100 From: Johan Hovold To: Georgi Djakov Cc: Bjorn Andersson , Andy Gross , Konrad Dybcio , Dmitry Baryshkov , Yassine Oudjana , Christophe JAILLET , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/2] interconnect: qcom: rpm: fix msm8996 interconnect registration Date: Mon, 13 Mar 2023 09:49:52 +0100 Message-Id: <20230313084953.24088-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313084953.24088-1-johan+linaro@kernel.org> References: <20230313084953.24088-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760244563285313269?= X-GMAIL-MSGID: =?utf-8?q?1760244834095859274?= A recent commit broke interconnect provider registration for the msm8996 platform by accidentally removing a conditional when adding the missing clock disable in the power-domain lookup error path. Fixes: b6edcc7570b2 ("interconnect: qcom: rpm: fix probe PM domain error handling") Reported-by: Christophe JAILLET Link: https://lore.kernel.org/r/641d04a3-9236-fe76-a20f-11466a01460e@wanadoo.fr Cc: stable@vger.kernel.org # 5.17 Signed-off-by: Johan Hovold --- drivers/interconnect/qcom/icc-rpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 4d0997b210f7..3b055cd893ea 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -498,7 +498,8 @@ int qnoc_probe(struct platform_device *pdev) if (desc->has_bus_pd) { ret = dev_pm_domain_attach(dev, true); - goto err_disable_clks; + if (ret) + goto err_disable_clks; } provider = &qp->provider; From patchwork Mon Mar 13 08:49:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 68705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1083425wrd; Mon, 13 Mar 2023 02:32:31 -0700 (PDT) X-Google-Smtp-Source: AK7set/zLtnd1JrrqT3QeFKLxUQBIexBEFox0bA24h9Y/LLmalWk8Ilkl0qKQV6oSv7RJnLKMhMI X-Received: by 2002:a05:6a20:7f98:b0:d4:e38b:b2ab with SMTP id d24-20020a056a207f9800b000d4e38bb2abmr838088pzj.22.1678699950794; Mon, 13 Mar 2023 02:32:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678699950; cv=none; d=google.com; s=arc-20160816; b=QwtsgDKQaS2OmmrP5b255ok7N5juLnY0yURa47g2ENhSrYzIA2TNSivJ75sJn4MQPv vAab1oN/AhvPbU/zPL8inPpew2iDjD5ZrXYDtZF3d04YUgXFx8QXCSOBEvUcda6tsCea M7o+ztyC8JBLnofoRWd8U4Ze17edXtUIWXHYMR+9ZBjMlr/5noBZ/0CVA23TLAAJY1W1 9vSVJ7JmAKpwfniXFLS1x/Zc+yhgtuLq5lfVfChDQ7IvfPJhtTqQxayplcRS4VOTerO2 3MTrfG0S3o6WhOplPcYJxXhcXqudAFY4GZNjaOiXWGNJG1WFHhlegCWRl8AIc3iiMuPQ eTYg== 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=ySq7el0qXbqE4w43EaTRnHttPmpTrKRDjuEK9z6pP6o=; b=nlzFrXG/uFTBKWRI6+xNli1FqtAL+EqhdDSUyOgyFJ/oJ6mafPgvU+tdsKEggM/pJF NwClcWdJfEZlYB/6Jt5oReW2hlTcu1v2AsOg9ziSh2ZbExYLaxHN74nvrHXRxKpUPd+S l+y+ERFaAf2k5QXfDmu8cGLS7UXJ7fdI7XdD5Ie36e2emkD5vt8PWaw3IqWpC/bBL28U EcGgGDVdqymRAo+mFedKiczj+cJOJlqHsnMzKDh6lv/IxyHa+yQKQoeTIwH/or8gScZH 74go3Q6IM09vIQ1T88M7P/adlIvjYKZH0BSqbjwAQsghlUdVcI/rqHmk/5tq28lp632V imrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P3MiTsci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z9-20020aa79909000000b0062545446afcsi373733pff.165.2023.03.13.02.32.16; Mon, 13 Mar 2023 02:32:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=P3MiTsci; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230199AbjCMIx5 (ORCPT + 99 others); Mon, 13 Mar 2023 04:53:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230371AbjCMIxa (ORCPT ); Mon, 13 Mar 2023 04:53:30 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F01C2BEDB; Mon, 13 Mar 2023 01:50:58 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DC9116116D; Mon, 13 Mar 2023 08:50:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F056C4339B; Mon, 13 Mar 2023 08:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678697456; bh=aGmBJTLihmn6NlY3ZdQbfuZ8mhBDbOUV15yYyJq3Nq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P3MiTsciJBrc4TsZhq68bs7oHbpEJ07tEltt2TZojiU+CULxKjs4hz9em8jFMQxRA bs+sRiiSz+1vtjs5mzQKvhjInbkj13HjJ0OH3JijgidZpmD1ewQjhORIkU/wufdhFz u2tuLa8IPfPufQMLhngCqVTuueEj9wL37U9jhwUNimDnlskgnRr5XwbiCNwjKBD0QK kH7ftGLDC7ajdOwzdBPn9GaLmNjXTsIz+45ubrg2rTt01UOG0sMdNnfTpFOdZ3NlBg mgL7ioJURhOutkqE788NZ0oL9oo0P/bKZmMFKcVvLbiuQSJB0CVbemxDfeX5nKJuHG lk51fCW5YSemg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pbduO-0006Hw-OJ; Mon, 13 Mar 2023 09:51:56 +0100 From: Johan Hovold To: Georgi Djakov Cc: Bjorn Andersson , Andy Gross , Konrad Dybcio , Dmitry Baryshkov , Yassine Oudjana , Christophe JAILLET , linux-arm-msm@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 2/2] interconnect: qcom: rpm: drop bogus pm domain attach Date: Mon, 13 Mar 2023 09:49:53 +0100 Message-Id: <20230313084953.24088-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230313084953.24088-1-johan+linaro@kernel.org> References: <20230313084953.24088-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760244479595018458?= X-GMAIL-MSGID: =?utf-8?q?1760244479595018458?= Any power domain would already have been attached by the platform bus code so drop the bogus power domain attach which always succeeds from probe. This effectively reverts commit 7de109c0abe9 ("interconnect: icc-rpm: Add support for bus power domain"). Fixes: 7de109c0abe9 ("interconnect: icc-rpm: Add support for bus power domain") Cc: Yassine Oudjana Signed-off-by: Johan Hovold Tested-by: Konrad Dybcio # MSM8996 Sony Kagura Reviewed-by: Konrad Dybcio --- drivers/interconnect/qcom/icc-rpm.c | 6 ------ drivers/interconnect/qcom/icc-rpm.h | 1 - drivers/interconnect/qcom/msm8996.c | 1 - 3 files changed, 8 deletions(-) diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 3b055cd893ea..c303ce22a7cd 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -496,12 +496,6 @@ int qnoc_probe(struct platform_device *pdev) if (ret) return ret; - if (desc->has_bus_pd) { - ret = dev_pm_domain_attach(dev, true); - if (ret) - goto err_disable_clks; - } - provider = &qp->provider; provider->dev = dev; provider->set = qcom_icc_set; diff --git a/drivers/interconnect/qcom/icc-rpm.h b/drivers/interconnect/qcom/icc-rpm.h index a49af844ab13..02257b0d3d5c 100644 --- a/drivers/interconnect/qcom/icc-rpm.h +++ b/drivers/interconnect/qcom/icc-rpm.h @@ -91,7 +91,6 @@ struct qcom_icc_desc { size_t num_nodes; const char * const *clocks; size_t num_clocks; - bool has_bus_pd; enum qcom_icc_type type; const struct regmap_config *regmap_cfg; unsigned int qos_offset; diff --git a/drivers/interconnect/qcom/msm8996.c b/drivers/interconnect/qcom/msm8996.c index 25a1a32bc611..14efd2761b7a 100644 --- a/drivers/interconnect/qcom/msm8996.c +++ b/drivers/interconnect/qcom/msm8996.c @@ -1823,7 +1823,6 @@ static const struct qcom_icc_desc msm8996_a0noc = { .num_nodes = ARRAY_SIZE(a0noc_nodes), .clocks = bus_a0noc_clocks, .num_clocks = ARRAY_SIZE(bus_a0noc_clocks), - .has_bus_pd = true, .regmap_cfg = &msm8996_a0noc_regmap_config };