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 X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADF89C47E50 for ; Wed, 14 Jul 2021 19:48:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F439613E2 for ; Wed, 14 Jul 2021 19:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238985AbhGNTtH (ORCPT ); Wed, 14 Jul 2021 15:49:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:38034 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229531AbhGNTpb (ORCPT ); Wed, 14 Jul 2021 15:45:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4ABD0613DC; Wed, 14 Jul 2021 19:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291724; bh=fNAfgilUz+BSyvc/aOHy3dfty8RsDUxO9eDDWTBjaSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uhKVId9pqSpa+Ym76ErcUWdCUp/DSmJYPHnw2Dn+N2D7I88g9CtkzjV+1fwCZ95+v vG8fUri7t+v8D+g+NYkUlemkNzv8xrO6635gVnhzVOoA4ecVYHonqI+spRqT+qxyAY xks5nf0IDeY5gSonPGxDxLIi2QEnrXmI0KPTdstHh53bNDLUQ7FU9oXX1qC7uVpb2A TWFSVQLh4J2fOIPpy70I4882l/DKr3QhEVEeqsHd14BcP+l2T12LtMP7OojKkdmb12 Mep9lex8yh+jQ1POmLkDd/MF/eEVKsw9G3R9QIvUy/vn3Wpj+J9Z8lAhGbenG+j3cK Snw0QYA/C9sSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Etienne Carriere , Cristian Marussi , Sudeep Holla , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 062/102] firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig Date: Wed, 14 Jul 2021 15:39:55 -0400 Message-Id: <20210714194036.53141-62-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194036.53141-1-sashal@kernel.org> References: <20210714194036.53141-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 5dd19dbd67a3..6f24b0429f36 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 c0fb45e7c3e8..9c1f06759536 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -244,7 +244,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 -- 2.30.2 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 X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4586DC12002 for ; Wed, 14 Jul 2021 21:13:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 154C1613D6 for ; Wed, 14 Jul 2021 21:13:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 154C1613D6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Q8xCL8Gi1gPKIiXzH4VddLEhoDZxhsiovqnNKRruNuU=; b=DxSi9FFmDXdIpn o/06PF2JDGcBTH1Ft+oPH5MA+y4mFILV349ZafFfx3+ctmNfA8ZFFChebewY6BaKDbxds2hZV2tMK bfNlGsVThSeRiwQdRSmyysMCPzWAenzJYuNkdpm0DTCq6c6MiMkyY3T4q6gkNPEJjOHZ3HR+xf66o wYS8c0znEZM9i+xgEmDXTmXDRRouTG/eb4nIkDsVS0DTG1PIvyaLpydApRsBSZrV+Mc2gSZr7pEYB iYncCNNUyCbyx3Q+J4xGMUKhyfIIqhj1vZPafWbEJP9WizrcIqON11+PyS8r4uRWbPezCy6OeJsJl 8mqzZvRI5dG5DCdwu1nQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3m9z-00FIig-NU; Wed, 14 Jul 2021 21:11:16 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3klg-00EduC-I1 for linux-arm-kernel@lists.infradead.org; Wed, 14 Jul 2021 19:42:06 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4ABD0613DC; Wed, 14 Jul 2021 19:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626291724; bh=fNAfgilUz+BSyvc/aOHy3dfty8RsDUxO9eDDWTBjaSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uhKVId9pqSpa+Ym76ErcUWdCUp/DSmJYPHnw2Dn+N2D7I88g9CtkzjV+1fwCZ95+v vG8fUri7t+v8D+g+NYkUlemkNzv8xrO6635gVnhzVOoA4ecVYHonqI+spRqT+qxyAY xks5nf0IDeY5gSonPGxDxLIi2QEnrXmI0KPTdstHh53bNDLUQ7FU9oXX1qC7uVpb2A TWFSVQLh4J2fOIPpy70I4882l/DKr3QhEVEeqsHd14BcP+l2T12LtMP7OojKkdmb12 Mep9lex8yh+jQ1POmLkDd/MF/eEVKsw9G3R9QIvUy/vn3Wpj+J9Z8lAhGbenG+j3cK Snw0QYA/C9sSQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Etienne Carriere , Cristian Marussi , Sudeep Holla , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.12 062/102] firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig Date: Wed, 14 Jul 2021 15:39:55 -0400 Message-Id: <20210714194036.53141-62-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210714194036.53141-1-sashal@kernel.org> References: <20210714194036.53141-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210714_124204_664726_4BA1E1C1 X-CRM114-Status: GOOD ( 12.54 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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(-) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 5dd19dbd67a3..6f24b0429f36 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 c0fb45e7c3e8..9c1f06759536 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -244,7 +244,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 -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel