From patchwork Thu Jul 22 16:30:39 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: 483914 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp520964jao; Thu, 22 Jul 2021 09:37:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzE1sKOs1DmD23ImsnFVrK8hs3FfqQ5w1eDVgrz/zJqfHidiSa/0N+3XNGcnS5x60u2D0/h X-Received: by 2002:a92:1942:: with SMTP id e2mr506432ilm.4.1626971856832; Thu, 22 Jul 2021 09:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626971856; cv=none; d=google.com; s=arc-20160816; b=gpx40GG//VdsEYIRimgIE79hUl75KVVADttl0kKW5jnl+bnuHVIhXy9iaCN4GVtdnc G1FpYmCDXgZRHVTq1/r8D1YErJIlkSQ1PjpmcP1+LE6ylOnWB4HMecL0e7jNVlc6ZAZT 0W1Gl3A5cQCIY6q8YkviyKskr5JGbFydwLZRSXFNyVupLjp1cjn328q4kAdEpgN41uM/ p9JxNXN8LD+83fcD70iML7TmUmT3xbLnmzRPwbkT1jgc0NCHkEidGdL2IjRUEPW0hONq iVMRt5y3OzsREn6e9HqtmCMMSik86wLweghLYwTy1IHKLLnsYl0bl/WsFow68AjtTW7i fbdA== 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=8S4ctXhffDLsxVlHddx+b13AvJ66owuxbWqNdjIh8Oo=; b=P7ciL9iGMVaVMhxyL/z4zC6HM1oHF8LLVsYNF+0P4wctAv+Am3P9N5aayAmZkkPrCp 936dBbsS0zXK+y7ZQ0LFHdBfN2xZpczl3S9XaiZ/dy0EiLuiEsDxJVrYC4CKvJcqtCoj 5ecIBH6CjPz5Yd+nbDajL/RabG8ysDDo1vZFupvCP/VLqbNfIZAIXNJbE3fCD+4PghLu s7+N33gRqLtljkYcUhAw+Fu26cK1BFTtz3IY/itupInbQ7zm6e6jdi4r8j5gHbmo6Qc6 MNyN7RX64i3PTdYkKpDJ37uG49o/sVvK+NpxEYJMPGneZlvJ9n/L4UeiYKn9LwdIJkVs Itew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=y+N+a1Wa; 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 n19si6409465iop.0.2021.07.22.09.37.36; Thu, 22 Jul 2021 09:37:36 -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=y+N+a1Wa; 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 S232910AbhGVP47 (ORCPT + 12 others); Thu, 22 Jul 2021 11:56:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:32946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232822AbhGVP4q (ORCPT ); Thu, 22 Jul 2021 11:56:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C8B461362; Thu, 22 Jul 2021 16:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626971841; bh=TcLEGpQPIjobDcUSChomeU0B3TP8FV1k6DGipp2SmGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y+N+a1WamQRoneLdEFySkIJgiR91+YnbltxBTGVYMmlHZZj8y/w1bBYvG5WHb6sND Tx5jgwHjuGHH5gCQ+sh3xLpr1R0++N/K6n/qStuz5sJ7wIHYDcc1I6SuarmYTVQ67S s7NR1c0KCYjtK0j0ifQ8Sj83cjisAXOAmBapQejs= 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.10 048/125] firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected Date: Thu, 22 Jul 2021 18:30:39 +0200 Message-Id: <20210722155626.317897290@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210722155624.672583740@linuxfoundation.org> References: <20210722155624.672583740@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 f9901fadb3a4..af4560dab6b4 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -922,7 +922,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