From patchwork Thu Jul 22 16:30:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 483913 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp520854jao; Thu, 22 Jul 2021 09:37:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoGDiGpSsfTKonDnjtKQrG+eyg0ewULLONNSpc7gJe9t/vSfaQsf6DAJuPnWHLCCONudTf X-Received: by 2002:a05:6638:3452:: with SMTP id q18mr357279jav.111.1626971849949; Thu, 22 Jul 2021 09:37:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626971849; cv=none; d=google.com; s=arc-20160816; b=K+UHvINMUOI7oU1rjeIxv8Cb7f5lAvm+5lrYMZ7kVVui/Kpf85cszYJsdQDU0sBVdl Ri+PpZ97bRsZbwsd99N7pZNNKkg4Fcl6HFmNX+a/1Qbxz+qVpVwxA+AQqHtDT1ib1Yn8 wBGYmYdNGrB664T5RFPzgZ5earIUASE86BNrxOyxSrx9LPWb/AUbbZwSSJFUpYfk/5J3 axOFFO73l7ppEuLldnHsvo5+AlZT/MVZ/22boE7F8+faFOnrmmxXiAe10rzX1paoYpo2 Ch1QvEoJHM8jpf2ktB8i5kuX68a+ZB5OL/IRAa4VlqR0kg23kly80pNkeAglg87VbWSt bZyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Zee/PKnc4zRbVFQxaeNduM7giyhW5fTF+H40sJSE7Kw=; b=0jshZ4vQGlBtfQoNIz9gbfAxeC9O9OgpHGjfclmD6A22x/OFPz6ZWV5meTx2VFiVGo 4Gtm2BRyyfXaGEY6F95mKm6mG8bSShK5OBnHye+hY7lF7vWvRRloOOLxmTYIalGEZQsn Nm+QWH+TIe1iyei9q5OZwXjkhdoxDC3UwECk7q2MTgqo6d9vZpiQr+IafIBIA7SIxmh7 9pz9HEIP2qj8m2r24kMl9Jp8N3CBDjProObNjWH7JQ+33SAEIIjRu+0maud0ge4+LP5B 0DbAD4ycA+g9tYjhU+WKY+vd3ACT9BIuIhExrimaQY3ON66wcwp3UP/VOnzmRGngmoSy qbxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XWu49i5r; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u12si29486611ilg.116.2021.07.22.09.37.29; Thu, 22 Jul 2021 09:37:29 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XWu49i5r; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230102AbhGVP4x (ORCPT + 12 others); Thu, 22 Jul 2021 11:56:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:32884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232833AbhGVP4o (ORCPT ); Thu, 22 Jul 2021 11:56:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2EAE96135A; Thu, 22 Jul 2021 16:37:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971838; bh=SZnq5VVEghT7dcss/neDjXEOAvWnzcf2v5dVXoj4GhU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XWu49i5r6XsU3SO/bL3DI9E+QGPKKt/pFj9V4hgNyScJCUIOohg7zzGKoA9IQ/6t5 SzSeC64LPFcgCKsw5NqtH+3wm82jB0vO3iluabeHS2lNfAECXP2OfAecLfB0L6J2FA hJKGysE+HjQHj3QGekPvz8Xkzru0FjzizKjKWeBs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cristian Marussi , Etienne Carriere , Sudeep Holla , Sasha Levin Subject: [PATCH 5.10 047/125] firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig Date: Thu, 22 Jul 2021 18:30:38 +0200 Message-Id: <20210722155626.283159319@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155624.672583740@linuxfoundation.org> References: <20210722155624.672583740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Etienne Carriere [ Upstream commit c05b07963e965ae34e75ee8c33af1095350cd87e ] ARM_SCMI_PROTOCOL depends on either MAILBOX or HAVE_ARM_SMCCC_DISCOVERY, not MAILBOX alone. Fix the depedency in Kconfig file and driver to reflect the same. Link: https://lore.kernel.org/r/20210521134055.24271-1-etienne.carriere@linaro.org Reviewed-by: Cristian Marussi Signed-off-by: Etienne Carriere [sudeep.holla: Minor tweaks to subject and change log] Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/Kconfig | 2 +- drivers/firmware/arm_scmi/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.30.2 diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 5fa6b3ca0a38..c08968c5ddf8 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -9,7 +9,7 @@ menu "Firmware Drivers" config ARM_SCMI_PROTOCOL tristate "ARM System Control and Management Interface (SCMI) Message Protocol" depends on ARM || ARM64 || COMPILE_TEST - depends on MAILBOX + depends on MAILBOX || HAVE_ARM_SMCCC_DISCOVERY help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index 65063fa948d4..34b7ae7980a3 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -243,7 +243,7 @@ struct scmi_desc { }; extern const struct scmi_desc scmi_mailbox_desc; -#ifdef CONFIG_HAVE_ARM_SMCCC +#ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY extern const struct scmi_desc scmi_smc_desc; #endif