Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4724952pxj; Wed, 12 May 2021 11:47:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGjRfbCqEipQ8JLgEFk1UCYaLpPTxLHPJaxxjrYaMLMgz2L58BeVcw/vkbcJWmXu7mXC3g X-Received: by 2002:a17:906:e10f:: with SMTP id gj15mr923279ejb.434.1620845221798; Wed, 12 May 2021 11:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620845221; cv=none; d=google.com; s=arc-20160816; b=XtijcPPtnAJUk0Za4pHHe47xUPg5TYzYP+oGyB/6s78S4IHqaZu4mO2dGEXe2JnRXi 2U3dDGZ8U7GgZpCf86RJo5LuU7bKGXr8sl+ISqtyYT19AyeMUS6t4+3//eyg9wgJLnIw MyzLwGEZDRPx4qO9cpzJdosAjsqemJBHQu6FzSh2BAWflwo1j9tEPuhn9gGL+cTv8o0G 5rwPsnIiA4WIEVqFOSUe+rir1Q57UWa//03SbzAS/DBISYpTMjc1ELQH1e2hC1bB1jy8 lXWx9p4Mp3uLoysEP7vlAPtwuSGyFpe/o3+cOq0LH+vL+W7lgVwm8C02a+mUYqHteU/e Fu6w== 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=jrt/7R/WonKF50FL3VzPmJf/6SegSpFroMCQNCoaglU=; b=GUaV1Ss7o9TXsVB8uNt5v8VTZhiVV6D9ZKwWemdFhQKL70cW9oIOfTzq0vrlS3jlrD XqBGtMJWdUAENDHghoQyR/t+JVcgEGeF6b6l9bmX7KkXz423+Yz8lctyXngAOcfZP7ti u4H/oCoIfnqM2mP8RpwZcKjXTamB68BHnAwo9ly89B5By/W+304MmH/bhORCeLangRU0 IdNkJkWBvAtMwiC1VcmnDa/4AeKbRdIsfyXbGY0L7A4hLAymkXnOzG6lDZYMoLkUpmFG ckjztEFg3RIcKH099ud6U2gq4QEHEf7T5f4ki8Neh8n6+UN7tsjjjlAWGMQpsQVrsvd5 k1+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C2b4sLBl; 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 l15si476125edv.180.2021.05.12.11.46.38; Wed, 12 May 2021 11:47:01 -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=C2b4sLBl; 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 S1357901AbhELSlu (ORCPT + 99 others); Wed, 12 May 2021 14:41:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:57420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243377AbhELQk6 (ORCPT ); Wed, 12 May 2021 12:40:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A780161E38; Wed, 12 May 2021 16:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835425; bh=ExR7R/puy40vjA7jj2E4lJAKtZ58EXmWh51nMdIuywo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C2b4sLBlevNNJ7Zm37icOFAmlGoaBcZ7pgzCMZksuYl4mbZqgCs61wpWgz+xHTxd4 ytm47La35A5y4rKS3bmbqQ0qFr4z+VJ3tIcs2/ZgUR7e6+MaJCrWtmdE7i07Xtrry2 eczhk4e7Gi6oxfdh5SWn3+L9VFQcQ7Uj9omGLQig= 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 5.12 305/677] firmware: qcom-scm: Fix QCOM_SCM configuration Date: Wed, 12 May 2021 16:45:51 +0200 Message-Id: <20210512144847.348670941@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@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 3f14dffb9669..5dd19dbd67a3 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -237,6 +237,7 @@ config INTEL_STRATIX10_RSU config QCOM_SCM bool depends on ARM || ARM64 + depends on HAVE_ARM_SMCCC select RESET_CONTROLLER config QCOM_SCM_DOWNLOAD_MODE_DEFAULT -- 2.30.2