From patchwork Fri Jan 20 15:37:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 46430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp270549wrn; Fri, 20 Jan 2023 07:45:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXtEqnyuP4weItgl8bmgqep28UdwpXky0Ak9TOXg0V8fKTKYyZHSGck8i5Onx66iet9w+9zK X-Received: by 2002:a17:902:f70e:b0:194:6c1b:60b9 with SMTP id h14-20020a170902f70e00b001946c1b60b9mr18081303plo.25.1674229500375; Fri, 20 Jan 2023 07:45:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674229500; cv=none; d=google.com; s=arc-20160816; b=0vQCAiDNvLD0y0kIxANAIZVqzAL7mGxdxNxcXutIUQ+UQ+NBY8Y4OJMttdRt6nRA1I DQaOELffkJpT4EoJSJRTGuCzrFBtJZ88DVDcwNBn9x4GbYPaHaCPWd//2VGxVIuseC3k uoZdx4hY9mb1VoyvUQN7ZnAL1fET/Tnywtpcv17UBtqPOvpmgRf2UIXjQATjQJrxpvgA KtU6rM1SIFD9EwUOEj7Fb4jWpmoZNCLiOze1dlzE58lHdrehW8km6AoqMtQAEoBfkccv n+qMMtFbAR/trCohz3o1St1GDmJHzwqTCP4gNysk0Y6+2xA0wZOefV7gUZD7E46cn70z WnVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=cftWnAmLp1SAzK+LEC+VkfIJXP3yn4XV5OF+VxxmSEI=; b=de7ynYkRUdOTq8zCn8AkZl1mM1RryrG6upmX+YThf3Ps5anZZIFbeQKsk7k3NbQtuJ /kWLEeEOU4XJS8KGpaJo616DFjOSv0hq1LI3VEUzvVXyatCC8BBl0afiGod0w/6P0uOA LV1cXU9ui9u7UnuHLjrGgenDgQXDe1HAXjbq/mT0vBjO/VG8bwr3sQ1Erh31AwUh0MlA frQhnUjAel4YeaOvwB0JcnWPzQGdU99EvqAJzlRRYwo9wKF+9/XXXt/5/TedhIWNY7Fr 3WWYPhodfsI9ayAKQ8YuTVriwqjv6L98Q0e3UtWZoo5pEVcKzhhqTa9NLe51fzrGexcv 7y7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kehQTJmy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e7-20020a170902b78700b001895e356f00si39433342pls.152.2023.01.20.07.44.47; Fri, 20 Jan 2023 07:45:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kehQTJmy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230456AbjATPiD (ORCPT + 99 others); Fri, 20 Jan 2023 10:38:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230403AbjATPiA (ORCPT ); Fri, 20 Jan 2023 10:38:00 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6772BC79EB for ; Fri, 20 Jan 2023 07:37:11 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id b7so5205442wrt.3 for ; Fri, 20 Jan 2023 07:37:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cftWnAmLp1SAzK+LEC+VkfIJXP3yn4XV5OF+VxxmSEI=; b=kehQTJmy06GF73Jk4gupKe+iWEBSAOLIlh+im1CqYyRHgwYZcbshJUPBfo72NL2LAd SLtSL0YWsl7BzjCrReChO3QJdVuU+6VCQP2yXD+UC2XIgu4L2cfaSb00D4h26H7FjZ1R ShBO5E9s4ISWQZzZYOx93qA1eVZPYMQTfLrMk3WozQqhIO0ZwTZiBsKePs9hL6qWo5LD WsaOhLeRTc2YqX6diZLb59zkH3S+py+QjDuizqXsGKvCv9cFAQyf1l9tQMJmlHCtTzNu ienzRpqA5wUeZ/1B2roxwgRvvX8PZrY/fWWZ01bC4YdTC9stVMa7pZ+uZhVPAnc15d8j J95Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cftWnAmLp1SAzK+LEC+VkfIJXP3yn4XV5OF+VxxmSEI=; b=hVpm3yyr8m4MgSlkRaVIuPNsDU2+/b6sGJr8UgRN1QtuSyxkE4J+FFcozsD+DiYdT7 zLiG27tlsL1MGdu/BVpADV11mGd8ozRm0npO0FMXCcMo04fVWo/pFJga8gnzGwNmGf54 fecHTLwwQl1LI1KpFGRGLKUj23mbGmZWZ+np7a1n+BOXF8rLaCcUm526uWcNJOE1whLf Q+DUe0SQq4FjpaFUdkYqmvp6mGJWjaR1gqwZtCiQB+nC2MsChcHV1OUxGa1IsKYub4dz /oI7giR6r0Hbq9pwwQmxiWAcnWdM5YuXoQAa3Fyt7xvyDXISpSbifycTT/Ew6IDcHOov tyqA== X-Gm-Message-State: AFqh2kobmI8D70acPMXZ7k9iFhfxbRzk/yQyX5AQ63mrmI+6aLdU3hdK miRTPCc67dGO0bcfL1imIBUUnArmtN/VYT63 X-Received: by 2002:adf:a485:0:b0:2bf:81eb:dc26 with SMTP id g5-20020adfa485000000b002bf81ebdc26mr1311316wrb.37.1674229029690; Fri, 20 Jan 2023 07:37:09 -0800 (PST) Received: from linaro.org ([2a00:23c5:6809:2201:a9b1:8068:4297:73be]) by smtp.gmail.com with ESMTPSA id b16-20020adff910000000b002bdf8dd6a8bsm14212460wrr.80.2023.01.20.07.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 07:37:08 -0800 (PST) From: Mike Leach To: linux-perf-users@vger.kernel.org Cc: acme@kernel.org, linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, leo.yan@linaro.org, mathieu.poirier@linaro.org, suzuki.poulose@arm.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@redhat.com, namhyung@kernel.org, Mike Leach Subject: [PATCH] perf: cs-etm: Update decoder code for OpenCSD version 1.4 Date: Fri, 20 Jan 2023 15:37:06 +0000 Message-Id: <20230120153706.20388-1-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755556872156017861?= X-GMAIL-MSGID: =?utf-8?q?1755556872156017861?= OpenCSD version 1.4 is released with support for FEAT_ITE. This adds a new packet type, with associated output element ID in the packet type enum - OCSD_GEN_TRC_ELEM_INSTRUMENTATION. As we just ignore this packet in perf, add to the switch statement to avoid the "enum not handled in switch error", but conditionally so as not to break the perf build for older OpenCSD installations. Signed-off-by: Mike Leach Reviewed-by: James Clark Acked-by: Ian Rogers --- tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c index fa3aa9c0fb2e..48e7121880a9 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -604,6 +604,9 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( case OCSD_GEN_TRC_ELEM_CUSTOM: case OCSD_GEN_TRC_ELEM_SYNC_MARKER: case OCSD_GEN_TRC_ELEM_MEMTRANS: +#if (OCSD_VER_NUM >= 0x010400) + case OCSD_GEN_TRC_ELEM_INSTRUMENTATION: +#endif default: break; }