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 89AD8FDEE32 for ; Thu, 23 Apr 2026 17:24:04 +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=7zXyaYPuNEBH/uqtbRt6221mLfw9k68fWfd4gc+ltoE=; b=kMKoyly0eR8L2gVfnJ/+UeYbvI 7j3P7AWsFq8kR/njNO9VnoPyJsTa8Zus1NQlNA1MQIi1shDQTjNb09tsCdlA7tj2+f5TZddGY+XqA Lx4SYF4YR37gItpBOzRJ3SbwbeH16PvBjrktHyo1cJR5MtXk8OCsLrQVrTJ6NyWdiSWhed3/Mk1a1 FObctaqomXbb6tzsgZ3WSvLsKbC70koXvkq7JJswWf7QypWqYr4dkltzHpXB+3+fvIDT3zuj4AQAc BWvJ66LEP5FjQq9O9s7XZ7QTKDPvTmwPplNkZPi5043JElLRZk8fTgmj4aaJlXXKTRilzdHAg9P6f nNQFJQUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wFxmS-0000000C2QB-2Q5v; Thu, 23 Apr 2026 17:24:00 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wFxmO-0000000C2N1-0l8g for linux-arm-kernel@lists.infradead.org; Thu, 23 Apr 2026 17:23:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id DCEFC4470D; Thu, 23 Apr 2026 17:23:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A17DC2BCB4; Thu, 23 Apr 2026 17:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776965035; bh=Sf1aBgZQBBHoZh/jIDqPw5Ja/XaZRFBpyaILdxqZ3rE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nV75orVYw0VeiwzfuxSYdYMs7MGANGfv9rcR45y5mElYgWyEkGr9+TBAdSZiIj5r2 hXxiWYXr71flMF2VpeMPjeLWclhN+6Li2LUqOXz6hf2G25JH3S5BLtnZQ5StbE8p2/ ZOeLcMtzq1Vnp8EZheQhVW0gVJvkpZml0k/HpWcrXgyUCBitSpMYHryHKu6kv1AolS 1XuHM6oVCE/PNdt+retDNpUqjVg8FImnusDZiMQOGEhjgsMc53GxCWu7D8klqI0meu YPkGPG99rk/tVLauyrNyOFgsYPZC6fv8wfSQ4N+0UkmnooxrUEnVEQbPl9qoISH5UH HABT+7rjEKYPw== From: Sudeep Holla Date: Thu, 23 Apr 2026 18:22:56 +0100 Subject: [PATCH 6/8] firmware: arm_ffa: Unregister v1.0 bus notifier on teardown MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260423-ffa_fixes-v1-6-61189661affe@kernel.org> References: <20260423-ffa_fixes-v1-0-61189661affe@kernel.org> In-Reply-To: <20260423-ffa_fixes-v1-0-61189661affe@kernel.org> To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Jens Wiklander , Sudeep Holla X-Mailer: b4 0.15.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260423_102356_245121_F7619E8E X-CRM114-Status: GOOD ( 11.51 ) 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 For FF-A v1.0 the driver registers a bus notifier to backfill UUID matching, but the notifier was never unregistered on cleanup paths. Track the registration state and unregister it during teardown and early partition-setup failure. Fixes: 9dd15934f60d ("firmware: arm_ffa: Move the FF-A v1.0 NULL UUID workaround to bus notifier") Signed-off-by: Sudeep Holla --- drivers/firmware/arm_ffa/driver.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 0e030f377985..4edb88079bac 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -100,6 +100,7 @@ struct ffa_drv_info { bool mem_ops_native; bool msg_direct_req2_supp; bool bitmap_created; + bool bus_notifier_registered; bool notif_enabled; unsigned int sched_recv_irq; unsigned int notif_pend_irq; @@ -1638,6 +1639,15 @@ static struct notifier_block ffa_bus_nb = { .notifier_call = ffa_bus_notifier, }; +static void ffa_bus_notifier_unregister(void) +{ + if (!drv_info->bus_notifier_registered) + return; + + bus_unregister_notifier(&ffa_bus_type, &ffa_bus_nb); + drv_info->bus_notifier_registered = false; +} + static int ffa_xa_add_partition_info(struct ffa_device *dev) { struct ffa_dev_part_info *info; @@ -1721,6 +1731,8 @@ static void ffa_partitions_cleanup(void) struct list_head *phead; unsigned long idx; + ffa_bus_notifier_unregister(); + /* Clean up/free all registered devices */ ffa_devices_unregister(); @@ -1748,11 +1760,14 @@ static int ffa_setup_partitions(void) ret = bus_register_notifier(&ffa_bus_type, &ffa_bus_nb); if (ret) pr_err("Failed to register FF-A bus notifiers\n"); + else + drv_info->bus_notifier_registered = true; } count = ffa_partition_probe(&uuid_null, &pbuf); if (count <= 0) { pr_info("%s: No partitions found, error %d\n", __func__, count); + ffa_bus_notifier_unregister(); return -EINVAL; } -- 2.43.0