From patchwork Thu Jul 22 16:30:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 483923 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp529615jao; Thu, 22 Jul 2021 09:47:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrt6hgjsMOXNZpcyWatwO3ZMr+45NySAMjPQr7McSVZqROFgUzOO+RCoPeQYK7PfVyUaSC X-Received: by 2002:a05:6e02:5ce:: with SMTP id l14mr489550ils.147.1626972441199; Thu, 22 Jul 2021 09:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626972441; cv=none; d=google.com; s=arc-20160816; b=09Bn9LgYpws0En0RKyaaMmqRkFu/pBLFisbclqLKEWODuE2gb166BuBPRYdQJ03VIl MKbauKOu3LiKSBsiOVsYCX4/Xd9T62Jw+7zeXmYDFwUIneMYFsbVg3h0zBG7fWXRNYDl Y1txjFnF/iPhHtmxe16/8dCmvuQ++ik5Hy+lNShDyv7b+hGr0JtTbVV/bnTZvD8PcQcS LsgV9Upxz5EsOaEzMO+63cGxWJxbaZiZnoPNa+Q5JxYqt0PXvhu2qmlFcoHnAvPczt2g b1OrJEZyfKIdhohlol2UT3idy+3pl9ljgCFpoxG3V91k33Mm/sGuey8A6AKr/Kg/BC2V CS8Q== 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=YGTG8Dekg4KQWYF+NB8q8UV0JiS8h8UxJiq4Xpvmfdo=; b=st+JJR34Mim/peJGi7KR3OoMRtNsUNNIlw4kpI3kCpeMTUlazugT/JqXNZNUtF10DP 1QCgOu1TIYZALzgoSTd8Y7/BfO00ZYrbWE3IDG4mzDQEhVH4pWLaV2GKPTenhaGTXrkw gzywmWEF0bZAPBgw+48jkfpok69bEu0B69MbKIiHikjflm5a9Z+UNNshuJOxWHr0pA2Q WRFCCAjk35eihnIkU1W1Cf3yN+oNHuL+CpvZJflamnniaOtP3yODBMun9ecYk5PhztEO QmtAtnN078ackmZnJFdcKJipaD3ESmtRAWtdmbtcpnhKsDJIzSbgUYpNCPcweXSRfQ0z T0VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EHl4960n; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 i16si18190809jam.109.2021.07.22.09.47.21; Thu, 22 Jul 2021 09:47:21 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=EHl4960n; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S235046AbhGVQGA (ORCPT + 12 others); Thu, 22 Jul 2021 12:06:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:40486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234204AbhGVQE2 (ORCPT ); Thu, 22 Jul 2021 12:04:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1FA5B61C9B; Thu, 22 Jul 2021 16:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626972291; bh=7QWhwlfYo8rg/I07HsV6QlOlBvbgeaZrfGVtDMLbItA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EHl4960nJ83JCURr+2jmz0ytiFKYD/k1h+m7HJy8kWLqMeoP2qyr3Vqq+AHqbJc9R DULS9a1e8qYIYS6PvnLvQxHaq8JaEY203bu3QF/ZgpJqMglk91iOw7Du0QumiCfoGo Mz/BeYBEhkugxA/945vIBNf6R1q8GPvzzTHYjmyk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Etienne Carriere , Cristian Marussi , kernel test robot , Sudeep Holla , Sasha Levin Subject: [PATCH 5.13 058/156] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected Date: Thu, 22 Jul 2021 18:30:33 +0200 Message-Id: <20210722155630.285420047@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155628.371356843@linuxfoundation.org> References: <20210722155628.371356843@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudeep Holla [ Upstream commit ab7766b72855e6a68109b915d071181b93086e29 ] 0day CI kernel test robot reported following build error with randconfig aarch64-linux-ld: drivers/firmware/arm_scmi/driver.o:(.rodata+0x1e0): undefined reference to `scmi_mailbox_desc' Fix the error by adding CONFIG_MAILBOX dependency for scmi_mailbox_desc. Link: https://lore.kernel.org/r/20210603072631.1660963-1-sudeep.holla@arm.com Cc: Etienne Carriere Cc: Cristian Marussi Reviewed-by: Etienne Carriere Reviewed-by: Cristian Marussi Tested-by: Cristian Marussi Reported-by: kernel test robot Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_scmi/driver.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.30.2 diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index c2983ed53494..74986bf96656 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1575,7 +1575,9 @@ ATTRIBUTE_GROUPS(versions); /* Each compatible listed below must have descriptor associated with it */ static const struct of_device_id scmi_of_match[] = { +#ifdef CONFIG_MAILBOX { .compatible = "arm,scmi", .data = &scmi_mailbox_desc }, +#endif #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY { .compatible = "arm,scmi-smc", .data = &scmi_smc_desc}, #endif