Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4597701pxj; Wed, 12 May 2021 08:58:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbPv6Ds31BqXFz1qV2YZuSc5Xu7ZQ395DhJz6dTN/iEjlUclp8lPrThFN+xTIaNp71VqrO X-Received: by 2002:aca:a88a:: with SMTP id r132mr8171454oie.86.1620835092116; Wed, 12 May 2021 08:58:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620835092; cv=none; d=google.com; s=arc-20160816; b=ZdcPHFRsLNEsLdUlp36DfjvliMpgUZlANUL9BUXDUE2X3R+TKXMUDFM3cqBOHEFOZh lv0rCJPJWdwL5L8aoR7tUZW+82fnXLfXP2cQeG9QML4EOZVhMwWXqFc2sIoCtga16rXv vbyhzB1VCOz1UgrkF8AIpNBvHC5jYkziPa7ShL/HeMICvdLYEC4SOZyrGmUZSbo0gOcr ez/n/SU7KfKBr5kowSghFvGR+2VMiONvqadMqvcIZaeZVm/h3BrjJ3qHHpddZPJnr2cB 51OiCvvUeciukyfEBUWaaKDMWstrfCgk6BlnHVKZXPmVdzNlruVuUZdB3GOEiUjFywJ8 +IRw== 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=Yk+Y1QNFwHjPw6CuVYHRNwp/LHpd6PaohT2F91OhBhw=; b=fEzQb39QA3YfztbT93TUdcPdvhT7t0TkZsXpIBCtyu3xjigf+o6KLRYtSP2MmpP/DQ TfsWAqL1jjdbiARX7gD5vluxB0XB5OOgrCODhBDiEbYBucYq31AE3kAAm7W1RpV0WT/J Dlg2Lo3mOjLcFvNMU/Q84KadM17AzAY/zFiPTU0yo7UT24QekQIA2Spntx5HeVh96muL LjSUa4995cHiW6IC0t1hGAAGKd+cN8lb0xBft9CRUdqgub4f4RO/M/hBZuEjkFXUhHzj Iw9GMcuZWuYBvk28LKz/Z0dv8RGIw0RMAN4AezBaULO2fkMGLNK+QEkxccOfV6O2mCgo xcmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LGZXZSn+; 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 l10si289892otn.155.2021.05.12.08.57.55; Wed, 12 May 2021 08:58:12 -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=LGZXZSn+; 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 S238323AbhELP5o (ORCPT + 99 others); Wed, 12 May 2021 11:57:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:39078 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235394AbhELP1q (ORCPT ); Wed, 12 May 2021 11:27:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8AA6E61965; Wed, 12 May 2021 15:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620832369; bh=x1SG/HMVO1a0/y/v51mZahfMnBKxjbOurd71PvXpIP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LGZXZSn+2ScgnCTcJP8CvdCHKqYf98ZlSewMiF+aEpcawAnNbDS8P3LKS+QqGQXi1 Kdw/jpT8Uc68piSpYJmuq2cGDisNypsG+iyc7HM59wegQ1TMakoDr+R22yCucuw+zB juk27SIbal4DQNDgMsYQ5Z74If/DAxwVaD7JaDRM= 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.10 250/530] firmware: qcom-scm: Fix QCOM_SCM configuration Date: Wed, 12 May 2021 16:46:00 +0200 Message-Id: <20210512144828.056004160@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144819.664462530@linuxfoundation.org> References: <20210512144819.664462530@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 3315e3c21586..5fa6b3ca0a38 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