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 212D03AA1B5 for ; Thu, 23 Apr 2026 17:23:55 +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=1776965036; cv=none; b=bYrhqzCcA0wJUN+xhklw9OboKTt0DuNSNSr9+uCZVTsyBB14HqZ1hjKV5UyxSn9kjbh9Jb/GaVvjN2ukrFDFnQFt4pI+GgsRIzwXum2bKSF4d3ZTX5GxzcU3AxQ8iXE7Pu4AHiOrSUQbvbJfyAJjIodtPo5NBrr3SKOkRr1So8k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776965036; c=relaxed/simple; bh=Sf1aBgZQBBHoZh/jIDqPw5Ja/XaZRFBpyaILdxqZ3rE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=e+g/2+2JrH1jUxadnFMhngBYFldnH8aD8CrZEjjMwFV8gbXzHBj1KiVmw+fr7s/BFOkrPkHEmmpyLiz6rkgDLdRutATdnC6OhzqmVJFFb/wdpp72hFuMSf+m3W9f+ZMqMYGpZE1Wp9/jDGEfW0Vogh6faC5K3zzfysno+A2Y74w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nV75orVY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nV75orVY" 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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