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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CF069C433EF for ; Tue, 8 Mar 2022 10:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2/KuK0df2dKU5iqUR70e5EFX/Btj2fQmY0pBlbPynXY=; b=AZMQTtkO4sMp0R 7da6Lfp1yZ62aQxFHvP6IDBm47LeRSX+HYkCGqktVGgzEeb5EdRn9elQcG8cFjV6WwR3uyW29LOh5 rXphRrjidgTvpwLqbBEcFAV1zOpf2wDxjU40lGo+1czwse2QD1DeBPGpNmwKXf0tc/ZvW23QcbLD3 ABehGzAoiHNHGheYe+0uXvUCqKGjDeSIihK5cSYynQx418CLwE3PFJGWdmfdMZ+/EGiAtwMMA55Ml tzM6Yd7NGi4wznNtBZndVKEbdFlI3uVapdHK8AuX7qIxx0vrdM7A+9V8B5kbfeMfrPO7e7mBGVThW GyIw6+LVnE/wkxv7GdSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRX9u-003tz3-Lz; Tue, 08 Mar 2022 10:33:39 +0000 Received: from frasgout.his.huawei.com ([185.176.79.56]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nRWyp-003ot2-14 for linux-arm-kernel@lists.infradead.org; Tue, 08 Mar 2022 10:22:14 +0000 Received: from fraeml713-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4KCWYY2Tlmz6H6q9; Tue, 8 Mar 2022 18:20:33 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml713-chm.china.huawei.com (10.206.15.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Tue, 8 Mar 2022 11:22:00 +0100 Received: from localhost (10.202.226.41) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.21; Tue, 8 Mar 2022 10:21:58 +0000 Date: Tue, 8 Mar 2022 10:21:57 +0000 From: Jonathan Cameron To: Yicong Yang CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: Re: [PATCH v5 3/8] hisi_ptt: Register PMU device for PTT trace Message-ID: <20220308102157.00003725@Huawei.com> In-Reply-To: <20220308084930.5142-4-yangyicong@hisilicon.com> References: <20220308084930.5142-1-yangyicong@hisilicon.com> <20220308084930.5142-4-yangyicong@hisilicon.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.29; i686-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.202.226.41] X-ClientProxiedBy: lhreml740-chm.china.huawei.com (10.201.108.190) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220308_022211_483533_B4BBB765 X-CRM114-Status: GOOD ( 22.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 8 Mar 2022 16:49:25 +0800 Yicong Yang wrote: > Register PMU device of PTT trace, then users can use trace through perf > command. The driver makes use of perf AUX trace and support following > events to configure the trace: > > - filter: select Root port or Endpoint to trace > - type: select the type of traced TLP headers > - direction: select the direction of traced TLP headers > - format: select the data format of the traced TLP headers > > This patch adds the PMU driver part of PTT trace. The perf command support > of PTT trace is added in the following patch. > > Signed-off-by: Yicong Yang It seems to me that you ended up doing both suggestions for how to clean up the remove order when it was meant to be a question of picking one or the other. Otherwise this looks good to me - so with that tidied up Reviewed-by: Jonathan Cameron > --- > + > +static int hisi_ptt_register_pmu(struct hisi_ptt *hisi_ptt) > +{ > + u16 core_id, sicl_id; > + char *pmu_name; > + u32 reg; > + > + hisi_ptt->hisi_ptt_pmu = (struct pmu) { > + .module = THIS_MODULE, > + .capabilities = PERF_PMU_CAP_EXCLUSIVE | PERF_PMU_CAP_ITRACE, > + .task_ctx_nr = perf_sw_context, > + .attr_groups = hisi_ptt_pmu_groups, > + .event_init = hisi_ptt_pmu_event_init, > + .setup_aux = hisi_ptt_pmu_setup_aux, > + .free_aux = hisi_ptt_pmu_free_aux, > + .start = hisi_ptt_pmu_start, > + .stop = hisi_ptt_pmu_stop, > + .add = hisi_ptt_pmu_add, > + .del = hisi_ptt_pmu_del, > + }; > + > + reg = readl(hisi_ptt->iobase + HISI_PTT_LOCATION); > + core_id = FIELD_GET(HISI_PTT_CORE_ID, reg); > + sicl_id = FIELD_GET(HISI_PTT_SICL_ID, reg); > + > + pmu_name = devm_kasprintf(&hisi_ptt->pdev->dev, GFP_KERNEL, "hisi_ptt%u_%u", > + sicl_id, core_id); > + if (!pmu_name) > + return -ENOMEM; > + > + return perf_pmu_register(&hisi_ptt->hisi_ptt_pmu, pmu_name, -1); As below, you can put back the devm cleanup that you had in v4 now you have modified how the filter cleanup is done to also be devm managed. > +} > + > /* > * The DMA of PTT trace can only use direct mapping, due to some > * hardware restriction. Check whether there is an IOMMU or the > @@ -303,15 +825,32 @@ static int hisi_ptt_probe(struct pci_dev *pdev, > > pci_set_master(pdev); > > + ret = hisi_ptt_register_irq(hisi_ptt); > + if (ret) > + return ret; > + > ret = hisi_ptt_init_ctrls(hisi_ptt); > if (ret) { > pci_err(pdev, "failed to init controls, ret = %d.\n", ret); > return ret; > } > > + ret = hisi_ptt_register_pmu(hisi_ptt); > + if (ret) { > + pci_err(pdev, "failed to register pmu device, ret = %d", ret); > + return ret; > + } > + > return 0; > } > > +void hisi_ptt_remove(struct pci_dev *pdev) > +{ > + struct hisi_ptt *hisi_ptt = pci_get_drvdata(pdev); > + > + perf_pmu_unregister(&hisi_ptt->hisi_ptt_pmu); Now you have the filter cleanup occurring using a devm_add_action_or_reset() there is no need to have a manual cleanup of this - you can use the approach of a devm_add_action_or_reset like you had in v4. As it is the last call in the probe() order it will be the first one called in the device managed cleanup. > +} > + _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel