From patchwork Thu Feb 7 11:50:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1038006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VMosbIMk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43wGpC3jBNz9s7h for ; Thu, 7 Feb 2019 22:50:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726448AbfBGLuK (ORCPT ); Thu, 7 Feb 2019 06:50:10 -0500 Received: from mail-wm1-f67.google.com ([209.85.128.67]:56277 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbfBGLuK (ORCPT ); Thu, 7 Feb 2019 06:50:10 -0500 Received: by mail-wm1-f67.google.com with SMTP id r17so2016664wmh.5 for ; Thu, 07 Feb 2019 03:50:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eRbdmTMApNrZ2r4ub/HZubx1gASwJ76Ay5LXRNUZ0os=; b=VMosbIMkm2Pl2KIj/2Tnja/g6kWblKQDsmG6McxRq+xrDgryp9U6fz4DcxAlq+D1cU iaeIuqzvq9Qns8w4GWEwbNSSHoym95vDDHxKIkKJBnCwGVhmZepV3ZGpa+pjkz5dPPf6 1CnbiMb/9bpnUQyFPzC4dcF9J0UjkKonbhRRqwGyow8yvpIpM8zKIQp93D0JKTnzHlxM geP0fxPKvVa41AhObq6ymetPM0vwW6WjWR4d1QT4siPbaddyfvw/0kow/bDaS+IADt1H FJxazaSFNYgfH0dSsi1AbKD4uiay9UV43rD7ypugYVcxI6xydSW+qExaAuKH6HTO1xFX mZHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eRbdmTMApNrZ2r4ub/HZubx1gASwJ76Ay5LXRNUZ0os=; b=YjdtgnBl33qA6dS4OcGZBevVKIoCB0b4YdIWR7uuXubRdHS7XFedNuycLT0aZvDlqN Tu+L+b/zXgLrXrIrCpenCHLn+bbAz66OO4Ibe12ebvD9dmLzcbHQf5WdFtT6w1Hj6R+O 3fTCWSPVOtdUGNuQXHK+wciiHCBuRe+3Mbx+E+rH+7oU1t137/PrR5LlGWYxJzJ/NraF 8xTT1gaZMLotjj95IGEsqms6s4sRJi1YETl/021CZMP+V7ZIZd3TWzrq41SdVUOv74i9 2Or9GsqA3H3wOIrwU9IuVLOJMD2JGzgaEjCJgrdqGvh0ZdqjDjwqn1D7lUjoVYg30ErU uPGA== X-Gm-Message-State: AHQUAubtv0aSFsrt2/CwIP/R4s3/MaUNYTkpl9zHdB15R6NCCso7gZhz 4Z6JRu7w8CMNHhrmf00QGfk= X-Google-Smtp-Source: AHgI3IbpfYIlhBTTfQh5bz3E6Bnu0ZAw24XTAuwYY1x09FHK2op8KNcKpmWN7nfBYqo4FJs0iJHL4g== X-Received: by 2002:a1c:7408:: with SMTP id p8mr5983055wmc.119.1549540208146; Thu, 07 Feb 2019 03:50:08 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id z14sm16251306wrm.48.2019.02.07.03.50.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 03:50:07 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Timo Alho , Guenter Roeck , linux-tegra@vger.kernel.org Subject: [PATCH 1/2] firmware: tegra: Conditionally support SoC generations Date: Thu, 7 Feb 2019 12:50:05 +0100 Message-Id: <20190207115006.8162-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding Only include support for Tegra210 and Tegra186 in the BPMP driver if support for those SoCs was selected. This fixes a build failure seen on 32-bit ARM allmodconfig builds, but could also happen on 64-bit ARM builds if either Tegra210 or Tegra186 were not selected. Reported-by: Guenter Roeck Signed-off-by: Thierry Reding Reviewed-by: Timo Alho Tested-by: Timo Alho --- drivers/firmware/tegra/bpmp-private.h | 4 ++++ drivers/firmware/tegra/bpmp.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/firmware/tegra/bpmp-private.h b/drivers/firmware/tegra/bpmp-private.h index 07c3d46abb87..cc343f4ebafb 100644 --- a/drivers/firmware/tegra/bpmp-private.h +++ b/drivers/firmware/tegra/bpmp-private.h @@ -23,7 +23,11 @@ struct tegra_bpmp_ops { int (*resume)(struct tegra_bpmp *bpmp); }; +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) extern const struct tegra_bpmp_ops tegra186_bpmp_ops; +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) extern const struct tegra_bpmp_ops tegra210_bpmp_ops; +#endif #endif diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 8e3f79959d48..6498c848c82c 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -813,6 +813,7 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(tegra_bpmp_pm_ops, NULL, tegra_bpmp_resume); +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) static const struct tegra_bpmp_soc tegra186_soc = { .channels = { .cpu_tx = { @@ -832,7 +833,9 @@ static const struct tegra_bpmp_soc tegra186_soc = { .ops = &tegra186_bpmp_ops, .num_resets = 193, }; +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) static const struct tegra_bpmp_soc tegra210_soc = { .channels = { .cpu_tx = { @@ -853,10 +856,15 @@ static const struct tegra_bpmp_soc tegra210_soc = { }, .ops = &tegra210_bpmp_ops, }; +#endif static const struct of_device_id tegra_bpmp_match[] = { +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, +#endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) { .compatible = "nvidia,tegra210-bpmp", .data = &tegra210_soc }, +#endif { } }; From patchwork Thu Feb 7 11:50:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1038007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U/HIWIuV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43wGpD50ssz9sLw for ; Thu, 7 Feb 2019 22:50:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726809AbfBGLuM (ORCPT ); Thu, 7 Feb 2019 06:50:12 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:56278 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726764AbfBGLuM (ORCPT ); Thu, 7 Feb 2019 06:50:12 -0500 Received: by mail-wm1-f65.google.com with SMTP id r17so2016770wmh.5 for ; Thu, 07 Feb 2019 03:50:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4jeDob/cB22tn+alud81WKJ6h2lxByyFM8uhCDoF+7Q=; b=U/HIWIuV1cM/RdqQpOEHMdqgzJFwNQoRHUyNUZOqW22BBzmqmz9+tfVUGD/W3Q81qm F3GCsVpNK9uyrAINnnEnyx2h/wHi3R2VJI7kBXGiasJ2kstNIAsq7ZMAwsQvtbmUGA85 LSa/Wfls/AOUYSXy/q7dVJakTX1tfI8w8l17KaNTbB8TC0rGLcqzFohehoqcwznCgTmb VHANJLvZBnOb65vlyhWIWdNAQdbAMZwpffS7JgdJRZmExywgqKaCWBDrlwRFOW+9MxQS KEooM4XHnQQkxFZd3RoObhkeqx0iBtPIAhq/os1unVwU2BXmcMOYQByTKMOCBuyVQB7A kBBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4jeDob/cB22tn+alud81WKJ6h2lxByyFM8uhCDoF+7Q=; b=XSoNzHBhSFADrFFM60GkuMMY6W9fBl0wrKUdqvdaag+A8QgjsM6PzMVFIyHwK/l/X6 LFWjrkLZGUeSddV8NbtrpndKXvY4uHkPTiYBmD4YgtCvpR0E2YXkyYS3/kpa/5N+E+Qu Tq47qwFtfFEesVdhslhkaNyJxHD43tUNx3SbXIRPUv5B41EtPleM1yTel0imgB4Hvu14 y+yV41k6X8y2DnDFjncf4e3N1YxFI3N0joFqIHxKKkMsrE+sahbMXYBfiQ27d19PNRri ygKO5fwUkvXJdu5hD5scK5X76werW7AIb/1cNVM54pvLQwqJqjV0yncR38A9iOUo86T+ VqkA== X-Gm-Message-State: AHQUAua39gcx3/sqQpWWJAGxQTT1UyRK/TYqADV2V2fZX1HnQ3yNXIAm zMbJu9KeQ8ye7IwSiRxN2sE= X-Google-Smtp-Source: AHgI3IbET+q128oUDKoFKS81xzEYWQnowBOzWAULOUACPJ96Ns5dh58bGFI4UtonkGzwmJV/p0j6JQ== X-Received: by 2002:a1c:7e56:: with SMTP id z83mr7603108wmc.100.1549540209852; Thu, 07 Feb 2019 03:50:09 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id j17sm26386424wrw.0.2019.02.07.03.50.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 03:50:09 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: Timo Alho , Guenter Roeck , linux-tegra@vger.kernel.org Subject: [PATCH 2/2] firmware/tegra: Enable Tegra186 BPMP support on Tegra194 Date: Thu, 7 Feb 2019 12:50:06 +0100 Message-Id: <20190207115006.8162-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190207115006.8162-1-thierry.reding@gmail.com> References: <20190207115006.8162-1-thierry.reding@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding The BPMP implementation on Tegra194 is mostly compatible with the implementation on Tegra186, so make sure the latter is available when support for Tegra194 is enabled. Suggested-by: Timo Alho Signed-off-by: Thierry Reding Reviewed-by: Timo Alho Tested-by: Timo Alho --- drivers/firmware/tegra/Makefile | 1 + drivers/firmware/tegra/bpmp-private.h | 3 ++- drivers/firmware/tegra/bpmp.c | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/tegra/Makefile b/drivers/firmware/tegra/Makefile index ba45e58f7647..676b01caff05 100644 --- a/drivers/firmware/tegra/Makefile +++ b/drivers/firmware/tegra/Makefile @@ -1,6 +1,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_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 cc343f4ebafb..54d560c48398 100644 --- a/drivers/firmware/tegra/bpmp-private.h +++ b/drivers/firmware/tegra/bpmp-private.h @@ -23,7 +23,8 @@ struct tegra_bpmp_ops { int (*resume)(struct tegra_bpmp *bpmp); }; -#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_194_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 6498c848c82c..dd775e8ba5a0 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -813,7 +813,8 @@ static int __maybe_unused tegra_bpmp_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(tegra_bpmp_pm_ops, NULL, tegra_bpmp_resume); -#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) static const struct tegra_bpmp_soc tegra186_soc = { .channels = { .cpu_tx = { @@ -859,7 +860,8 @@ static const struct tegra_bpmp_soc tegra210_soc = { #endif static const struct of_device_id tegra_bpmp_match[] = { -#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) +#if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) { .compatible = "nvidia,tegra186-bpmp", .data = &tegra186_soc }, #endif #if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)