Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1084999ybn; Tue, 24 Sep 2019 14:30:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqy+daSzFxZ/SbourrZSDgwHdzaUlIzLk8u7srfz9CDLgp/nts2x8CW85ephVFY9CO+r20ki X-Received: by 2002:a1c:720b:: with SMTP id n11mr2585150wmc.23.1569360644828; Tue, 24 Sep 2019 14:30:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569360644; cv=none; d=google.com; s=arc-20160816; b=NQHYgq2clw/UJzDDUfJvebEvAImMXx4fTwMJJKytA4+ecRUo+WlpUemajndTT5cPab Q4pJzy0M+mk3YDLDwZ2SrGVlXkcHB7bmzcnnHBoWsFRoeIRy/JB1/UPVq31zZTdPYhLa LYkn6nRmq+LXOOhvkJ1Y2vUTg6nVIx168YEDdw5sleriEU14aoWtpAAAIwfyTvamrrHQ IXwCrv9z88DhhHINfsjtd/+E1RGXr9iUOv3bBHvYZeXJ7SZdiXsexrwUCGI4AW2VrUGB 9DDptq6CP/FX51bdOe6CAKVHGs6nSOfqbEJvw3N2GmAmVuyBgsCL581XD7eHXsBeZRds +5uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SYq5bHnqq/nrp+72ScMsEuHQ7AzAjnDVv2L9FaeBmEQ=; b=MPWGMBUTU5PaCah0BShUWSWmf+XQBEXACLvkTBHMMJbTFm4pGP/wSe3rAUWmDewRBG XWqYKS6I2k4ClWdJoe7uj7Ho7QtvYdgGNxowJaoLR0xhQzW9tN68DVqD8DN2UWSu+U5o fmoErb5Rs4+AMebwAGB+t5XXcSqvjMPLofrMgnbSGlp79hm1sA7svq4AaqRymrpVdMBQ ykOcYqGpOmi5mV3djXSSL/VCmABursajfjzcnRfdhu4i/0mPiKnk83KyQ3yr7vFncrxP NHiby/4xFo34pSSjly3p6E0xwWpjDb29GUWgz1T1FTHF1+MI9wmGmi7Yju6x9W9a9kIU vdsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vAnZ2xM3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si1626507ejw.308.2019.09.24.14.30.20; Tue, 24 Sep 2019 14:30:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vAnZ2xM3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438601AbfIVTeO (ORCPT + 99 others); Sun, 22 Sep 2019 15:34:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:43782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390724AbfIVSrU (ORCPT ); Sun, 22 Sep 2019 14:47:20 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76C69206C2; Sun, 22 Sep 2019 18:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178040; bh=ewPq7fQ+Kpl7Nb7d8O0y/srjFnu8XZRUFHNrMK6wO+8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vAnZ2xM34JG/kNW0/loLz30FCB0QJPjMy1dKhvzhTWh3kwhjuJxYcj/aVinq0ExJq M/ItD1u/9fgmyxFOm5dZw+g1x/X4cOp7+vOMZGZ+vo4ZanTCBG2LkyCDHGycSAgmjz flLp+kwy6LtLhcHoI+REC0huj1EW3VvbF2jBxHLI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Masahiro Yamada , Keerthy , Tony Lindgren , Sasha Levin , linux-omap@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 120/203] ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2 Date: Sun, 22 Sep 2019 14:42:26 -0400 Message-Id: <20190922184350.30563-120-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada [ Upstream commit ccf4975dca233b1d6a74752d6ab35c239edc0d58 ] is only generated and included by arch/arm/mach-omap2/, so it does not need to reside in the globally visible include/generated/. I renamed it to arch/arm/mach-omap2/pm-asm-offsets.h since the prefix 'ti-' is just redundant in mach-omap2/. My main motivation of this change is to avoid the race condition for the parallel build (-j) when CONFIG_IKHEADERS is enabled. When it is enabled, all the headers under include/ are archived into kernel/kheaders_data.tar.xz and exposed in the sysfs. In the parallel build, we have no idea in which order files are built. - If ti-pm-asm-offsets.h is built before kheaders_data.tar.xz, the header will be included in the archive. Probably nobody will use it, but it is harmless except that it will increase the archive size needlessly. - If kheaders_data.tar.xz is built before ti-pm-asm-offsets.h, the header will not be included in the archive. However, in the next build, the archive will be re-generated to include the newly-found ti-pm-asm-offsets.h. This is not nice from the build system point of view. - If ti-pm-asm-offsets.h and kheaders_data.tar.xz are built at the same time, the corrupted header might be included in the archive, which does not look nice either. This commit fixes the race. Signed-off-by: Masahiro Yamada Tested-by: Keerthy Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/mach-omap2/.gitignore | 1 + arch/arm/mach-omap2/Makefile | 5 +++-- arch/arm/mach-omap2/sleep33xx.S | 2 +- arch/arm/mach-omap2/sleep43xx.S | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 arch/arm/mach-omap2/.gitignore diff --git a/arch/arm/mach-omap2/.gitignore b/arch/arm/mach-omap2/.gitignore new file mode 100644 index 0000000000000..79a8d6ea71520 --- /dev/null +++ b/arch/arm/mach-omap2/.gitignore @@ -0,0 +1 @@ +pm-asm-offsets.h diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 6006505516219..21c6d4bca3c0f 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -223,9 +223,10 @@ obj-y += omap_phy_internal.o obj-$(CONFIG_MACH_OMAP2_TUSB6010) += usb-tusb6010.o -include/generated/ti-pm-asm-offsets.h: arch/arm/mach-omap2/pm-asm-offsets.s FORCE +$(obj)/pm-asm-offsets.h: $(obj)/pm-asm-offsets.s FORCE $(call filechk,offsets,__TI_PM_ASM_OFFSETS_H__) -$(obj)/sleep33xx.o $(obj)/sleep43xx.o: include/generated/ti-pm-asm-offsets.h +$(obj)/sleep33xx.o $(obj)/sleep43xx.o: $(obj)/pm-asm-offsets.h targets += pm-asm-offsets.s +clean-files += pm-asm-offsets.h diff --git a/arch/arm/mach-omap2/sleep33xx.S b/arch/arm/mach-omap2/sleep33xx.S index 68fee339d3f12..dc221249bc22c 100644 --- a/arch/arm/mach-omap2/sleep33xx.S +++ b/arch/arm/mach-omap2/sleep33xx.S @@ -6,7 +6,6 @@ * Dave Gerlach, Vaibhav Bedia */ -#include #include #include #include @@ -15,6 +14,7 @@ #include "iomap.h" #include "cm33xx.h" +#include "pm-asm-offsets.h" #define AM33XX_CM_CLKCTRL_MODULESTATE_DISABLED 0x00030000 #define AM33XX_CM_CLKCTRL_MODULEMODE_DISABLE 0x0003 diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S index c1f4e4852644e..90d2907a2eb27 100644 --- a/arch/arm/mach-omap2/sleep43xx.S +++ b/arch/arm/mach-omap2/sleep43xx.S @@ -6,7 +6,6 @@ * Dave Gerlach, Vaibhav Bedia */ -#include #include #include #include @@ -19,6 +18,7 @@ #include "iomap.h" #include "omap-secure.h" #include "omap44xx.h" +#include "pm-asm-offsets.h" #include "prm33xx.h" #include "prcm43xx.h" -- 2.20.1