From patchwork Thu Jul 22 16:30:32 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: 483920 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp529348jao; Thu, 22 Jul 2021 09:47:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3Cjlpb4Zvdfnh21VcThW+iXNzaYT+tbAbVzYEH4gAQ8jMDytzzAlk49CTKSSoxsmZ50VD X-Received: by 2002:a92:cf0a:: with SMTP id c10mr489244ilo.19.1626972422978; Thu, 22 Jul 2021 09:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972422; cv=none; d=google.com; s=arc-20160816; b=QdRxBHVWWyWQWaG+WhALG4qetycADZ2m/c7LD7CEfmWmxmhR7JWGktu0BVE+v+DlBb JRJcF0XIfF6nl2GSlWyjkLZKHykLigiUx8gTrGslkEPbmK++tmmj73yDeF+B14BegGF1 ZS7Tchgmd6ZYoZlKVhQyb7xSpOf0/fU200i5+AJNQ/+1M7eO9nebKInP7QG5mi3Fb02S cig8m8EJdswYCWLC5auH5bjdf4mexaw3BARP3yid1TUCERJ8aqFMX0zX54UqNVETwfdx 6nBv3NZgODvT0vSNdMsRUMmqDN2pXr+klUSYnUp78R+cwimkKoUVy6rAKlylLhfWvj5B p/eg== 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=IFFtYREMq/Zj9z6jSQUWdKKsV9ZEz5uQm9KtIc9aQMY=; b=HNMt8NH20qHhr8+0An3OrmSxNPSYCp0Di/MbSDIJlXdjI19Bom0YeTMTiuQzVr3n1V 0vBjxBr2YiEIH4nshhusOjiiexLhl/htVwucH6uKNWMlDeeeTmK17WqO8RSAusfzFf9/ 7W7RoqG7DBAMgy+DGRAbq7Ay+r1wwhWL0xxf9CthtME5MJw6pK1h6g2QRkNW35l0Vjob tH3S2NSLEI6p6hzMTvJj/Va7ZQafa6Kio86HAfaywQq6t5A/zEC7kC6dXiGGi8mQWtRW ii8ytVRV16Bt7QqyoDHDFh/5F1XwvIqMf+bMIHnbiT9jObKCrh574ImO5y6SWiy0JAEv 7qCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wGd6bN2K; 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 i16si18190809jam.109.2021.07.22.09.47.02; Thu, 22 Jul 2021 09:47:02 -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=wGd6bN2K; 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 S234988AbhGVQFk (ORCPT + 12 others); Thu, 22 Jul 2021 12:05:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:40490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234215AbhGVQE3 (ORCPT ); Thu, 22 Jul 2021 12:04:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7360261C24; Thu, 22 Jul 2021 16:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972289; bh=noKFCILb6PIUVj+e8wfqFFGfMkQKsjF205S4l1s3whE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wGd6bN2KTad58+G41lWfYqmq5+eNEVoliDHg0+f47bZDO88IaT5kKhRudv6A7Pv2J E7f26vKfuDzojUCdyNKzdofva6uzOLDsC+usTHU+RjEMOuZ8wHbZZ3jsjo34N0DmBX OXPUbgXtQ8u5vo7obKqoZgcir9IFH3nyiqW25y48= 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.13 057/156] firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig Date: Thu, 22 Jul 2021 18:30:32 +0200 Message-Id: <20210722155630.256419362@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155628.371356843@linuxfoundation.org> References: <20210722155628.371356843@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 db0ea2d2d75a..a9c613c32282 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 228bf4a71d23..8685619d38f9 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -331,7 +331,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