From patchwork Thu Oct 13 17:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp405709wrs; Thu, 13 Oct 2022 10:58:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5EZtjC5hhDZ1Pak2blTsO/jGD8GkeMWu2CliJRybRgrflLk0Q9CF+JjO6Ohy5Tl28wH44s X-Received: by 2002:a17:907:9493:b0:78d:765:6cc9 with SMTP id dm19-20020a170907949300b0078d07656cc9mr697769ejc.265.1665683925331; Thu, 13 Oct 2022 10:58:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665683925; cv=none; d=google.com; s=arc-20160816; b=QD5J5z2Dr+Rlo118Y3XUOKytzx0zb72X7HJm2BUmFO25oM2m/BwD6AFX8+AXm+zMtH 8/9CBTNQHOWTdw6LQZSLqmDzleS2vZybiiR1/ytUHcC9DU+4dl7RS+vDOieQ1OW/ZJNr kg/wwyqlBLFh+ACnW6yTCJcKfyum4FuwTQLpVmV7hgDiM72odHEojQmryPWrexmHQgzO HSCD7Hfkc5VAtdxQYNp6B8Sjlk11UjGQk7uI7ic6SwFDmSnezejaGX+M/lEqSKEol4zO sOMDWSC7PwFEMIL9abKj6aX4rCCaYpzbko1JhsaFtIO4aVMD3WlJzrZdPOaJJUMz5pwU 9lJA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nwg/Dyr9+pFzs7hEHccjc/UlULFtgB3Z8VqfNgsgKPg=; b=reK1QXGF0N8ld90wHAw6wr/FFBym3HtQa9h2EgFPQg4SX9Q5+7RkDUNWvCqUfvnHT5 62GwcWVuiET4/haO7O0COqfA+SiJNaNCMKnqViuyjliy5ZkmuvuF3n1e6gSRL0Bl/Nvx wLOJf8ginvUPkvFRTU4wUb1fmCHKSqg5Ff+bEO3HQymTI0pFOxWJiUUAEBNWfhuBVQMp vqPyzXcxEws4q3K2v0srYKVF6KcI8dLrg4udBH5lTfEJMF2zKE8ncIX06kmm5rJHR4Lb xRs0F7xRPBCsW4HaAvlWHTST3eJQYhYTiegI4DpQ8OkSN3s0DRetEHBvXV8xJ3/FrnL5 S86A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=unc05gJ+; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bx26-20020a170906a1da00b0078d45e9d485si208844ejb.709.2022.10.13.10.58.19; Thu, 13 Oct 2022 10:58:45 -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=@linuxfoundation.org header.s=korg header.b=unc05gJ+; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbiJMR5v (ORCPT + 99 others); Thu, 13 Oct 2022 13:57:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229911AbiJMR5M (ORCPT ); Thu, 13 Oct 2022 13:57:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED7A0155D83; Thu, 13 Oct 2022 10:55:39 -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 ams.source.kernel.org (Postfix) with ESMTPS id 27C86B82038; Thu, 13 Oct 2022 17:55:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7386EC433D7; Thu, 13 Oct 2022 17:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683737; bh=ze8Kwqc6HzjN8J0TweMqtxWJyDX3NdfE7J09Nyh4haE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=unc05gJ+mmP0GQr+w4hyglEtIvzo4IZyT8w2di6XG/5NOzBxmVh39tFxZRHPaQ2iQ NVqqZvC0P8y+/w+vYLS+M5CXAlnTaSibXEFsZo6pw3l/5mWCaI7lUnRHuNXryXIYju yqMK+REYfjdUu7fdhVA6tZ4GRUjkQzIoj5NP4sCU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cristian Marussi , Sudeep Holla , Sasha Levin Subject: [PATCH 5.10 15/54] firmware: arm_scmi: Add SCMI PM driver remove routine Date: Thu, 13 Oct 2022 19:52:09 +0200 Message-Id: <20221013175147.736768006@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 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?1746596187823697143?= X-GMAIL-MSGID: =?utf-8?q?1746596187823697143?= From: Cristian Marussi [ Upstream commit dea796fcab0a219830831c070b8dc367d7e0f708 ] Currently, when removing the SCMI PM driver not all the resources registered with genpd subsystem are properly de-registered. As a side effect of this after a driver unload/load cycle you get a splat with a few warnings like this: | debugfs: Directory 'BIG_CPU0' with parent 'pm_genpd' already present! | debugfs: Directory 'BIG_CPU1' with parent 'pm_genpd' already present! | debugfs: Directory 'LITTLE_CPU0' with parent 'pm_genpd' already present! | debugfs: Directory 'LITTLE_CPU1' with parent 'pm_genpd' already present! | debugfs: Directory 'LITTLE_CPU2' with parent 'pm_genpd' already present! | debugfs: Directory 'LITTLE_CPU3' with parent 'pm_genpd' already present! | debugfs: Directory 'BIG_SSTOP' with parent 'pm_genpd' already present! | debugfs: Directory 'LITTLE_SSTOP' with parent 'pm_genpd' already present! | debugfs: Directory 'DBGSYS' with parent 'pm_genpd' already present! | debugfs: Directory 'GPUTOP' with parent 'pm_genpd' already present! Add a proper scmi_pm_domain_remove callback to the driver in order to take care of all the needed cleanups not handled by devres framework. Link: https://lore.kernel.org/r/20220817172731.1185305-7-cristian.marussi@arm.com Signed-off-by: Cristian Marussi Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_scmi/scmi_pm_domain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/firmware/arm_scmi/scmi_pm_domain.c index a4e4aa9a3542..af74e521f89f 100644 --- a/drivers/firmware/arm_scmi/scmi_pm_domain.c +++ b/drivers/firmware/arm_scmi/scmi_pm_domain.c @@ -106,9 +106,28 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) scmi_pd_data->domains = domains; scmi_pd_data->num_domains = num_domains; + dev_set_drvdata(dev, scmi_pd_data); + return of_genpd_add_provider_onecell(np, scmi_pd_data); } +static void scmi_pm_domain_remove(struct scmi_device *sdev) +{ + int i; + struct genpd_onecell_data *scmi_pd_data; + struct device *dev = &sdev->dev; + struct device_node *np = dev->of_node; + + of_genpd_del_provider(np); + + scmi_pd_data = dev_get_drvdata(dev); + for (i = 0; i < scmi_pd_data->num_domains; i++) { + if (!scmi_pd_data->domains[i]) + continue; + pm_genpd_remove(scmi_pd_data->domains[i]); + } +} + static const struct scmi_device_id scmi_id_table[] = { { SCMI_PROTOCOL_POWER, "genpd" }, { }, @@ -118,6 +137,7 @@ MODULE_DEVICE_TABLE(scmi, scmi_id_table); static struct scmi_driver scmi_power_domain_driver = { .name = "scmi-power-domain", .probe = scmi_pm_domain_probe, + .remove = scmi_pm_domain_remove, .id_table = scmi_id_table, }; module_scmi_driver(scmi_power_domain_driver);