Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp452249pxj; Thu, 20 May 2021 13:16:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxosRmUOOS+cpB0qhrp02r9/vWsuoSxG8BttQQKVcZ4QqbTv1Vmc5mIu06YwaLFYafk4hTQ X-Received: by 2002:a6b:e817:: with SMTP id f23mr3392251ioh.183.1621541791495; Thu, 20 May 2021 13:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621541791; cv=none; d=google.com; s=arc-20160816; b=rroTnlPbmna8g7RX/Buvtso2NBS41JeoePE6PPR1gERGGQCq3e/Idgg7BIZpRc3B0Z GYl2A1bSXjxPoq3Z+rmbD0UmsPw4bL8gqFL7ihBdHiuC/VShhjfAAe6JSXCMRSy1R6Iz v60gIfRZf7snSOq9Pa174bB1a5Q+8whtxHF08MWtObWDCT9ThvDp5x+jGmk+hvHBd/Dg l/9r+0YlbUnlg+dHxdVgex4389BTasOCIPPgiah4tRe9RUdnl+Z6GBXqUvSXPSgsQNAn WMmYa1Wzl64gC2+H8XoWtkF18HeSh+2D+kGggOlrkMK/KZ1vKDaK4kDol7lMmB/XeNSQ +iMA== 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=1/9IBImvii8K2CmifIBi4t2t6c8q5PCK5mq8uFgBBy8=; b=ZG5dxJATM0unjgGxbQn/SIeJZupqmLNuNOHZ3gOe+4VI5yLUF0tmPd/f10d3Dl0+Ru Y438YmkImewlUbLQlZN33wmFKs2BoGlfNvT1jz88eBZoeT9n8tG+XA1oXtTiwPR6j1IU +gMzucKWjHTFdLDCY5mterIgojytm2KMhlzmuBJzhG1DJxUAWHcBCyKSgtyBKHWwgz8h RFBTbhlGQi39KDtAiCp8sFCm1Lz1IVY/TQu9oW7zDKwXTlLDzIaRnXyx4eE5o/p3NfC8 ROWmnbIdPADG3YshJs9E4E6WXWpgF/PM3YaQAKqtb8QwDVZqjTnJOokc/OSqRFDOhkPy hxlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gonbEFru; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 n4si2962263ion.59.2021.05.20.13.16.18; Thu, 20 May 2021 13:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=gonbEFru; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S238009AbhETKs0 (ORCPT + 99 others); Thu, 20 May 2021 06:48:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:33416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237078AbhETKcb (ORCPT ); Thu, 20 May 2021 06:32:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A211161C46; Thu, 20 May 2021 09:52:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504354; bh=/hcxhy2mgNjwhbDfiyWU5PPzDU5bWuTaMU+8t8Y+/pQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gonbEFruA1Uf3qjEvKYalHy4cQ65hBvrej5cVjbPC7IyDdkCtij5YXHoRYwu18ua0 l4DXTzX4pHLWCycsMUc59f22/uZDF/CrJUCwFLsU4dRo8um6ympS9TVfrwH4QFOOM/ pyN7pKCYURMV5veInzzVSZ2v3fD0bQ9D8On9f7+I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , He Ying , Sasha Levin Subject: [PATCH 4.14 174/323] firmware: qcom-scm: Fix QCOM_SCM configuration Date: Thu, 20 May 2021 11:21:06 +0200 Message-Id: <20210520092126.077248573@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: He Ying [ Upstream commit 2954a6f12f250890ec2433cec03ba92784d613e8 ] When CONFIG_QCOM_SCM is y and CONFIG_HAVE_ARM_SMCCC is not set, compiling errors are encountered as follows: drivers/firmware/qcom_scm-smc.o: In function `__scm_smc_do_quirk': qcom_scm-smc.c:(.text+0x36): undefined reference to `__arm_smccc_smc' drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call': qcom_scm-legacy.c:(.text+0xe2): undefined reference to `__arm_smccc_smc' drivers/firmware/qcom_scm-legacy.o: In function `scm_legacy_call_atomic': qcom_scm-legacy.c:(.text+0x1f0): undefined reference to `__arm_smccc_smc' Note that __arm_smccc_smc is defined when HAVE_ARM_SMCCC is y. So add dependency on HAVE_ARM_SMCCC in QCOM_SCM configuration. Fixes: 916f743da354 ("firmware: qcom: scm: Move the scm driver to drivers/firmware") Reported-by: Hulk Robot Signed-off-by: He Ying Link: https://lore.kernel.org/r/20210406094200.60952-1-heying24@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/firmware/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 42c4ff75281b..89c5f3651c3b 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -206,6 +206,7 @@ config FW_CFG_SYSFS_CMDLINE config QCOM_SCM bool depends on ARM || ARM64 + depends on HAVE_ARM_SMCCC select RESET_CONTROLLER config QCOM_SCM_32 -- 2.30.2