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,URIBL_BLOCKED autolearn=unavailable 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 E825BC2D0F3 for ; Wed, 1 Apr 2020 14:55:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A855C20787 for ; Wed, 1 Apr 2020 14:55:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="nm9AbqnG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733043AbgDAOzP (ORCPT ); Wed, 1 Apr 2020 10:55:15 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35561 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732911AbgDAOzP (ORCPT ); Wed, 1 Apr 2020 10:55:15 -0400 Received: by mail-wr1-f66.google.com with SMTP id d5so429509wrn.2 for ; Wed, 01 Apr 2020 07:55:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:openpgp:autocrypt:message-id:date :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=t4+1X7zuTabkl4VU/FiL5rsh3iqB89LLWvHabfZ8bN4=; b=nm9AbqnGhdLB24KuhbCa3xT4Qd2F2BKFbEc2rAhXAyvnKZRcP6CNCCvemmASJTvga8 jWfrh6ki3K4U3X2F2p5XTsTYEhh/z8SGd5BJupxTvM33CmYl9J+UJ3hKZUxr6OoPpU4o 1x2fTfAh8yEwb4EfkHCR693C1opsXmOGd89BoRnfw3Ed7zdbeQQCuSeHfupQx2VK0GmN QEyZlGrygtXV8pginl/epf9ebJGoQNl/8gSMOYKrs/Vxt0Z/qVTTAW84rGVjiR2epIvk tBdo3inugCLpjI2CaYfnY5QUvLmjDvkQHi2PkN9o4u4hGEEnlUqr06chWFMjwQIbUafQ zzHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :message-id:date:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=t4+1X7zuTabkl4VU/FiL5rsh3iqB89LLWvHabfZ8bN4=; b=hzUwafIKDmoeriholsz4GCQM0FupwNMvkfW7Jqfv8lLPcujI8ixab35QW22ez5XBJr yWSelcGD3hX8fXWED6StZOHHzJWqnNq/onlrfhQg4bFTUwlHChUjVuSG1wc/o+izV/N/ HGFcv/7He7j4j2CUu0YGy9D6CnZ0HcSNnyNeHhAqGVnUhW0japfS/+639s0kP6a2xcPt lCWhisFZDnZ60UL6cNA1IYdvDpx3mtVh1vAHs3/LCtZOUhUGa12bireAHjtnvroAxs/J 5lcGS28RuqTH4gzA2mkOLCXJtGDci1WWUpvZfrYWE5no7JpXGdGbcvFeihhUZSse2mQc obog== X-Gm-Message-State: ANhLgQ2jcyLIrLxVxjrw0XX1LrJGaea3ny9R47ePUom9FMwhf/nW+N4d 6GRcnStBAS6c22ftqVT/dXXZhg== X-Google-Smtp-Source: ADFU+vvaKT/UJl+09yLoveYYpX/EUL3cp5RDYbE7QifDqpxHUr3G6jt7MxfWgi7B9yow6rdZArNNag== X-Received: by 2002:a5d:498b:: with SMTP id r11mr26388151wrq.368.1585752912225; Wed, 01 Apr 2020 07:55:12 -0700 (PDT) Received: from [192.168.0.136] ([87.120.218.65]) by smtp.googlemail.com with ESMTPSA id x16sm3327577wrn.71.2020.04.01.07.55.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Apr 2020 07:55:11 -0700 (PDT) Subject: Re: [PATCH V4 09/13] interconnect: mediatek: Add mt8183 interconnect provider driver To: Henry Chen Cc: Rob Herring , Matthias Brugger , Viresh Kumar , Stephen Boyd , Ryan Case , Mark Brown , Mark Rutland , Nicolas Boichat , Fan Chen , James Liao , Arvin Wang , Mike Turquette , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, srv_heupstream@mediatek.com References: <1584092066-24425-1-git-send-email-henryc.chen@mediatek.com> <1584092066-24425-10-git-send-email-henryc.chen@mediatek.com> From: Georgi Djakov Openpgp: preference=signencrypt Autocrypt: addr=georgi.djakov@linaro.org; prefer-encrypt=mutual; keydata= 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 KEmKjLDvB0pePJkdTw== Message-ID: <2007da85-6ab8-225b-0ac7-b38bc9a590d2@linaro.org> Date: Wed, 1 Apr 2020 17:55:09 +0300 MIME-Version: 1.0 In-Reply-To: <1584092066-24425-10-git-send-email-henryc.chen@mediatek.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Hi Henry, Thanks for the patch! On 3/13/20 11:34, Henry Chen wrote: > Introduce Mediatek MT8183 specific provider driver using the > interconnect framework. > > Signed-off-by: Henry Chen > --- > drivers/interconnect/Kconfig | 1 + > drivers/interconnect/Makefile | 1 + > drivers/interconnect/mediatek/Kconfig | 13 ++ > drivers/interconnect/mediatek/Makefile | 3 + > drivers/interconnect/mediatek/mtk-emi.c | 242 ++++++++++++++++++++++++++++++++ > 5 files changed, 260 insertions(+) > create mode 100644 drivers/interconnect/mediatek/Kconfig > create mode 100644 drivers/interconnect/mediatek/Makefile > create mode 100644 drivers/interconnect/mediatek/mtk-emi.c > > diff --git a/drivers/interconnect/Kconfig b/drivers/interconnect/Kconfig > index bfa4ca3..dd9ecb6 100644 > --- a/drivers/interconnect/Kconfig > +++ b/drivers/interconnect/Kconfig > @@ -12,5 +12,6 @@ menuconfig INTERCONNECT > if INTERCONNECT > > source "drivers/interconnect/qcom/Kconfig" > +source "drivers/interconnect/mediatek/Kconfig" > > endif > diff --git a/drivers/interconnect/Makefile b/drivers/interconnect/Makefile > index 725029a..330a108 100644 > --- a/drivers/interconnect/Makefile > +++ b/drivers/interconnect/Makefile > @@ -5,3 +5,4 @@ icc-core-objs := core.o > > obj-$(CONFIG_INTERCONNECT) += icc-core.o > obj-$(CONFIG_INTERCONNECT_QCOM) += qcom/ > +obj-$(CONFIG_INTERCONNECT_MTK) += mediatek/ > diff --git a/drivers/interconnect/mediatek/Kconfig b/drivers/interconnect/mediatek/Kconfig > new file mode 100644 > index 0000000..972d3bb > --- /dev/null > +++ b/drivers/interconnect/mediatek/Kconfig > @@ -0,0 +1,13 @@ > +config INTERCONNECT_MTK > + bool "Mediatek Network-on-Chip interconnect drivers" > + depends on ARCH_MEDIATEK > + help > + Support for Mediatek's Network-on-Chip interconnect hardware. > + > +config INTERCONNECT_MTK_EMI > + tristate "Mediatek EMI interconnect driver" > + depends on INTERCONNECT_MTK > + depends on (MTK_DVFSRC && OF) > + help > + This is a driver for the Mediatek Network-on-Chip on DVFSRC-based > + platforms. > diff --git a/drivers/interconnect/mediatek/Makefile b/drivers/interconnect/mediatek/Makefile > new file mode 100644 > index 0000000..353842b > --- /dev/null > +++ b/drivers/interconnect/mediatek/Makefile > @@ -0,0 +1,3 @@ > +# SPDX-License-Identifier: GPL-2.0 > + > +obj-$(CONFIG_INTERCONNECT_MTK_EMI) += mtk-emi.o > \ No newline at end of file > diff --git a/drivers/interconnect/mediatek/mtk-emi.c b/drivers/interconnect/mediatek/mtk-emi.c > new file mode 100644 > index 0000000..0a16992 > --- /dev/null > +++ b/drivers/interconnect/mediatek/mtk-emi.c > @@ -0,0 +1,242 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2019, The Linux Foundation. All rights reserved. Nit: Maybe 2020? > + * > + */ > + > +#include Please move this below the all other linux/ headers > +#include > +#include > +#include > +#include > +#include Is this needed? > +#include > +#include > + > +enum mtk_icc_name { > + SLAVE_DDR_EMI, > + MASTER_MCUSYS, > + MASTER_GPUSYS, > + MASTER_MMSYS, > + MASTER_MM_VPU, > + MASTER_MM_DISP, > + MASTER_MM_VDEC, > + MASTER_MM_VENC, > + MASTER_MM_CAM, > + MASTER_MM_IMG, > + MASTER_MM_MDP, > +}; > + > +#define MT8183_MAX_LINKS 1 > + > +/** > + * struct mtk_icc_node - Mediatek specific interconnect nodes > + * @name: the node name used in debugfs > + * @ep: true if the node is an end point. > + * @id: a unique node identifier > + * @links: an array of nodes where we can go next while traversing > + * @num_links: the total number of @links > + * @buswidth: width of the interconnect between a node and the bus > + * @sum_avg: current sum aggregate value of all avg bw kBps requests > + * @max_peak: current max aggregate value of all peak bw kBps requests > + */ > +struct mtk_icc_node { > + unsigned char *name; > + bool ep; > + u16 id; > + u16 links[MT8183_MAX_LINKS]; > + u16 num_links; > + u16 buswidth; > + u64 sum_avg; > + u64 max_peak; > +}; > + > +struct mtk_icc_desc { > + struct mtk_icc_node **nodes; > + size_t num_nodes; > +}; > + > +#define DEFINE_MNODE(_name, _id, _buswidth, _ep, ...) \ > + static struct mtk_icc_node _name = { \ > + .name = #_name, \ > + .id = _id, \ > + .buswidth = _buswidth, \ > + .ep = _ep, \ > + .num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })), \ > +} > + > +DEFINE_MNODE(ddr_emi, SLAVE_DDR_EMI, 1024, 1, 0); > +DEFINE_MNODE(mcusys, MASTER_MCUSYS, 256, 0, SLAVE_DDR_EMI); > +DEFINE_MNODE(gpu, MASTER_GPUSYS, 256, 0, SLAVE_DDR_EMI); > +DEFINE_MNODE(mmsys, MASTER_MMSYS, 256, 0, SLAVE_DDR_EMI); > +DEFINE_MNODE(mm_vpu, MASTER_MM_VPU, 128, 0, MASTER_MMSYS); > +DEFINE_MNODE(mm_disp, MASTER_MM_DISP, 128, 0, MASTER_MMSYS); > +DEFINE_MNODE(mm_vdec, MASTER_MM_VDEC, 128, 0, MASTER_MMSYS); > +DEFINE_MNODE(mm_venc, MASTER_MM_VENC, 128, 0, MASTER_MMSYS); > +DEFINE_MNODE(mm_cam, MASTER_MM_CAM, 128, 0, MASTER_MMSYS); > +DEFINE_MNODE(mm_img, MASTER_MM_IMG, 128, 0, MASTER_MMSYS); > +DEFINE_MNODE(mm_mdp, MASTER_MM_MDP, 128, 0, MASTER_MMSYS); > + > +static struct mtk_icc_node *mt8183_icc_nodes[] = { > + [MT8183_SLAVE_DDR_EMI] = &ddr_emi, > + [MT8183_MASTER_MCUSYS] = &mcusys, > + [MT8183_MASTER_GPU] = &gpu, > + [MT8183_MASTER_MMSYS] = &mmsys, > + [MT8183_MASTER_MM_VPU] = &mm_vpu, > + [MT8183_MASTER_MM_DISP] = &mm_disp, > + [MT8183_MASTER_MM_VDEC] = &mm_vdec, > + [MT8183_MASTER_MM_VENC] = &mm_venc, > + [MT8183_MASTER_MM_CAM] = &mm_cam, > + [MT8183_MASTER_MM_IMG] = &mm_img, > + [MT8183_MASTER_MM_MDP] = &mm_mdp, > +}; > + > +static struct mtk_icc_desc mt8183_icc = { const? > + .nodes = mt8183_icc_nodes, > + .num_nodes = ARRAY_SIZE(mt8183_icc_nodes), > +}; > + > +static int emi_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, > + u32 peak_bw, u32 *agg_avg, u32 *agg_peak) > +{ > + struct mtk_icc_node *in; > + > + in = node->data; > + > + *agg_avg += avg_bw; > + *agg_peak += peak_bw; > + > + in->sum_avg = *agg_avg; > + in->max_peak = *agg_peak; > + > + return 0; > +} > + > +static int emi_icc_set(struct icc_node *src, struct icc_node *dst) > +{ > + int ret = 0; > + struct mtk_icc_node *node; > + > + node = dst->data; > + if (node->ep) { > + pr_debug("sum_avg (%llu), max_peak (%llu)\n", > + node->sum_avg, node->max_peak); > + mtk_dvfsrc_send_request(src->provider->dev->parent, > + MTK_DVFSRC_CMD_BW_REQUEST, > + node->max_peak); > + } > + > + return ret; > +} > + > +static int emi_icc_remove(struct platform_device *pdev); > +static int emi_icc_probe(struct platform_device *pdev) > +{ > + int ret; > + const struct mtk_icc_desc *desc; > + struct icc_node *node; > + struct icc_onecell_data *data; > + struct icc_provider *provider; > + struct mtk_icc_node **mnodes; > + size_t num_nodes, i, j; > + > + desc = of_device_get_match_data(&pdev->dev); > + if (!desc) > + return -EINVAL; > + > + mnodes = desc->nodes; > + num_nodes = desc->num_nodes; > + > + provider = devm_kzalloc(&pdev->dev, sizeof(*provider), GFP_KERNEL); > + if (!provider) > + return -ENOMEM; > + > + data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node), GFP_KERNEL); This should be: devm_kzalloc(&pdev->dev, struct_size(data, nodes, num_nodes), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + provider->dev = &pdev->dev; > + provider->set = emi_icc_set; > + provider->aggregate = emi_icc_aggregate; > + provider->xlate = of_icc_xlate_onecell; > + INIT_LIST_HEAD(&provider->nodes); > + provider->data = data; > + > + ret = icc_provider_add(provider); > + if (ret) { > + dev_err(&pdev->dev, "error adding interconnect provider\n"); > + return ret; > + } > + > + for (i = 0; i < num_nodes; i++) { > + node = icc_node_create(mnodes[i]->id); > + if (IS_ERR(node)) { > + ret = PTR_ERR(node); > + goto err; > + } > + > + node->name = mnodes[i]->name; > + node->data = mnodes[i]; > + icc_node_add(node, provider); > + > + dev_dbg(&pdev->dev, "registered node %s, num link: %d\n", > + mnodes[i]->name, mnodes[i]->num_links); Please remove this. > + > + /* populate links */ Please remove the comment too. > + for (j = 0; j < mnodes[i]->num_links; j++) > + icc_link_create(node, mnodes[i]->links[j]); > + > + data->nodes[i] = node; > + } > + data->num_nodes = num_nodes; > + > + platform_set_drvdata(pdev, provider); > + > + return 0; > +err: > + emi_icc_remove(pdev); This will not work because platform_set_drvdata() is called only when the probe function completes successfully. So platform_get_drvdata() in emi_icc_remove() will return NULL. > + return ret; > +} > + > +static int emi_icc_remove(struct platform_device *pdev) > +{ > + struct icc_provider *provider = platform_get_drvdata(pdev); > + struct icc_node *n; > + > + list_for_each_entry(n, &provider->nodes, node_list) { > + icc_node_del(n); > + icc_node_destroy(n->id); > + } You can use icc_nodes_remove() instead of the above. Thanks, Georgi