From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbdFUS3V (ORCPT ); Wed, 21 Jun 2017 14:29:21 -0400 Received: from terminus.zytor.com ([65.50.211.136]:39267 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751754AbdFUS3T (ORCPT ); Wed, 21 Jun 2017 14:29:19 -0400 Date: Wed, 21 Jun 2017 11:27:03 -0700 From: tip-bot for Adrian Hunter Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, ak@linux.intel.com, adrian.hunter@intel.com, mingo@kernel.org, tglx@linutronix.de, acme@redhat.com Reply-To: tglx@linutronix.de, mingo@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, ak@linux.intel.com, linux-kernel@vger.kernel.org, acme@redhat.com In-Reply-To: <1495786658-18063-15-git-send-email-adrian.hunter@intel.com> References: <1495786658-18063-15-git-send-email-adrian.hunter@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf intel-pt: Add reserved byte to CBR packet payload Git-Commit-ID: 26fb2fb19c28ec692d6604bb01cbb4f03a4ee009 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 26fb2fb19c28ec692d6604bb01cbb4f03a4ee009 Gitweb: http://git.kernel.org/tip/26fb2fb19c28ec692d6604bb01cbb4f03a4ee009 Author: Adrian Hunter AuthorDate: Fri, 26 May 2017 11:17:15 +0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 21 Jun 2017 11:35:50 -0300 perf intel-pt: Add reserved byte to CBR packet payload Future proof CBR packet decoding by passing through also the undefined 'reserved' byte in the packet payload. Signed-off-by: Adrian Hunter Cc: Andi Kleen Link: http://lkml.kernel.org/r/1495786658-18063-15-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 +- tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c index e42804d..96bf8d8 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c @@ -1444,7 +1444,7 @@ static void intel_pt_calc_mtc_timestamp(struct intel_pt_decoder *decoder) static void intel_pt_calc_cbr(struct intel_pt_decoder *decoder) { - unsigned int cbr = decoder->packet.payload; + unsigned int cbr = decoder->packet.payload & 0xff; if (decoder->cbr == cbr) return; diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c index accdb64..ba4c9dd 100644 --- a/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-pkt-decoder.c @@ -130,7 +130,7 @@ static int intel_pt_get_cbr(const unsigned char *buf, size_t len, if (len < 4) return INTEL_PT_NEED_MORE_BYTES; packet->type = INTEL_PT_CBR; - packet->payload = buf[2]; + packet->payload = le16_to_cpu(*(uint16_t *)(buf + 2)); return 4; }