From patchwork Thu Sep 6 05:30:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuyuki Kobayashi X-Patchwork-Id: 1412011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id A5B9E3FC85 for ; Thu, 6 Sep 2012 05:34:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9Ugy-0002to-79; Thu, 06 Sep 2012 05:31:52 +0000 Received: from bombadil.infradead.org ([2001:4830:2446:ff00:4687:fcff:fea6:5117]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9Ugi-0002sQ-9l for linux-arm-kernel@merlin.infradead.org; Thu, 06 Sep 2012 05:31:36 +0000 Received: from vrgw9.firstserver.ne.jp ([164.46.1.107]) by bombadil.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9Uge-0006M9-Ed for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 05:31:35 +0000 Received: from fvrsp10.firstserver.ne.jp (fvrsp10.firstserver.ne.jp [203.183.0.4]) by vrgw9.firstserver.ne.jp (8.13.8/8.13.8/FirstServer) with ESMTP id q865V57X007088; Thu, 6 Sep 2012 14:31:05 +0900 (envelope-from koba@kmckk.co.jp) Received: from 203.137.25.97 (203.137.25.97) by fvrsp10.firstserver.ne.jp (F-Secure/virusgw_smtp/407/fvrsp10.firstserver.ne.jp); Thu, 06 Sep 2012 14:31:05 +0900 (JST) X-Virus-Status: clean(F-Secure/virusgw_smtp/407/fvrsp10.firstserver.ne.jp) Received: from localhost (58-188-103-12f2.kns1.eonet.ne.jp [58.188.103.12]) (authenticated (0 bits)) by mail.kmckk.co.jp (8.14.3/8.11.3) with ESMTP id q865V5TL022082; Thu, 6 Sep 2012 14:31:05 +0900 From: Tetsuyuki Kobayshi To: horms@verge.net.au, linux-sh@vger.kernel.org Subject: [PATCH v2 2/2] ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit) Date: Thu, 6 Sep 2012 14:30:47 +0900 Message-Id: <1346909447-12526-3-git-send-email-koba@kmckk.co.jp> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346909447-12526-1-git-send-email-koba@kmckk.co.jp> References: <1346813317-4030-1-git-send-email-koba@kmckk.co.jp> <1346909447-12526-1-git-send-email-koba@kmckk.co.jp> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20120906_013133_062098_CD568B44 X-CRM114-Status: UNSURE ( 7.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 1.2 RCVD_NUMERIC_HELO Received: contains an IP address used for HELO -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tetsuyuki Kobayashi , arm@kernel.org, kuninori.morimoto.gx@renesas.com, magnus.damm@gmail.com, lethal@linux-sh.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Tetsuyuki Kobayashi This patch enables PMU(Performance Monitoring Unit) for emev2. Signed-off-by: Tetsuyuki Kobayashi --- Changes for v2: - Removed #ifdef CONFIG_HW_PERF_EVENTS - Added kzm9d_defconfig arch/arm/configs/kzm9d_defconfig | 1 + arch/arm/mach-shmobile/setup-emev2.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 26146ff..8c49df6 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig @@ -8,6 +8,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y +CONFIG_PERF_EVENTS=y CONFIG_SLAB=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c index dae9aa6..e1219a3 100644 --- a/arch/arm/mach-shmobile/setup-emev2.c +++ b/arch/arm/mach-shmobile/setup-emev2.c @@ -36,6 +36,7 @@ #include #include #include +#include static struct map_desc emev2_io_desc[] __initdata = { #ifdef CONFIG_SMP @@ -356,6 +357,26 @@ static struct platform_device gio4_device = { }, }; +static struct resource pmu_resources[] = { + [0] = { + .start = 152, + .end = 152, + .flags = IORESOURCE_IRQ, + }, + [1] = { + .start = 153, + .end = 153, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device pmu_device = { + .name = "arm-pmu", + .id = ARM_PMU_DEVICE_CPU, + .num_resources = ARRAY_SIZE(pmu_resources), + .resource = pmu_resources, +}; + static struct platform_device *emev2_early_devices[] __initdata = { &uart0_device, &uart1_device, @@ -370,6 +391,7 @@ static struct platform_device *emev2_late_devices[] __initdata = { &gio2_device, &gio3_device, &gio4_device, + &pmu_device, }; void __init emev2_add_standard_devices(void)