From patchwork Tue Jun 13 14:03:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 107394 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp569305vqr; Tue, 13 Jun 2023 07:05:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ66bhXFa0LuxQ+97UeGVeAWeuXpk5VMFMJcMG4epojLWMOYeWBnAUJ0KVI9SEfrV0ZF0O3P X-Received: by 2002:a17:907:2d25:b0:978:8685:71d5 with SMTP id gs37-20020a1709072d2500b00978868571d5mr13161545ejc.30.1686665115744; Tue, 13 Jun 2023 07:05:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686665115; cv=none; d=google.com; s=arc-20160816; b=rJustvAVQsBre3qqWRgs7l2NHUmdXpcJ5jIiYs0Ae6+PTiI4ffPLM8L9aaBv/mt9VQ dr6i6GTLVXBGkoBpKvmDvimVW7d7yG0elvSluaJInDXGE2e6PHxUNjnVXy9eP5tXxAgc pkjU2cAMm1KjsIarfD3rvd9Et5+a6AldO07hr2RQH41zg8V9gb9PqJhrSOKZebgMd8xu ULgncfVE9b9774NViwaW/umqNFUJZ4YGQPHPBhrfCqVEi1VsaIoFK4bHK5qnfkHj41DU MuUUNrCjFCekCF59uR8gv/i3mSoJspFGexJwBp4QbqLQqQyXADtdEt7eZIfQWNOBN12Z voHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=lt52lJ7IAYpZyo39NdZRaisuqAyx1l+kNW12PnaKg2U=; b=vSSzL6zZpQIOF/OY9hi+YH41d3BUGH6hgkRK2MVtIAT2MMJQpmFRtOAaQoPVs6zeyq 9VIT6wvTNN2BE3c33MPAVUx2dbRTBBdUjZAVcYkJS3vCkR56Apt+D6rctifMmxhmUeGH ydcQyD61mFh1WxZi+pHL1g5UfZtZf7PfFu3uMP5UMf6D/jqxnQp6408lBw7+699h3EIQ y2nzyR32W9byuA76lTxBCkF2XzHY/LzKdp5afIACV2NGQgjvQrljr986IckVYJ68wDGu gLAsRD/+JMFecvY5SKzDofIZOUfg5InOCGSPU2QgfWftZgJJ5T1F+0uOPXP2TCRwj3+B p9yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ThrpD4eD; 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=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gr24-20020a170906e2d800b0096606485250si6863256ejb.390.2023.06.13.07.04.39; Tue, 13 Jun 2023 07:05:15 -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=@linaro.org header.s=google header.b=ThrpD4eD; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242699AbjFMOD2 (ORCPT + 99 others); Tue, 13 Jun 2023 10:03:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242668AbjFMODW (ORCPT ); Tue, 13 Jun 2023 10:03:22 -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 6A4751709 for ; Tue, 13 Jun 2023 07:03:19 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2b1a653b409so68016791fa.0 for ; Tue, 13 Jun 2023 07:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686664997; x=1689256997; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lt52lJ7IAYpZyo39NdZRaisuqAyx1l+kNW12PnaKg2U=; b=ThrpD4eDhmC8apgDDrueWJ7fLMadb7c07jItLxCFThO5OB6SNss5gCTnJlzRcKytiJ vVvWvBRPXZklMzL/FtZNs14nX0PVxw0he287V/9b+24rq6/HJ3vQG9c4WsOtJVEeh+L3 RUXTYAr7+VDellaWch3ep7p50T+iXRO6tvwjRxPN5UqVYempAC/nd9ApM9+nyQpg7lxT a9NlNH8FJlIu1fzvhbABmnmJFmz+8xPiv3MuM/3tpsIUFfXH/goZnj2naXWPRfCZNlWU 9njBi1A4VI1vM4CKF/i5+TuxOa0liwkvJ+bh+SHfaJ4OQ3d83xOoQR6U/TuWNg0/pxdg vlWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686664997; x=1689256997; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lt52lJ7IAYpZyo39NdZRaisuqAyx1l+kNW12PnaKg2U=; b=Z+OFa5SQRTP/ec551l1A0ixiKH/KEpByIzPM5S7mXj5uqgqU6qtQ4dOfyuwQtIs253 VKvTMFI/vxKWZMZta/80Z4fMI+GJgLrDA3AiSzy8Rqd9FmC6YHpyWohgOGBU7TNLDI8z aualYD+ChGcagzhe1ECpkA1z6AOV4X1A9zI29kHDQnp8blS09DkykkjOFov0lul9gJIR a3OSW/tyobx2MUgaRcHR2RatSfukJrih6pXTaXADBzNKq6QGirT3ZJhE+i0nySdtQwjy 533XzxnrGjUp1+V0A/98kl2exgFWlN3WoLfPLBE8qAP534ZBNcmJQzZIqqC8W2gYntap OmQA== X-Gm-Message-State: AC+VfDzj1HXKlz51+DBn4uCLzGatbAYnWknIaPmW/eToEFuqxWsEHTLj Log3oRC5WN79Wa92jrxH3Gt36w== X-Received: by 2002:a2e:b55a:0:b0:2b1:cc47:9253 with SMTP id a26-20020a2eb55a000000b002b1cc479253mr3366385ljn.14.1686664997726; Tue, 13 Jun 2023 07:03:17 -0700 (PDT) Received: from [192.168.1.101] (abyj190.neoplus.adsl.tpnet.pl. [83.9.29.190]) by smtp.gmail.com with ESMTPSA id a18-20020a05651c011200b002b32af2e9c6sm901490ljb.116.2023.06.13.07.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jun 2023 07:03:17 -0700 (PDT) From: Konrad Dybcio Date: Tue, 13 Jun 2023 16:03:05 +0200 Subject: [PATCH v4 05/22] soc: qcom: smd-rpm: Move icc_smd_rpm registration to clk-smd-rpm MIME-Version: 1.0 Message-Id: <20230526-topic-smd_icc-v4-5-5ba82b6fbba2@linaro.org> References: <20230526-topic-smd_icc-v4-0-5ba82b6fbba2@linaro.org> In-Reply-To: <20230526-topic-smd_icc-v4-0-5ba82b6fbba2@linaro.org> To: Andy Gross , Bjorn Andersson , Michael Turquette , Stephen Boyd , Georgi Djakov , Leo Yan , Evan Green , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Marijn Suijten , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, Konrad Dybcio , Stephan Gerhold X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1686664985; l=3949; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=jmhJvBjqUtAAd9ogN4BP2RfilLnjEO+h94MD5RIqO5E=; b=GbzTJFrqm1PMKEdCcNqwy06QAz/uOcAck1xsVcTtjGg87VgHDmHOJXYYX2yokqnZyIlNWYDNv u1ILC5doPOqDJuK7+1ShkTa/5oDJXRmKH6prU1lpplfSONgxBFSnYt6 X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1768596560360805777?= X-GMAIL-MSGID: =?utf-8?q?1768596560360805777?= From: Stephan Gerhold icc_smd_rpm will do bus clock votes itself rather than taking the unnecessary detour through the clock subsystem. However, it can only do that after the clocks have been handed off and scaling has been enabled in the RPM in clk-smd-rpm. Move the icc_smd_rpm registration from smd-rpm.c to clk-smd-rpm.c to avoid any possible races. icc_smd_rpm gets the driver data from the smd-rpm device, so still register the platform device on the smd-rpm parent device. Signed-off-by: Stephan Gerhold [Konrad: remove unrelated cleanups] Acked-by: Stephen Boyd Signed-off-by: Konrad Dybcio --- drivers/clk/qcom/clk-smd-rpm.c | 21 +++++++++++++++++++++ drivers/soc/qcom/smd-rpm.c | 17 +---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index 937cb1515968..6e7f0438e8b8 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -1289,12 +1289,20 @@ static struct clk_hw *qcom_smdrpm_clk_hw_get(struct of_phandle_args *clkspec, return desc->clks[idx] ? &desc->clks[idx]->hw : ERR_PTR(-ENOENT); } +static void rpm_smd_unregister_icc(void *data) +{ + struct platform_device *icc_pdev = data; + + platform_device_unregister(icc_pdev); +} + static int rpm_smd_clk_probe(struct platform_device *pdev) { int ret; size_t num_clks, i; struct clk_smd_rpm **rpm_smd_clks; const struct rpm_smd_clk_desc *desc; + struct platform_device *icc_pdev; rpmcc_smd_rpm = dev_get_drvdata(pdev->dev.parent); if (!rpmcc_smd_rpm) { @@ -1344,6 +1352,19 @@ static int rpm_smd_clk_probe(struct platform_device *pdev) if (ret) goto err; + icc_pdev = platform_device_register_data(pdev->dev.parent, + "icc_smd_rpm", -1, NULL, 0); + if (IS_ERR(icc_pdev)) { + dev_err(&pdev->dev, "Failed to register icc_smd_rpm device: %pE\n", + icc_pdev); + /* No need to unregister clocks because of this */ + } else { + ret = devm_add_action_or_reset(&pdev->dev, rpm_smd_unregister_icc, + icc_pdev); + if (ret) + goto err; + } + return 0; err: dev_err(&pdev->dev, "Error registering SMD clock driver (%d)\n", ret); diff --git a/drivers/soc/qcom/smd-rpm.c b/drivers/soc/qcom/smd-rpm.c index 0c1aa809cc4e..577f1f25ab10 100644 --- a/drivers/soc/qcom/smd-rpm.c +++ b/drivers/soc/qcom/smd-rpm.c @@ -19,7 +19,6 @@ /** * struct qcom_smd_rpm - state of the rpm device driver * @rpm_channel: reference to the smd channel - * @icc: interconnect proxy device * @dev: rpm device * @ack: completion for acks * @lock: mutual exclusion around the send/complete pair @@ -27,7 +26,6 @@ */ struct qcom_smd_rpm { struct rpmsg_endpoint *rpm_channel; - struct platform_device *icc; struct device *dev; struct completion ack; @@ -197,7 +195,6 @@ static int qcom_smd_rpm_callback(struct rpmsg_device *rpdev, static int qcom_smd_rpm_probe(struct rpmsg_device *rpdev) { struct qcom_smd_rpm *rpm; - int ret; rpm = devm_kzalloc(&rpdev->dev, sizeof(*rpm), GFP_KERNEL); if (!rpm) @@ -210,23 +207,11 @@ static int qcom_smd_rpm_probe(struct rpmsg_device *rpdev) rpm->rpm_channel = rpdev->ept; dev_set_drvdata(&rpdev->dev, rpm); - rpm->icc = platform_device_register_data(&rpdev->dev, "icc_smd_rpm", -1, - NULL, 0); - if (IS_ERR(rpm->icc)) - return PTR_ERR(rpm->icc); - - ret = of_platform_populate(rpdev->dev.of_node, NULL, NULL, &rpdev->dev); - if (ret) - platform_device_unregister(rpm->icc); - - return ret; + return of_platform_populate(rpdev->dev.of_node, NULL, NULL, &rpdev->dev); } static void qcom_smd_rpm_remove(struct rpmsg_device *rpdev) { - struct qcom_smd_rpm *rpm = dev_get_drvdata(&rpdev->dev); - - platform_device_unregister(rpm->icc); of_platform_depopulate(&rpdev->dev); }