From patchwork Thu Oct 3 15:51:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175133 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp557249ill; Thu, 3 Oct 2019 09:30:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqxMZ+sSiOMONyUTb2RnFsXvF2tnUldVSdm4bmTNRdu/Zot1igc/+txKQ49c+p34feUicSwL X-Received: by 2002:a17:906:b298:: with SMTP id q24mr8515666ejz.168.1570120214941; Thu, 03 Oct 2019 09:30:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120214; cv=none; d=google.com; s=arc-20160816; b=RjUYM9CD04n9Iq27v0y1V4nlyYd7+N2Bj1o6TKIwTI+fBfegaJIPKDxHOa4k9FOJnm ltKRAJkvWfZiAE74GXLLMdqcyWcW+S0Di830QhSG+CYrcdhXa9Sja8/5DzLMmH8PsIL+ X6DhhUiWP977XznUYAwdQxH78n/TVzTxbNggpoipl6KXibDdRknEr4Uf/9MDuwpKSGgN xxVm1N/9mHuWbP/V/jjWA0yfaGrAx7HishA5hOQtIh51LCN4CBa3RzaoAJBvVc5O81x1 0O1uGXW2nIe11nyIZx1H9Zh4Z1xeD1DdZ6G5pHzfCQgs/lFwXauNETBs7WNrG7iSLe3p HDHA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YQLYvzko/B5yhXVIXBj5w940LD92sw7/gFWgD7OC4zk=; b=Mmh1xiaT/6TSNSGbDMSqJzKBj4FmV4/OLtt20ab0yOXntd0EQzxUm3BzRcTfRa1M32 HoFsXYcTqge6Z+hBIfumXa35dFKc6xneGhidOvHzgjT6szxMVeY3PeyzNDqI3LmUjyeu R1WjeNSFZnEmVE2XJ3uVAZSnOlv4VOIKKsznDGKELfSwO1XIHPHCLTa/GWPNmKnnPzUh ianO6+9PTh0bG1pAmsMMqRXwfKjHI/wgYfJxZYVM4s6G1fF1p4laeoFoO3/C5RL/62Z5 ITbee/JYgX6GXrzLUukFBJlcCzZebHLydgiMT+doDIcwCCwWai8ASvJknfXWr9b+jSSr nUGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1e5XnYUZ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ca7si1528034ejb.319.2019.10.03.09.30.14; Thu, 03 Oct 2019 09:30:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=1e5XnYUZ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391681AbfJCQaN (ORCPT + 14 others); Thu, 3 Oct 2019 12:30:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:36082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391678AbfJCQaM (ORCPT ); Thu, 3 Oct 2019 12:30:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2A53C2054F; Thu, 3 Oct 2019 16:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120211; bh=Iqq+ihm3MEyO7MocIdtefL66drtCw5MVI0GpPu7TVtI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1e5XnYUZPjyxvUN2tlPVZvkOoo7DfDuB0rm9rGyr6tb4h81a0Qh7w0mCaITWQm3bj xGyV+DWbWz3CYVWIVT8o/yt7n/t2pLV+DiTxOAputC0uFs/hTq+QI0PfC+lLNICicF GVDNlksOxypblKuWAN43J63+KooUZ85rHyRmaVzY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masahiro Yamada , Keerthy , Tony Lindgren , Sasha Levin Subject: [PATCH 5.2 138/313] ARM: OMAP2+: move platform-specific asm-offset.h to arch/arm/mach-omap2 Date: Thu, 3 Oct 2019 17:51:56 +0200 Message-Id: <20191003154546.468390520@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 -- 2.20.1 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 85d1b13c9215b..26baeb6477aff 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -236,9 +236,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 47a816468cdb4..a003769121aaa 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 0c1031442571f..27b13d47cf193 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"