From patchwork Fri May 18 16:39:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 10411145 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 0A6526031B for ; Fri, 18 May 2018 16:40:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED7422899B for ; Fri, 18 May 2018 16:39:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1202289EC; Fri, 18 May 2018 16:39:59 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 5E4E62899B for ; Fri, 18 May 2018 16:39:59 +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:References: In-Reply-To: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:List-Owner; bh=lNefhuRCZ8uH8rfX8r8OJkJ1GclDHdozsWGKyuvy3Tw=; b=EwaVi/WjmHwJpY9yv4r3PPujDt Kt4ppJ+KijVEhmA1hHhVnwl0uUZiQu9FFUG9x7cO6h3bp1+jr/b1/pcKh0+rVwvWeaKJOLWy8P3On cjP+jp2Dlm3+kWlR78FibaGUfpSaxeg0nXW10gYRgZLHDthUqVZgWRhdMeudxsg0JNkZqtYtBSGN/ 0+Mj7Kkwo8XNihLmu5MpeG923B+Y+I2PfsnKkVh/OxcXE736vwwRrtmeO0qmFNj+skroVCn/AStao 3mA7D/DvnjqNH0o+pWLQhpzoxpl1iafB1YVcd9ri8AhTVRfGMlAHo5Sccq4icwYRoCnLM/ClB0EC9 leH8i6tg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiQ7-0008Cw-Mv; Fri, 18 May 2018 16:39:55 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJiPx-00089N-Ez for linux-arm-kernel@lists.infradead.org; Fri, 18 May 2018 16:39:47 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 286EE1596; Fri, 18 May 2018 09:39:37 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.206.73]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 822823F25D; Fri, 18 May 2018 09:39:35 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/11] coresight: ETM: Add support for Arm Cortex-A73 and Cortex-A35 Date: Fri, 18 May 2018 17:39:17 +0100 Message-Id: <1526661567-4578-2-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526661567-4578-1-git-send-email-suzuki.poulose@arm.com> References: <1526661567-4578-1-git-send-email-suzuki.poulose@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180518_093945_756268_D4D5AE01 X-CRM114-Status: GOOD ( 14.43 ) 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: mark.rutland@arm.com, robh@kernel.org, mathieu.poirier@linaro.org, Suzuki K Poulose , coresight@lists.linaro.org, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, frowand.list@gmail.com 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 Add ETM PIDs of the Arm cortex-A CPUs to the white list of ETMs. While at it, also add description of the CPU to which the ETM belongs, to make it easier to identify the ETM devices. Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-etm4x.c | 32 +++++++++++++-------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index cf364a5..fe5b41c 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -1034,7 +1034,8 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) } pm_runtime_put(&adev->dev); - dev_info(dev, "%s initialized\n", (char *)id->data); + dev_info(dev, "CPU%d: %s initialized\n", + drvdata->cpu, (char *)id->data); if (boot_enable) { coresight_enable(drvdata->csdev); @@ -1052,23 +1053,20 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) return ret; } +#define ETM4_AMBA_ID(cpu, pid) \ + { \ + .id = pid, \ + .mask = 0x000fffff, \ + .data = #cpu " ETM v4.x", \ + } + static const struct amba_id etm4_ids[] = { - { /* ETM 4.0 - Cortex-A53 */ - .id = 0x000bb95d, - .mask = 0x000fffff, - .data = "ETM 4.0", - }, - { /* ETM 4.0 - Cortex-A57 */ - .id = 0x000bb95e, - .mask = 0x000fffff, - .data = "ETM 4.0", - }, - { /* ETM 4.0 - A72, Maia, HiSilicon */ - .id = 0x000bb95a, - .mask = 0x000fffff, - .data = "ETM 4.0", - }, - { 0, 0}, + ETM4_AMBA_ID(Cortex-A53, 0x000bb95d), + ETM4_AMBA_ID(Cortex-A57, 0x000bb95e), + ETM4_AMBA_ID(Cortex-A72, 0x000bb95a), + ETM4_AMBA_ID(Cortex-A73, 0x000bb959), + ETM4_AMBA_ID(Cortex-A35, 0x000bb9da), + {}, }; static struct amba_driver etm4x_driver = {