From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 181BEC44501 for ; Tue, 14 Jul 2026 12:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ehQFaZwB++NiZIOgrY7uUtxuBIui57J6SGoKkKl6y/o=; b=QL8sY52WRpXQVO9Q/W1olnT+Sg RM4g8Jfz2Ntuzg9hBQqUyj236Zxs+V2lPLAB9A2EY97gQPu2q8x92WeJyG1vVfJqojU7H5gypNuME 53pUhMkS09gfiqzhV5HP6E7MoActrocmzjsa+1P4EeWSaBfMTPnf51uzVeBmhmmXNlJinjWptZTbG IUfBUOOpRXyVVbsvw9TTYQiyuYbDWUSCey0jdt//QovaN23lurc5VtYqs0+oFc2YG31mIxUDYnso4 w3XF1gH3k2iUTKjefGsJ548vOx8ydOB8GwxFNsjX18JH1i/MprN/iOMneQ5Nyujo3m5CdiAvHAq64 qRf9zxIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjcjN-0000000C3Mc-1SfP; Tue, 14 Jul 2026 12:59:25 +0000 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wjcio-0000000C2f3-1JLY for linux-arm-kernel@lists.infradead.org; Tue, 14 Jul 2026 12:58:50 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id A3D7E601EC; Tue, 14 Jul 2026 12:58:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C625C1F00A3E; Tue, 14 Jul 2026 12:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784033929; bh=ehQFaZwB++NiZIOgrY7uUtxuBIui57J6SGoKkKl6y/o=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=O6ldXDYMpZBEkbuz42LNYGNEnGGW31L2Pjj0c0yDS19yoUH0dT9LaoExBAtcgotsb jo7k6/rK/paRqhmRTcWoGojx0pfDmJkzVXqYbtHJo0nZG2fB3OZ7ZB7Frv0TpFt0w6 qPkl5ltVamlJPYrVzjpCqhXibppF9oEXdU/5a29fvxuQytgNN7ABDg9qrZVzTZo3/6 8Z3N/Q047NWarIffxPjU/Il2hqTnL8CEsxfGn9PNUjJZhLQUxtNzAG7qJwdTvLTaPw jBXZUnFs3ffUpKo2MfPejhF7jhGNQByVw4cokVbRXCzljxR/1W2CRZ9x2txop8NwtD 630YK4uKr++tw== From: Sudeep Holla Date: Tue, 14 Jul 2026 13:56:31 +0100 Subject: [PATCH v6 12/16] firmware: arm_scmi: Fix OF node reference handling MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260714-scmi_core_fixes-v6-12-3afe499d46e3@kernel.org> References: <20260714-scmi_core_fixes-v6-0-3afe499d46e3@kernel.org> In-Reply-To: <20260714-scmi_core_fixes-v6-0-3afe499d46e3@kernel.org> To: arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Cristian Marussi X-Mailer: b4 0.15.2 X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org SCMI devices store the DT node in dev.of_node through device_set_node(), but that helper only assigns the fwnode and of_node pointers without taking an OF node reference. Take a reference when assigning the node and release it from the SCMI device release path. With the device owning that reference, remove the separate channel-side get/put pair from the core driver. Fixes: 96da4a99ce50 ("firmware: arm_scmi: Set fwnode for the scmi_device") Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/bus.c | 3 ++- drivers/firmware/arm_scmi/driver.c | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c index dcaefc1aa892..a14df82a9310 100644 --- a/drivers/firmware/arm_scmi/bus.c +++ b/drivers/firmware/arm_scmi/bus.c @@ -401,6 +401,7 @@ static void scmi_device_release(struct device *dev) struct scmi_device *scmi_dev = to_scmi_dev(dev); scmi_device_release_syspower(scmi_dev); + of_node_put(dev->of_node); kfree_const(scmi_dev->name); kfree(scmi_dev); } @@ -464,7 +465,7 @@ __scmi_device_create(struct device_node *np, struct device *parent, scmi_dev->id = id; scmi_dev->dev.parent = parent; - device_set_node(&scmi_dev->dev, of_fwnode_handle(np)); + device_set_node(&scmi_dev->dev, of_fwnode_handle(of_node_get(np))); scmi_dev->dev.bus = &scmi_bus_type; scmi_dev->dev.release = scmi_device_release; dev_set_name(&scmi_dev->dev, "scmi_dev.%d", id); diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 84d1294f269c..532f1f65b2ab 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -2789,14 +2789,12 @@ static int scmi_chan_setup(struct scmi_info *info, struct device_node *of_node, devm_kfree(info->dev, cinfo); return -EINVAL; } - of_node_get(of_node); cinfo->id = prot_id; cinfo->dev = &tdev->dev; cinfo->handle = &info->handle; ret = info->desc->ops->chan_setup(cinfo, info->dev, tx); if (ret) { - of_node_put(of_node); scmi_device_destroy(info->dev, prot_id, name); devm_kfree(info->dev, cinfo); return ret; @@ -2820,7 +2818,6 @@ static int scmi_chan_setup(struct scmi_info *info, struct device_node *of_node, /* Destroy channel and device only if created by this call. */ if (tdev) { info->desc->ops->chan_free(prot_id, cinfo, idr); - of_node_put(of_node); scmi_device_destroy(info->dev, prot_id, name); devm_kfree(info->dev, cinfo); } @@ -2906,7 +2903,6 @@ static int scmi_chan_destroy(int id, void *p, void *data) struct scmi_info *info = handle_to_scmi_info(cinfo->handle); struct scmi_device *sdev = to_scmi_dev(cinfo->dev); - of_node_put(cinfo->dev->of_node); scmi_device_destroy(info->dev, cinfo->id, sdev->name); cinfo->dev = NULL; } -- 2.43.0