From patchwork Wed Sep 27 15:51:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9974323 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B0A786037F for ; Wed, 27 Sep 2017 15:53:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A11C328FF9 for ; Wed, 27 Sep 2017 15:53:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9FD4A290ED; Wed, 27 Sep 2017 15:53:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2D08029345 for ; Wed, 27 Sep 2017 15:52:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Q23Myrlcw0ZOD2EJG++E72D2Zh5w9OhBJC248J55cZA=; b=PeN N5XyyN/BuBOQKRlkh7Juf0gFtlYLoFns6Q6v2dic/L18NX1DOPbWYyptcv9W8CSoyX41XkR6EBiGT PpIm44eN0HpRvumnzIC2/ghVTP6DxmKsYjjHaod23iEKJE96OOS5Z/qNlWYZPltJeeeAJ2lM18Kbm 2IBkXx26Ndeiqw1jKCd8UOIcIrOsrv1ZRkpP+q22ZcIZSGaXfJaMKkO8G4IZX70n7ieR7NsktWqRB JJF5H8xMfJUPmaEJFQ6MVUiU6/oOUV8vO6EedGuTULZNI3Wp6fzb9OJwvxR5dIKGuMF/oUtqSD5kj X6Ogzdt6vPxwy6Y54OjAv20lEfRObnQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dxEct-0004lV-W4; Wed, 27 Sep 2017 15:51:56 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dxEcq-0004gJ-B3 for linux-arm-kernel@lists.infradead.org; Wed, 27 Sep 2017 15:51:54 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id E735C60996; Wed, 27 Sep 2017 15:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506527491; bh=GtR3zEJ3R3CV1gSZfdMdSwOVlW5Pcf9+CeHPzXsKtZo=; h=From:To:Cc:Subject:Date:From; b=IUlbSWxwILX18HFzySPjSTqO9/9Oq82H5NpAp00Yp8P72EPKrP5IJjGkyb7vckTTi LTVp0dxHnXEmAEhf8ys1UiMt61hWOCEHSaWiL1txXXJgmFqkwpvfX8gVrPiHBYG7V2 OnLwR6P4NGQVYP/sY0hV7fV2u+MAFqKXtCEFaLWw= Received: from sboyd-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sboyd@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3B2A260708; Wed, 27 Sep 2017 15:51:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506527491; bh=GtR3zEJ3R3CV1gSZfdMdSwOVlW5Pcf9+CeHPzXsKtZo=; h=From:To:Cc:Subject:Date:From; b=IUlbSWxwILX18HFzySPjSTqO9/9Oq82H5NpAp00Yp8P72EPKrP5IJjGkyb7vckTTi LTVp0dxHnXEmAEhf8ys1UiMt61hWOCEHSaWiL1txXXJgmFqkwpvfX8gVrPiHBYG7V2 OnLwR6P4NGQVYP/sY0hV7fV2u+MAFqKXtCEFaLWw= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3B2A260708 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sboyd@codeaurora.org From: Stephen Boyd To: Catalin Marinas , Will Deacon Subject: [PATCH v2] arm64: Unconditionally support {ARCH_}HAVE_NMI{_SAFE_CMPXCHG} Date: Wed, 27 Sep 2017 08:51:30 -0700 Message-Id: <20170927155130.28539-1-sboyd@codeaurora.org> X-Mailer: git-send-email 2.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170927_085152_467322_134D08F7 X-CRM114-Status: GOOD ( 11.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonathan Zhang , linux-arm-msm@vger.kernel.org, Tyler Baicar , linux-kernel@vger.kernel.org, Dongjiu Geng , James Morse , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From what I can see there isn't anything about ACPI_APEI_SEA that means the arm64 architecture can or cannot support NMI safe cmpxchg or NMIs, so the 'if' condition here is not important. Let's remove it. Doing that allows us to support ftrace histograms via CONFIG_HIST_TRIGGERS that depends on the arch having the ARCH_HAVE_NMI_SAFE_CMPXCHG config selected. Cc: Tyler Baicar Cc: Jonathan (Zhixiong) Zhang Cc: James Morse Cc: Dongjiu Geng Signed-off-by: Stephen Boyd --- Changes from v1: * Also drop condition from HAVE_NMI (James Morse) arch/arm64/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0df64a6a56d4..0e4cc113b74e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -21,7 +21,7 @@ config ARM64 select ARCH_HAS_STRICT_KERNEL_RWX select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST - select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA + select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_USE_CMPXCHG_LOCKREF select ARCH_SUPPORTS_MEMORY_FAILURE select ARCH_SUPPORTS_ATOMIC_RMW @@ -98,7 +98,7 @@ config ARM64 select HAVE_IRQ_TIME_ACCOUNTING select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP if NUMA - select HAVE_NMI if ACPI_APEI_SEA + select HAVE_NMI select HAVE_PATA_PLATFORM select HAVE_PERF_EVENTS select HAVE_PERF_REGS