From patchwork Thu Nov 19 15:24:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 11917917 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D2A2C6369E for ; Thu, 19 Nov 2020 15:28:50 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C24A024698 for ; Thu, 19 Nov 2020 15:28:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VylL+DsD"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SsP81Hhv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C24A024698 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=3gau6ERJIk6hEcXyjx76fuiXmHVUORIs6nPq65ToPK0=; b=VylL+DsDQHWxJN/jaBWRL7MwQ9 mhfV1ODlUGbBv+yexMMcnbTFIVvSwdzQPeeHbSETKhFZU2VXW3ADQdjY8Cmp845a1xMVahNZ51DRB AcRdiNLn3o0yNuhIcocolxlhO87ndEu6Kn3sEzzCC/kMabU1kDB0MVbthSZmkR5H+GGZER3F7o63s GSJ+8JzBlvKeY5/UMoDYk38HneXplWygsHDdKfnbZMRDlLvYzPITWyg3zxu0wX0rCjKrAZjqFSn3W 7EesRqC64lDuZRNC6D+DypZRHMVYq9uAuSkkb4hC1hOgGXbd43nidEOyhsGfyVjpL0CDMVExUB/Ux BoJkwxbw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kflr6-0005Ds-Uy; Thu, 19 Nov 2020 15:28:17 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfloG-0004Dw-A4 for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2020 15:25:27 +0000 Received: by mail-pl1-x62f.google.com with SMTP id x15so3124271pll.2 for ; Thu, 19 Nov 2020 07:25:19 -0800 (PST) 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=oR0P4SqSunF7MLRCBYZbypsc+vvGTSsTPUDSK1boJO0=; b=SsP81HhvvUdeLLrVeQ+9w5LXjOHGLDiJq4TJ+E3Jm1Qf2YLAmwOZWWVNndlS86NMG3 CZOs0OsvdzQyhdtifjw4wf1i/k65jpt7skUB1GdmA97rQZbPskvBTOSTfgdHT6Ajy65M JLShaGLZbXGdxBk/5i9l8SUV6UjPTk/oY5+uMU1qbfjleo4sUuWMNyJTXuYGJ/OzNKNi HkOvWkp9yGIFr4jIj4OPVPEDxS8DhplHQDe5/LQLb6pnR9efKXBdhxVt9Srs64E4sA3p IjFTQXdTxnEpQmBZrUclNaH+cm6seo7Fq1A2GttgwGWOqpvhAIYD/yJKLR9v2iN0nbbk jlyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oR0P4SqSunF7MLRCBYZbypsc+vvGTSsTPUDSK1boJO0=; b=FhoU1Rj49NBrde8//jWkY2xjCHrcHJi5enSkocJw6LSUA+sTfKUZH6r0Dt7WWqZZHo k/srY0+ld0HSeTqw9781GpuJ4UG7iDEtfJnrZjKxvbtiLrINtERr4t9Rmn5PHGhSaGwW Bb709YMFxw6teMZHb6TVA9rBTwAbMJMQPGjO7+dW3RNq5H5OLiiRcigyfJmZhfbzd+tl os8Lw2+aF5ijIrGUU4ggue32XdIWSPWDuzN9uLDrW05Z7UmYTGmGk60PRc7acr90enib fVcNN3QEkaaYMpAm+mGXJtiLoSAkKEjQ+ESD0crY4Impq8OcNuvFSRtn1Qgqp6RS2IB+ B+BA== X-Gm-Message-State: AOAM531ZVroeajyDmJ/dJ9jgmadIhMuFl8iVRy+VFmeMb2eLc7vnAUuz 2IA1jWcpqJiWB3C8thAUHDQDGQ== X-Google-Smtp-Source: ABdhPJwZKJOHZeya+U2mPQRz6hYHrLIxpehiADlh6glVgtjksHiU9B9/msjBgGqHcSsl4rD4lfTqsw== X-Received: by 2002:a17:902:aa4b:b029:d8:f87e:1f3c with SMTP id c11-20020a170902aa4bb02900d8f87e1f3cmr9052560plr.23.1605799517397; Thu, 19 Nov 2020 07:25:17 -0800 (PST) Received: from localhost ([45.137.216.7]) by smtp.gmail.com with ESMTPSA id 23sm389pgs.19.2020.11.19.07.25.16 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Nov 2020 07:25:16 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Andre Przywara , Dave Martin , James Clark , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Al Grant , Wei Li , John Garry , Will Deacon , Mathieu Poirier , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 06/16] perf arm-spe: Refactor context packet handling Date: Thu, 19 Nov 2020 23:24:31 +0800 Message-Id: <20201119152441.6972-7-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201119152441.6972-1-leo.yan@linaro.org> References: <20201119152441.6972-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201119_102520_463930_DA3D4F04 X-CRM114-Status: GOOD ( 16.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leo Yan MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Minor refactoring to use macro for index mask. Signed-off-by: Leo Yan Reviewed-by: Andre Przywara --- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 2 +- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c index d37c4008adbc..978f5551b82c 100644 --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c @@ -136,7 +136,7 @@ static int arm_spe_get_context(const unsigned char *buf, size_t len, struct arm_spe_pkt *packet) { packet->type = ARM_SPE_CONTEXT; - packet->index = buf[0] & 0x3; + packet->index = SPE_CTX_PKT_HDR_INDEX(buf[0]); return arm_spe_get_payload(buf, len, 0, packet); } diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h index f97d6840be3a..9bc876bffd35 100644 --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h @@ -79,6 +79,9 @@ struct arm_spe_pkt { #define SPE_ADDR_PKT_EL2 2 #define SPE_ADDR_PKT_EL3 3 +/* Context packet header */ +#define SPE_CTX_PKT_HDR_INDEX(h) ((h) & GENMASK_ULL(1, 0)) + const char *arm_spe_pkt_name(enum arm_spe_pkt_type); int arm_spe_get_packet(const unsigned char *buf, size_t len,