Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp316539pxj; Thu, 20 May 2021 09:59:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGETn/lIKg1UNNeW02Z0hEt0WUZxccCVPwv0WnluJG32KHFmubhEp3JxCfus2vvfKq9qtP X-Received: by 2002:a5d:8188:: with SMTP id u8mr6683773ion.163.1621529957565; Thu, 20 May 2021 09:59:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621529957; cv=none; d=google.com; s=arc-20160816; b=pVkA5+hirKmbh0yAg749IKes0ZsFV8RHV7X1PRBwp1aXwuFNX6jrXBZl7UVuNQipig xz6c9+5sfd4VDSrmDlGLfvfpTvk0RHKEgkOH0JRkDyrH1TKJk4sSdSM9Cf7kQWLCYaW5 96R/wtf2ewn2b+qbGJJX8znoZmAZyDPJ5dCap4rE7aIprqEPaBF9G0Ay+h897WO3Mm6x WwGjCuoCehcczW8FKE+PvavAOGIbCB+1x3JLH/nBALUhhN4m11R8ULllj1CfxOfp99N+ jEzpIZ1BjvVwN/MufXlxSJIEI85I/esO3L/3Ry/f6TZ5Whd0se8zxwHP5Xo9V//ZNCyM N0hA== 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=qvlNj0zrLDvUUskWj/1C3f+x/DdMNH9hWQqxoozRMbE=; b=fJ8jl0T0+JFh+M8mk9fu76/ULyL+ox0xS5iYhLNVe0zPoliDXWTmralFZkLzN+6cmL xqJaKgxUd8T1niKLXFEThYV01jBMOcwhGHE9cOAvpCFeuaDPbhOn15039JXfRws/x4lb nKhUIuskf5sJTKbdP8bzvJZioKhTkezeFInnjwGIdeoJEpBtLQ6yL7RPiWtFVXqmOY43 2kiCJsa0HsIxC1bIDp5sXFSd25q7w7hjryuE5Ti6E17xLpp5N+Ew30FTgSDhNXOMdBFm 1q1seNyXhRf9fyxUPXWEFIBoJo5L6ZiVNp20x6ADWTvCUMMm7egJSGKw7h8tzUUhkn3o 92xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TWtMb2CU; 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 s13si2552893iow.103.2021.05.20.09.59.04; Thu, 20 May 2021 09:59:17 -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=TWtMb2CU; 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 S234855AbhETKBR (ORCPT + 99 others); Thu, 20 May 2021 06:01:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:60418 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234619AbhETJ4k (ORCPT ); Thu, 20 May 2021 05:56:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B510661623; Thu, 20 May 2021 09:37:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503467; bh=WcZXxMma3oywvHntgEoaPZppZpw7r4oKshEaQ7kByxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TWtMb2CU3VngW9K9d8dWd2QdP/TKwZ0IIgkhrqMnmLkn2cKhvrr4EtxnyKtlr+u2N 2x5jPPFBh9z5ygwsSYW74lTsDMaAvUWKOURu/kT3+UJX5eSsFbMFQSehzuXqdWKsz8 qp9wLLI+QqZQGgXDSQ8Iu36O4V40a8D8jQPagcT0= 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.19 217/425] firmware: qcom-scm: Fix QCOM_SCM configuration Date: Thu, 20 May 2021 11:19:46 +0200 Message-Id: <20210520092138.556283208@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@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 ed212c8b4108..1c419e4cea83 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -248,6 +248,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