From patchwork Thu Aug 25 21:18:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 9300043 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 CD0FE60757 for ; Thu, 25 Aug 2016 21:34:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCA88293D2 for ; Thu, 25 Aug 2016 21:34:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1827293E3; Thu, 25 Aug 2016 21:34:20 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 49CEC293D2 for ; Thu, 25 Aug 2016 21:34:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bd2GS-00015I-S2; Thu, 25 Aug 2016 21:32:44 +0000 Received: from mail-it0-x22c.google.com ([2607:f8b0:4001:c0b::22c]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bd243-0006Jt-E7 for linux-arm-kernel@lists.infradead.org; Thu, 25 Aug 2016 21:19:56 +0000 Received: by mail-it0-x22c.google.com with SMTP id n128so113437175ith.1 for ; Thu, 25 Aug 2016 14:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bX6+DVlEUnBYHbs8g5Vt+3VB/9y9mSw/16IAjkMmaS0=; b=eqYqlrx/QOcWgzpFo3rjTPlSu3GiJ9V0x+WXl9dPVBfT/TKQW8m3fYVjlaYuCWZIWT bKmP0RqyCvXGm/W0o3NuOrnpS7t6A97wy9jNTaCQH1wRYwMHtFx1SKiFRiQ1S1Mo2QCr TzNdKPIFtCi2deRvr4S9as4/gt91EAe9iYfHA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bX6+DVlEUnBYHbs8g5Vt+3VB/9y9mSw/16IAjkMmaS0=; b=Q30RxWptn5M1XYLgb4fH4vzttI0oKipFT3ZR2IVx1Ogy7Xv2R3ueVqcuozb0cF1uaf Kybu58lkATN5iqIC05hhqMtvkUVB6M9JUFBUO3UyeoyjxzvyiP7WlXNACwPVu/NYATWS ChPxLYPlriURwwCAiey/CMDlyDC8UTSvwYdBaDEh6/hTfVqojCV3DZh5PFKa3xbLCmwB IPY2PocPKB6nUD6w3AvYabJbxyYoyR+1gdMuLYgywZjYv17MFn6mdAnCoIeNQrFY8dCs j/nwWAv+9L3BaFC66PdckmuP0VTWuND29Qq0EKyRrfvWlbNLUM1/jUpLLhn2qSBuGIEF LuaQ== X-Gm-Message-State: AEkoousJv4FeFPjoXJpjvTIdcpcqwNCmh+nwip1bJbZLlEmo5ZdXTNEiv8jE+qB1OL7M7xbB X-Received: by 10.36.212.132 with SMTP id x126mr7888613itg.34.1472159977598; Thu, 25 Aug 2016 14:19:37 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id o5sm14506120ith.20.2016.08.25.14.19.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 14:19:37 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Subject: [PATCH 08/28] coresight: etmv4: Fix ETMv4x peripheral ID table Date: Thu, 25 Aug 2016 15:18:58 -0600 Message-Id: <1472159958-5981-9-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472159958-5981-1-git-send-email-mathieu.poirier@linaro.org> References: <1472159958-5981-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160825_141955_583268_5A94CF0E X-CRM114-Status: GOOD ( 13.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, 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: Suzuki K Poulose This patch cleans up the peripheral id table for different ETMv4 implementations. As per Cortex-A53 TRM, the ETM has following id values: Peripheral ID0 0x5D 0xFE0 Peripheral ID1 0xB9 0xFE4 Peripheral ID2 0x4B 0xFE8 Peripheral ID3 0x00 0xFEC where, PID2: has the following format: [7:4] Revision [3] JEDEC 0b1 res1. Indicates a JEP106 identity code is used [2:0] DES_1 0b011 ARM Limited. This is bits[6:4] of JEP106 ID code The existing table entry checks only the bits [1:0], which is not sufficient enough. Fix it to match bits [3:0], just like the other entries do. While at it, correct the comment for A57 and the A53 entry. Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm4x.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index 17e2e81d2e90..bc5ed207a3b5 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -812,12 +812,12 @@ err_arch_supported: } static struct amba_id etm4_ids[] = { - { /* ETM 4.0 - Qualcomm */ - .id = 0x0003b95d, - .mask = 0x0003ffff, + { /* ETM 4.0 - Cortex-A53 */ + .id = 0x000bb95d, + .mask = 0x000fffff, .data = "ETM 4.0", }, - { /* ETM 4.0 - Juno board */ + { /* ETM 4.0 - Cortex-A57 */ .id = 0x000bb95e, .mask = 0x000fffff, .data = "ETM 4.0",