Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp1162777lqb; Thu, 18 Apr 2024 01:48:50 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWtdfisVxK2fYIwHfEnr1G5vwHasKhdRgRsk7HU9gr/srECLfvRCoC+jN4JQ3LAsw+sx1NhDginAf2RU3YwCM1L1debVliaiQ/fu/Lkfg== X-Google-Smtp-Source: AGHT+IGvkpl9cjsONPyhdZOe7vEdYFO6wx2NfwzjEELbM6ZAVyob1QbaEWGVjn1zqJYKn5ubSRed X-Received: by 2002:a17:902:ed95:b0:1e6:40f1:935e with SMTP id e21-20020a170902ed9500b001e640f1935emr2034376plj.35.1713430130654; Thu, 18 Apr 2024 01:48:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713430130; cv=pass; d=google.com; s=arc-20160816; b=TRL2T63n5Eg1Ac4x21zLBJBez34yPxSjiymLuO3bzQOOh63rGqck4YyIbnXeuGKseJ sneQAJhDIfEZvQFElHvS+FCPQIhqSmodjMsIxDJ/YYrqxprycCMtQoymgp5fct7GjbKY VZHJIR+JXOKHFWw+N1GJE50EDqJD85dQkMyUtMK/ZQZfcXzxkFVKuWtR/hxgc+z2HIMv dSZD7PxG8uoP2Vheqb+X20p0z4+ZbDWjhT/wvrA/gEGU5MK1NH/y0CLnQqRVzCwuoQLW ExQtomHtZWcmLQT1BnOXAYywn/8fi7CMcIlvzUoudcA6ruf7aJXS9VebZf8LShMaP4tu cccw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :dkim-signature; bh=Lmt3tYGOoqoNLTtj14hxrHoQy0pZ0DBcF5LAXBXwiCU=; fh=BRM182+sG2/pLL53t5es0apuDI8wryXP8OpSK4nB1wM=; b=CBeTkp2M0xYtAzYOfq0JAkVb95n1QnKRZMIKdtRZPK2dt1QdI48r2nogsLzR6XMTcj Ay9iRJC57jiH/A0L6asHzdZsYpAkvHS+IQrpP68a2wNlmz8JUQxg0eEZH9y3utJdrYJC hIG9WjsniK9Nyjze05qRDPAU8ivoiO5YSu3QzxlI6DjrKcvsgW/bdjgdUclulu0qxw9E vzW0g55KOtg7SHtCFfHWywiRTk/7Osu07bYfiNILIy7wfALAeK+4cyQ4BeMLwEzi8t4O s5yhUzV4U/ioJGkgX1gtkNfg4OjAeu9N7VKKnExpOnOv35rlAf2s7xxuDeWsEZP442Nm R4VQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V9R2dgxv; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-149744-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-149744-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id b14-20020a170902650e00b001e29483faccsi982532plk.635.2024.04.18.01.48.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 01:48:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-149744-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V9R2dgxv; arc=pass (i=1 spf=pass spfdomain=linaro.org dkim=pass dkdomain=linaro.org dmarc=pass fromdomain=linaro.org); spf=pass (google.com: domain of linux-kernel+bounces-149744-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-149744-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 462B128264F for ; Thu, 18 Apr 2024 08:48:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4AF9C158858; Thu, 18 Apr 2024 08:48:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="V9R2dgxv" Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2791E1EEE4 for ; Thu, 18 Apr 2024 08:48:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713430120; cv=none; b=MFWtmtguvhwFufDgs9cVpxs5URj+onPT5rU5TrT2DMa0thsBRoYylLJFhzLzX3rRMGB3tMuxYjv54olugPlVLhcXsW3WqSgoomDDjBxdOJ6nDz4DEvFfaELlgEwBSz27f4RpdsaqNxGXTmZkr93ti8VumCdOHvBknkgCgTE4gjI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713430120; c=relaxed/simple; bh=2gfe0zd3BZyHUR3Woo+Eylj4mM4VsqTmz4EO7RjKaNA=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=gjTPZSniGIZWomQkH9RoNZnqASePqhFehbE393ZPd2m5YkZDVIOQpDwQTKglRHUUJxdUuv0wEPnMnVoHFadxFbAhTIPQ8ASEpoL79DeDGODB1ALBX4c3z/gx8X1qkHJhqawMPBldODi2O1XW139BvWf70/oJDLOlZXB3dNXvL6o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=V9R2dgxv; arc=none smtp.client-ip=209.85.210.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6eb6b9e1808so427026a34.3 for ; Thu, 18 Apr 2024 01:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713430117; x=1714034917; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Lmt3tYGOoqoNLTtj14hxrHoQy0pZ0DBcF5LAXBXwiCU=; b=V9R2dgxvx7PPVSnvqqtHnWs5yDatKT5Km8WuZ8PiutKUy7CQ2uIJ1tjREvz66V3QCP 59Hl58eg2rgdUll4w5NiX7aVqPTAec6PBLxDOfDZpd7p1VMQQk0SRT/3hErlLPTuvLfJ RSq2rvoIWevHJ6oVXyx6moaR/VQGo3pTlEAg9qkBhvwURv6PnSa1mOFqN403k3+qO9YK +3IlfqXGnRQshZKQ7eQ/nF1UMY8xSfMffprKMTLSjw5nn8PodKNJMkbozQpvQVakoVtJ MEpHQoU9Mhm9tEmsX/9j/J7pXkX5Ql2wvrYyv1labmKjCMQ0HAWv905mcirD7zE+Xj6o I5LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713430117; x=1714034917; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Lmt3tYGOoqoNLTtj14hxrHoQy0pZ0DBcF5LAXBXwiCU=; b=uiBYBpGo4LPn0lBxApvWNdhlIaf9T+w183HFZUpibkqbPMROFZyS3yRjeVLYw6VS+7 LPFcTpoEB/WuQ21ZyyEoNhbIJCiJnwwCJRBkWUZg5MCRceGiahja07VWt1sv1a4N3fjy 0DANpYYmoXE97uQeQ188ycJwoDr7rqdq0WKc/ikT5Sl54DynTY7wU5wh+h1nmJ7Fm5Ow iMMQU847b6hlPFgqFiQJaPWkyKGE64dKKZs8wITaTctm1VVken9jr4Kfwnp1LB1ufUGb UkIKiE1BGWz5ZzIuqevEmTQMEbdwzqiwH6qlkPitjkQ+RAyQZ/JpRc7wh6vn/w6EdBko 9V3w== X-Forwarded-Encrypted: i=1; AJvYcCWJdLCw9RN0KaDDCiCSHVI3dS77ootR5POfPyLFMcrT9PQ8416TWcRf9tpn60TfuB/xRAcRdsDnNzMF9XeWI3gFaoure/GxagSF6Xjo X-Gm-Message-State: AOJu0YyR/1gqI9355oF55Y5xNfykWuGq8P8yzRJViBkYbgWcobmNiazm 9Qwtjyu9t6WAFExgz1I3vVrJJX169L5R2FG4zSCU9c1aH3bZaWeJQHaqNGF/WtJp9f3Ug+UbPjJ k8ahwenX6Sb19nEQ7oLaPmvQ/Mw5svj06e2J49A== X-Received: by 2002:a05:6808:de2:b0:3c6:e2e:fb36 with SMTP id g34-20020a0568080de200b003c60e2efb36mr1986982oic.14.1713430117086; Thu, 18 Apr 2024 01:48:37 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <1711009927-17873-1-git-send-email-quic_taozha@quicinc.com> <1711009927-17873-3-git-send-email-quic_taozha@quicinc.com> <8d381e6e-9328-46ff-83fe-efbe5bb4363e@arm.com> <6baaff95-728b-4492-ae3e-00dedbb50fb0@quicinc.com> <7fc09bfe-b34a-4658-a141-105f0f62e62c@arm.com> <1f9609fe-298f-4a5f-aa5e-be8c7dd6a719@arm.com> In-Reply-To: <1f9609fe-298f-4a5f-aa5e-be8c7dd6a719@arm.com> From: Mike Leach Date: Thu, 18 Apr 2024 09:48:25 +0100 Message-ID: Subject: Re: [PATCH 2/4] coresight: Add support for multiple output ports on the funnel To: Suzuki K Poulose Cc: Tao Zhang , Mathieu Poirier , Alexander Shishkin , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Jinlong Mao , Leo Yan , Greg Kroah-Hartman , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Tingwei Zhang , Yuanfang Zhang , Trilok Soni , Song Chai , linux-arm-msm@vger.kernel.org, andersson@kernel.org Content-Type: text/plain; charset="UTF-8" Hi Suzuki On Wed, 17 Apr 2024 at 10:21, Suzuki K Poulose wrote: > > Hi Mike > > On 16/04/2024 15:19, Mike Leach wrote: > > Hi, > > > > On Mon, 15 Apr 2024 at 14:24, Suzuki K Poulose wrote: > >> > >> On 09/04/2024 14:22, Tao Zhang wrote: > >>> > >>> On 4/9/2024 3:13 PM, Suzuki K Poulose wrote: > >>>> Hi > >>>> > >>>> On 29/03/2024 09:27, Tao Zhang wrote: > >>>>> > >>>>> On 3/22/2024 12:41 AM, Suzuki K Poulose wrote: > >>>>>> On 21/03/2024 08:32, Tao Zhang wrote: > >>>>>>> Funnel devices are now capable of supporting multiple-inputs and > >>>>>>> multiple-outputs configuration with in built hardware filtering > >>>>>>> for TPDM devices. Add software support to this function. Output > >>>>>>> port is selected according to the source in the trace path. > >>>>>>> > >>>>>>> The source of the input port on funnels will be marked in the > >>>>>>> device tree. > >>>>>>> e.g. > >>>>>>> tpdm@xxxxxxx { > >>>>>>> ... ... ... ... > >>>>>>> }; > >>>>>>> > >>>>>>> funnel_XXX: funnel@xxxxxxx { > >>>>>>> ... ... ... ... > >>>>>>> out-ports { > >>>>>>> ... ... ... ... > >>>>>>> port@x { > >>>>>>> ... ... ... ... > >>>>>>> label = "xxxxxxx.tpdm"; <-- To label the source > >>>>>>> }; corresponding to the output > >>>>>>> ... ... ... ... connection "port@x". And this > >>>>>>> }; is a hardware static > >>>>>>> connections. > >>>>>>> ... ... ... ... Here needs to refer to hardware > >>>>>>> }; design. > >>>>>>> > >>>>>>> Then driver will parse the source label marked in the device tree, and > >>>>>>> save it to the coresight path. When the function needs to know the > >>>>>>> source label, it could obtain it from coresight path parameter. > >>>>>>> Finally, > >>>>>>> the output port knows which source it corresponds to, and it also > >>>>>>> knows > >>>>>>> which input port it corresponds to. > >>>>>> > >>>>>> Why do we need labels ? We have connection information for all devices > >>>>>> (both in and out), so, why do we need this label to find a device ? > >>>>> > >>>>> Because our funnel's design has multi-output ports, the data stream > >>>>> will not > >>>>> > >>>>> know which output port should pass in building the data trace path. > >>>>> This source > >>>>> > >>>>> label can make the data stream find the right output port to go. > >>>>> > >>>>>> > >>>>>> And also, I thought TPDM is a source device, why does a funnel output > >>>>>> port link to a source ? > >>>>> > >>>>> No, this label doesn't mean this funnel output port link to a source, > >>>>> it just let > >>>>> > >>>>> the output port know its data source. > >>>>> > >>>>>> > >>>>>> Are these funnels programmable ? Or, are they static ? If they are > >>>>>> static, do these need to be described in the DT ? If they are simply > >>>>>> acting as a "LINK" (or HWFIFO ?) > >>>>> > >>>>> These funnels are static, and we will add the "label" to the DT to > >>>>> describe the > >>>>> > >>>>> multi-output ports for these funnels. > >>>> > >>>> I think there is still a bit of confusion. By "Dynamic" I mean, > >>>> the "dynamic funnel" (explicit port enablement via MMIO) vs "static > >>>> funnel" (no programming, always ON). > >>>> > >>>> So, coming to your example, do we need to "explicitly" enable trace > >>>> flow for an "input" and/or an "output" port in your "funnel" ? > >>> > >>> Sorry for my misunderstanding in the previous mails. Our funnels are > >>> programmable just like the common dynamic funnels. > >>> > >>> In our solution, we just make funnels have multiple output ports > >>> connected to different devices or ports. When we use it, we still > >>> > >>> enable the input port through programming. Our solution is to know which > >>> input port the expected data comes from based on the > >>> > >>> source label corresponding to the output port. This way we can build the > >>> expected trace path. In other respects, it is used the same > >>> > >>> as common dynamic funnels. > >> > >> > >> Ok. So, to summarise : > >> > >> 1. This is not a standard Funnel, but a trace link with multiple-input > >> and multiple-output, with inputs hardwired to an outline at > >> integration. > >> 2. The programming model is same as that of a "standard funnel". > >> > >> Now, we do have enough information in the coresight_connections > >> to traverse input/output ports. But we need additional logic > >> to "hardwire" the ports to each other and necessary logic > >> to handle the > >> > >> There are two options here : > >> > >> 1. Treat this as a new component and have its own driver, with > >> additional logic to handle the input/output wiring. > >> > >> 2. Drive it using the funnel driver, with a a new compatible and > >> add additional logic to handle the input/output wiring. > >> > >> My inclination is towards (2), we need to see how this works out. > >> > >> We need to irrespective of the options, we need special handling > >> for hardwired ports in 1) building path 2) walking back the path > >> (in TPDA driver) > >> > >> We also need some "DT" information to bind a given input port > >> to an output port. We must not use "any device" labels to hack > >> this up, like the approach in this series. > >> > > > > Given that the internal connections are static for the given device, > > then the compatible will imply these connections in just the same way > > as the arm,coresight-funnel implies that all inputs are connected to > > the single output. > > I am sorry, I couldn't follow the last part. We have two or more output > ports and we need a way to identify, which input port is hardwired to > output-port0 and output-port1. Given we need special handling for these > anyway, I would like to avoid hard coding the input-output connection. > i.e., we do not want to assume that input-0 is always => output-0. > If we regard the current component as having compatible "qcom,coresight-compound-funnel-v1", then this identifies the relationship between the in-ports and out-ports. So the new driver / extension to the funnel driver that handles this compatible with know the static mapping between input and output so program it. If however you want a more generic approach to handle future different versions of the component, then of course a method in DT of mapping in-ports to out-ports is useful. If did wonder if something along the lines of:- compound-funnel@0x1234000 { compatible = "compound-funnel" regs = < 0x1234000 0x1000> sub-funnel@0 { in-ports { [some port definitions] } out-ports { [some port definitions] } } sub-funnel@1 { in-ports { [some port definitions] } out-ports { [some port definitions] } } } might be made to work? not sure about the implications of having more that one set of in-ports and out-ports in a component in the device tree & would need specific handling in the driver to iterate sub-funnels. > > > > > Irrespective of if a new driver is used, or an extension to the > > current funnel driver to handle a new compatible - the mapping between > > input and output ports are created based on the compatible.. > > > > As we are building a path from source to sink, what is then needed is > > a method in the generic path building code, to recognise these > > amppings and filter the output ports that are searched based on the > > input port in use. > > Agreed. We could mark this as a property of the > port/coresight_connection. > > > > > On standard components, where the mapping is not present, then the > > code will continue as it does now, for these compound funnels, the > > mappings will be present and the output filtering will occur. > > Agreed > > > This removes the need for the labels / extra connection attributes on > > devices other than the funnel, and also removes the need to specify > > the internal connections as part of the device tree. > > I am still not clear how we map the input-output ports. Rest is what > exactly I had in mind. So, once we sort out the port mapping > we could proceed to the prototyping. > given we iterate by output port index into an array of out ports, and have an array of in-ports by index, a third mapping array, same size as in-ports, determining the associated out port index should suffice. Mapping array should be optional - if not there, path discovery works as previously Regards Mike > Kind regards > Suzuki > > > > > > Regards > > > > Mike > > > >> Rob/Krzysztof, > >> > >> Do you have any recommendations for describing the 'hard wired > >> ports' ? > >> > >> e.g: > >> > >> component { > >> input_ports { > >> component_input_port0: port@0 { > >> ... > >> = &component_output_port0; > >> }; > >> ... > >> }; > >> > >> output_ports { > >> componentne_output_port0: port@0 { > >> ... > >> = &component_input_port0; > >> }; > >> ... > >> }; > >> > >> }; > >> > >> *Need a better suitable property than "hard-wired-to". > >> > >> > >> Suzuki > >> > >> > >>> > >>> > >>> Best, > >>> > >>> Tao > >>> > >>>> > >>>> > >>>>> > >>>>> "If they are simply acting as a "LINK" (or HWFIFO ?) " I'm not sure > >>>>> what's the meaning > >>>> > >>>> i.e, Like TMC-ETF in HWFIFO mode. In this mode, the TMC-ETF is acting > >>>> like a cache for easing ATB data load, by providing h/w buffering. > >>>> (In your case, it may not be providing any buffering, it doesn't matter > >>>> either way, as it is not visible to the driver). > >>>> > >>>> Suzuki > >>>> > >>>>> > >>>>> of this. Could you describe it in detail? > >>>>> > >>>>> > >>>>> Best, > >>>>> > >>>>> Tao > >>>>> > >>>>>> > >>>>>> Suzuki > >>>>>> > >>>>>>> > >>>>>>> Signed-off-by: Tao Zhang > >>>>>>> --- > >>>>>>> drivers/hwtracing/coresight/coresight-core.c | 81 > >>>>>>> ++++++++++++++++--- > >>>>>>> .../hwtracing/coresight/coresight-platform.c | 5 ++ > >>>>>>> include/linux/coresight.h | 2 + > >>>>>>> 3 files changed, 75 insertions(+), 13 deletions(-) > >>>>>>> > >>>>>>> diff --git a/drivers/hwtracing/coresight/coresight-core.c > >>>>>>> b/drivers/hwtracing/coresight/coresight-core.c > >>>>>>> index 5dde597403b3..b1b5e6d9ec7a 100644 > >>>>>>> --- a/drivers/hwtracing/coresight/coresight-core.c > >>>>>>> +++ b/drivers/hwtracing/coresight/coresight-core.c > >>>>>>> @@ -113,15 +113,63 @@ struct coresight_device > >>>>>>> *coresight_get_percpu_sink(int cpu) > >>>>>>> } > >>>>>>> EXPORT_SYMBOL_GPL(coresight_get_percpu_sink); > >>>>>>> +static struct coresight_device *coresight_get_source(struct > >>>>>>> list_head *path) > >>>>>>> +{ > >>>>>>> + struct coresight_device *csdev; > >>>>>>> + > >>>>>>> + if (!path) > >>>>>>> + return NULL; > >>>>>>> + > >>>>>>> + csdev = list_first_entry(path, struct coresight_node, > >>>>>>> link)->csdev; > >>>>>>> + if (csdev->type != CORESIGHT_DEV_TYPE_SOURCE) > >>>>>>> + return NULL; > >>>>>>> + > >>>>>>> + return csdev; > >>>>>>> +} > >>>>>>> + > >>>>>>> +/** > >>>>>>> + * coresight_source_filter - checks whether the connection matches > >>>>>>> the source > >>>>>>> + * of path if connection is binded to specific source. > >>>>>>> + * @path: The list of devices > >>>>>>> + * @conn: The connection of one outport > >>>>>>> + * > >>>>>>> + * Return zero if the connection doesn't have a source binded or > >>>>>>> source of the > >>>>>>> + * path matches the source binds to connection. > >>>>>>> + */ > >>>>>>> +static int coresight_source_filter(struct list_head *path, > >>>>>>> + struct coresight_connection *conn) > >>>>>>> +{ > >>>>>>> + int ret = 0; > >>>>>>> + struct coresight_device *source = NULL; > >>>>>>> + > >>>>>>> + if (conn->source_label == NULL) > >>>>>>> + return ret; > >>>>>>> + > >>>>>>> + source = coresight_get_source(path); > >>>>>>> + if (source == NULL) > >>>>>>> + return ret; > >>>>>>> + > >>>>>>> + if (strstr(kobject_get_path(&source->dev.kobj, GFP_KERNEL), > >>>>>>> + conn->source_label)) > >>>>>>> + ret = 0; > >>>>>>> + else > >>>>>>> + ret = -1; > >>>>>>> + > >>>>>>> + return ret; > >>>>>>> +} > >>>>>>> + > >>>>>>> static struct coresight_connection * > >>>>>>> coresight_find_out_connection(struct coresight_device *src_dev, > >>>>>>> - struct coresight_device *dest_dev) > >>>>>>> + struct coresight_device *dest_dev, > >>>>>>> + struct list_head *path) > >>>>>>> { > >>>>>>> int i; > >>>>>>> struct coresight_connection *conn; > >>>>>>> for (i = 0; i < src_dev->pdata->nr_outconns; i++) { > >>>>>>> conn = src_dev->pdata->out_conns[i]; > >>>>>>> + if (coresight_source_filter(path, conn)) > >>>>>>> + continue; > >>>>>>> if (conn->dest_dev == dest_dev) > >>>>>>> return conn; > >>>>>>> } > >>>>>>> @@ -312,7 +360,8 @@ static void coresight_disable_sink(struct > >>>>>>> coresight_device *csdev) > >>>>>>> static int coresight_enable_link(struct coresight_device *csdev, > >>>>>>> struct coresight_device *parent, > >>>>>>> - struct coresight_device *child) > >>>>>>> + struct coresight_device *child, > >>>>>>> + struct list_head *path) > >>>>>>> { > >>>>>>> int ret = 0; > >>>>>>> int link_subtype; > >>>>>>> @@ -321,8 +370,8 @@ static int coresight_enable_link(struct > >>>>>>> coresight_device *csdev, > >>>>>>> if (!parent || !child) > >>>>>>> return -EINVAL; > >>>>>>> - inconn = coresight_find_out_connection(parent, csdev); > >>>>>>> - outconn = coresight_find_out_connection(csdev, child); > >>>>>>> + inconn = coresight_find_out_connection(parent, csdev, path); > >>>>>>> + outconn = coresight_find_out_connection(csdev, child, path); > >>>>>>> link_subtype = csdev->subtype.link_subtype; > >>>>>>> if (link_subtype == CORESIGHT_DEV_SUBTYPE_LINK_MERG && > >>>>>>> IS_ERR(inconn)) > >>>>>>> @@ -341,7 +390,8 @@ static int coresight_enable_link(struct > >>>>>>> coresight_device *csdev, > >>>>>>> static void coresight_disable_link(struct coresight_device *csdev, > >>>>>>> struct coresight_device *parent, > >>>>>>> - struct coresight_device *child) > >>>>>>> + struct coresight_device *child, > >>>>>>> + struct list_head *path) > >>>>>>> { > >>>>>>> int i; > >>>>>>> int link_subtype; > >>>>>>> @@ -350,8 +400,8 @@ static void coresight_disable_link(struct > >>>>>>> coresight_device *csdev, > >>>>>>> if (!parent || !child) > >>>>>>> return; > >>>>>>> - inconn = coresight_find_out_connection(parent, csdev); > >>>>>>> - outconn = coresight_find_out_connection(csdev, child); > >>>>>>> + inconn = coresight_find_out_connection(parent, csdev, path); > >>>>>>> + outconn = coresight_find_out_connection(csdev, child, path); > >>>>>>> link_subtype = csdev->subtype.link_subtype; > >>>>>>> if (link_ops(csdev)->disable) { > >>>>>>> @@ -507,7 +557,7 @@ static void coresight_disable_path_from(struct > >>>>>>> list_head *path, > >>>>>>> case CORESIGHT_DEV_TYPE_LINK: > >>>>>>> parent = list_prev_entry(nd, link)->csdev; > >>>>>>> child = list_next_entry(nd, link)->csdev; > >>>>>>> - coresight_disable_link(csdev, parent, child); > >>>>>>> + coresight_disable_link(csdev, parent, child, path); > >>>>>>> break; > >>>>>>> default: > >>>>>>> break; > >>>>>>> @@ -588,7 +638,7 @@ int coresight_enable_path(struct list_head > >>>>>>> *path, enum cs_mode mode, > >>>>>>> case CORESIGHT_DEV_TYPE_LINK: > >>>>>>> parent = list_prev_entry(nd, link)->csdev; > >>>>>>> child = list_next_entry(nd, link)->csdev; > >>>>>>> - ret = coresight_enable_link(csdev, parent, child); > >>>>>>> + ret = coresight_enable_link(csdev, parent, child, path); > >>>>>>> if (ret) > >>>>>>> goto err; > >>>>>>> break; > >>>>>>> @@ -802,7 +852,8 @@ static void coresight_drop_device(struct > >>>>>>> coresight_device *csdev) > >>>>>>> */ > >>>>>>> static int _coresight_build_path(struct coresight_device *csdev, > >>>>>>> struct coresight_device *sink, > >>>>>>> - struct list_head *path) > >>>>>>> + struct list_head *path, > >>>>>>> + struct coresight_device *source) > >>>>>>> { > >>>>>>> int i, ret; > >>>>>>> bool found = false; > >>>>>>> @@ -814,7 +865,7 @@ static int _coresight_build_path(struct > >>>>>>> coresight_device *csdev, > >>>>>>> if (coresight_is_percpu_source(csdev) && > >>>>>>> coresight_is_percpu_sink(sink) && > >>>>>>> sink == per_cpu(csdev_sink, > >>>>>>> source_ops(csdev)->cpu_id(csdev))) { > >>>>>>> - if (_coresight_build_path(sink, sink, path) == 0) { > >>>>>>> + if (_coresight_build_path(sink, sink, path, source) == 0) { > >>>>>>> found = true; > >>>>>>> goto out; > >>>>>>> } > >>>>>>> @@ -825,8 +876,12 @@ static int _coresight_build_path(struct > >>>>>>> coresight_device *csdev, > >>>>>>> struct coresight_device *child_dev; > >>>>>>> child_dev = csdev->pdata->out_conns[i]->dest_dev; > >>>>>>> + if (csdev->pdata->out_conns[i]->source_label && > >>>>>>> + !strstr(kobject_get_path(&source->dev.kobj, GFP_KERNEL), > >>>>>>> + csdev->pdata->out_conns[i]->source_label)) > >>>>>>> + continue; > >>>>>>> if (child_dev && > >>>>>>> - _coresight_build_path(child_dev, sink, path) == 0) { > >>>>>>> + _coresight_build_path(child_dev, sink, path, source) > >>>>>>> == 0) { > >>>>>>> found = true; > >>>>>>> break; > >>>>>>> } > >>>>>>> @@ -871,7 +926,7 @@ struct list_head *coresight_build_path(struct > >>>>>>> coresight_device *source, > >>>>>>> INIT_LIST_HEAD(path); > >>>>>>> - rc = _coresight_build_path(source, sink, path); > >>>>>>> + rc = _coresight_build_path(source, sink, path, source); > >>>>>>> if (rc) { > >>>>>>> kfree(path); > >>>>>>> return ERR_PTR(rc); > >>>>>>> diff --git a/drivers/hwtracing/coresight/coresight-platform.c > >>>>>>> b/drivers/hwtracing/coresight/coresight-platform.c > >>>>>>> index 9d550f5697fa..f553fb20966d 100644 > >>>>>>> --- a/drivers/hwtracing/coresight/coresight-platform.c > >>>>>>> +++ b/drivers/hwtracing/coresight/coresight-platform.c > >>>>>>> @@ -205,6 +205,7 @@ static int of_coresight_parse_endpoint(struct > >>>>>>> device *dev, > >>>>>>> struct fwnode_handle *rdev_fwnode; > >>>>>>> struct coresight_connection conn = {}; > >>>>>>> struct coresight_connection *new_conn; > >>>>>>> + const char *label; > >>>>>>> do { > >>>>>>> /* Parse the local port details */ > >>>>>>> @@ -243,6 +244,10 @@ static int of_coresight_parse_endpoint(struct > >>>>>>> device *dev, > >>>>>>> conn.dest_fwnode = fwnode_handle_get(rdev_fwnode); > >>>>>>> conn.dest_port = rendpoint.port; > >>>>>>> + conn.source_label = NULL; > >>>>>>> + if (!of_property_read_string(ep, "label", &label)) > >>>>>>> + conn.source_label = label; > >>>>>>> + > >>>>>>> new_conn = coresight_add_out_conn(dev, pdata, &conn); > >>>>>>> if (IS_ERR_VALUE(new_conn)) { > >>>>>>> fwnode_handle_put(conn.dest_fwnode); > >>>>>>> diff --git a/include/linux/coresight.h b/include/linux/coresight.h > >>>>>>> index e8b6e388218c..a9c06ef9bbb2 100644 > >>>>>>> --- a/include/linux/coresight.h > >>>>>>> +++ b/include/linux/coresight.h > >>>>>>> @@ -167,6 +167,7 @@ struct coresight_desc { > >>>>>>> * struct coresight_connection - representation of a single > >>>>>>> connection > >>>>>>> * @src_port: a connection's output port number. > >>>>>>> * @dest_port: destination's input port number @src_port is > >>>>>>> connected to. > >>>>>>> + * @source_label: source component's label. > >>>>>>> * @dest_fwnode: destination component's fwnode handle. > >>>>>>> * @dest_dev: a @coresight_device representation of the component > >>>>>>> connected to @src_port. NULL until the device is created > >>>>>>> @@ -195,6 +196,7 @@ struct coresight_desc { > >>>>>>> struct coresight_connection { > >>>>>>> int src_port; > >>>>>>> int dest_port; > >>>>>>> + const char *source_label; > >>>>>>> struct fwnode_handle *dest_fwnode; > >>>>>>> struct coresight_device *dest_dev; > >>>>>>> struct coresight_sysfs_link *link; > >>>>>> > >>>> > >> > > > > > -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK