Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp249710imm; Tue, 31 Jul 2018 18:01:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdXghYnnGWCiTpIzvWruAN9avdlYNrvMqK53LTKB7phx8xwWcxDTwXJYC6lKDP7YYvt5GIe X-Received: by 2002:a17:902:1121:: with SMTP id d30-v6mr22889513pla.247.1533085282689; Tue, 31 Jul 2018 18:01:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533085282; cv=none; d=google.com; s=arc-20160816; b=tTMVb/h0uYuR8XadIKXtPOPrZUCak+iSSS+87EN4vZncwfwIgnmHGuB9DfGbrviv98 /yyA4Md2LGWAhIvybdjAPkXjpsXL/D4s6ePoiWM55pqIBYrARuQhQd0v6dkY2kz66cxQ NSapw3PNri2lTsMGaIX+6FmXnq04PHfa47K1H1xfVxpwYuBeZwZ0JDV7dYiCxbG+Fkj6 0N/8jP523t5ZeRh0L0R4crzzmeZt/zn38g1OILGB85x9Oh6w1sCzR7J6/GcKRaZoqmh7 bv5aHBn3JRbqoJWiIB5oPq+GPASAa39zh7YY8EX8Qje+aLPYPNAUz3eU6iRbyUYCvXsD 88vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-language :content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:subject:dmarc-filter:dkim-signature :dkim-signature:arc-authentication-results; bh=GOfZ1bif6SF3gu0s3gTmvs4jg4VbLWwLRaTBFQ9RAY8=; b=tQ579SSKQAJJdK0FDPn2LiL4lU2JjaKAQs0+IcQok4Fj7d/SOsPWkCNQjN6Yv+4gxq mfnF0MU/RJDbim3Gh63zAJFrpkRI0pWmadkevXbJTq2P8S8p9gSPy6LxnLiFK+rQIfbT Acx1UucSCnE2C7Z+kO8aq/HP7/T7tRGMr2vV76IpyeZm+mP9HLgzk/5WkC7sQoi9m4K6 JxMEQlscXuWb/3j8+5VQlLB7U9qQjM+Zn5nhnar27AP/vVVAcGCrtogwRAC0l3HuMdA1 ryX5zDbW/l/NdsIb/AXUS1Q1ES+OHRO79vXU/I+2hES/iT4KuQxRn1ytQDxaGy7LV9o1 /oog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=Tv8AzTNt; dkim=pass header.i=@codeaurora.org header.s=default header.b=KTjCGSuS; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n7-v6si13318576plk.254.2018.07.31.18.01.07; Tue, 31 Jul 2018 18:01:22 -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=@codeaurora.org header.s=default header.b=Tv8AzTNt; dkim=pass header.i=@codeaurora.org header.s=default header.b=KTjCGSuS; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732924AbeHACnK (ORCPT + 99 others); Tue, 31 Jul 2018 22:43:10 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40206 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732863AbeHACnK (ORCPT ); Tue, 31 Jul 2018 22:43:10 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 9069B60585; Wed, 1 Aug 2018 01:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1533085212; bh=L7sKvbaF5FOij2ADd6/ll1NVxT0icmfH433NDd2MifI=; h=Subject:To:References:From:Date:In-Reply-To:From; b=Tv8AzTNt/7saa9/xliIvWgzJcw1wWZKA8f1nkwbmonkBwogmFV7zvL6ZSbs2n2iy9 TS7cjHnqfdgB+XO6tx0zP1njPSeT8HAUu3T2BKikyg0BdoreAxonRtS0hjxotblvY7 CVMPNdoPJFpd8LO2jM2K2ryljowe3ZjgKmPMS338= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from [10.46.163.64] (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: daidavid1@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 07D4660117; Wed, 1 Aug 2018 01:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1533085210; bh=L7sKvbaF5FOij2ADd6/ll1NVxT0icmfH433NDd2MifI=; h=Subject:To:References:From:Date:In-Reply-To:From; b=KTjCGSuSdwCgVFpOHN4dvg4nxKMIcs9IroPkk+F+PmSUXKZWvkdrYpZMrDwVwxTbk PTMBDMV2xoedM1No7MOBmaRVKIi4A8vfxh1swCBpLhMUxfFrSZuyUDxrXA5oILGYVc egTqqwAlncpzB5z0JKdHYvOdUFn1vLX/VmdPXiVk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 07D4660117 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=daidavid1@codeaurora.org Subject: Re: [RFC PATCH v2 1/2] interconnect: qcom: Add sdm845 interconnect provider driver To: Evan Green , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, georgi.djakov@linaro.org, Vincent Guittot , Bjorn Andersson , amit.kucheria@linaro.org, Lina Iyer , seansw@qti.qualcomm.com, grahamr@qti.qualcomm.com References: <1531967820-27483-1-git-send-email-daidavid1@codeaurora.org> <1531967820-27483-2-git-send-email-daidavid1@codeaurora.org> From: David Dai Message-ID: Date: Tue, 31 Jul 2018 18:00:01 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Evan, Thanks for taking the time to review and feedback! On 7/27/2018 2:12 PM, Evan Green wrote: > Hi David, > > On Thu, Jul 26, 2018 at 4:30 PM David Dai wrote: >> Introduce Qualcomm SDM845 specific provider driver using the >> interconnect framework. >> >> Signed-off-by: David Dai >> --- >> .../bindings/interconnect/qcom-sdm845.txt | 22 + >> drivers/interconnect/qcom/Kconfig | 8 + >> drivers/interconnect/qcom/Makefile | 1 + >> drivers/interconnect/qcom/qcom-icc-ids.h | 142 ++++ >> drivers/interconnect/qcom/sdm845.c | 826 +++++++++++++++++++++ >> 5 files changed, 999 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/interconnect/qcom-sdm845.txt >> create mode 100644 drivers/interconnect/qcom/qcom-icc-ids.h >> create mode 100644 drivers/interconnect/qcom/sdm845.c >> > ... >> diff --git a/drivers/interconnect/qcom/sdm845.c b/drivers/interconnect/qcom/sdm845.c >> new file mode 100644 >> index 0000000..bf13053 >> --- /dev/null >> +++ b/drivers/interconnect/qcom/sdm845.c >> @@ -0,0 +1,826 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +/* >> + * Copyright (c) 2018, The Linux Foundation. All rights reserved. >> + * >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> +#include >> + >> +#include "qcom-icc-ids.h" >> + >> +#define BCM_TCS_CMD_COMMIT_SHFT 30 >> +#define BCM_TCS_CMD_COMMIT_MASK 0x40000000 >> +#define BCM_TCS_CMD_VALID_SHFT 29 >> +#define BCM_TCS_CMD_VALID_MASK 0x200010000 >> +#define BCM_TCS_CMD_VOTE_X_SHFT 14 >> +#define BCM_TCS_CMD_VOTE_MASK 0x3fff >> +#define BCM_TCS_CMD_VOTE_Y_SHFT 0 >> +#define BCM_TCS_CMD_VOTE_Y_MASK 0xfffc000 >> + >> +#define BCM_TCS_CMD(commit, valid, vote_x, vote_y) \ >> + ((commit << BCM_TCS_CMD_COMMIT_SHFT) |\ >> + (valid << BCM_TCS_CMD_VALID_SHFT) |\ >> + ((vote_x & BCM_TCS_CMD_VOTE_MASK) << BCM_TCS_CMD_VOTE_X_SHFT) |\ >> + ((vote_y & BCM_TCS_CMD_VOTE_MASK) << BCM_TCS_CMD_VOTE_Y_SHFT)) > These values that are >8 bits (vote_x and vote_y) should be converted > from cpu to little endian. Done. > >> + >> +#define to_qcom_provider(_provider) \ >> + container_of(_provider, struct qcom_icc_provider, provider) >> + >> +#define DEFINE_QNODE(_name, _id, _channels, _buswidth, \ >> + _numlinks, ...) \ >> + static struct qcom_icc_node _name = { \ >> + .id = _id, \ >> + .name = #_name, \ >> + .channels = _channels, \ >> + .buswidth = _buswidth, \ >> + .num_links = _numlinks, \ >> + .links = { __VA_ARGS__ }, \ >> + } >> + >> +#define DEFINE_QBCM(_name, _bcmname, _keepalive, _numnodes, ...) \ >> + static struct qcom_icc_bcm _name = { \ >> + .name = _bcmname, \ >> + .keepalive = _keepalive, \ >> + .num_nodes = _numnodes, \ >> + .nodes = { __VA_ARGS__ }, \ >> + } >> + >> +struct qcom_icc_provider { >> + struct icc_provider provider; >> + void __iomem *base; >> + struct device *dev; >> + struct qcom_icc_bcm **bcms; >> + size_t num_bcms; >> +}; >> + >> +/** >> + * struct bcm_db - Auxiliary data pertaining to each Bus Clock Manager(BCM) >> + * @unit: bcm threshold values are in magnitudes of this >> + * @width: prototype width >> + * @vcd: virtual clock domain that this bcm belongs to >> + */ >> + >> +struct bcm_db { >> + u32 unit; >> + u16 width; >> + u8 vcd; >> + u8 reserved; >> +}; >> + >> +#define SDM845_MAX_LINKS 43 >> +#define SDM845_MAX_BCMS 30 >> +#define SDM845_MAX_BCM_PER_NODE 2 >> +#define SDM845_MAX_VCD 10 >> + >> +/** >> + * struct qcom_icc_node - Qualcomm specific interconnect nodes >> + * @name: the node name used in debugfs >> + * @links: an array of nodes where we can go next while traversing >> + * @id: a unique node identifier >> + * @num_links: the total number of @links >> + * @channels: num of channels at this node >> + * @buswidth: width of the interconnect between a node and the bus >> + * @sum_avg: current sum aggregate value of all avg bw requests >> + * @max_peak: current max aggregate value of all peak bw requests >> + * @bcms: list of bcms associated with this logical node >> + * @num_bcm: num of @bcms >> + */ >> +struct qcom_icc_node { >> + const char *name; >> + u16 links[SDM845_MAX_LINKS]; >> + u16 id; >> + u16 num_links; >> + u16 channels; >> + u16 buswidth; >> + u64 sum_avg; >> + u64 max_peak; >> + struct qcom_icc_bcm *bcms[SDM845_MAX_BCM_PER_NODE]; >> + size_t num_bcms; >> +}; >> + >> +/** >> + * struct qcom_icc_bcm - Qualcomm specific hardware accelerator nodes >> + * known as Bus Clock Manager(BCM) >> + * @name: the bcm node name used to fetch BCM data from command db >> + * @type: latency or bandwidth bcm >> + * @addr: address offsets used when voting to RPMH >> + * @vote_x: aggregated threshold values, represents sum_bw when @type is bw bcm >> + * @vote_y: aggregated threshold values, represents peak_bw when @type is bw bcm >> + * @dirty: flag used to indicate whether or bcm needs to be committed >> + * @aux_data: auxiliary data used when calculating threshold values and >> + * communicating with RPMh >> + * @list: used to link to other bcms when compiling lists for commit >> + * @num_nodes: total number of @num_nodes >> + * @nodes: list of qcom_icc_nodes that this BCM encapsulates >> + */ >> + >> +struct qcom_icc_bcm { >> + const char *name; >> + u32 type; >> + u32 addr; >> + u64 vote_x; >> + u64 vote_y; >> + bool dirty; >> + bool keepalive; >> + struct bcm_db aux_data; >> + struct list_head list; >> + size_t num_nodes; >> + struct qcom_icc_node *nodes[]; >> +}; >> + >> +struct qcom_icc_fabric { >> + struct qcom_icc_node **nodes; >> + size_t num_nodes; >> + u32 base_offset; >> + u32 qos_offset; >> +}; >> + >> +struct qcom_icc_desc { >> + struct qcom_icc_node **nodes; >> + size_t num_nodes; >> + struct qcom_icc_bcm **bcms; >> + size_t num_bcms; >> +}; >> + > ... >> + >> +static int qcom_icc_init(struct icc_node *node) >> +{ >> + /* TODO: init qos and priority */ >> + >> + return 0; >> +} >> + >> +static int qcom_icc_bcm_init(struct qcom_icc_bcm *bcm, struct device *dev) >> +{ >> + struct qcom_icc_node *qn; >> + int ret, i; >> + >> + bcm->addr = cmd_db_read_addr(bcm->name); >> + if (!bcm->addr) { >> + dev_err(dev, "%s could not find RPMh address\n", >> + bcm->name); >> + return -EINVAL; >> + } >> + >> + if (!cmd_db_read_aux_data_len(bcm->name)) { > I think you should validate that the aux data length being returned is > the length you expect it to be. Or maybe "at least" the length you > expect it to be, if this structure is meant to be backwards > compatible? Done. >> + dev_err(dev, "%s command db missing aux data\n", >> + bcm->name); >> + return -EINVAL; >> + } >> + >> + ret = cmd_db_read_aux_data(bcm->name, (u8 *)&bcm->aux_data, >> + sizeof(struct bcm_db)); > This still doesn't work for big endian, after being read the > multi-byte members of this structure need to be converted from little > endian to cpu format. Done. I'll convert the values to cpu format. >> + if (ret < 0) { >> + dev_err(dev, "%s command db read error (%d)\n", >> + bcm->name, ret); >> + return ret; >> + } >> + >> + for (i = 0; i < bcm->num_nodes; i++) { > This loop could use a comment describing what it's doing, which I > understand to be: Add links back to the BCM for each node in the BCM. Done. >> + qn = bcm->nodes[i]; >> + qn->bcms[qn->num_bcms] = bcm; >> + qn->num_bcms++; >> + } >> + >> + return 0; >> +} >> + >> +static int qcom_tcs_cmd_gen(struct tcs_cmd *cmd, u64 vote_x, >> + u64 vote_y, u32 addr, bool commit) >> +{ >> + int ret = 0; >> + bool valid = true; >> + >> + if (!cmd) >> + return ret; >> + >> + if (vote_x == 0 && vote_y == 0) >> + valid = false; >> + >> + if (vote_x > BCM_TCS_CMD_VOTE_MASK) >> + vote_x = BCM_TCS_CMD_VOTE_MASK; >> + >> + if (vote_y > BCM_TCS_CMD_VOTE_MASK) >> + vote_y = BCM_TCS_CMD_VOTE_MASK; >> + >> + cmd->addr = addr; >> + cmd->data = BCM_TCS_CMD(commit, valid, vote_x, vote_y); >> + >> + /* Set the wait for completion flag on commands that have the commit > I think the preferred style of multiline commenting has /* on its own line. Done. >> + * set, in order to indicate to the RSC to not release the TCS slot >> + * until hardware has acknowledged that this transaction has completed >> + */ >> + if (commit) >> + cmd->wait = true; >> + >> + return ret; >> +} >> + >> +static void qcom_tcs_list_gen(struct list_head *bcm_list, >> + struct tcs_cmd *tcs_list, int *n) >> +{ >> + struct qcom_icc_bcm *bcm; >> + bool commit; >> + size_t idx = 0, batch = 0, cur_vcd_size = 0; >> + >> + memset(n, 0, sizeof(int) * SDM845_MAX_VCD); >> + >> + list_for_each_entry(bcm, bcm_list, list) { >> + commit = false; >> + cur_vcd_size++; >> + if ((bcm->aux_data.vcd != >> + list_next_entry(bcm, list)->aux_data.vcd) || >> + list_is_last(&bcm->list, bcm_list)) { > You should switch the order of these conditions. Otherwise for the > last node you end up reaching through the list head object to get > aux_data.vcd, which is a wild memory access. In my mind at the time, it didn't really matter that the last member compared itself against head, since it would have a different VCD anyways unless there's only a single VCD in the entire commit list, which is what the list_is_list check takes care of. Though now that you mention it, it shouldn't need to compare at all if it sees that it's the last entry. I'll swap them. >> + commit = true; >> + cur_vcd_size = 0; >> + } >> + qcom_tcs_cmd_gen(&tcs_list[idx], bcm->vote_x, bcm->vote_y, >> + bcm->addr, commit); >> + idx++; >> + n[batch]++; >> + if (n[batch] >= MAX_RPMH_PAYLOAD) { >> + if (!commit) { >> + n[batch] -= cur_vcd_size; >> + n[batch+1] = cur_vcd_size; >> + } >> + batch++; > I think I have my head around this, but it at least needs a comment > describing what it's doing, because it's still mind boggling. My > understanding is: "Avoid splitting requests for the same BCM across > multiple RPMh payloads. If the current set of BCM requests would be > split, move it to the next batch." I agree that the logic here gets a bit busy, will add comments to clarify. > > I would also include a warning if cur_vcd_size is > MAX_RPMH_PAYLOAD, > or if n[batch] <= cur_vcd_size. This would help with readability, and > help catch any sort of crazy situation not anticipated by this logic. hm, I think cur_vcd_size is > MAX_RPMH_PAYLOAD is a useful check if somehow we got bad data to begin with, n[batch] <= cur_vcd_size is only a useful check when cur_vcd_size is > MAX_RPMH_PAYLOAD, since n[batch] == cur_vcd_size can be valid if cur_vcd_size == MAX_RPMH_PAYLOAD. >> + } >> + } >> +} >> + >> +static void qcom_icc_bcm_aggregate(struct qcom_icc_bcm *bcm) >> +{ >> + size_t i; >> + u64 agg_avg = 0; >> + u64 agg_peak = 0; >> + >> + for (i = 0; i < bcm->num_nodes; i++) { >> + agg_avg = max(agg_avg, >> + bcm->nodes[i]->sum_avg * bcm->aux_data.width / >> + (bcm->nodes[i]->buswidth * bcm->nodes[i]->channels)); >> + agg_peak = max(agg_peak, >> + bcm->nodes[i]->max_peak * bcm->aux_data.width / >> + bcm->nodes[i]->buswidth); >> + } >> + >> + bcm->vote_x = (u64)(agg_avg * 1000ULL / bcm->aux_data.unit); >> + bcm->vote_y = (u64)(agg_peak * 1000ULL / bcm->aux_data.unit); >> + >> + if (bcm->keepalive && bcm->vote_x == 0 && bcm->vote_y == 0) { >> + bcm->vote_x = 1; >> + bcm->vote_y = 1; >> + } >> + >> + bcm->dirty = false; >> +} >> + >> +static int qcom_icc_aggregate(struct icc_node *node, u32 avg_bw, >> + u32 peak_bw, u32 *agg_avg, u32 *agg_peak) >> +{ >> + size_t i; >> + struct qcom_icc_node *qn; >> + >> + qn = node->data; >> + >> + *agg_avg += avg_bw; >> + *agg_peak = max_t(u64, agg_peak, peak_bw); >> + >> + qn->sum_avg = *agg_avg; >> + qn->max_peak = *agg_peak; >> + >> + for (i = 0; i < qn->num_bcms; i++) >> + qn->bcms[i]->dirty = true; >> + >> + return 0; >> +} >> + >> +static int qcom_icc_set(struct icc_node *src, struct icc_node *dst, >> + u32 avg, u32 peak) >> +{ >> + struct qcom_icc_provider *qp; >> + struct qcom_icc_node *qn; >> + struct icc_node *node; >> + struct icc_provider *provider; >> + struct tcs_cmd cmds[SDM845_MAX_BCMS]; >> + struct list_head commit_list; >> + int commit_idx[SDM845_MAX_VCD]; >> + int ret = 0, i; >> + >> + if (!src) >> + node = dst; >> + else >> + node = src; >> + >> + qn = node->data; >> + provider = node->provider; >> + qp = to_qcom_provider(node->provider); >> + >> + INIT_LIST_HEAD(&commit_list); >> + >> + for (i = 0; i < qp->num_bcms; i++) { >> + if (qp->bcms[i]->dirty) { >> + qcom_icc_bcm_aggregate(qp->bcms[i]); >> + list_add_tail(&qp->bcms[i]->list, &commit_list); >> + } >> + } >> + >> + /* Construct the command list based on a pre ordered list of BCMs > Another networking-style comment. Done. > >> + * based on VCD > period? Done. > >> + */ >> + qcom_tcs_list_gen(&commit_list, cmds, commit_idx); >> + >> + if (!commit_idx[0]) >> + return ret; >> + >> + ret = rpmh_invalidate(qp->dev); >> + if (ret) { >> + pr_err("Error invalidating RPMH client (%d)\n", ret); >> + return ret; >> + } >> + >> + ret = rpmh_write_batch(qp->dev, RPMH_ACTIVE_ONLY_STATE, >> + cmds, commit_idx); >> + if (ret) { >> + pr_err("Error sending AMC RPMH requests (%d)\n", ret); >> + return ret; >> + } >> + >> + /* TODO: collect and send wake and sleep sets */ >> + return ret; >> +} >> + >> +static int cmp_vcd(const void *_l, const void *_r) >> +{ >> + const struct qcom_icc_bcm **l = (const struct qcom_icc_bcm **)_l; >> + const struct qcom_icc_bcm **r = (const struct qcom_icc_bcm **)_r; >> + >> + if (l[0]->aux_data.vcd < r[0]->aux_data.vcd) >> + return -1; >> + else if (l[0]->aux_data.vcd == r[0]->aux_data.vcd) >> + return 0; >> + else >> + return 1; >> +} >> + >> +static int qnoc_probe(struct platform_device *pdev) >> +{ >> + const struct qcom_icc_desc *desc; >> + struct qcom_icc_node **qnodes; >> + struct qcom_icc_provider *qp; >> + struct icc_provider *provider; >> + size_t num_nodes, i; >> + int ret; >> + >> + desc = of_device_get_match_data(&pdev->dev); >> + if (!desc) >> + return -EINVAL; >> + >> + qnodes = desc->nodes; >> + num_nodes = desc->num_nodes; >> + >> + qp = devm_kzalloc(&pdev->dev, sizeof(*qp), GFP_KERNEL); >> + if (!qp) >> + return -ENOMEM; >> + >> + provider = &qp->provider; >> + provider->dev = &pdev->dev; >> + provider->set = &qcom_icc_set; >> + provider->aggregate = &qcom_icc_aggregate; >> + INIT_LIST_HEAD(&provider->nodes); >> + provider->data = qp; >> + >> + qp->dev = &pdev->dev; >> + qp->bcms = desc->bcms; >> + qp->num_bcms = desc->num_bcms; >> + >> + 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++) { >> + struct icc_node *node; >> + int ret; >> + size_t j; >> + >> + node = icc_node_create(qnodes[i]->id); >> + if (IS_ERR(node)) { >> + ret = PTR_ERR(node); >> + goto err; > I think you need to clean up the nodes you've already created and > added, otherwise provider_del will end up printing a warning and > failing. Done. >> + } >> + >> + node->name = qnodes[i]->name; >> + node->data = qnodes[i]; >> + icc_node_add(node, provider); >> + >> + dev_dbg(&pdev->dev, "registered node %p %s %d\n", node, >> + qnodes[i]->name, node->id); >> + >> + ret = qcom_icc_init(node); >> + if (ret) >> + dev_err(&pdev->dev, "%s init error (%d)\n", node->name, >> + ret); >> + >> + /* populate links */ >> + for (j = 0; j < qnodes[i]->num_links; j++) >> + if (qnodes[i]->links[j]) >> + icc_link_create(node, qnodes[i]->links[j]); >> + } >> + >> + for (i = 0; i < qp->num_bcms; i++) >> + qcom_icc_bcm_init(qp->bcms[i], &pdev->dev); >> + >> + /* Pre sort the BCMs based on VCD for ease of generating a command list > Another comment that needs the /* line on its own. It turns out I do > this a lot too :) Done. >> + * that groups the BCMs with the same VCD together. VCDs are numbered >> + * with lowest being the most expensive time wise, ensuring that >> + * those commands are being sent the earliest in the queue. >> + */ >> + sort(qp->bcms, qp->num_bcms, sizeof(*qp->bcms), cmp_vcd, NULL); >> + >> + platform_set_drvdata(pdev, provider); >> + dev_info(&pdev->dev, "Registered SDM845 ICC\n"); >> + >> + return ret; >> +err: >> + icc_provider_del(provider); >> + return ret; >> +} >> + >> +static int qnoc_remove(struct platform_device *pdev) >> +{ >> + struct icc_provider *provider = platform_get_drvdata(pdev); >> + >> + icc_provider_del(provider); > Don't you need to tear all the nodes down too? Otherwise this function > will fail. Should you check the return value as well and complain at > least, or maybe fail qnoc_remove entirely? Done. >> + >> + return 0; >> +} >> + >> +static const struct of_device_id qnoc_of_match[] = { >> + { .compatible = "qcom,sdm845-rsc-hlos", .data = &sdm845_rsc_hlos }, >> + { }, >> +}; >> +MODULE_DEVICE_TABLE(of, qnoc_of_match); >> + >> +static struct platform_driver qnoc_driver = { >> + .probe = qnoc_probe, >> + .remove = qnoc_remove, >> + .driver = { >> + .name = "qnoc-sdm845", >> + .of_match_table = qnoc_of_match, >> + }, >> +}; >> +module_platform_driver(qnoc_driver); >> + >> +MODULE_AUTHOR("David Dai "); >> +MODULE_DESCRIPTION("Qualcomm sdm845 NoC driver"); >> +MODULE_LICENSE("GPL v2"); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project