From patchwork Thu Feb 19 06:09:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dinguyen@opensource.altera.com X-Patchwork-Id: 5850511 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 78E659F30C for ; Thu, 19 Feb 2015 06:18:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9CEDF2025A for ; Thu, 19 Feb 2015 06:18:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40CF920259 for ; Thu, 19 Feb 2015 06:18:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YOKOb-0000Rz-Du; Thu, 19 Feb 2015 06:15:33 +0000 Received: from mail-by2on0071.outbound.protection.outlook.com ([207.46.100.71] helo=na01-by2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YOKOJ-0007dL-Pj for linux-arm-kernel@lists.infradead.org; Thu, 19 Feb 2015 06:15:16 +0000 Received: from linux-builds1.altera.com (64.129.157.38) by DM2PR0301MB1198.namprd03.prod.outlook.com (25.160.217.148) with Microsoft SMTP Server (TLS) id 15.1.87.18; Thu, 19 Feb 2015 06:14:52 +0000 From: To: Subject: [RFC PATCH] arm: cti: fix up cti pmu build Date: Thu, 19 Feb 2015 00:09:45 -0600 Message-ID: <1424326185-31463-2-git-send-email-dinguyen@opensource.altera.com> X-Mailer: git-send-email 2.2.1 In-Reply-To: <1424326185-31463-1-git-send-email-dinguyen@opensource.altera.com> References: <1424326185-31463-1-git-send-email-dinguyen@opensource.altera.com> MIME-Version: 1.0 X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: BLUPR08CA0047.namprd08.prod.outlook.com (10.141.200.27) To DM2PR0301MB1198.namprd03.prod.outlook.com (25.160.217.148) Authentication-Results: arm.linux.org.uk; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1198; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005003); SRVR:DM2PR0301MB1198; X-Forefront-PRVS: 0492FD61DD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(122386002)(40100003)(50466002)(42186005)(47776003)(33646002)(110136001)(76176999)(66066001)(92566002)(46102003)(2950100001)(50226001)(50986999)(62966003)(19580395003)(19580405001)(77156002)(2351001)(229853001)(86362001)(575784001)(53416004)(86152002)(48376002)(87976001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB1198; H:linux-builds1.altera.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1198; X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2015 06:14:52.0118 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB1198 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150218_221515_918222_C8FB2444 X-CRM114-Status: UNSURE ( 7.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: dinh.linux@gmail.com, Mathieu Poirier , Greg Kroah-Hartman , Will Deacon , linux-kernel@vger.kernel.org, Dinh Nguyen , Pratik Patel , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dinh Nguyen commit "184901a06a36 ARM: removing support for etb/etm in "arch/arm/kernel/" removed arch/arm/include/asm/hardware/coresight.h then commit "a06ae8609b3d coresight: add CoreSight core layer framework" added include/linux/coresight.h Update cti.h to use thew new coresight.h and replace CS_LAR_KEY with CORESIGHT_UNLOCK. Signed-off-by: Dinh Nguyen Cc: Pratik Patel Cc: Mathieu Poirier Cc: Greg Kroah-Hartman Cc: Will Deacon --- arch/arm/include/asm/cti.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/cti.h b/arch/arm/include/asm/cti.h index 2381199..044fda8 100644 --- a/arch/arm/include/asm/cti.h +++ b/arch/arm/include/asm/cti.h @@ -2,7 +2,7 @@ #define __ASMARM_CTI_H #include -#include +#include /* The registers' definition is from section 3.2 of * Embedded Cross Trigger Revision: r0p0 @@ -142,7 +142,7 @@ static inline void cti_irq_ack(struct cti *cti) */ static inline void cti_unlock(struct cti *cti) { - __raw_writel(CS_LAR_KEY, cti->base + LOCKACCESS); + __raw_writel(CORESIGHT_UNLOCK, cti->base + LOCKACCESS); } /** @@ -154,6 +154,6 @@ static inline void cti_unlock(struct cti *cti) */ static inline void cti_lock(struct cti *cti) { - __raw_writel(~CS_LAR_KEY, cti->base + LOCKACCESS); + __raw_writel(~CORESIGHT_UNLOCK, cti->base + LOCKACCESS); } #endif