From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8D1F2DE6FB; Wed, 21 Jan 2026 18:17:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769019445; cv=none; b=rUQ0Ns38eqqlnZgKxvJQb4Ji9Z3BpALr2JppzdAtIAIAYphsJK0Kgh8js9JADs7X+onKb8US7fMG9ruX/hLTBV2FF/1C91SiH7pmvSW/2XmEBf5ugz+3wlz+yJO6u6IJLpD+fv7EDQVfDVmmSQj6CR3WYfJbO19+0Y81GQH2BmI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769019445; c=relaxed/simple; bh=2Bg+7qPCIv0QQeUWZIQDYLwQQVUY+S9pXiw+yNH7L0o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iJUPN2Ju8SBE7RvkM1gacC+fgdcerTYBQi5AiqJF4cr/7yKeEzvTlpOn+LgNPuF+zXXw3K35FvFiYZzkT/yEddUDkXN6xxGWrppcfDjFY/ONWj0dqyns7lXrr8Px2Eq1sHuAY379P/KOsTzH45l5h05FyqhVtN3KM6Ii0bN93Yo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pci/wY36; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="pci/wY36" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 93F05C16AAE; Wed, 21 Jan 2026 18:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769019445; bh=2Bg+7qPCIv0QQeUWZIQDYLwQQVUY+S9pXiw+yNH7L0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pci/wY36nUwZHIaMzqOizrE13wHebwoz2nghgGEzTRh4g6JWv7A8djkoZrptXII4T +6ELFbQWLhDU0cPuq1DpVQa7s9zAD1+kSTPk6p1wPlz1pEFBJNkbamp89GtSKs7PIN DaPb1b/TnPvX7unt3/vPr9aNfKPg3KIwMi8PGV0k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Frank Li , Peng Fan , Shawn Guo , Ben Hutchings Subject: [PATCH 6.12 001/139] firmware: imx: scu-irq: Set mu_resource_id before get handle Date: Wed, 21 Jan 2026 19:14:09 +0100 Message-ID: <20260121181411.509269596@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260121181411.452263583@linuxfoundation.org> References: <20260121181411.452263583@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peng Fan commit ff3f9913bc0749364fbfd86ea62ba2d31c6136c8 upstream. mu_resource_id is referenced in imx_scu_irq_get_status() and imx_scu_irq_group_enable() which could be used by other modules, so need to set correct value before using imx_sc_irq_ipc_handle in SCU API call. Reviewed-by: Frank Li Signed-off-by: Peng Fan Signed-off-by: Shawn Guo Fixes: 81fb53feb66a ("firmware: imx: scu-irq: Init workqueue before request mbox channel") Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/imx/imx-scu-irq.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) --- a/drivers/firmware/imx/imx-scu-irq.c +++ b/drivers/firmware/imx/imx-scu-irq.c @@ -203,6 +203,18 @@ int imx_scu_enable_general_irq_channel(s struct mbox_chan *ch; int ret = 0, i = 0; + if (!of_parse_phandle_with_args(dev->of_node, "mboxes", + "#mbox-cells", 0, &spec)) { + i = of_alias_get_id(spec.np, "mu"); + of_node_put(spec.np); + } + + /* use mu1 as general mu irq channel if failed */ + if (i < 0) + i = 1; + + mu_resource_id = IMX_SC_R_MU_0A + i; + ret = imx_scu_get_handle(&imx_sc_irq_ipc_handle); if (ret) return ret; @@ -225,18 +237,6 @@ int imx_scu_enable_general_irq_channel(s return ret; } - if (!of_parse_phandle_with_args(dev->of_node, "mboxes", - "#mbox-cells", 0, &spec)) { - i = of_alias_get_id(spec.np, "mu"); - of_node_put(spec.np); - } - - /* use mu1 as general mu irq channel if failed */ - if (i < 0) - i = 1; - - mu_resource_id = IMX_SC_R_MU_0A + i; - /* Create directory under /sysfs/firmware */ wakeup_obj = kobject_create_and_add("scu_wakeup_source", firmware_kobj); if (!wakeup_obj) {