From patchwork Mon Sep 28 16:34:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 11804073 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9715F139A for ; Mon, 28 Sep 2020 16:38:18 +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 5ABB62080C for ; Mon, 28 Sep 2020 16:38:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="T8G7NStC"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kLqhFN7/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5ABB62080C 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+patchwork-linux-arm=patchwork.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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=+DzAyBaiAqOK+inkcOb0ifkxBLmYgHgLPJrpIL5+46g=; b=T8G7NStCyU2pLY/BqVmjwmEL5 z1Og2YgOKzXCY8MN7HcjUXL1D6rEoEUL2uBg3GgI857qFvooDEHqrF+3YOwIw99j2PovtvmIyWCDu aWAHJm0xJYq3+3wcT0SZM4krWHKVONDBllgx4xALwIfgCS8GBL7U5MUyHw5dF4AUUrJRwwcq8UwSa 8amVrHZI669VQQ2fNVHyt/3KD6mc5kMMfrFMuPG/9n54QNu4/Lv1Sum2oLGyLs/vVGEZkRqFuklJP cxKeFKluLL0hvombsz7TrfBgFT/sKL28XDtytCMxfqK559SSINqrtp9xogWkxB9Zj4C8Yziu+VN56 ZQePHMdOA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMw8A-0000op-AW; Mon, 28 Sep 2020 16:36:02 +0000 Received: from mail-pj1-x1041.google.com ([2607:f8b0:4864:20::1041]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kMw7U-0000WR-JM for linux-arm-kernel@lists.infradead.org; Mon, 28 Sep 2020 16:35:25 +0000 Received: by mail-pj1-x1041.google.com with SMTP id b17so953159pji.1 for ; Mon, 28 Sep 2020 09:35:20 -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 :mime-version:content-transfer-encoding; bh=gSNI4aKIAgjaa3IWnWs5bKpT6ackNFBWDJoRKS0EH98=; b=kLqhFN7/bIhd9wUGI78A0ktoH07XgmRZDjrVQAc8bdiSY5sbjRd0KQ5BcMDjNJn4YH E25q2of6p9zDRYlVsaN3x7Iq4GKJn2areWyQRdDOI4i4HDxDZ4CtNoyCCZvkvmyTJ9a9 zDy7W1IYNUQB+pETxN7DFxnKfre/pTE38Q6ZJSqf12rteCxF5CXKbacx2khW9wVo1RbN gTGJYdSqXShTzo2N8Zk8jN54Jitx1bYyqXDM/IMvACoGbmoslDcpUUHCFloGPOu8gXP0 +QU4ZhuiJn2ANRF68wg3fvw3bESzHZpOB6BfycD4j4Iqu6+OMtpywnrU9FiN8wtxzMh2 ruxA== 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:mime-version:content-transfer-encoding; bh=gSNI4aKIAgjaa3IWnWs5bKpT6ackNFBWDJoRKS0EH98=; b=ebUoaGPlfee4I4LWtqxMKpRXNYRG0giqUSC3CfSABzR21PvETCJgoxmyw2FJrxDHK5 Q9KN1rkORleVKNQzPWtsYjflEmjfmsPQpa67iNRdPAqNytA7qNs+9QtbUI7hK+On28Fk DW3MV3lD5Yh2ftneUBw68slNzU0KQ16VaSRctUpVgdA6xOBoLPXusLioq80XMU16jUJm FKx10/3JLIjMc7I9JLnWUfG85w46+bw2Ywb62PRbQu0xrlmz6ctaq6bep5VnWVWILn0o cKo73N8FGwKVv+8lebB2pVJYsvMjPu8Q2vx1tduaEga0evGWa7pex9Ab50pP4lmAQEca vPvg== X-Gm-Message-State: AOAM532PM0PPQo0mFk8/sdJnvdQ3IhLrwpBusvlVwB2vu6+rJbpcFMnG 7XF6emjNZR09jhMVc0cW3CUC3Q== X-Google-Smtp-Source: ABdhPJz+6aMCbhN+gVLQgyJolgCX8SUrFCFZ1ruiPcZVR/nvFJJyzSfEYpCpkzTChA2TCT7+0vUdyA== X-Received: by 2002:a17:90a:d914:: with SMTP id c20mr167794pjv.34.1601310918968; Mon, 28 Sep 2020 09:35:18 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id f19sm2345640pfd.45.2020.09.28.09.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 09:35:18 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Subject: [PATCH 04/25] coresight: Add coresight prefix to barrier_pkt Date: Mon, 28 Sep 2020 10:34:52 -0600 Message-Id: <20200928163513.70169-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200928163513.70169-1-mathieu.poirier@linaro.org> References: <20200928163513.70169-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200928_123520_678128_4FDF8AA3 X-CRM114-Status: GOOD ( 16.39 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1041 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Tingwei Zhang Add coresight prefix to make it specific. It will be a export symbol. Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Tingwei Zhang Reviewed-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etb10.c | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 7 +++---- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index 03e3f2590191..04ee9cda988d 100644 --- a/drivers/hwtracing/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c @@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev, cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt; for (i = 0; i < to_read; i += 4) { buf_ptr = buf->data_pages[cur] + offset; diff --git a/drivers/hwtracing/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 28695e26e5c6..d638c7d48815 100644 --- a/drivers/hwtracing/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h @@ -66,8 +66,8 @@ static DEVICE_ATTR_RO(name) #define coresight_simple_reg64(type, name, lo_off, hi_off) \ __coresight_simple_func(type, NULL, name, lo_off, hi_off) -extern const u32 barrier_pkt[4]; -#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt)) +extern const u32 coresight_barrier_pkt[4]; +#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt)) enum etm_addr_type { ETM_ADDR_TYPE_NONE, @@ -104,10 +104,9 @@ struct cs_buffers { static inline void coresight_insert_barrier_packet(void *buf) { if (buf) - memcpy(buf, barrier_pkt, CORESIGHT_BARRIER_PKT_SIZE); + memcpy(buf, coresight_barrier_pkt, CORESIGHT_BARRIER_PKT_SIZE); } - static inline void CS_LOCK(void __iomem *addr) { do { diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c index 6375504ba8b0..44402d413ebb 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c @@ -519,7 +519,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev, cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt; /* for every byte to read */ for (i = 0; i < to_read; i += 4) { diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index bb4f9e0a5438..ae40bb0539fd 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -53,7 +53,7 @@ static struct list_head *stm_path; * beginning of the data collected in a buffer. That way the decoder knows that * it needs to look for another sync sequence. */ -const u32 barrier_pkt[4] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}; +const u32 coresight_barrier_pkt[4] = {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}; static int coresight_id_match(struct device *dev, void *data) {