Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp163483img; Wed, 27 Mar 2019 19:37:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIy0VNsO+sysY6K9SRSsy0/0qsAnBnolxHZL8hOPk4TJfhtjO9AvIj845o+Q3bE3aP+nX5 X-Received: by 2002:a63:ef07:: with SMTP id u7mr14852877pgh.0.1553740670843; Wed, 27 Mar 2019 19:37:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553740670; cv=none; d=google.com; s=arc-20160816; b=Jjq8VS9ANUc0EXDrZ0mz3NOOn0Ma97XHlqVJNs9IWOWoSOAmtGqSm1VignxmVpPOLn 2seU38hj30H1rqdg2dLFGPU/na2BoRbmeqiRW4LYIuF5RByzyuClBoLlW+qUxO1xiBNw Dtvn3/0T/JDQ3/AXg5tiW0gzfDMa2w/CntXtlrEz0rn9hOKoukEuz7AUcaaseeP24YPJ 16+o939EQLrRZprg/1UrAcDySWP0n73rroAWD2V3omairax2FJ7wwnamY0ehWctaYWLM /RsCWxarXerOy3hJaFn21AB1+2mC8A6jkJeBMy2basBQH9zRuiLHdZ+7HP2JEyUAJBuA gFqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=ifdzwTxGteEEao9dZvMWL/DO9hxA9H+vArMJZ+eWCgg=; b=OLiwtIT8vMHEh17t0cVRB9c+i3yJmsCj6HVtjjQ32rtrT7Xo8uAPckwVZ1pvpBTEBC Q1efi2vJQyt1G5JeIAArL6kxD3cqL9XsrvsHqW1pR5ZW8G1zezkivxOODXafFl4dBZqd A5jE+jQM+B7Khf5QndzUWpSfUEuP565DtaPaIkCCpRMn3amn2BWv/v6HX/jG+KAH45hb LoWHLt7AIYVgKpq2qmQI+WNaDQnHsmzdh7tzLYS1tWwb4q/LSDuqHOyUODkNpLXo7nBx WuuOKrF+Jgu6p0BC3DGn6KGoNWXZfOVKN47zFuUOkQAkODl7a+I1n2ClCF9/7Pk1gA2u 1Scw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d4AKsUOn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y17si19324101pfe.192.2019.03.27.19.37.35; Wed, 27 Mar 2019 19:37:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d4AKsUOn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1728643AbfC1CgY (ORCPT + 99 others); Wed, 27 Mar 2019 22:36:24 -0400 Received: from mail-yw1-f65.google.com ([209.85.161.65]:33415 "EHLO mail-yw1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728203AbfC1CgY (ORCPT ); Wed, 27 Mar 2019 22:36:24 -0400 Received: by mail-yw1-f65.google.com with SMTP id l5so13982451ywa.0 for ; Wed, 27 Mar 2019 19:36:23 -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; bh=ifdzwTxGteEEao9dZvMWL/DO9hxA9H+vArMJZ+eWCgg=; b=d4AKsUOnzAZqhFXfuz4Z1YoetDtQIw/6wL2E9QNq6+vlOoMEm5l6CZnQBTkytLn43Z bJ5ByTewTet2zBa2xiia2X+LAFqlzgYL4uhY3ep064ej6r3xfWMd9c+Un0jmJRZT7Lrj sJAob9HblZ41kyu2cRUCcAsu/+0vBaJwGJ3csEGw4aj20cs0fWmBzoJFfOwzfD9j0unV vhIF6LmOBW3s0HAx4KiZ46IersVgiEqGQoMJh4qttCVfw6733Qxeiei3lK1CbOOBQWyW UI16o7jlWVQLhqLPLK2uziGEFa+Q+iDlwRvqvQ4hXgTAoLs+Lz+tELfx4tz09OylIrnf mcBw== 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=ifdzwTxGteEEao9dZvMWL/DO9hxA9H+vArMJZ+eWCgg=; b=Li0CKPFfo5wwvl/1PQbJbfa9PjV/MLvRFAhAPzSVzbRLV2u6LVpKkP5EUMt28c9BoF ck2TNbA0qMJDEyNzU4EcKkiSqxSRuW8mve/5lx+gTZNQFg92RlWuj2IHgQmt025NTXiX +9A9Gfoa12waqTpl1gUKDJ+aFty4lHk4UvzBfDdecsE5+0zGd6M/KZQ0ozqCzUfTGqnN G3qQGOe5lgURZWr8Q+3h6g0Y93tV/9pudi18/v/3ZJ5NSPp9JziWOiHT2f0vfX1JFQi7 6TRVAkCYmHDg/jfcDeantVzhExlDcho3VP+uJHUNYN3DVUVPxeUFbFXzfyneDnmyv6Az X2fg== X-Gm-Message-State: APjAAAX+vkosFGzS0SHdi5cqANDVGTsJhybrkkcg6rgMA9vsaOt3P2Z9 py3G48xlM/z0r5YN+a6otKl3Ew== X-Received: by 2002:a25:4211:: with SMTP id p17mr32945290yba.96.1553740583042; Wed, 27 Mar 2019 19:36:23 -0700 (PDT) Received: from localhost.localdomain (li931-65.members.linode.com. [45.56.113.65]) by smtp.gmail.com with ESMTPSA id t71sm16272787ywc.4.2019.03.27.19.36.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 19:36:22 -0700 (PDT) From: Leo Yan To: Mathieu Poirier , Suzuki K Poulose , Rob Herring , Mark Rutland , Alexander Shishkin , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, Wanglai Shi Cc: Leo Yan Subject: [PATCH v3 2/2] coresight: funnel: Support static funnel Date: Thu, 28 Mar 2019 10:35:09 +0800 Message-Id: <20190328023509.22242-3-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190328023509.22242-1-leo.yan@linaro.org> References: <20190328023509.22242-1-leo.yan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since CoreSight hardware topology can use a 'hidden' funnel in the trace data path, this kind funnel doesn't have register for accessing and is used by default from hardware design perspective. Below is an example for related hardware topology: +------+ +------+ | cpu0 |->| ETM |-\ +------+ +------+ \-> +--------+ +-----+ ...... | Funnel |->| ETF |-\ Hidden funnel +------+ +------+ /-> +--------+ +-----+ \ | | cpu3 |->| ETM |-/ \ V +------+ +------+ \-> +--------+ | Funnel |-> ... +------+ +------+ /-> +--------+ | cpu4 |->| ETM |-\ / +------+ +------+ \-> +--------+ +-----+ / ...... | Funnel |->| ETF |-/ +------+ +------+ /-> +--------+ +-----+ | cpu7 |->| ETM |-/ +------+ +------+ The CoreSight funnel driver only supports dynamic funnel with registration register resource, thus it cannot support for the static funnel case and it's impossible to create trace data path for this case. This patch is to extend CoreSight funnel driver to support both for static funnel and dynamic funnel. For the dynamic funnel it reuses the code existed in the driver, for static funnel the driver will support device probe if without providing register resource and the driver skips registers accessing when detect the register base is NULL. Cc: Mathieu Poirier Cc: Suzuki K Poulose Cc: Wanglai Shi Suggested-by: Suzuki K Poulose Signed-off-by: Leo Yan --- .../hwtracing/coresight/coresight-funnel.c | 112 +++++++++++++----- 1 file changed, 85 insertions(+), 27 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 927925151509..2030d2596d90 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -43,7 +44,7 @@ struct funnel_drvdata { unsigned long priority; }; -static int funnel_enable_hw(struct funnel_drvdata *drvdata, int port) +static int dynamic_funnel_enable_hw(struct funnel_drvdata *drvdata, int port) { u32 functl; int rc = 0; @@ -71,17 +72,19 @@ static int funnel_enable_hw(struct funnel_drvdata *drvdata, int port) static int funnel_enable(struct coresight_device *csdev, int inport, int outport) { - int rc; + int rc = 0; struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - rc = funnel_enable_hw(drvdata, inport); + if (drvdata->base) + rc = dynamic_funnel_enable_hw(drvdata, inport); if (!rc) dev_dbg(drvdata->dev, "FUNNEL inport %d enabled\n", inport); return rc; } -static void funnel_disable_hw(struct funnel_drvdata *drvdata, int inport) +static void dynamic_funnel_disable_hw(struct funnel_drvdata *drvdata, + int inport) { u32 functl; @@ -103,7 +106,8 @@ static void funnel_disable(struct coresight_device *csdev, int inport, { struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - funnel_disable_hw(drvdata, inport); + if (drvdata->base) + dynamic_funnel_disable_hw(drvdata, inport); dev_dbg(drvdata->dev, "FUNNEL inport %d disabled\n", inport); } @@ -177,54 +181,67 @@ static struct attribute *coresight_funnel_attrs[] = { }; ATTRIBUTE_GROUPS(coresight_funnel); -static int funnel_probe(struct amba_device *adev, const struct amba_id *id) +static int funnel_probe(struct device *dev, struct resource *res) { int ret; void __iomem *base; - struct device *dev = &adev->dev; struct coresight_platform_data *pdata = NULL; struct funnel_drvdata *drvdata; - struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; + struct device_node *np = dev->of_node; if (np) { pdata = of_get_coresight_platform_data(dev, np); if (IS_ERR(pdata)) return PTR_ERR(pdata); - adev->dev.platform_data = pdata; + dev->platform_data = pdata; } drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; - drvdata->dev = &adev->dev; - drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ + drvdata->dev = dev; + drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk); if (ret) return ret; } - dev_set_drvdata(dev, drvdata); - /* Validity for the resource is already checked by the AMBA core */ - base = devm_ioremap_resource(dev, res); - if (IS_ERR(base)) - return PTR_ERR(base); + /* + * Map the device base for dynamic-funnel, which has been + * validated by AMBA core. + */ + if (res) { + base = devm_ioremap_resource(dev, res); + if (IS_ERR(base)) { + ret = PTR_ERR(base); + goto out_disable_clk; + } + drvdata->base = base; + desc.groups = coresight_funnel_groups; + } - drvdata->base = base; - pm_runtime_put(&adev->dev); + dev_set_drvdata(dev, drvdata); desc.type = CORESIGHT_DEV_TYPE_LINK; desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_MERG; desc.ops = &funnel_cs_ops; desc.pdata = pdata; desc.dev = dev; - desc.groups = coresight_funnel_groups; drvdata->csdev = coresight_register(&desc); + if (IS_ERR(drvdata->csdev)) { + ret = PTR_ERR(drvdata->csdev); + goto out_disable_clk; + } + + pm_runtime_put(dev); - return PTR_ERR_OR_ZERO(drvdata->csdev); +out_disable_clk: + if (ret && !IS_ERR_OR_NULL(drvdata->atclk)) + clk_disable_unprepare(drvdata->atclk); + return ret; } #ifdef CONFIG_PM @@ -253,7 +270,48 @@ static const struct dev_pm_ops funnel_dev_pm_ops = { SET_RUNTIME_PM_OPS(funnel_runtime_suspend, funnel_runtime_resume, NULL) }; -static const struct amba_id funnel_ids[] = { +static int static_funnel_probe(struct platform_device *pdev) +{ + int ret; + + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + /* Static funnel do not have programming base */ + ret = funnel_probe(&pdev->dev, NULL); + + if (ret) { + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + } + + return ret; +} + +static const struct of_device_id static_funnel_match[] = { + {.compatible = "arm,coresight-static-funnel"}, + {} +}; + +static struct platform_driver static_funnel_driver = { + .probe = static_funnel_probe, + .driver = { + .name = "coresight-static-funnel", + .of_match_table = static_funnel_match, + .pm = &funnel_dev_pm_ops, + .suppress_bind_attrs = true, + }, +}; +builtin_platform_driver(static_funnel_driver); + +static int dynamic_funnel_probe(struct amba_device *adev, + const struct amba_id *id) +{ + return funnel_probe(&adev->dev, &adev->res); +} + +static const struct amba_id dynamic_funnel_ids[] = { { .id = 0x000bb908, .mask = 0x000fffff, @@ -266,14 +324,14 @@ static const struct amba_id funnel_ids[] = { { 0, 0}, }; -static struct amba_driver funnel_driver = { +static struct amba_driver dynamic_funnel_driver = { .drv = { - .name = "coresight-funnel", + .name = "coresight-dynamic-funnel", .owner = THIS_MODULE, .pm = &funnel_dev_pm_ops, .suppress_bind_attrs = true, }, - .probe = funnel_probe, - .id_table = funnel_ids, + .probe = dynamic_funnel_probe, + .id_table = dynamic_funnel_ids, }; -builtin_amba_driver(funnel_driver); +builtin_amba_driver(dynamic_funnel_driver); -- 2.17.1