From patchwork Tue Jun 21 02:24:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 70489 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1789392qgy; Mon, 20 Jun 2016 19:26:41 -0700 (PDT) X-Received: by 10.66.121.136 with SMTP id lk8mr25100823pab.51.1466476001823; Mon, 20 Jun 2016 19:26:41 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ea17si23673566pac.171.2016.06.20.19.26.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jun 2016 19:26:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org 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 1bFBNg-0006vn-2e; Tue, 21 Jun 2016 02:25:36 +0000 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bFBNd-0006YV-Du for linux-arm-kernel@lists.infradead.org; Tue, 21 Jun 2016 02:25:34 +0000 Received: by mail-pa0-x234.google.com with SMTP id bz2so1144260pad.1 for ; Mon, 20 Jun 2016 19:25:12 -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; bh=eWNGQIg8XCIZQYwdRaV+/zq+MhGSwxx8N+F642hG7pA=; b=e2oTEfWHhYPA6u/ASvRrRRIVNGPqNUbV515WZXKI5U2mCcOgafzFjhyMByfw4Z9PQl 4E1KNFi10kur3Zuu06cA7GTsv7pa1279rBmjCY0BLiK9/uT+2SD0Ril+kigHC/cx7UlI FLvADjQvUtut/hZ/U2b0p4+IFKfTYMnThzNwM= 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; bh=eWNGQIg8XCIZQYwdRaV+/zq+MhGSwxx8N+F642hG7pA=; b=HN0NDLM6vkwWzNftWXx0sFj6NzgoD+HTyRj9n0+bkRsZ1xHTNyWYKHXQaYOv6GB4vc ozbWNMHBttraeUi1xNXKNq/EtkFPp862+qIB2w1QakaDeeEdBZzEQlEeVwlQyqYE9+zd zoyKJaqrSB0UmrN6X87K4Xnma32doLIN6qWH571ERBPT+lxUUQtBhgxIijGNK8dE1iPJ 9o79JWVkyNgCkmkPYsph6H3pkO1/8ke2i4hWZ6wweGXvinsO+O7Ccq79B4xjPEpitC5u J+TbCxufD8KE8ZCATBzGbDmvNDsCYaOTYWgmTxJWZZD3dBgTWaI8axuy8sgIHkLOzRn1 e/2g== X-Gm-Message-State: ALyK8tLas/yOiaK8XKydGLUlR85JNz9xyjAZAkrt9BfUxYrH8e0TTyGyfrry9ejGSIx5LJVh X-Received: by 10.66.151.71 with SMTP id uo7mr25538977pab.134.1466475912399; Mon, 20 Jun 2016 19:25:12 -0700 (PDT) Received: from zcy-ubuntu.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id fj13sm91422894pab.0.2016.06.20.19.25.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Jun 2016 19:25:11 -0700 (PDT) From: Chunyan Zhang To: mathieu.poirier@linaro.org Subject: [PATCH V2] coresight-stm: support mmapping channel regions with mmio_addr Date: Tue, 21 Jun 2016 10:24:36 +0800 Message-Id: <1466475876-5937-1-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160620_192533_490515_9181869E X-CRM114-Status: GOOD ( 12.40 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c03:0:0:0:234 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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 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: zhang.lyra@gmail.com, Al.Grant@arm.com, 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+patch=linaro.org@lists.infradead.org CoreSight STM device allows direct mapping of the channel regions to userspace for zero-copy writing. To support this ability, the STM framework has provided a hook 'mmio_addr', this patch just implemented this hook for CoreSight STM. This patch also added an item into 'channel_space' to save the physical base address of channel region which mmap operation needs to know. Signed-off-by: Chunyan Zhang --- drivers/hwtracing/coresight/coresight-stm.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c index 73be58a..482c8bb 100644 --- a/drivers/hwtracing/coresight/coresight-stm.c +++ b/drivers/hwtracing/coresight/coresight-stm.c @@ -105,10 +105,12 @@ module_param_named( /** * struct channel_space - central management entity for extended ports * @base: memory mapped base address where channels start. + * @phys: physical base address of channel region. * @guaraneed: is the channel delivery guaranteed. */ struct channel_space { void __iomem *base; + phys_addr_t phys; unsigned long *guaranteed; }; @@ -356,6 +358,23 @@ static void stm_generic_unlink(struct stm_data *stm_data, stm_disable(drvdata->csdev); } +static phys_addr_t +stm_mmio_addr(struct stm_data *stm_data, unsigned int master, + unsigned int channel, unsigned int nr_chans) +{ + struct stm_drvdata *drvdata = container_of(stm_data, + struct stm_drvdata, stm); + phys_addr_t addr; + + addr = drvdata->chs.phys + channel * BYTES_PER_CHANNEL; + + if (offset_in_page(addr) || + offset_in_page(nr_chans * BYTES_PER_CHANNEL)) + return 0; + + return addr; +} + static long stm_generic_set_options(struct stm_data *stm_data, unsigned int master, unsigned int channel, @@ -761,7 +780,9 @@ static void stm_init_generic_data(struct stm_drvdata *drvdata) drvdata->stm.sw_end = 1; drvdata->stm.hw_override = true; drvdata->stm.sw_nchannels = drvdata->numsp; + drvdata->stm.sw_mmiosz = BYTES_PER_CHANNEL; drvdata->stm.packet = stm_generic_packet; + drvdata->stm.mmio_addr = stm_mmio_addr; drvdata->stm.link = stm_generic_link; drvdata->stm.unlink = stm_generic_unlink; drvdata->stm.set_options = stm_generic_set_options; @@ -808,6 +829,7 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id) ret = stm_get_resource_byname(np, "stm-stimulus-base", &ch_res); if (ret) return ret; + drvdata->chs.phys = ch_res.start; base = devm_ioremap_resource(dev, &ch_res); if (IS_ERR(base))