Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp2217122pxf; Sat, 27 Mar 2021 05:41:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvglq9/ji3ZjTgLnWr8XK8kYcS16R2LciVgbgYgtldQKMFGxGDjKe8bvoLI0j2OLvejjbC X-Received: by 2002:a17:907:119b:: with SMTP id uz27mr19794849ejb.464.1616848908108; Sat, 27 Mar 2021 05:41:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616848908; cv=none; d=google.com; s=arc-20160816; b=cnA4Kpml1ldcvPDIfmQ1YtXwG/n/RRqkGWiqWrmGx9dneGGmpymhaII+zeLyXfLsm9 FmUAZfuJyEKqw1dClB+WD0IAId1Me71hcZOZFWELhadWWxtGg2OFqSlap1zZ8Wxubkpu V0i6wDR4WfWeJSvjQoO3VcX+i1MxwM1MMHv6rblbVspJGg9pvxoUyc9um0pIPMJv7+Lt vmHNzyNVIMeQi35CVCkVk8CQTM1v18f4XQsIAe2kle5xGQ0k+FTbM38AFv68bsIoC/DC R3OGlgQA5CekUjqP2/m1TOTB/qRInKoEI4HSeufSUetu2pNpWkT7kZaz5uGFIoLwyVx4 l8mw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Hws+cUkOun+KnIVZVx9OiDi7oSIRxhgD6KijGll1z7A=; b=fR7VSxO/9qnxRrXTGta73YEv1UkRz0mtDk2RGfPhi0uRnmcFa6SWwHmTQbN28+6oyY mcTjoFlMQ09jZRMAgTZ0dtDA5cbRhFCsSPEfZL+0cZQ/fRQTJ4tRsRGE5FcoZMHdMMg8 ouG0SWjCC8WgDiWx0D3PuDYs15BwaYhv0+UiiQd8SLIfqfSgqhnDyuweCO14FGrfkl0w qrnH4mNsTCZDArCGX8Fm2yKsm9dE0gUWEgL5cxIgpol43BB9NaXCQl4KvjbHoMUGuOq9 CbqxXRGldJqqLH/l9gglUckDK1doMdFIa6glEF2VB+dM7P1Ngx6C0SSdS6WBCJNIecqX oHSg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m12si8900006eds.183.2021.03.27.05.41.25; Sat, 27 Mar 2021 05:41:48 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230242AbhC0Mgi (ORCPT + 99 others); Sat, 27 Mar 2021 08:36:38 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:14502 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbhC0Mgf (ORCPT ); Sat, 27 Mar 2021 08:36:35 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4F6yvp261Gzrbjn; Sat, 27 Mar 2021 20:34:30 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.498.0; Sat, 27 Mar 2021 20:36:20 +0800 From: Xie XiuQi To: , CC: , , Subject: [PATCH 2/2] firmware: tegra: Fix build with Tegra234 configuration Date: Sat, 27 Mar 2021 20:37:57 +0800 Message-ID: <20210327123757.4568-3-xiexiuqi@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210327123757.4568-1-xiexiuqi@huawei.com> References: <20210327123757.4568-1-xiexiuqi@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If only Tegra234 support is enabled, the tegra186_bpmp_ops and tegra186_soc are not defined and cause a build failure. Add Tegra234 to the preprocessor guard to make sure these functions are available for Tegra234-only builds as well. Fixes: 0ebdf11699d0 ("firmware: tegra: Enable BPMP support on Tegra234") Signed-off-by: Xie XiuQi --- drivers/firmware/tegra/Makefile | 1 + drivers/firmware/tegra/bpmp-private.h | 3 ++- drivers/firmware/tegra/bpmp.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/tegra/Makefile b/drivers/firmware/tegra/Makefile index 49c87e00fafb..620cf3fdd607 100644 --- a/drivers/firmware/tegra/Makefile +++ b/drivers/firmware/tegra/Makefile @@ -3,6 +3,7 @@ tegra-bpmp-y = bpmp.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o +tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o obj-$(CONFIG_TEGRA_IVC) += ivc.o diff --git a/drivers/firmware/tegra/bpmp-private.h b/drivers/firmware/tegra/bpmp-private.h index 54d560c48398..182bfe396516 100644 --- a/drivers/firmware/tegra/bpmp-private.h +++ b/drivers/firmware/tegra/bpmp-private.h @@ -24,7 +24,8 @@ struct tegra_bpmp_ops { }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) extern const struct tegra_bpmp_ops tegra186_bpmp_ops; #endif #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 0742a90cb844..5654c5e9862b 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -809,7 +809,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = { }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) static const struct tegra_bpmp_soc tegra186_soc = { .channels = { .cpu_tx = { -- 2.25.1