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 E667ECFB443 for ; Sun, 6 Oct 2024 04:35:00 +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:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ZUMqNgMKTdvpswl6YCYSNaJBLdQ7ytxsmID+U1UwBTE=; b=zEeBinidkY2YOGkp+JlzcQbH74 B2FWw223hj3ccLe/tSsxRmheKnYH2hwqnbCABX6SmdtGkCaAMa6AYfYorD/TyTRvwE+h/F6ikntQE X4CbwRsrRdJLwVuPWaMt2OQj2TkZXlW8cNIrrEcnWanlfjDk5BxbBt/jKGdotjBm3gzl4GMlHCdWv O9q1QlH4g96BCnPhup687AdNsENNh+slTueXhgcUkRwPbObBtE59duz/eljbiFcRtnNcX/3Mr39OI wqcMI72N+P03lJxOSYm5stGcj9L/XIPr+iyKCjotfUNv6+PsnL3kO1F7kvhTdUurqiz9kgbtZLt/o VeRFhzLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sxIyj-0000000Gv6d-19qK; Sun, 06 Oct 2024 04:34:45 +0000 Received: from relay.smtp-ext.broadcom.com ([192.19.144.208]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sxIxR-0000000GucI-06or for linux-arm-kernel@lists.infradead.org; Sun, 06 Oct 2024 04:33:27 +0000 Received: from mail-lvn-it-01.lvn.broadcom.net (mail-lvn-it-01.lvn.broadcom.net [10.36.132.253]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 6C13FC0003E0; Sat, 5 Oct 2024 21:33:20 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 6C13FC0003E0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1728189200; bh=OgWcY174jMlqIgoQJR+RJ1sBLdOV/0eU2EwSmfEVl78=; h=From:To:Cc:Subject:Date:From; b=o4/xUZQ/Ta5j3XqdyES9BBXAg2/4PPJY5+GjJ+mwDDoW9jO+JQg4oURrIOZvA39ZP A/zHT4BGTaWILF6v5qKS3fjCu/q6rTFEKlpnlv6HIHfjWwt7pmYCBRg3sAOTUWW68q v6SQVf6R3PNLonPS9PFOztyFl4xwvE5316Z64ccY= Received: from stbirv-lnx-1.igp.broadcom.net (stbirv-lnx-1.igp.broadcom.net [10.67.48.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail-lvn-it-01.lvn.broadcom.net (Postfix) with ESMTPSA id 056FC18041CAC6; Sat, 5 Oct 2024 21:33:20 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infread.org Cc: Florian Fainelli , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sudeep Holla , Cristian Marussi , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list), arm-scmi@vger.kernel.org (open list:SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE), linux-arm-kernel@lists.infradead.org (moderated list:SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE), justin.chen@broadcom.com, opendmb@gmail.com, kapil.hali@broadcom.com, bcm-kernel-feedback-list@broadcom.com, Arnd Bergmann Subject: [PATCH] firmware: arm_scmi: Give SMC transport precedence over mailbox Date: Sat, 5 Oct 2024 21:33:17 -0700 Message-Id: <20241006043317.3867421-1-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241005_213325_399207_D2CEB2E2 X-CRM114-Status: GOOD ( 12.86 ) 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 Broadcom STB platforms have for historical reasons included both "arm,scmi-smc" and "arm,scmi" in their SCMI Device Tree node compatible string. After the commit cited in the Fixes tag and with a kernel configuration that enables both the SCMI and the Mailbox transports, we would probe the mailbox transport, but fail to complete since we would not have a mailbox driver available. By keeping the SMC transport objects linked first, we can let the platform driver, match the compatible string and probe successfully with no adverse effects on platforms using the mailbox transport. Fixes: b53515fa177c ("firmware: arm_scmi: Make MBOX transport a standalone driver") Signed-off-by: Florian Fainelli Change-Id: I8e348e3e0deabdc5c1d596929d7f9134793f346e --- drivers/firmware/arm_scmi/transports/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/arm_scmi/transports/Makefile b/drivers/firmware/arm_scmi/transports/Makefile index 362a406f08e6..3ba3d3bee151 100644 --- a/drivers/firmware/arm_scmi/transports/Makefile +++ b/drivers/firmware/arm_scmi/transports/Makefile @@ -1,8 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only -scmi_transport_mailbox-objs := mailbox.o -obj-$(CONFIG_ARM_SCMI_TRANSPORT_MAILBOX) += scmi_transport_mailbox.o +# Keep before scmi_transport_mailbox.o to allow precedence +# while matching the compatible. scmi_transport_smc-objs := smc.o obj-$(CONFIG_ARM_SCMI_TRANSPORT_SMC) += scmi_transport_smc.o +scmi_transport_mailbox-objs := mailbox.o +obj-$(CONFIG_ARM_SCMI_TRANSPORT_MAILBOX) += scmi_transport_mailbox.o scmi_transport_optee-objs := optee.o obj-$(CONFIG_ARM_SCMI_TRANSPORT_OPTEE) += scmi_transport_optee.o scmi_transport_virtio-objs := virtio.o -- 2.34.1