From patchwork Sat Jan 1 16:39:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 12702108 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 58CCAC433F5 for ; Sat, 1 Jan 2022 16:41:48 +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:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=1SnaH4H84xmCXhGbauKRPKwqXNQVl5FQKGGFJshVkWI=; b=l3WUe+AYa2iksf M4OJBP28wcdPk2EbuUxEF6fe7/F4Aw8lHvWAZonoGA4el8evbEJ9B874ron6Wjasj5yDJNNWz3cni Kmwm7wnXN1yALiKmRzDDWvEec19zhL0Oum5iHu5by1w3qbLFUyfWCzIj80AXrFmvlR9oZdBtJA+7o vZCYuY4D0vWVszCuhfjW+Kb/AajMgEd0ut3LFEgzdjXTXHq2Prd0n/Ub7Sz9DBbwBMt11eMO1dTlG Z78oVcaPj0vvMbbTvxLQVYB7OxbYruC3e/yVojjrSNJWgYUb1oQbdFlLUfJ6B4bji8wh9AENwyFg7 tkb1JxSPzrF+C5gmtfHQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n3hQm-007CKr-I4; Sat, 01 Jan 2022 16:40:32 +0000 Received: from mail-vi1eur05on2061.outbound.protection.outlook.com ([40.107.21.61] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n3hQa-007CIe-KF for linux-arm-kernel@lists.infradead.org; Sat, 01 Jan 2022 16:40:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jA39r04TnZrEeurx5kS3yle2lvX6DS8LE0diA0K750kU3CMAntFYuHsc6tJ7+wzv0uKUNLCjLac42Q04JOGcu7uLVYfHz3AE6hwZ5fbc5t2oXDx/Tmgfse0F90MI8r0Ld7MS+ouDVr3dBYtrHdDwvWL4aAckNH0VhEWZbxCV+L37MqMNbDM4A574FVFRbxfVBmD6jFjY5KrHGn+gmGaKvuQyleo28Fy6elINEu7dg7qqsmipJSuxOJ/ocnnJuqeAHc4sYmQfIt2xvpXfYaGSwSgDIGNYE0YdwAktTSZndtmkvELQG+saDpWyHBHR8WgM8hst7FY4qQYvELwR+mFAsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mHV70ZFxuNKZwO/6Zm4FAcelOFlwfp+t9TvLmt6+jUA=; b=MyBQ0ZN1UCaIK/KY6nxZhuTDBmxYZQJzlqMXjpTstneSS1XjxSkLEbhhab/egzdl3JOVrXl3MmD9exfjfzk30u6ezcbnZJul/vhBz09xdHIvXW8xrhgn0YqDugVlJXVZlLSKpPJn0uvcdUAEgsD7hHQYnGHJ+7qDo5p1mn1aqrh/A6soDNrk1CkVFtIvVXrOATNDUUrjgH5dprp2Sv1f/XaGP9+o+LApvD8P568tys0sbPRcTx4k/xBdNX/aWoSqvwvVmM3hGj706qVIjvk59iuNlNjhJSdP5Ql7Vql31c31s/3cM+glbC9d4rp1uxoDjqIg6Wm+hHX97mZQMT4ZZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mHV70ZFxuNKZwO/6Zm4FAcelOFlwfp+t9TvLmt6+jUA=; b=HSSV6z3dJZraI+qM1/i1FOv7O6PFeoaKac9sVlStkciUUsRNpDB5kKnqPTzF23nXQV3nZfvdX0yab/55TKanMQ4tg5Vta1Uvxmb9u2xLGkSljn9QebLXEsE/E0Tz0ua5UYu4jTEvzGtLvVCHKo5T8VBO5WXzAk6IaZyTuRW0C/0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) by VI1PR0402MB2797.eurprd04.prod.outlook.com (2603:10a6:800:ad::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.14; Sat, 1 Jan 2022 16:40:14 +0000 Received: from VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841]) by VI1PR04MB4688.eurprd04.prod.outlook.com ([fe80::4c4c:f2b2:addb:841%6]) with mapi id 15.20.4844.015; Sat, 1 Jan 2022 16:40:14 +0000 From: Abel Vesa To: Georgi Djakov , Shawn Guo , Sascha Hauer , Fabio Estevam Cc: Pengutronix Kernel Team , NXP Linux Team , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Linux Kernel Mailing List Subject: [PATCH v2 1/3] interconnect: imx: Switch from imx_icc_node_adj_desc to fsl, icc-id node assignment Date: Sat, 1 Jan 2022 18:39:54 +0200 Message-Id: <20220101163956.3344467-1-abel.vesa@nxp.com> X-Mailer: git-send-email 2.31.1 X-ClientProxiedBy: VI1P18901CA0014.EURP189.PROD.OUTLOOK.COM (2603:10a6:801::24) To VI1PR04MB4688.eurprd04.prod.outlook.com (2603:10a6:803:6a::30) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88b8dafb-1cfa-4fd6-cbd0-08d9cd4562b5 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2797:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:541; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rTHFay5IYkn5vf/IGK5Unnh/0qgh0FYfuCzuwdB9X9Jq8mSIXUgsG6ej8LnkNfTXr6dZNb1ltspYVoF+1aWN4rqAmWpQ59kDgporpwLvZZZdS/kFHoVqXLUPAKpGlrASZMBLbhf2j2zNnkaVqZuEQGGFdJ1txVtvwNnN8mPWBvNZdMdSbVCv9AnyG6/bkxusctsOnImy3aCTm/HAU793XmKNWDGozcE6CfjENksL8GKW5UbJ/16lo2up+ikgloCxDVMXMKyBesgNP7+MIs/61spmubUmxMsoeZmLYzgK2pTf7ElQq9wBFX/ZcxbhNiSjGeSxHjZUk9XEHPE0mfmL65iH+IhBlhjZtAdS8fVVy4MdmHojh/3hKP0CeDNb01TrBl4wlv6ZVPc/YKMF9QGpFS3Cr189dAmWccDusSI5QQAvklGEnvH4KZ+aLVCzvQsa2O3qIk9TtI3SG9Hmajilt5Z7/Io6mjdgFOnBXgZfkouYBgfeg52pG/QKmqUKrzCS86U2O6fqujTWTuX8K83wn7uyr8JZ2z1nsD/KanfMWvu9D0SPYIgC4PkrxGvpnhxFRJaZffW0cUxw1gIlb8SET+FjmvIYoJLG6TqMerS+mwp6web6HoNygSkH2TwcnsV2yWJJxNZHpbDZehpIC+zJHIaPp9XfNDMcSpx8hVW6rFgJl0AktKr5wClghPBU/JHXRk5hLs6XtpR9ZY2MSSXFuQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB4688.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(4326008)(6512007)(5660300002)(6486002)(36756003)(38350700002)(38100700002)(66476007)(316002)(2906002)(44832011)(86362001)(8936002)(110136005)(52116002)(2616005)(1076003)(186003)(6666004)(508600001)(8676002)(66556008)(83380400001)(26005)(6506007)(66946007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4dZiDv5rvxsyaFaFcCpglUmHjo3I+fMJRBHNzoPWujWoj2yTVg5zC9OH3zyZ+IHRf6pKCD5ASjo167VHYERz7dsvGN+teeGDkZyREna7LlU5YZRfnsJeeFkbhzam/btxBg7HgPeqAgEBGky1uDQ7Z6mHfSbfZB7+7phCgioFa4Zi1v7qpFXdy04eH5ci4Jbsvrmc2555T85qNdfU6OsUGe8bFjGYEQPp8j8IiXdtURCVqXH6ekFgzP7u7+sYO/12lIL+26jxsPVMSAeVU3DYJZmN3oLNqP7C71vy2loXlCI/6BOZCI7PltVBjtzNw15wOe4CF2aTHpKCBK1eqyHPXOUv5QeG3E+M1mhHFrdTmiS7K+BpSIljIJhH5l5fx1Wv/9E3oX7pxN8QaXN1dHgtEPIJqk+pGr2aT2ZT842QnfcF2jCIB/QYalPNi+DzX9aPvtzIoqshx1JwLKv/XImHgCMeEB0ynxi9xMQxTTktBiVpobDZxo6fKTUTcnagsOeeHntrYf6ssQjXoLkz0cnNTYj+qgcBOXashzvzGfRbxIXkyUXQqIk8/hZnxQVqZSj3jq3xcxXCyffxBkte6DjWVKmoS7ywx/fYl2wHj0FBlzJi879TeSMFSk0ozAyl6sBqL+zoBL5QYLfVCWdHklrWKTIQ6I9x7R+zKDKIX5KQ69idIkBu32QsRcHELEneRQTYMFLPzM/MbzRxVSGh4Khie0H8OHr3qTX5xIil4ujyk/iZqA7TjUJxGcnOrT0imh/g2eIPmxCEUmSUp3dXiBbqUzWbXENOjNS27r56/iMhdlyXcx2klKIaeT64EQxS9FEMxyplwztsK1GGyMDQoU5UtbLe1+wYeAfloFpGh5/mhYH5RO0QG+KA3ibov7bFoz7307/WEyVTTrfQmzk5eDpna8C2ci4pjywqdfYEEr1vaANVwbpHSTuzuZdb0I7uq01nZTYzL2GmuW5HoTDH1/yotq5x7oVVmeA4MLixB3bYw/9DQKW+GQb9pCvRxVBSw8obh0CLT6tUYiZsTSCktJ6byTJB4Nh6YT1my7dr7cbneYXDXZA7mBTV31N6702mZRWcpTC+XCyDSoeP5xrmpC9EIDWPPZocHsMbZL3qPqStriePj+QAwJWDeJMYVF9H7WyqwWsQyzBFbSPrBT65VVhPmlAXzsi+55Y+LR+oTfIERAny/Lh5einn0kuRuNxZkvoLy0fYNeSa97HsL53loF5Zi3Wgcqq73UTo5J2d52N8tDZX71OFeKcJlaH1SdaaVC7GusCXy7sF/Mw0Ue82ZVc0igrgTGINxE0SPY126cSQ50tmL6WTHDChtu0fkasNNIAZcjZwML8FAxTJ1XK2mVDjnkRd9SlqjsbtvgckT3SUxRnTr8+kTZE47P1+hb+dIrSHF+yizzinphRX585GIMrFQYtqhskIs8m+esdjLOtBTFO6T8U/z9pMM54RhYLjmGqV7HZeMvcrg3R99yQmRcC+haSHJ2+uRQjPAf8WvYd9SY6DXZ6ACwD9l5ZL7g7RPqis24Vrckxr97fT+K6YDm08GPj1nUjZK9/EuMt8MAGiJcD4BP/z9DjxB6mGECzv6d+KdgmgBdW76B3W/VtpVRna5gYhDlBBiGVR9StbgxN9K7c= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88b8dafb-1cfa-4fd6-cbd0-08d9cd4562b5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB4688.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jan 2022 16:40:14.3723 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NIgn5uBAEkNZpNq+n63k3ykBodlwguenSDY+VbeOHC3aTOIsJdZUfanzNCODTfKD0CXBT7UjzGuJ/eOqXMAVBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2797 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220101_084020_695111_4240CAE9 X-CRM114-Status: GOOD ( 18.51 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org In order to be able to have more than one NoCs in the interconnect net we need to decouple the NoC from the dram. So instead of using the imx_icc_node_adj_desc, we use the fsl,icc-id property that is in each NoC (or pl301) to the icc node (based on the id) to it. Along with all the NoC and pl301 nodes in the dts we will have a interconnect dedicated node. This node will be the actual device of the icc provider. Signed-off-by: Abel Vesa --- No changes since v1. drivers/interconnect/imx/imx.c | 70 +++++++++++++++------------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index c770951a909c..34bfc7936387 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -34,8 +34,8 @@ static int imx_icc_node_set(struct icc_node *node) if (!node_data->qos_dev) return 0; - freq = (node->avg_bw + node->peak_bw) * node_data->desc->adj->bw_mul; - do_div(freq, node_data->desc->adj->bw_div); + freq = max(node->avg_bw, node->peak_bw); + dev_dbg(dev, "node %s device %s avg_bw %ukBps peak_bw %ukBps min_freq %llukHz\n", node->name, dev_name(node_data->qos_dev), node->avg_bw, node->peak_bw, freq); @@ -79,41 +79,35 @@ static int imx_icc_node_init_qos(struct icc_provider *provider, struct icc_node *node) { struct imx_icc_node *node_data = node->data; - const struct imx_icc_node_adj_desc *adj = node_data->desc->adj; struct device *dev = provider->dev; - struct device_node *dn = NULL; struct platform_device *pdev; + struct device_node *np = NULL, *dn = NULL; + int idx; - if (adj->main_noc) { - node_data->qos_dev = dev; - dev_dbg(dev, "icc node %s[%d] is main noc itself\n", - node->name, node->id); - } else { - dn = of_parse_phandle(dev->of_node, adj->phandle_name, 0); - if (!dn) { - dev_warn(dev, "Failed to parse %s\n", - adj->phandle_name); - return -ENODEV; - } - /* Allow scaling to be disabled on a per-node basis */ - if (!of_device_is_available(dn)) { - dev_warn(dev, "Missing property %s, skip scaling %s\n", - adj->phandle_name, node->name); - of_node_put(dn); - return 0; - } + for_each_node_with_property(np, "fsl,icc-id") { + of_property_read_u32(np, "fsl,icc-id", &idx); + if (idx == node_data->desc->id) + dn = np; + } - pdev = of_find_device_by_node(dn); - of_node_put(dn); - if (!pdev) { - dev_warn(dev, "node %s[%d] missing device for %pOF\n", - node->name, node->id, dn); - return -EPROBE_DEFER; - } - node_data->qos_dev = &pdev->dev; - dev_dbg(dev, "node %s[%d] has device node %pOF\n", - node->name, node->id, dn); + if (!dn) + return 0; + + if (!of_device_is_available(dn)) { + dev_warn(dev, "%pOF is disabled\n", dn); + return 0; + } + + pdev = of_find_device_by_node(dn); + of_node_put(dn); + if (!pdev) { + dev_warn(dev, "node %s[%d] missing device for %pOF\n", + node->name, node->id, dn); + return -EPROBE_DEFER; } + node_data->qos_dev = &pdev->dev; + dev_dbg(dev, "node %s[%d] has device node %pOF\n", node->name, + node->id, dn); return dev_pm_qos_add_request(node_data->qos_dev, &node_data->qos_req, @@ -151,12 +145,10 @@ static struct icc_node *imx_icc_node_add(struct icc_provider *provider, node_data->desc = node_desc; icc_node_add(node, provider); - if (node_desc->adj) { - ret = imx_icc_node_init_qos(provider, node); - if (ret < 0) { - imx_icc_node_destroy(node); - return ERR_PTR(ret); - } + ret = imx_icc_node_init_qos(provider, node); + if (ret < 0) { + imx_icc_node_destroy(node); + return ERR_PTR(ret); } return node; @@ -244,7 +236,7 @@ int imx_icc_register(struct platform_device *pdev, provider->aggregate = icc_std_aggregate; provider->xlate = of_icc_xlate_onecell; provider->data = data; - provider->dev = dev->parent; + provider->dev = dev; platform_set_drvdata(pdev, provider); ret = icc_provider_add(provider);