From patchwork Mon Feb 24 22:40:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 1243674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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.a=rsa-sha256 header.s=20161025 header.b=hsDvzxEI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48RHDK4gZdz9sRl for ; Tue, 25 Feb 2020 09:44:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728177AbgBXWmh (ORCPT ); Mon, 24 Feb 2020 17:42:37 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:39794 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727976AbgBXWmh (ORCPT ); Mon, 24 Feb 2020 17:42:37 -0500 Received: by mail-lf1-f65.google.com with SMTP id n30so7250233lfh.6; Mon, 24 Feb 2020 14:42:35 -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=7nkAq5GfDlPZXykqJhY6isdTe+F5tuToLJNPg+hqtHo=; b=hsDvzxEIXKi4FCYfJ+ZLDZvH+mO5gpla9lgaqgwCyubD5j1EFvFa4tU8W4A4hDIoQk wG0OZ/NNTuhpGZSWv2pgrhYTXAWLizcWgpnKFwzGRi812pEuunDzPgsZ+HAZPj4DhWU+ uoR1UfzWpfmgXR6LOXTOWEkwidUdizHBP6htjShFLM5/scmf1G8aKvKiWaFq4BLJ8RZo SRtRWqBunY83Ubn08d2lFVWLeL7pmb/vMAUHl9x+opS7bECRvdrrNhFpQmIRq85kFFZy e1jAifEZe7EsFWtx9tTlFNTt8xW0VPv+Xqh0BrXJD9EbkgJrJNNK+NF47ginS/Pfmddh hzdA== 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=7nkAq5GfDlPZXykqJhY6isdTe+F5tuToLJNPg+hqtHo=; b=os2yXgEE5c0N+RNVVvrCaU+NKm4cGc//wYnm/hIXilAHEtRoVFB+7oLlDaYvH904Wk xGDWdQZXixuYLfO2mW0yHVncSVsvDA/7WPw8HiLnJ5o6lu2EMf4coWQLpyYP2I9oifRj oEhkp8pUkEZLIpXgaa3h3AlQoFW0KHu7KAQFcPj+e2RYji9ztcf5Mo/FuxsNS2zv1RCz KeCvALyomXMY+/zUoU1lSAzBKOnlzlVj89qxfrCjLjOXrCTg8/kyCbkEI7LuzeTF5Mwq pfS6c7xGHhQWsUljodHsDD0uifdgQI+xAp27mzT8m7nKF3Jq7OAhsp+5rwpwCAR5tqvM 8SHA== X-Gm-Message-State: APjAAAVAyHPqQ7RY2uEHH3kkVgbvP0p846iagzEKt0ShWrXTkRFsLPU6 k1iu8tNj7Uw5yj/yFrYzOQk= X-Google-Smtp-Source: APXvYqyWxyrGGjB38rrxlxmx71Ht5tQ+diDjSZVo+lOGG4jypLBemdCB7MVBd0yPrQFDFq4AqnoA+g== X-Received: by 2002:a19:ee0a:: with SMTP id g10mr9964294lfb.182.1582584154684; Mon, 24 Feb 2020 14:42:34 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id j7sm6264833lfh.25.2020.02.24.14.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 14:42:34 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Peter De Schrijver , "Rafael J. Wysocki" , Daniel Lezcano , =?utf-8?q?Micha=C5=82_Miro?= =?utf-8?b?c8WCYXc=?= , Jasper Korten , David Heidelberg , Peter Geis , Nicolas Chauvet Cc: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 01/17] ARM: tegra: Compile sleep-tegra20/30.S unconditionally Date: Tue, 25 Feb 2020 01:40:41 +0300 Message-Id: <20200224224057.21877-2-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200224224057.21877-1-digetx@gmail.com> References: <20200224224057.21877-1-digetx@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 The sleep-tegra*.S provides functionality required for suspend/resume and CPU hotplugging. The new unified CPUIDLE driver will support multiple hardware generations starting from Terga20 and ending with Tegra124, the driver will utilize functions that are provided by the assembly and thus it is cleaner to compile that code without any build-dependencies in order to avoid churning with #ifdef's. Acked-by: Peter De Schrijver Tested-by: Peter Geis Tested-by: Jasper Korten Tested-by: David Heidelberg Tested-by: Nicolas Chauvet Signed-off-by: Dmitry Osipenko --- arch/arm/mach-tegra/Makefile | 6 ++---- arch/arm/mach-tegra/sleep.h | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 6c1dff2eccc2..965862608ff6 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -8,13 +8,13 @@ obj-y += reset.o obj-y += reset-handler.o obj-y += sleep.o obj-y += tegra.o +obj-y += sleep-tegra20.o +obj-y += sleep-tegra30.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += sleep-tegra20.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += pm-tegra20.o ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += cpuidle-tegra20.o endif -obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += sleep-tegra30.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += pm-tegra30.o ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuidle-tegra30.o @@ -22,12 +22,10 @@ endif obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o -obj-$(CONFIG_ARCH_TEGRA_114_SOC) += sleep-tegra30.o obj-$(CONFIG_ARCH_TEGRA_114_SOC) += pm-tegra30.o ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o endif -obj-$(CONFIG_ARCH_TEGRA_124_SOC) += sleep-tegra30.o obj-$(CONFIG_ARCH_TEGRA_124_SOC) += pm-tegra30.o ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_TEGRA_124_SOC) += cpuidle-tegra114.o diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h index 78ef32a907c8..63e2205cbc82 100644 --- a/arch/arm/mach-tegra/sleep.h +++ b/arch/arm/mach-tegra/sleep.h @@ -120,10 +120,8 @@ void tegra_resume(void); int tegra_sleep_cpu_finish(unsigned long); void tegra_disable_clean_inv_dcache(u32 flag); -#ifdef CONFIG_HOTPLUG_CPU void tegra20_hotplug_shutdown(void); void tegra30_hotplug_shutdown(void); -#endif void tegra20_cpu_shutdown(int cpu); int tegra20_cpu_is_resettable_soon(void);