From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6781BC2D0DB for ; Tue, 28 Jan 2020 19:32:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 31727214D8 for ; Tue, 28 Jan 2020 19:32:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="VCuq4zNQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726333AbgA1TcS (ORCPT ); Tue, 28 Jan 2020 14:32:18 -0500 Received: from mail-qk1-f196.google.com ([209.85.222.196]:38653 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726291AbgA1TcS (ORCPT ); Tue, 28 Jan 2020 14:32:18 -0500 Received: by mail-qk1-f196.google.com with SMTP id k6so14568748qki.5 for ; Tue, 28 Jan 2020 11:32:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=k16PGj1qUUwziMfMyn3s5qm2lit+ozL0yN14mkzck48=; b=VCuq4zNQI3kDYT7a2bEUe7emt8NIOG2ziynarqCfccw/g+7AtujVoRAlWhtU6S6M1a NV+pVh9dmzFPKybyCSQ5aS684JZkjevxgY6nX5F/aOosdYj5nlltq4EfLIZS4aONWGqC 3MuERsazOp//jGrl2k6VckYP5c/IO09HqrOXCHwH8INvTHTf3vdbCBHw5XhqTmf0Yv4y 1fpEVTrAx14NpqYWJPElYomJel2KlOMrouExyhNavBdJYTgf0K/Uq4kDjlr9evj/LqLy wK1P3tLF9OitxoSEF9VCwru8N5lZZGYI4uXOCN0QaUNjS66pXwnAdioIsa+y9WPcAYBk rVPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=k16PGj1qUUwziMfMyn3s5qm2lit+ozL0yN14mkzck48=; b=oqv2eCehHpcWWGMGtP52p3JsPvs8kvhidNd4c/uuUrjWAVAdXVlre0Gadhz60k6w90 OITimUVIwjpqAvH0jUI7MuUOoB9XCe839yHCO95rTdLfmdfQd8dfRQL3tPgLcfPCDzZ1 6BkpzNAeRxGCkWbJcm8lUk993Q+i+9QoEtT2UX6K7lW5TL1BE5vraPri9i5u/iNRu/uT bvgNuC12N8PI70zBcNuDIXvzcSG1bmCAh5O5oZaJ75Zo86lXfJN5AI5MR683f7/PuphV INhJQm1tpZsbm0tcFlNv7y1o1LlJWwQCBUWAjEMFfZeH2ww9Ong3bxk4XZNacGZ4wbI8 UwpA== X-Gm-Message-State: APjAAAWc9lRa+6HVh6JXWiA0KA/IiJiAMSa/Bc0IAiLHIEFWNszQTymE Lhum8BQRgzqMYPFI3ED7HqkCPP/hBgufXrt/cT0K9w== X-Google-Smtp-Source: APXvYqzjFiCsOsyFZYRIARaX+Cxwp6joYRuRYTlShoJmbGYCjLP+Q9xdZCbgZRx/xiZxfmZYvodgjgU8Xat5WYUFZ3Y= X-Received: by 2002:a37:9c8a:: with SMTP id f132mr23481931qke.432.1580239937466; Tue, 28 Jan 2020 11:32:17 -0800 (PST) MIME-Version: 1.0 References: <20200113213149.25599-1-mike.leach@linaro.org> <20200113213149.25599-9-mike.leach@linaro.org> <396fc3a2-083b-29ef-2bb6-2fca066ea0ef@arm.com> In-Reply-To: <396fc3a2-083b-29ef-2bb6-2fca066ea0ef@arm.com> From: Mike Leach Date: Tue, 28 Jan 2020 19:32:06 +0000 Message-ID: Subject: Re: [PATCH v8 08/15] coresight: cti: Enable CTI associated with devices. To: Suzuki Kuruppassery Poulose Cc: linux-arm-kernel , devicetree@vger.kernel.org, Coresight ML , "open list:DOCUMENTATION" , linux-arm-msm@vger.kernel.org, Mathieu Poirier , Rob Herring , Maxime Ripard , Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , Andy Gross , Jonathan Corbet Content-Type: text/plain; charset="UTF-8" Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Hi Suzuki, On Wed, 15 Jan 2020 at 11:14, Suzuki Kuruppassery Poulose wrote: > > On 13/01/2020 21:31, Mike Leach wrote: > > The CoreSight subsystem enables a path of devices from source to sink. > > Any CTI devices associated with the path devices must be enabled at the > > same time. > > > > This patch adds an associated coresight_device element to the main > > coresight device structure, and uses this to create associations between > > the CTI and other devices based on the device tree data. The associated > > device element is used to enable CTI in conjunction with the path elements. > > > > CTI devices are reference counted so where a single CTI is associated with > > multiple elements on the path, it will be enabled on the first associated > > device enable, and disabled with the last associated device disable. > > > > Signed-off-by: Mike Leach > > Reviewed-by: Mathieu Poirier > > --- > > drivers/hwtracing/coresight/coresight-cti.c | 129 ++++++++++++++++++ > > drivers/hwtracing/coresight/coresight-cti.h | 1 + > > .../hwtracing/coresight/coresight-platform.c | 1 + > > drivers/hwtracing/coresight/coresight-priv.h | 12 ++ > > drivers/hwtracing/coresight/coresight.c | 71 +++++++++- > > include/linux/coresight.h | 4 + > > 6 files changed, 213 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/hwtracing/coresight/coresight-cti.c b/drivers/hwtracing/coresight/coresight-cti.c > > index 77c2af247917..2be1b310e854 100644 > > --- a/drivers/hwtracing/coresight/coresight-cti.c > > +++ b/drivers/hwtracing/coresight/coresight-cti.c > > @@ -4,6 +4,7 @@ > > * Author: Mike Leach > > */ > > > > +#include > > #include "coresight-cti.h" > > > > /** > > @@ -440,6 +441,131 @@ int cti_channel_setop(struct device *dev, enum cti_chan_set_op op, > > return err; > > } > > > > +/* > > + * Look for a matching connection device name in the list of connections. > > + * If found then swap in the csdev name, set trig con association pointer > > + * and return found. > > + */ > > +static bool > > +cti_match_fixup_csdev(struct cti_device *ctidev, const char *node_name, > > + struct coresight_device *csdev) > > +{ > > + struct cti_trig_con *trig_con; > > super minor nit: Please use "struct cti_trig_con *tc;" consistent with > the naming everywhere else. Helps a lot in reading the code, especially > which has a lot of different structures. > > > + const char *csdev_name; > > + > > + list_for_each_entry(trig_con, &ctidev->trig_cons, node) { > > + if (trig_con->con_dev_name) { > > This was allocated via devm_* and ... > > > + if (!strcmp(node_name, trig_con->con_dev_name)) { > > + /* match: so swap in csdev name & dev */ > > + kfree(trig_con->con_dev_name); > > ... we free it here using kfree() without devm_ being aware. This could > cause double-free when the device is removed. This should either be > devm_kfree() or simply overwritten with the new string and leave > the device cleanup to free it. > Agreed - fixed up in v9. > > + csdev_name = dev_name(&csdev->dev); > > + trig_con->con_dev_name = > > + kstrdup(csdev_name, GFP_KERNEL); > > Please use devm_kstrdup() here on the CTI device to have a consistent > allocation. > > > > + trig_con->con_dev = csdev; > > + return true; > > + } > > + } > > + } > > + return false; > > +} > > > > > > +/* > > + * Removing the associated devices is easier. > > + * A CTI will not have a value for csdev->ect_dev. > > + */ > > +void cti_remove_assoc_from_csdev(struct coresight_device *csdev) > > +{ > > + struct cti_drvdata *ctidrv; > > + struct cti_trig_con *tc; > > + struct cti_device *ctidev; > > + > > + mutex_lock(&ect_mutex); > > + if (csdev->ect_dev) { > > + ctidrv = csdev_to_cti_drvdata(csdev->ect_dev); > > + ctidev = &ctidrv->ctidev; > > + list_for_each_entry(tc, &ctidev->trig_cons, node) { > > + if (tc->con_dev == csdev->ect_dev) { > > + tc->con_dev = NULL; > > Should we clear/free the name too ? > Not now devm_ allocation is being used. > > + break; > > + } > > + } > > + csdev->ect_dev = NULL; > > + } > > + mutex_unlock(&ect_mutex); > > +} > > +EXPORT_SYMBOL_GPL(cti_remove_assoc_from_csdev); > > + > > ... > > > diff --git a/drivers/hwtracing/coresight/coresight-cti.h b/drivers/hwtracing/coresight/coresight-cti.h > > index 469a06a1bb78..578d7e9ac67e 100644 > > --- a/drivers/hwtracing/coresight/coresight-cti.h > > +++ b/drivers/hwtracing/coresight/coresight-cti.h > > @@ -216,6 +216,7 @@ int cti_channel_setop(struct device *dev, enum cti_chan_set_op op, > > u32 channel_idx); > > struct coresight_platform_data * > > coresight_cti_get_platform_data(struct device *dev); > > +const char *cti_plat_get_node_name(struct fwnode_handle *fwnode); > > > > /* cti powered and enabled */ > > static inline bool cti_active(struct cti_config *cfg) > > diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c > > index 43418a2126ff..421d4fc95f41 100644 > > --- a/drivers/hwtracing/coresight/coresight-platform.c > > +++ b/drivers/hwtracing/coresight/coresight-platform.c > > @@ -313,6 +313,7 @@ static int of_get_coresight_platform_data(struct device *dev, > > > > return 0; > > } > > + > > nit : spurious hunk ? > > > #else > > static inline int > > of_get_coresight_platform_data(struct device *dev, > > Otherwise looks good to me > > Suzuki Thanks. Mike -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK