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: 9974319 X-Patchwork-Delegate: agross@codeaurora.org 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 B694A6037F for ; Wed, 27 Sep 2017 15:52:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6E5228FCE for ; Wed, 27 Sep 2017 15:52:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6812928F5E; Wed, 27 Sep 2017 15:52:54 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B44029383 for ; Wed, 27 Sep 2017 15:51:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752455AbdI0Pvd (ORCPT ); Wed, 27 Sep 2017 11:51:33 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:49714 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752190AbdI0Pvc (ORCPT ); Wed, 27 Sep 2017 11:51:32 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 2D912609F2; Wed, 27 Sep 2017 15:51:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1506527492; bh=GtR3zEJ3R3CV1gSZfdMdSwOVlW5Pcf9+CeHPzXsKtZo=; h=From:To:Cc:Subject:Date:From; b=aFNqFB+CqWCgXhlTKWvSufYPgnT6mLDFz5BJYdgo3i/Z6+IeB+W+cxMIX9DTig1Wq DDF09/yQSQ5CTsn77Ff/ixhhCGNHQPOV+SHcr7hJiMknuzGdwbSmvUXw6NDeG2187Q D9uBATNXP0ZB+KuRSDQxlZ5nyw26RgDiVJ2jySio= 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 Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tyler Baicar , Jonathan Zhang , James Morse , Dongjiu Geng 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 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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