From patchwork Tue Dec 20 16:02:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635558 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2080C4167B for ; Tue, 20 Dec 2022 16:03:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233336AbiLTQDI (ORCPT ); Tue, 20 Dec 2022 11:03:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233763AbiLTQDC (ORCPT ); Tue, 20 Dec 2022 11:03:02 -0500 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AD0A1869E; Tue, 20 Dec 2022 08:03:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A5werpiVlWdI+40AdgOJ0iPNoEBTbdgmsFI/NdN8KfrjH8VuodL496lTg7wVEPCfm7bQGBnbyDeHpxAKqcX+ytnj5yXUBwinty2tKbfa01ok5PL3hGPQi2HZZMmXz5NVJoOJ97p0s0fmtHqXCrfAObQlJ4VVa8tY8w6KXSk+jCu0lRTlvBXrM4lYvICX/Mny1+YpLG8TX8vHzP0I6jHJVHBMxbt7f3kpMR1FZfS4N94k85pCUsU9DM81b8tIEt137EVHQFzSbbrSkBoFP4TcV2faVsTu5qOklF8/mYTW+6z7fyM0RPEQOlzfBLSwtmXu9J/WFfKJZKYZ0UqSRMBobQ== 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=NlbBRuKJsTAuqn1DhWagMB+lf4MGcxVzpTMiAqdG1Oo=; b=GISmqvCy/csVR7Y35tX+VWpl1hbIy1qvs2Ww/tTwupPKkKVaSb5jW5fSa2V6uDA2wVjFPTKGoxBpFS1yBXDroXizwW2KGJKipw4cjBxxCdiHtJqJgGOJusfaIUkuoCuW0F2FckihFVsu8ltaYmRB4ehIubBT3kdkLUON2Jo2er6Y5ZA/oSiY2nKcF2iW5t6sjWnmTMtF4fo2aYp/UQA6DIk2TmZsg1wz70TTYYT5n7RvAGTo30YUB9MNEA/17VjfJGHl96wGIkQJW+1DIbmODr2wIeX9CLKYl02qy7aRz1PQxhyd7NviZgvalG3mRnHrXFkD7B7sixkoQh60hTyExQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NlbBRuKJsTAuqn1DhWagMB+lf4MGcxVzpTMiAqdG1Oo=; b=AlPmBs4crAkDJMMc/BmYMIiudaDqM1nFmDzxqdbiaCOzNT4dHt3hdHyyKLqjQxYs5gW6nO9PRMj+bjoI0nfhk3ON46mnQVjhN89OJb8XibkZDkIwMx0g/d/DrZj7/TCLSKifYBARbhLaoOD44DqBjEVl9TpHxJxJqnvi6rPzCwnAzhZDWfCKcJNrFaLzDvXtDy8Zc8vdxpcaGvzeffmghGsKLmCYlxZm8Z1/UyJVZwy/IplPAsXcICOPmipIXn8uxMw7MpUV4x1NU+osEstFTcYZzs19plvmC5SIlqjmqMjyDSEsvg/zoU5U5suACol8YkJqmmVhzVSmUGrxzmgTsQ== Received: from MW4PR04CA0263.namprd04.prod.outlook.com (2603:10b6:303:88::28) by IA1PR12MB7591.namprd12.prod.outlook.com (2603:10b6:208:429::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:02:59 +0000 Received: from CO1NAM11FT086.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::62) by MW4PR04CA0263.outlook.office365.com (2603:10b6:303:88::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:02:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT086.mail.protection.outlook.com (10.13.175.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:02:58 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:02:58 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:02:57 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:02:53 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 01/10] memory: tegra: add interconnect support for DRAM scaling in Tegra234 Date: Tue, 20 Dec 2022 21:32:31 +0530 Message-ID: <20221220160240.27494-2-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT086:EE_|IA1PR12MB7591:EE_ X-MS-Office365-Filtering-Correlation-Id: 84124632-5180-49b1-fb0d-08dae2a3a9f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRIk+iTRCA2+y/ZAz4C6rGr+Uj8Uq/Y7BfaGOqg1txxYXthPNtGcW6zJT/8nFGkUuerqpVNsiZzRM4NVV42djJbAMGJmENfERS0nC01dTyhvNHL6UCPOmYgjRQgK/QPDoMxHGT1g9Zgy85hJZa21n5MjhDq0HQd5Cqfa6+UegTm5XML3ivC9xDPLSMnj0ScIcrsQG+tx/r3Z1vRC0d6uDnoZTe2VaiP9o6qEYkTZSLZUHBUqtnvpcWNLoSVBIR0XtALYCz4PiGZCtkLBVmSEGrGdB4qM8RlPY6nf8Ji2Qw/2HHki77wrjHzxmpA7iZMSXjf0BPLr5i0whuULM2qfyywLBQSSt6AR3uOU+YNeQXfhinfmVR8an74hcSj1NKIaqUhWe3Q0daXYzEytI6+jeYyXIh90uzWkp2vgl5hEShvoDRocuVaNUf6LmfqJfenkwLReDaN/dmoaJz5RNSk4V9Lm5VBbVYbpPCQa8mfDwnHRuSQB04zm9bG/ewqHfOI0jyGTJWZ/zISjII8ZOWLyihV5VhyXOI0YmmrYhAlH7RHuuPFTRlAPcwI2r/IlrV7UXMewUXkLvnUvjEG9e+pQX9g3qjPquWMOC4TLwRAZuGkex03DoZ+fm6g7OVcpPqFvD49wsXp43DdyOtaqjCe39J/C1JJ5uyPn6XDt2aV3nvzuOA76N8T0GAKBLy3kumAlNBg8UpdXkp4pQz2hv2sEUOhvU5y8rSd0y2SgDfSmbYs= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(136003)(39860400002)(396003)(376002)(346002)(451199015)(46966006)(36840700001)(40470700004)(54906003)(7696005)(36860700001)(40460700003)(316002)(478600001)(82740400003)(7636003)(8676002)(110136005)(4326008)(2616005)(86362001)(921005)(70586007)(36756003)(356005)(70206006)(1076003)(82310400005)(83380400001)(5660300002)(30864003)(40480700001)(8936002)(107886003)(6666004)(426003)(47076005)(336012)(2906002)(186003)(41300700001)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:02:58.4204 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84124632-5180-49b1-fb0d-08dae2a3a9f4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT086.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB7591 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Adding Interconnect framework support to dynamically set the DRAM bandwidth from different clients. Both the MC and EMC drivers are added as ICC providers. The path for any request will be: MC-Client[1-n] -> MC -> EMC -> EMEM/DRAM MC clients will request for bandwidth to the MC driver which will pass the tegra icc node having current request info to the EMC driver. The EMC driver will send the BPMP Client ID, Client type and bandwidth request info to the BPMP-FW where the final DRAM freq for achieving the requested bandwidth is set based on the passed parameters. Signed-off-by: Sumit Gupta --- drivers/memory/tegra/mc.c | 18 ++- drivers/memory/tegra/tegra186-emc.c | 166 ++++++++++++++++++++++++++++ drivers/memory/tegra/tegra234.c | 101 ++++++++++++++++- include/soc/tegra/mc.h | 7 ++ include/soc/tegra/tegra-icc.h | 72 ++++++++++++ 5 files changed, 362 insertions(+), 2 deletions(-) create mode 100644 include/soc/tegra/tegra-icc.h diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index 592907546ee6..ff887fb03bce 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -17,6 +17,7 @@ #include #include +#include #include "mc.h" @@ -779,6 +780,7 @@ const char *const tegra_mc_error_names[8] = { */ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) { + struct tegra_icc_node *tnode; struct icc_node *node; unsigned int i; int err; @@ -792,7 +794,11 @@ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) mc->provider.data = &mc->provider; mc->provider.set = mc->soc->icc_ops->set; mc->provider.aggregate = mc->soc->icc_ops->aggregate; - mc->provider.xlate_extended = mc->soc->icc_ops->xlate_extended; + mc->provider.get_bw = mc->soc->icc_ops->get_bw; + if (mc->soc->icc_ops->xlate) + mc->provider.xlate = mc->soc->icc_ops->xlate; + if (mc->soc->icc_ops->xlate_extended) + mc->provider.xlate_extended = mc->soc->icc_ops->xlate_extended; err = icc_provider_add(&mc->provider); if (err) @@ -814,6 +820,10 @@ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) goto remove_nodes; for (i = 0; i < mc->soc->num_clients; i++) { + tnode = kzalloc(sizeof(*tnode), GFP_KERNEL); + if (!tnode) + return -ENOMEM; + /* create MC client node */ node = icc_node_create(mc->soc->clients[i].id); if (IS_ERR(node)) { @@ -828,6 +838,12 @@ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) err = icc_link_create(node, TEGRA_ICC_MC); if (err) goto remove_nodes; + + node->data = tnode; + tnode->node = node; + tnode->type = mc->soc->clients[i].type; + tnode->bpmp_id = mc->soc->clients[i].bpmp_id; + tnode->mc = mc; } return 0; diff --git a/drivers/memory/tegra/tegra186-emc.c b/drivers/memory/tegra/tegra186-emc.c index 26e763bde92a..3500ed6ccd8f 100644 --- a/drivers/memory/tegra/tegra186-emc.c +++ b/drivers/memory/tegra/tegra186-emc.c @@ -8,8 +8,11 @@ #include #include #include +#include #include +#include +#include "mc.h" struct tegra186_emc_dvfs { unsigned long latency; @@ -29,8 +32,15 @@ struct tegra186_emc { unsigned long min_rate; unsigned long max_rate; } debugfs; + + struct icc_provider provider; }; +static inline struct tegra186_emc *to_tegra186_emc(struct icc_provider *provider) +{ + return container_of(provider, struct tegra186_emc, provider); +} + /* * debugfs interface * @@ -146,11 +156,150 @@ DEFINE_DEBUGFS_ATTRIBUTE(tegra186_emc_debug_max_rate_fops, tegra186_emc_debug_max_rate_get, tegra186_emc_debug_max_rate_set, "%llu\n"); +/* + * tegra_emc_icc_set_bw() - Pass MC client info and BW request to BPMP + * @src: ICC node for External Memory Controller (EMC) + * @dst: ICC node for External Memory (DRAM) + * + * Passing the MC client info and Banwidth request to BPMP-FW where + * LA and PTSA registers are accessed and the final EMC freq is set based + * on client, type, latency and bandwidth. + */ +static int tegra_emc_icc_set_bw(struct icc_node *src, struct icc_node *dst) +{ + struct tegra186_emc *emc = to_tegra186_emc(dst->provider); + struct tegra_mc *mc = dev_get_drvdata(emc->dev->parent); + struct mrq_bwmgr_int_request bwmgr_req = { 0 }; + struct mrq_bwmgr_int_response bwmgr_resp = { 0 }; + struct tegra_icc_node *tnode = mc->curr_tnode; + struct tegra_bpmp_message msg; + int ret = 0; + + /* + * Same Src and Dst node will happen during boot from icc_node_add(). + * This can be used to pre-initialize and set bandwidth for all clients + * before their drivers are loaded. We are skipping this case as for us, + * the pre-initialization already happened in Bootloader(MB2) and BPMP-FW. + */ + if (src->id == dst->id) + return 0; + + if (mc->curr_tnode->type == TEGRA_ICC_NISO) + bwmgr_req.bwmgr_calc_set_req.niso_bw = tnode->node->avg_bw; + else + bwmgr_req.bwmgr_calc_set_req.iso_bw = tnode->node->avg_bw; + + bwmgr_req.bwmgr_calc_set_req.client_id = tnode->bpmp_id; + + bwmgr_req.cmd = CMD_BWMGR_INT_CALC_AND_SET; + bwmgr_req.bwmgr_calc_set_req.mc_floor = tnode->node->peak_bw; + bwmgr_req.bwmgr_calc_set_req.floor_unit = BWMGR_INT_UNIT_KBPS; + + memset(&msg, 0, sizeof(msg)); + msg.mrq = MRQ_BWMGR_INT; + msg.tx.data = &bwmgr_req; + msg.tx.size = sizeof(bwmgr_req); + msg.rx.data = &bwmgr_resp; + msg.rx.size = sizeof(bwmgr_resp); + + ret = tegra_bpmp_transfer(emc->bpmp, &msg); + if (ret < 0) { + dev_err(emc->dev, "BPMP transfer failed: %d\n", ret); + goto error; + } + if (msg.rx.ret < 0) { + pr_err("failed to set bandwidth for %u: %d\n", + bwmgr_req.bwmgr_calc_set_req.client_id, msg.rx.ret); + ret = -EINVAL; + } + +error: + return ret; +} + +static struct icc_node * +tegra_emc_of_icc_xlate(struct of_phandle_args *spec, void *data) +{ + struct icc_provider *provider = data; + struct icc_node *node; + + /* External Memory is the only possible ICC route */ + list_for_each_entry(node, &provider->nodes, node_list) { + if (node->id != TEGRA_ICC_EMEM) + continue; + + return node; + } + + return ERR_PTR(-EPROBE_DEFER); +} + +static int tegra_emc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *peak) +{ + *avg = 0; + *peak = 0; + + return 0; +} + +static int tegra_emc_interconnect_init(struct tegra186_emc *emc) +{ + struct tegra_mc *mc = dev_get_drvdata(emc->dev->parent); + const struct tegra_mc_soc *soc = mc->soc; + struct icc_node *node; + int err = 0; + + emc->provider.dev = emc->dev; + emc->provider.set = tegra_emc_icc_set_bw; + emc->provider.data = &emc->provider; + emc->provider.aggregate = soc->icc_ops->aggregate; + emc->provider.xlate = tegra_emc_of_icc_xlate; + emc->provider.get_bw = tegra_emc_icc_get_init_bw; + + err = icc_provider_add(&emc->provider); + if (err) + return err; + + /* create External Memory Controller node */ + node = icc_node_create(TEGRA_ICC_EMC); + if (IS_ERR(node)) { + err = PTR_ERR(node); + goto del_provider; + } + + node->name = "External Memory Controller"; + icc_node_add(node, &emc->provider); + + /* link External Memory Controller to External Memory (DRAM) */ + err = icc_link_create(node, TEGRA_ICC_EMEM); + if (err) + goto remove_nodes; + + /* create External Memory node */ + node = icc_node_create(TEGRA_ICC_EMEM); + if (IS_ERR(node)) { + err = PTR_ERR(node); + goto remove_nodes; + } + + node->name = "External Memory (DRAM)"; + icc_node_add(node, &emc->provider); + + return 0; +remove_nodes: + icc_nodes_remove(&emc->provider); +del_provider: + icc_provider_del(&emc->provider); + + return err; +} + static int tegra186_emc_probe(struct platform_device *pdev) { struct mrq_emc_dvfs_latency_response response; struct tegra_bpmp_message msg; struct tegra186_emc *emc; + struct tegra_mc *mc; unsigned int i; int err; @@ -158,6 +307,9 @@ static int tegra186_emc_probe(struct platform_device *pdev) if (!emc) return -ENOMEM; + platform_set_drvdata(pdev, emc); + emc->dev = &pdev->dev; + emc->bpmp = tegra_bpmp_get(&pdev->dev); if (IS_ERR(emc->bpmp)) return dev_err_probe(&pdev->dev, PTR_ERR(emc->bpmp), "failed to get BPMP\n"); @@ -236,6 +388,19 @@ static int tegra186_emc_probe(struct platform_device *pdev) debugfs_create_file("max_rate", S_IRUGO | S_IWUSR, emc->debugfs.root, emc, &tegra186_emc_debug_max_rate_fops); + mc = dev_get_drvdata(emc->dev->parent); + if (mc && mc->soc->icc_ops) { + if (tegra_bpmp_mrq_is_supported(emc->bpmp, MRQ_BWMGR_INT)) { + err = tegra_emc_interconnect_init(emc); + if (!err) + return err; + dev_err(&pdev->dev, "tegra_emc_interconnect_init failed:%d\n", err); + goto put_bpmp; + } else { + dev_info(&pdev->dev, "MRQ_BWMGR_INT not present\n"); + } + } + return 0; put_bpmp: @@ -272,6 +437,7 @@ static struct platform_driver tegra186_emc_driver = { .name = "tegra186-emc", .of_match_table = tegra186_emc_of_match, .suppress_bind_attrs = true, + .sync_state = icc_sync_state, }, .probe = tegra186_emc_probe, .remove = tegra186_emc_remove, diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 02dcc5748bba..65d4e32ee118 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (C) 2021-2022, NVIDIA CORPORATION. All rights reserved. + * Copyright (C) 2021-2023, NVIDIA CORPORATION. All rights reserved. */ #include @@ -8,11 +8,16 @@ #include #include "mc.h" +#include +#include +#include static const struct tegra_mc_client tegra234_mc_clients[] = { { .id = TEGRA234_MEMORY_CLIENT_MGBEARD, .name = "mgbeard", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE, .regs = { .sid = { @@ -23,6 +28,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_MGBEBRD, .name = "mgbebrd", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE_VF1, .regs = { .sid = { @@ -33,6 +40,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_MGBECRD, .name = "mgbecrd", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE_VF2, .regs = { .sid = { @@ -43,6 +52,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_MGBEDRD, .name = "mgbedrd", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE_VF3, .regs = { .sid = { @@ -52,6 +63,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, }, { .id = TEGRA234_MEMORY_CLIENT_MGBEAWR, + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .name = "mgbeawr", .sid = TEGRA234_SID_MGBE, .regs = { @@ -63,6 +76,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_MGBEBWR, .name = "mgbebwr", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE_VF1, .regs = { .sid = { @@ -73,6 +88,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_MGBECWR, .name = "mgbecwr", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE_VF2, .regs = { .sid = { @@ -83,6 +100,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_SDMMCRAB, .name = "sdmmcrab", + .bpmp_id = TEGRA_ICC_BPMP_SDMMC_4, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_SDMMC4, .regs = { .sid = { @@ -93,6 +112,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_MGBEDWR, .name = "mgbedwr", + .bpmp_id = TEGRA_ICC_BPMP_EQOS, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_MGBE_VF3, .regs = { .sid = { @@ -103,6 +124,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_SDMMCWAB, .name = "sdmmcwab", + .bpmp_id = TEGRA_ICC_BPMP_SDMMC_4, + .type = TEGRA_ICC_NISO, .sid = TEGRA234_SID_SDMMC4, .regs = { .sid = { @@ -153,6 +176,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_APEDMAR, .name = "apedmar", + .bpmp_id = TEGRA_ICC_BPMP_APEDMA, + .type = TEGRA_ICC_ISO_AUDIO, .sid = TEGRA234_SID_APE, .regs = { .sid = { @@ -163,6 +188,8 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, { .id = TEGRA234_MEMORY_CLIENT_APEDMAW, .name = "apedmaw", + .bpmp_id = TEGRA_ICC_BPMP_APEDMA, + .type = TEGRA_ICC_ISO_AUDIO, .sid = TEGRA234_SID_APE, .regs = { .sid = { @@ -333,6 +360,77 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { }, }; +/* + * tegra234_mc_icc_set() - Pass MC client info to External Memory Controller (EMC) + * @src: ICC node for Memory Controller's (MC) Client + * @dst: ICC node for Memory Controller (MC) + * + * Passing the current request info from the MC to the EMC driver using + * 'struct tegra_mc'. EMC driver will further send the MC client's request info + * to the BPMP-FW where LA and PTSA registers are accessed and the final EMC freq + * is set based on client, type, latency and bandwidth. + * icc_set_bw() makes set_bw calls for both MC and EMC providers in sequence. + * Both the calls are protected by 'mutex_lock(&icc_lock)'. So, the data passed + * from MC and EMC won't be updated by concurrent set calls from other clients. + */ +static int tegra234_mc_icc_set(struct icc_node *src, struct icc_node *dst) +{ + struct tegra_mc *mc = icc_provider_to_tegra_mc(dst->provider); + struct tegra_icc_node *tnode = src->data; + + /* + * Same Src and Dst node will happen during boot from icc_node_add(). + * This can be used to pre-initialize and set bandwidth for all clients + * before their drivers are loaded. We are skipping this case as for us, + * the pre-initialization already happened in Bootloader(MB2) and BPMP-FW. + */ + if (src->id == dst->id) + return 0; + + if (tnode->node) + mc->curr_tnode = tnode; + else + pr_err("%s, tegra_icc_node is null\n", __func__); + + return 0; +} + +static struct icc_node* +tegra234_mc_of_icc_xlate(struct of_phandle_args *spec, void *data) +{ + struct tegra_mc *mc = icc_provider_to_tegra_mc(data); + unsigned int cl_id = spec->args[0]; + struct icc_node *node; + + list_for_each_entry(node, &mc->provider.nodes, node_list) { + if (node->id != cl_id) + continue; + + return node; + } + + /* + * If a client driver calls devm_of_icc_get() before the MC driver + * is probed, then return EPROBE_DEFER to the client driver. + */ + return ERR_PTR(-EPROBE_DEFER); +} + +static int tegra234_mc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *peak) +{ + *avg = 0; + *peak = 0; + + return 0; +} + +static const struct tegra_mc_icc_ops tegra234_mc_icc_ops = { + .xlate = tegra234_mc_of_icc_xlate, + .get_bw = tegra234_mc_icc_get_init_bw, + .aggregate = icc_std_aggregate, + .set = tegra234_mc_icc_set, +}; + const struct tegra_mc_soc tegra234_mc_soc = { .num_clients = ARRAY_SIZE(tegra234_mc_clients), .clients = tegra234_mc_clients, @@ -345,6 +443,7 @@ const struct tegra_mc_soc tegra234_mc_soc = { MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, .has_addr_hi_reg = true, .ops = &tegra186_mc_ops, + .icc_ops = &tegra234_mc_icc_ops, .ch_intmask = 0x0000ff00, .global_intstatus_channel_shift = 8, /* diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 51a2263e1bc5..0a32a9eb12a4 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -13,6 +13,7 @@ #include #include #include +#include struct clk; struct device; @@ -26,6 +27,8 @@ struct tegra_mc_timing { struct tegra_mc_client { unsigned int id; + unsigned int bpmp_id; + enum tegra_icc_client_type type; const char *name; /* * For Tegra210 and earlier, this is the SWGROUP ID used for IOVA translations in the @@ -166,8 +169,10 @@ struct tegra_mc_icc_ops { int (*set)(struct icc_node *src, struct icc_node *dst); int (*aggregate)(struct icc_node *node, u32 tag, u32 avg_bw, u32 peak_bw, u32 *agg_avg, u32 *agg_peak); + struct icc_node* (*xlate)(struct of_phandle_args *spec, void *data); struct icc_node_data *(*xlate_extended)(struct of_phandle_args *spec, void *data); + int (*get_bw)(struct icc_node *node, u32 *avg, u32 *peak); }; struct tegra_mc_ops { @@ -238,6 +243,8 @@ struct tegra_mc { struct { struct dentry *root; } debugfs; + + struct tegra_icc_node *curr_tnode; }; int tegra_mc_write_emem_configuration(struct tegra_mc *mc, unsigned long rate); diff --git a/include/soc/tegra/tegra-icc.h b/include/soc/tegra/tegra-icc.h new file mode 100644 index 000000000000..3855d8571281 --- /dev/null +++ b/include/soc/tegra/tegra-icc.h @@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2022-2023 NVIDIA CORPORATION. All rights reserved. + */ + +#ifndef MEMORY_TEGRA_ICC_H +#define MEMORY_TEGRA_ICC_H + +enum tegra_icc_client_type { + TEGRA_ICC_NONE, + TEGRA_ICC_NISO, + TEGRA_ICC_ISO_DISPLAY, + TEGRA_ICC_ISO_VI, + TEGRA_ICC_ISO_AUDIO, + TEGRA_ICC_ISO_VIFAL, +}; + +struct tegra_icc_node { + struct icc_node *node; + struct tegra_mc *mc; + u32 bpmp_id; + u32 type; +}; + +/* ICC ID's for MC client's used in BPMP */ +#define TEGRA_ICC_BPMP_DEBUG 1 +#define TEGRA_ICC_BPMP_CPU_CLUSTER0 2 +#define TEGRA_ICC_BPMP_CPU_CLUSTER1 3 +#define TEGRA_ICC_BPMP_CPU_CLUSTER2 4 +#define TEGRA_ICC_BPMP_GPU 5 +#define TEGRA_ICC_BPMP_CACTMON 6 +#define TEGRA_ICC_BPMP_DISPLAY 7 +#define TEGRA_ICC_BPMP_VI 8 +#define TEGRA_ICC_BPMP_EQOS 9 +#define TEGRA_ICC_BPMP_PCIE_0 10 +#define TEGRA_ICC_BPMP_PCIE_1 11 +#define TEGRA_ICC_BPMP_PCIE_2 12 +#define TEGRA_ICC_BPMP_PCIE_3 13 +#define TEGRA_ICC_BPMP_PCIE_4 14 +#define TEGRA_ICC_BPMP_PCIE_5 15 +#define TEGRA_ICC_BPMP_PCIE_6 16 +#define TEGRA_ICC_BPMP_PCIE_7 17 +#define TEGRA_ICC_BPMP_PCIE_8 18 +#define TEGRA_ICC_BPMP_PCIE_9 19 +#define TEGRA_ICC_BPMP_PCIE_10 20 +#define TEGRA_ICC_BPMP_DLA_0 21 +#define TEGRA_ICC_BPMP_DLA_1 22 +#define TEGRA_ICC_BPMP_SDMMC_1 23 +#define TEGRA_ICC_BPMP_SDMMC_2 24 +#define TEGRA_ICC_BPMP_SDMMC_3 25 +#define TEGRA_ICC_BPMP_SDMMC_4 26 +#define TEGRA_ICC_BPMP_NVDEC 27 +#define TEGRA_ICC_BPMP_NVENC 28 +#define TEGRA_ICC_BPMP_NVJPG_0 29 +#define TEGRA_ICC_BPMP_NVJPG_1 30 +#define TEGRA_ICC_BPMP_OFAA 31 +#define TEGRA_ICC_BPMP_XUSB_HOST 32 +#define TEGRA_ICC_BPMP_XUSB_DEV 33 +#define TEGRA_ICC_BPMP_TSEC 34 +#define TEGRA_ICC_BPMP_VIC 35 +#define TEGRA_ICC_BPMP_APE 36 +#define TEGRA_ICC_BPMP_APEDMA 37 +#define TEGRA_ICC_BPMP_SE 38 +#define TEGRA_ICC_BPMP_ISP 39 +#define TEGRA_ICC_BPMP_HDA 40 +#define TEGRA_ICC_BPMP_VIFAL 41 +#define TEGRA_ICC_BPMP_VI2FAL 42 +#define TEGRA_ICC_BPMP_VI2 43 +#define TEGRA_ICC_BPMP_RCE 44 +#define TEGRA_ICC_BPMP_PVA 45 + +#endif /* MEMORY_TEGRA_ICC_H */ From patchwork Tue Dec 20 16:02:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635918 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75E31C4167B for ; Tue, 20 Dec 2022 16:03:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229628AbiLTQDa (ORCPT ); Tue, 20 Dec 2022 11:03:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232097AbiLTQD3 (ORCPT ); Tue, 20 Dec 2022 11:03:29 -0500 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2080.outbound.protection.outlook.com [40.107.96.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE92C6372; Tue, 20 Dec 2022 08:03:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ASR/zpdyGU58WuVIHJvFR4JYYGs54RQr4pY0pn4eJ1JGdWMnHhP8gq1vjUWtJbhluIT5MJG5xKL6mxXCKDloJTSOb26gAU6v08GFh+AZYVsEv+T5apq8gYmpnGnZznsnQlrMsn7UflsVJ6nC5PToV/qoyLJsKQAGFkuRtluxF07LvLE38+huRA1tmFxBUqp4kWw20lk0gkxlzv2y8wBvrpgIOS5loQuyl/mUyG36BEQ3p1ajctNe7MynRmLfqiL82K4sw0PMVKMi7YDbLLtOHF0Qui+9OGoJ282u5kgV/QTD/6epbhdCEJTCXUDs0TNwfg56kYC2PgT8irclr3xXtg== 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=fhMSgxATmR+4it38bYM1L1k2HXbBm2ivcoeA8x76BNg=; b=PYTKmVRkPUdOmi7UTKGtCrnIgkh6OC93FaCZDTf2LTbmncDAtkQo+e2A9SB/PqTP1bIhQIP5idApershJnkzb15iI9hoKHQcbXGPpQLrZhOjD4fYGAB5JLYXa4jU5zGXAjjVPa5+gpFaU35OaKsbdt56G+ncegqp+LCk9oxTh30vF3w0LeeXJjD9t+kHe54cXKh3iNf+Zj21Cfza/gEiI1T9VYz2WV9npFhvQr1Gyq5w+9pa2QHGn6yX5QwmjNbc35hmSGCN759qnEud5kWv6cHcvv4THS+u+mP/WUvoUSUUKkwOThTvKLYgiScwz2W8w5L6LWZu1Nn7PhN+ew+H8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fhMSgxATmR+4it38bYM1L1k2HXbBm2ivcoeA8x76BNg=; b=cnkJF6ay39ejMxBiLU74gM9Zlriy+uBVlagXQJ5ozE7Qf9vKnZnRVUTmW25yP7KMeUCSDM8eiDOuSPCFGEXGqzCjzj/V+wyshi+TWYRyGJ9uiUGS7ONGBMtKy0JJqY/pm8uSeBAGaPL2ujRrodL+HSaF2uMGtFoSOzJ+iSw3dp8M2s2Ea9j4NEvuR0rKQV3uh3Oef0L5NLTeq/sdbkHYy/veAPeppg4TLpCsEr3UHqA7gNVqNoll+cmI45jS5/w73VMj6e/8yJfyYYFCa8JcGc0TubdCicINo5l4IJ+1Riz73eGg3RB+8C63oQXYWrxnGuHDyau6abSV1m7CWWzNPQ== Received: from MW4PR04CA0120.namprd04.prod.outlook.com (2603:10b6:303:83::35) by CH3PR12MB8583.namprd12.prod.outlook.com (2603:10b6:610:15f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:03:27 +0000 Received: from CO1NAM11FT013.eop-nam11.prod.protection.outlook.com (2603:10b6:303:83:cafe::fd) by MW4PR04CA0120.outlook.office365.com (2603:10b6:303:83::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:03:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT013.mail.protection.outlook.com (10.13.174.227) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:03:26 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:03:16 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:03:16 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:03:12 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 02/10] memory: tegra: adding iso mc clients for Tegra234 Date: Tue, 20 Dec 2022 21:32:32 +0530 Message-ID: <20221220160240.27494-3-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT013:EE_|CH3PR12MB8583:EE_ X-MS-Office365-Filtering-Correlation-Id: 21b4a30b-d3a9-43b3-6e1b-08dae2a3baed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eWVUruIHguJl4hjE25jlO8AHz76vCtgLce1miDx/GyrguMvjDGAlvb1rSFYFkTVKhEq+k++7RrPMgAMZeuZ391w0m1DWGIYJMQ3y9olGC4G0NxxzCelN0JLdZzv/T+1TKs2etT8d99+o4ITA2QCfNF8k8shvuiB/XPVgxxRJ0tj2wBqKOeVLBA7hK+HH/iF1zD8uD6eyBMb/aeWMHSY94FQBIANvoCa5HokqmmUjuRXWTJ6nZFZ9s6jTzMLzpOVVcmYeh6P5OJyviWypgA5yxxlwRanT8APnbKnvJPuqUuG4adkfOwzsQhuiyCUohrNyZT/FZJnxyPQZB/y5cHzRxY888Y73kuf6C5MA7CIh5vGDkRzyAJx/h3aDH4Wqk5YnwB6UfLcbbdO4c32Tk/EvhtuWxF4cjimajS6YnGEzMRSwrQmMULozR76VT8AJeAdzQ+VPiil4lPdMYpjMJ5dK65JNVVZ53FS3nhF7tsXkgEprQ/NL9YEyB9dWqFUWAWd+/xFPjcmB/hj11VT7v/O7/B6J+WsBbmQ8eS3KKpAYJ2RuRUrgNue+XE7MLgmwe6VjtgY73CjwepgfravdT26USyRLVKCMBkr6WEHklFYuAJs+FTOfFIGO0NWeLvZSqjDuFH7+8pP8ER8U+/ugg6kr6kEhohVXZO0ut7aT1PBig6bwtaeMP6iMVYEFxVC/VS7VRGWP4PXXao/L3coZ6ox44z6jI74SpW/yzmKr6l/xEPE= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199015)(36840700001)(46966006)(40470700004)(6666004)(47076005)(426003)(5660300002)(8936002)(107886003)(40480700001)(83380400001)(26005)(186003)(2906002)(41300700001)(336012)(36756003)(921005)(82310400005)(356005)(40460700003)(7636003)(110136005)(36860700001)(1076003)(2616005)(70206006)(70586007)(478600001)(316002)(82740400003)(54906003)(7696005)(4326008)(8676002)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:03:26.9234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 21b4a30b-d3a9-43b3-6e1b-08dae2a3baed X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT013.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8583 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Adding Isochronous (ISO) MC clients to the mc_clients table for Tegra234. ISO clients have guaranteed bandwidth requirement. Signed-off-by: Sumit Gupta --- drivers/memory/tegra/tegra234.c | 108 ++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 65d4e32ee118..2e37b37da9be 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -14,6 +14,30 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { { + .id = TEGRA234_MEMORY_CLIENT_HDAR, + .name = "hdar", + .bpmp_id = TEGRA_ICC_BPMP_HDA, + .type = TEGRA_ICC_ISO_AUDIO, + .sid = TEGRA234_SID_HDA, + .regs = { + .sid = { + .override = 0xa8, + .security = 0xac, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_HDAW, + .name = "hdaw", + .bpmp_id = TEGRA_ICC_BPMP_HDA, + .type = TEGRA_ICC_ISO_AUDIO, + .sid = TEGRA234_SID_HDA, + .regs = { + .sid = { + .override = 0x1a8, + .security = 0x1ac, + }, + }, + }, { .id = TEGRA234_MEMORY_CLIENT_MGBEARD, .name = "mgbeard", .bpmp_id = TEGRA_ICC_BPMP_EQOS, @@ -133,6 +157,90 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { .security = 0x33c, }, }, + }, { + .id = TEGRA234_MEMORY_CLIENT_VI2W, + .name = "vi2w", + .bpmp_id = TEGRA_ICC_BPMP_VI2, + .type = TEGRA_ICC_ISO_VI, + .sid = TEGRA234_SID_ISO_VI2, + .regs = { + .sid = { + .override = 0x380, + .security = 0x384, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_VI2FALR, + .name = "vi2falr", + .bpmp_id = TEGRA_ICC_BPMP_VI2FAL, + .type = TEGRA_ICC_ISO_VIFAL, + .sid = TEGRA234_SID_ISO_VI2FALC, + .regs = { + .sid = { + .override = 0x388, + .security = 0x38c, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_VI2FALW, + .name = "vi2falw", + .bpmp_id = TEGRA_ICC_BPMP_VI2FAL, + .type = TEGRA_ICC_ISO_VIFAL, + .sid = TEGRA234_SID_ISO_VI2FALC, + .regs = { + .sid = { + .override = 0x3e0, + .security = 0x3e4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_APER, + .name = "aper", + .bpmp_id = TEGRA_ICC_BPMP_APE, + .type = TEGRA_ICC_ISO_AUDIO, + .sid = TEGRA234_SID_APE, + .regs = { + .sid = { + .override = 0x3d0, + .security = 0x3d4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_APEW, + .name = "apew", + .bpmp_id = TEGRA_ICC_BPMP_APE, + .type = TEGRA_ICC_ISO_AUDIO, + .sid = TEGRA234_SID_APE, + .regs = { + .sid = { + .override = 0x3d8, + .security = 0x3dc, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_NVDISPLAYR, + .name = "nvdisplayr", + .bpmp_id = TEGRA_ICC_BPMP_DISPLAY, + .type = TEGRA_ICC_ISO_DISPLAY, + .sid = TEGRA234_SID_ISO_NVDISPLAY, + .regs = { + .sid = { + .override = 0x490, + .security = 0x494, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_NVDISPLAYR1, + .name = "nvdisplayr1", + .bpmp_id = TEGRA_ICC_BPMP_DISPLAY, + .type = TEGRA_ICC_ISO_DISPLAY, + .sid = TEGRA234_SID_ISO_NVDISPLAY, + .regs = { + .sid = { + .override = 0x508, + .security = 0x50c, + }, + }, }, { .id = TEGRA234_MEMORY_CLIENT_BPMPR, .name = "bpmpr", From patchwork Tue Dec 20 16:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635557 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 619D6C46467 for ; Tue, 20 Dec 2022 16:04:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233949AbiLTQEX (ORCPT ); Tue, 20 Dec 2022 11:04:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233923AbiLTQEN (ORCPT ); Tue, 20 Dec 2022 11:04:13 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2060.outbound.protection.outlook.com [40.107.243.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB4CA18E25; Tue, 20 Dec 2022 08:04:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h7euPnjHSyrK2emZ8+eDgFd1+Cb62Pxr6jzayTd38+1eVL18M/MtH1yzOoNLHCO3dfxEHwW4WtV5KIW2GQ5xSJslRH9Phgpnarf/9PF0OtF3h1IKyXeZ66ddW/zHx0NRqKXHMmGc5f3iX4l3VjMCvwkCoT9oJZfZ908CzlVpiWDekf43SsF/4WKXJsajZWGMMVe1YLn2+SGqC++Q267OW7SM7mLoNjuNb3RaAbOZ5qjGNy9f3LMCSFaPsHht5a8jRzxYyu1/JJ2uu4u47XoyvoJ9eSCUWgpdzF/o1vAwNWOwJHl1qE4IZZkSLsFVcnCzvSlV6qhrbw4wRnlWRT+I4A== 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=uaY7u8UnZgqSmkoeVGsDDAZuKZAnscuuhZiKX8OyHVo=; b=hp2mnWBZID/TOMIFFaerTywl3ik2Ssq0/PGAM0YhFY+OTlGdCVcjDj53MnrKnhx/f0oJja+vYUl6ucdOU/pdpGoacSa6DmAIiJpqGH0K9g4WJC9hPr1IHuia7aUhT3xfBQch86M0B0R+M7oDAJqasIggvzNgEUXVYzfvfL3tHdG4zk9cyKzKYPOxVbN5rFtoY2IqlBOgc7IXT4r6QJid85TJP867GH2+PMn7YYffqSIzG5tR7hzPyWEaLkQbMEdeHqLAhew1k/E1VqWK7yFv0ttkvpPJ7mbYzTrA9eKtCtboEerURsBP8wSDSUFK0E7jP/CNGegRBbTmdQhHXpY2GA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uaY7u8UnZgqSmkoeVGsDDAZuKZAnscuuhZiKX8OyHVo=; b=frlIyP7dbJk5fhUy6dHMD/AvzCB8jDb/7w6PDrj2o+2NsKE5+WEFQiNzEv7+wDGutnf4FcBuqUiTImA5LnMsTaZ67zxA56p1rNN1XeuUm5MnnPFJMlIn5F41NT/BlbPm4Li+6744WWlE46EhF//p2pIa5mXOVS1cia7D8ujAYHYKOPLMK8EBvuawlHyX4UH66paiTn5gYqSZkcN9jge7vlDDwaKXSCBAV7fmIDHpIdtLe/SZA/FDM3yCqsyNNnvk1pC0LAGsjDsrnQwnd5iS1BKuHC+pfLxoLb75BljgLXnHVI5yqm812zc25rw2oiDpgyY4enb0NbFLphTylcTfgg== Received: from BN8PR12CA0010.namprd12.prod.outlook.com (2603:10b6:408:60::23) by MW4PR12MB7214.namprd12.prod.outlook.com (2603:10b6:303:229::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:03:59 +0000 Received: from BN8NAM11FT096.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::57) by BN8PR12CA0010.outlook.office365.com (2603:10b6:408:60::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:03:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BN8NAM11FT096.mail.protection.outlook.com (10.13.177.195) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:03:58 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:03:42 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:03:41 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:03:38 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 03/10] memory: tegra: add pcie mc clients for Tegra234 Date: Tue, 20 Dec 2022 21:32:33 +0530 Message-ID: <20221220160240.27494-4-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT096:EE_|MW4PR12MB7214:EE_ X-MS-Office365-Filtering-Correlation-Id: da2d236d-ae60-41e6-5c5c-08dae2a3cda4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GFUTVOhGon1uE7AR/ksnksLfEPJvmIHeypWqaQ4Il0WT1MzsTtBn5UswyOISXZDaPvzIKt+Qv9QgaCum3cVI1xPnCpSna/2snM8lWsFd2eIXrGhCWBlHdKgAGar0Al1dNZKC0BF0UeEo0POhiAE50me0EPfRSf1XjtgL11AbrxW69rX6OFCHNi7wzSIsC4/8kBYkZbhz0U0dNxxH95w2bFL1F3HNC1pLFxu2Y6lDj9XIXbzO2P/JGhNt0dD+QEhPVN+Lf+WaHNR6zVlyS9ByNReiIk7IpuBujVZ32bt6AaM6153KQ1yU0es91Yf+vIDMbF7UGdSzmZno1jXI3VkWv2+4mngUobjq149P9IdXafKXoqm235eZfxyC/YfXCcfwZ1ZT6mzvUg1p7Y23XCw75yznKFOM0ovKHrw0Mghy3Crx+zm1JAXzapBVpPRNdJmbnq37gc68o3b4SLS7TANru9cAJytrRKhFGITFVDi/HWxrExzOuxz7y1kJp4VpqrX7Vfl77JQ+UWkSoYbRoCzM8aLSuGZX9psOLRSY2PCraZ5rXsxM+MhRYjnODHml5QF+NslmmM2B/W649EzGUl+XV9ZHC9qkdmJU7akndNYKx58Lp1wWmm7zMRHI4JkIWf4Ja9i5xLRZzi6oa6KDS+esegiCumFjIjT4+IGfjBOVwWQasjIhWZjQSRQq8V7znAqw6yymaX0JJvKmRG5gfvc9UAjTj+PI/xWMeSdFa07ATAw= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(136003)(346002)(39860400002)(396003)(376002)(451199015)(46966006)(40470700004)(36840700001)(8676002)(8936002)(426003)(1076003)(40460700003)(4326008)(7696005)(336012)(36756003)(356005)(36860700001)(41300700001)(921005)(47076005)(7636003)(83380400001)(82740400003)(82310400005)(5660300002)(2906002)(2616005)(6666004)(107886003)(478600001)(316002)(110136005)(54906003)(70586007)(70206006)(40480700001)(86362001)(186003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:03:58.2119 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da2d236d-ae60-41e6-5c5c-08dae2a3cda4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT096.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7214 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Adding PCIE clients representing each controller to the mc_clients table for Tegra234. Signed-off-by: Sumit Gupta --- drivers/memory/tegra/tegra234.c | 314 +++++++++++++++++++++++++++++++- 1 file changed, 313 insertions(+), 1 deletion(-) diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 2e37b37da9be..420546270c8b 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -465,7 +465,319 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { .security = 0x37c, }, }, - }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE0R, + .name = "pcie0r", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_0, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE0, + .regs = { + .sid = { + .override = 0x6c0, + .security = 0x6c4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE0W, + .name = "pcie0w", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_0, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE0, + .regs = { + .sid = { + .override = 0x6c8, + .security = 0x6cc, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE1R, + .name = "pcie1r", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_1, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE1, + .regs = { + .sid = { + .override = 0x6d0, + .security = 0x6d4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE1W, + .name = "pcie1w", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_1, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE1, + .regs = { + .sid = { + .override = 0x6d8, + .security = 0x6dc, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE2AR, + .name = "pcie2ar", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_2, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE2, + .regs = { + .sid = { + .override = 0x6e0, + .security = 0x6e4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE2AW, + .name = "pcie2aw", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_2, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE2, + .regs = { + .sid = { + .override = 0x6e8, + .security = 0x6ec, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE3R, + .name = "pcie3r", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_3, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE3, + .regs = { + .sid = { + .override = 0x6f0, + .security = 0x6f4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE3W, + .name = "pcie3w", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_3, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE3, + .regs = { + .sid = { + .override = 0x6f8, + .security = 0x6fc, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE4R, + .name = "pcie4r", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_4, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE4, + .regs = { + .sid = { + .override = 0x700, + .security = 0x704, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE4W, + .name = "pcie4w", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_4, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE4, + .regs = { + .sid = { + .override = 0x708, + .security = 0x70c, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE5R, + .name = "pcie5r", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_5, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE5, + .regs = { + .sid = { + .override = 0x710, + .security = 0x714, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE5W, + .name = "pcie5w", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_5, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE5, + .regs = { + .sid = { + .override = 0x718, + .security = 0x71c, + }, + } + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE6AR, + .name = "pcie6ar", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_6, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE6, + .regs = { + .sid = { + .override = 0x140, + .security = 0x144, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE5R1, + .name = "pcie5r1", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_5, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE5, + .regs = { + .sid = { + .override = 0x778, + .security = 0x77c, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE6AW, + .name = "pcie6aw", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_6, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE6, + .regs = { + .sid = { + .override = 0x148, + .security = 0x14c, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE6AR1, + .name = "pcie6ar1", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_6, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE6, + .regs = { + .sid = { + .override = 0x1e8, + .security = 0x1ec, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE7AR, + .name = "pcie7ar", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_7, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE7, + .regs = { + .sid = { + .override = 0x150, + .security = 0x154, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE7AW, + .name = "pcie7aw", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_7, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE7, + .regs = { + .sid = { + .override = 0x180, + .security = 0x184, + }, + } + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE7AR1, + .name = "pcie7ar1", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_7, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE7, + .regs = { + .sid = { + .override = 0x248, + .security = 0x24c, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE8AR, + .name = "pcie8ar", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_8, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE8, + .regs = { + .sid = { + .override = 0x190, + .security = 0x194, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE8AW, + .name = "pcie8aw", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_8, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE8, + .regs = { + .sid = { + .override = 0x1d8, + .security = 0x1dc, + }, + } + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE9AR, + .name = "pcie9ar", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_9, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE9, + .regs = { + .sid = { + .override = 0x1e0, + .security = 0x1e4, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE9AW, + .name = "pcie9aw", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_9, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE9, + .regs = { + .sid = { + .override = 0x1f0, + .security = 0x1f4, + }, + } + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE10AR, + .name = "pcie10ar", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_10, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE10, + .regs = { + .sid = { + .override = 0x1f8, + .security = 0x1fc, + }, + }, + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE10AW, + .name = "pcie10aw", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_10, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE10, + .regs = { + .sid = { + .override = 0x200, + .security = 0x204, + }, + } + }, { + .id = TEGRA234_MEMORY_CLIENT_PCIE10AR1, + .name = "pcie10ar1", + .bpmp_id = TEGRA_ICC_BPMP_PCIE_10, + .type = TEGRA_ICC_NISO, + .sid = TEGRA234_SID_PCIE10, + .regs = { + .sid = { + .override = 0x240, + .security = 0x244, + }, + }, + } }; /* From patchwork Tue Dec 20 16:02:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635917 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C833C4167B for ; Tue, 20 Dec 2022 16:04:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233994AbiLTQEy (ORCPT ); Tue, 20 Dec 2022 11:04:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233966AbiLTQEZ (ORCPT ); Tue, 20 Dec 2022 11:04:25 -0500 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2066.outbound.protection.outlook.com [40.107.237.66]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB47318B1A; Tue, 20 Dec 2022 08:04:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dIIvfYblJTJhS/shXwMitM+NAP5+T/97Uyc3Hx5p6CEnI0vbVCxzKd0cVuKdIdWD6WNo23lOSPzDBxLN5gXwR9dihggioKZyvKRAUdhdExkf2Pk1+yr8KVNsnmmhs8akUeYSMtlhmTC06Sc4gAQts2Y02mXpWtprmGkGNOOzyAWEZlGnu4rlB0xrSmq7kL3MadlTuNaLK7Sw4J/RiU8Tmmdb0MjQ7BKMYFUn5Al6NDtLjdEHBu3UFThNUXc3Cus157m+gKEW1S5rF4wQQYc5/PzUfX08FX8Fu3eZ63ujx51otsJqxjgBvELOF1CFRt0U/KqQEVFEONQobzBwQipTmw== 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=aMBze2lUDGe49y9mBsS0lygtGppQEuGNK7Eq20IEFGI=; b=e8n9hsMCEEmoVV5K0ay6zLfcqwhbQDyA06F9vlxKUtp6M2MY2hnXDnWZQhthsdGFS2ioyi5Kx751j0HQWZaTPr5m7O8AloOHhGR6uOxKmUyQ4lsIYP733GPo/Kth8Y9T3Ra0CEoWF6r6H+208YxvJmX6FN0Fzz/iybuutEKUAJLDPkZjzL6LToB27odP/N+3RJN6/khrv6bZsGd7JbKH3wWhS9WkZqDERdRbRAjE4lW44umX/lzyjvz+0TQQAos76kOjB6FkC907P3znhIMLc6GWeFsXPUfPV8V4Un0aEwNuNICRTRWAaVj1FFEPFq7P2Z6WqDYotfo6cillyzAXug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aMBze2lUDGe49y9mBsS0lygtGppQEuGNK7Eq20IEFGI=; b=lidHEl+9SNNVMv2E7oFKz+0Al/SMEsb5sO930X9P30Mxzp3jmmtgSf2LIRaq5L7KbRZIRubjIhi06rwaQ3W5c22DZK0et+4CcmhsRRLW8TXvuGjHNhJK8qCBsu8PCS+Jg9OGvxlLiDJCxU4yAVZWZVGmBoe4BWP+pwKVQ+MNFZvKl6EbkM9qhdYKv2CpABFTV3JF4qYpriFwiMJFv2tTof51u1JyCnI58SFeteJqJD+Bfm3ZyopYnQLLIFVaML1Fg+1chbGO6cPbZRt/5ib2Pi7a7MXPGkuzsNsQaVIeDz40kvQQns+WHTSxVU25lb6nL8RybIGlDT0fGGv31PrfAQ== Received: from MW4PR03CA0274.namprd03.prod.outlook.com (2603:10b6:303:b5::9) by SN7PR12MB8147.namprd12.prod.outlook.com (2603:10b6:806:32e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:04:16 +0000 Received: from CO1NAM11FT046.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::f9) by MW4PR03CA0274.outlook.office365.com (2603:10b6:303:b5::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:04:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT046.mail.protection.outlook.com (10.13.174.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:04:15 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:08 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:08 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:04:04 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 04/10] memory: tegra: add support for software mc clients in Tegra234 Date: Tue, 20 Dec 2022 21:32:34 +0530 Message-ID: <20221220160240.27494-5-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT046:EE_|SN7PR12MB8147:EE_ X-MS-Office365-Filtering-Correlation-Id: 62112302-1bcf-4901-e266-08dae2a3d7f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: coa9nE2R5ivQDAkHn0A1gM9l3WX0x+gBWcYe1pFwoZOngQz3Ucbx94BP/xxDgtVHgnaCwGt77QC/sCG2Kbpm5tmeluvCvINq24tzL/HVCc+HXNQzKR81mwgoZ2zXpTbV9hU1bjaueRFre5fcXYFv69XcUVuN6nCxuiKfaWuJWpzVNVDrnDohyA0NidtGgNpjc9MQz4rVYjzEO12wPE0YzXKZP4GfKz9wmcOoyx6hq31cXurEuLpaUpUwomiuHLW/5o+QEq/ny1RRBNGBShtHu4L5/aGeXJ+1Obv4h3OHK9imSbgnQAAJhWlcn4iF3Mn4NZ+7ZQHmm2TZlVwyDVqcrVHFvNNd5JR8ohfNQ2XKJOsZaxJOY9+X22NQvw62uJyl8016lbgrBTJnSJxeanZL3e2DEYxo9fuJVQkuBLK7ovQz47NinCwLuadMEPkiNLa9oQP86XcRcEUJSCTU7ga9d9d/xcnDSMMKecyokzp/UWKeZHg5mm8R5clm8Y/oqPs0BKDg60Ytkf8M3IuPDI68XFXgBSUV30T0eJMOe53/9xqQ6FkLyyhWEY0mdgMidwtCZlTvg7auIq/8anpEgNqC5qO+10jkkZxk9xBxIxsPmLi6JeB1R/fvxvmcmSkoenCUZyWjOYpe2cQwMqNAYDoGZSa9GnWWrox7xtvTGCjlGn6O4Ay1/BhkvVTVJmlTbHsR+IFIvwLPAFcGfVjmjIfBYg8zKtOBiC6In3sa3xjyPY4= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(376002)(396003)(136003)(346002)(451199015)(40470700004)(46966006)(36840700001)(107886003)(6666004)(478600001)(2616005)(7696005)(70206006)(40480700001)(70586007)(186003)(26005)(110136005)(316002)(1076003)(86362001)(54906003)(40460700003)(36860700001)(41300700001)(36756003)(47076005)(336012)(356005)(921005)(4326008)(8936002)(426003)(8676002)(2906002)(5660300002)(82740400003)(7636003)(82310400005)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:04:15.6040 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 62112302-1bcf-4901-e266-08dae2a3d7f3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT046.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8147 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Adding support for dummy memory controller clients for use by software. --- drivers/memory/tegra/mc.c | 65 +++++++++++++++++++++++---------- drivers/memory/tegra/tegra234.c | 21 +++++++++++ include/soc/tegra/mc.h | 3 ++ include/soc/tegra/tegra-icc.h | 7 ++++ 4 files changed, 76 insertions(+), 20 deletions(-) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index ff887fb03bce..4ddf9808fe6b 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -755,6 +755,39 @@ const char *const tegra_mc_error_names[8] = { [6] = "SMMU translation error", }; +static int tegra_mc_add_icc_node(struct tegra_mc *mc, unsigned int id, const char *name, + unsigned int bpmp_id, unsigned int type) +{ + struct tegra_icc_node *tnode; + struct icc_node *node; + int err; + + tnode = kzalloc(sizeof(*tnode), GFP_KERNEL); + if (!tnode) + return -ENOMEM; + + /* create MC client node */ + node = icc_node_create(id); + if (IS_ERR(node)) + return -EINVAL; + + node->name = name; + icc_node_add(node, &mc->provider); + + /* link Memory Client to Memory Controller */ + err = icc_link_create(node, TEGRA_ICC_MC); + if (err) + return err; + + node->data = tnode; + tnode->node = node; + tnode->bpmp_id = bpmp_id; + tnode->type = type; + tnode->mc = mc; + + return 0; +} + /* * Memory Controller (MC) has few Memory Clients that are issuing memory * bandwidth allocation requests to the MC interconnect provider. The MC @@ -780,7 +813,6 @@ const char *const tegra_mc_error_names[8] = { */ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) { - struct tegra_icc_node *tnode; struct icc_node *node; unsigned int i; int err; @@ -820,30 +852,23 @@ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) goto remove_nodes; for (i = 0; i < mc->soc->num_clients; i++) { - tnode = kzalloc(sizeof(*tnode), GFP_KERNEL); - if (!tnode) - return -ENOMEM; - - /* create MC client node */ - node = icc_node_create(mc->soc->clients[i].id); - if (IS_ERR(node)) { - err = PTR_ERR(node); + err = tegra_mc_add_icc_node(mc, mc->soc->clients[i].id, + mc->soc->clients[i].name, + mc->soc->clients[i].bpmp_id, + mc->soc->clients[i].type); + if (err) goto remove_nodes; - } - node->name = mc->soc->clients[i].name; - icc_node_add(node, &mc->provider); + } + + for (i = 0; i < mc->soc->num_sw_clients; i++) { + err = tegra_mc_add_icc_node(mc, mc->soc->sw_clients[i].id, + mc->soc->sw_clients[i].name, + mc->soc->sw_clients[i].bpmp_id, + mc->soc->sw_clients[i].type); - /* link Memory Client to Memory Controller */ - err = icc_link_create(node, TEGRA_ICC_MC); if (err) goto remove_nodes; - - node->data = tnode; - tnode->node = node; - tnode->type = mc->soc->clients[i].type; - tnode->bpmp_id = mc->soc->clients[i].bpmp_id; - tnode->mc = mc; } return 0; diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 420546270c8b..82ce6c3c3eb0 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -780,6 +780,25 @@ static const struct tegra_mc_client tegra234_mc_clients[] = { } }; +static const struct tegra_mc_sw_client tegra234_mc_sw_clients[] = { + { + .id = TEGRA_ICC_MC_CPU_CLUSTER0, + .name = "sw_cluster0", + .bpmp_id = TEGRA_ICC_BPMP_CPU_CLUSTER0, + .type = TEGRA_ICC_NISO, + }, { + .id = TEGRA_ICC_MC_CPU_CLUSTER1, + .name = "sw_cluster1", + .bpmp_id = TEGRA_ICC_BPMP_CPU_CLUSTER1, + .type = TEGRA_ICC_NISO, + }, { + .id = TEGRA_ICC_MC_CPU_CLUSTER2, + .name = "sw_cluster2", + .bpmp_id = TEGRA_ICC_BPMP_CPU_CLUSTER2, + .type = TEGRA_ICC_NISO, + }, +}; + /* * tegra234_mc_icc_set() - Pass MC client info to External Memory Controller (EMC) * @src: ICC node for Memory Controller's (MC) Client @@ -854,6 +873,8 @@ static const struct tegra_mc_icc_ops tegra234_mc_icc_ops = { const struct tegra_mc_soc tegra234_mc_soc = { .num_clients = ARRAY_SIZE(tegra234_mc_clients), .clients = tegra234_mc_clients, + .num_sw_clients = ARRAY_SIZE(tegra234_mc_sw_clients), + .sw_clients = tegra234_mc_sw_clients, .num_address_bits = 40, .num_channels = 16, .client_id_mask = 0x1ff, diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 0a32a9eb12a4..6a94e88b6100 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -192,6 +192,9 @@ struct tegra_mc_soc { const struct tegra_mc_client *clients; unsigned int num_clients; + const struct tegra_mc_sw_client *sw_clients; + unsigned int num_sw_clients; + const unsigned long *emem_regs; unsigned int num_emem_regs; diff --git a/include/soc/tegra/tegra-icc.h b/include/soc/tegra/tegra-icc.h index 3855d8571281..f9bcaae8ffee 100644 --- a/include/soc/tegra/tegra-icc.h +++ b/include/soc/tegra/tegra-icc.h @@ -22,6 +22,13 @@ struct tegra_icc_node { u32 type; }; +struct tegra_mc_sw_client { + unsigned int id; + unsigned int bpmp_id; + unsigned int type; + const char *name; +}; + /* ICC ID's for MC client's used in BPMP */ #define TEGRA_ICC_BPMP_DEBUG 1 #define TEGRA_ICC_BPMP_CPU_CLUSTER0 2 From patchwork Tue Dec 20 16:02:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635556 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EA3CC46467 for ; Tue, 20 Dec 2022 16:05:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233773AbiLTQE7 (ORCPT ); Tue, 20 Dec 2022 11:04:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233899AbiLTQE3 (ORCPT ); Tue, 20 Dec 2022 11:04:29 -0500 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2067.outbound.protection.outlook.com [40.107.93.67]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51CA61D335; Tue, 20 Dec 2022 08:04:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NJHmGouuJi3POtbK0lIuotsWoF7p9LeiM/5Dd86uyhfURsfgkTGMEw2GnegAg7KJ2b3XE+b1Q8lf0SN9TN9Dt+fpuZxYeGRNl6pTYB5GmV42bx4ake8LOD65wj3XPxWcONtb7RtZyLdegFQO18HPovii03XDSGvcVlkxBRTmquIvU6kE3BLmL1Uj3cbo+4Bhgclohz93pvsKk7lxaQQIQL6d/OQKcAnq4KmVO7AohGbESdJsLNcK5xoBlLcFrU9M14sSsJ1q1Z5hmRJzbzrUIFFnXpVi8OQLD2MP/nhyqGwR1QA1qK3R+rXsfE6JQr1ipqnPW52Nqcu/iXYCfjeIHA== 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=7Kt5LCU4tu8Bz3aHqOZwJCyMH9HRz8jU5pX7iyG8RdY=; b=TohWmtczSH/9FkZy21B1eXOYMMqu29032mQEkGBMu/k13clh9rNK2XUvcHgWHhjFO+ZkG3NuAGK5gNfT0juGlSvlLnlBhAav3fQLrkjKzovo3FSqtGnf3vaK9WjPeEy6zQNGXuNjaXwoG8CVLHxDq6CgzAjiuAVe+dOZw+XHe1SFfdassgFOpQ5EjA/Q6WSSzH3v/N0jVeQzFKH+0ouIcb+xgayG270Q0whV4xYZ5+GOocXt2tkpURGU5sO/EijzgkN5rSmz9/sC2CFkhkadPJn9BKbteNu1CaO3PjzIlfGqWnh+FNuAdzZiZiSUR2qesrfgNN0MIJUbQBLJiHQygA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7Kt5LCU4tu8Bz3aHqOZwJCyMH9HRz8jU5pX7iyG8RdY=; b=aFSvQJ7CJobPG9taVsVmKVob6DNL2Jbjd4IRksUlQotgEI1LbDid91zDtEOjv74dtNYRcpzBw1hUkohg6zN1s45BNDEU7Ym/1LtcZvbe7rzJf3UOixyVpUaUCy1wZKbOMGdyJLo/SzA39geTH0jyM4IucR03Ij34ro45VT49dKl7PDueG5rnQlhxoXAOYUX/x54jzBi/3iB+puEe/mO848be/UrgogddjYcXnVuuknoROdyzwzgqKoIvPyhmNPDdMtZisKQZ21SFbfo0XdcXJiginNws1ImP6RIpD6B860PBP+gIU7CVK9mdz6GUKSaBx4pl2f47QojqHlxh7JEiZw== Received: from MW4PR03CA0022.namprd03.prod.outlook.com (2603:10b6:303:8f::27) by LV2PR12MB5776.namprd12.prod.outlook.com (2603:10b6:408:178::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:04:21 +0000 Received: from CO1NAM11FT041.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8f:cafe::97) by MW4PR03CA0022.outlook.office365.com (2603:10b6:303:8f::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:04:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT041.mail.protection.outlook.com (10.13.174.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:04:21 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:18 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:18 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:04:14 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 05/10] dt-bindings: tegra: add icc ids for dummy MC clients Date: Tue, 20 Dec 2022 21:32:35 +0530 Message-ID: <20221220160240.27494-6-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT041:EE_|LV2PR12MB5776:EE_ X-MS-Office365-Filtering-Correlation-Id: d58fff73-a042-49a8-79fe-08dae2a3db61 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vmgvFAdO8uBeJZfWd01cx9nxnNFAzkjy36Gzp/FaGjZqdapa2OMXlzHPm6+Yxy9f+L1eC5dg7y/EXlfjJorLHmhPXRyoDOG5N40FmUw3r5Gvk8r852WT6bC/PUpQigxxlWkDVIII/U1fQJnv/2tT5UUamcta11VCTjnMb8YvyJzeTTSVqVa6ZFvLqzUPhwFAvleyv1mkQ4sIgJHs3VOuv5bmxnAb6Dw0w+Fx34eez7MQHFdXL8zXtkk4OPXq2CJmmrY9I3+AJGZ7VYBksdNqTjQ60InWbROXndGDnIGvGireLdrRIfJhNgv9gU7RbWy708L+/p6FuZ94+l8VyrQz7wYACgSiECvRtaOuOqxBIAWWNiKrgQJGdtPYNmbfRnLSqwjRN9apJKJsiN1sXNfcJQlrsMfSFtx77ZJ3qRxc/jFVccka9kLEDMC9UaYYC+Ns6+NBbYe/FErXNe3giUbuRnlVVPwNWeoo6jSe9K3QX97BjzIElPCz2l6FxGr/gdORgGftpzudBzqCB0n1+ve2Kan/bUPtJMVM09Igm0wvF99ABA+PISf7Q7gk6U+YHSfUTmK7L/spcdupgkAUT5PIGBp4/YJxA97/TRs/rCBs34RnphQdI1tRQrgEL4uMCmqFCKzW9aqPO2bCqo+piGUvXzvgBsjLLc7lI1Y8y1ywunTcbGNsfhtz8bheC1bdu/haQYHCVknokKeHvOe81o74amzXQPtp/AC1j6Px1pKn5tk= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(376002)(396003)(346002)(39860400002)(136003)(451199015)(36840700001)(40470700004)(46966006)(107886003)(6666004)(426003)(8936002)(47076005)(40480700001)(4744005)(5660300002)(186003)(41300700001)(26005)(2906002)(336012)(36860700001)(316002)(82740400003)(478600001)(54906003)(921005)(7696005)(36756003)(40460700003)(356005)(86362001)(2616005)(1076003)(70586007)(82310400005)(7636003)(70206006)(4326008)(8676002)(110136005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:04:21.3554 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d58fff73-a042-49a8-79fe-08dae2a3db61 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT041.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5776 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Adding ICC id's for dummy software clients representing CCPLEX clusters. Signed-off-by: Sumit Gupta Acked-by: Krzysztof Kozlowski --- include/dt-bindings/memory/tegra234-mc.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dt-bindings/memory/tegra234-mc.h b/include/dt-bindings/memory/tegra234-mc.h index 347e55e89a2a..6e60d55491b3 100644 --- a/include/dt-bindings/memory/tegra234-mc.h +++ b/include/dt-bindings/memory/tegra234-mc.h @@ -536,4 +536,9 @@ #define TEGRA234_MEMORY_CLIENT_NVJPG1SRD 0x123 #define TEGRA234_MEMORY_CLIENT_NVJPG1SWR 0x124 +/* ICC ID's for dummy MC clients used to represent CPU Clusters */ +#define TEGRA_ICC_MC_CPU_CLUSTER0 1003 +#define TEGRA_ICC_MC_CPU_CLUSTER1 1004 +#define TEGRA_ICC_MC_CPU_CLUSTER2 1005 + #endif From patchwork Tue Dec 20 16:02:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635555 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52C64C3DA79 for ; Tue, 20 Dec 2022 16:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233965AbiLTQFi (ORCPT ); Tue, 20 Dec 2022 11:05:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233992AbiLTQEx (ORCPT ); Tue, 20 Dec 2022 11:04:53 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4462B192B5; Tue, 20 Dec 2022 08:04:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RWFbGY7QdAh4VtAYDrMO1yCwJQtVyFNq9PYSBPq0UL2Dr3iAGHz451vaOsO0x3sSGA0OryQ9eprquvw82WCQ56Uh/1FOhMGAcsz6fcNeb+117Am8mc9Spd8oX6xMOk+hJ4TztrYKWOhpo9zcCCfsc8E3yKpOW1mdJntGt0uFcg9TAF/iqKpf3KavN33Z6yFpatE3ZYSi1EVKMNHMd4lo9RwjUEyZDrRQPh1WhIcliMDvBRae5B4SvukVQdDRWAxHY+jZC4TjnDUB4GVAtKB5rkSZVdpYVwbMwHZt7H8bwCnNACWF/Y6vHeJBN9xSZGeUmQiAImxhE1+FslTMS8z0DA== 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=LPmxEPT60rpBjjfnjaPCaiFXjJsECB6ksmfYWk3NtA0=; b=K5IvkvyEvw/zvcMC12wRJGG+ccibC3jDOeG7JZf0jOaoSGtCWygr39zPd6lqFB2RfaPaLCteUx25WHEbXy3Hu0I/S5NRySwfkaBWaloG+FjBuuXJfqsl5DDzwLIJ6Q2BiBt7dJKnn6DeL/sBb14TBrBWtO706NIhk9/QzFi5fTts6iq+BiOsGW/8d3iaopEMD4+H32ErUGFDB+oPvi0xEyXwcxyIiKzxgoyrwnZ4uI1zWBb0NIutyRnVWSNOeRW0jmaU0EOm8U4G+0FesAAWvwBGjXRQZfHGw4SFuxlixjEOvL1GUNRf0Tx3rbPa4/B/YBHdxcfiA4LSE+qkBUPRCw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LPmxEPT60rpBjjfnjaPCaiFXjJsECB6ksmfYWk3NtA0=; b=YErEKXWK/kWyy5MX4Ie9eDTVEA/NzgQA/uz0QAGB0OxByaUwgxWIypi/zR0x13GEhYGxK8E1CVS3bWBEzlepO2tJdXOyslCJFUvFegXMJ7shH7+EhrmBYuLjiumSmRZIq7AOxUWMHi+xBKVQVYZhd7zENqfHjqXaS8AGenzyx5x5WzU8VHEgdk+lE/twCp5hs0o8AHDnOgQAx5x3xrZTLAFHVeiufQEBK9HL7oKXVyzOwXfAxTVPRewafLqZkHYmHWc69ABkV0YIKA8ot0Z5tw9tRisGuo/mdOxS1Bv2Gt+XF/f3R22rv8wBEPDNutZAyjqGdsHBvk2rPHmIq40y1A== Received: from BN8PR03CA0016.namprd03.prod.outlook.com (2603:10b6:408:94::29) by PH7PR12MB8055.namprd12.prod.outlook.com (2603:10b6:510:268::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:04:48 +0000 Received: from BN8NAM11FT110.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::5) by BN8PR03CA0016.outlook.office365.com (2603:10b6:408:94::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:04:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BN8NAM11FT110.mail.protection.outlook.com (10.13.176.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:04:47 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:27 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:27 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:04:23 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 06/10] arm64: tegra: Add cpu OPP tables and interconnects property Date: Tue, 20 Dec 2022 21:32:36 +0530 Message-ID: <20221220160240.27494-7-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT110:EE_|PH7PR12MB8055:EE_ X-MS-Office365-Filtering-Correlation-Id: ae147af3-c374-4e2b-b0fd-08dae2a3eb32 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tuI8aVIeL9UyR9tY0Rhj2KD/y0EHZgmegFlvtKWEKGmBn1IEWspeeUVjumI+A62QaUzdXIjam6t0qaLwDMrzWyyuPKeBNJ/bIIL9F2JI3K/n/6EHQdzKncR/cW7duU5Vj2ZG3g6qUquVKCag80OXXkm/0LMplx+XhuE7uIRDomTD2fSNHGCegrhct+cX3h34NVMLAwrXhOJRgBvF8JSyyqAbzuZSk95d0LclBUPSfCuYydkLWn5wkt4tQ72vQjepCbRDhjdQxAfcp89I93Qs5rWsloSwjld/I+RLRQbag2HpEVYKuW37wEV+DYPCdSsZwJ53dMKbS7rMwseFchw3YyxbY4uwedRO5qvTcAadLSOFu3V+91VmLZfdqHCwqWMBeEexssF5p1EZz67hSEbYJVTewK6Pr7gqhrJB9BQen/uRQFKJS50wwSCaubogoXhAP82Cj46ZXGIPqAIfmCMPqODekx2frOIq6c2T2ZyARwF/9HM9SJpjL8HQBt7wIGWIP6puCrwRrz/k7WT3mAAslD4VMt776lNkroLOnxOAmkAKIc3gT95Fxwz78DRKcP1weY7lQ6CV5C8Hktsy8nFpHppBdqNV6RGGZGIeDJh1nGThNLlHBuY8Dj7vh1hdMqwcsUeQG0JETdhEPSktrN9x8XZNdIcwFFt73e9N2qWiwmMy5I+w2yq1q0oU2qmG6OWo7xn0XJJqV8oOa6X3c/Hk8ClZBk9zZTMHI143ky5GJbs= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(396003)(376002)(346002)(136003)(451199015)(36840700001)(40470700004)(46966006)(1076003)(2616005)(70586007)(82740400003)(40480700001)(70206006)(47076005)(426003)(6666004)(4326008)(41300700001)(107886003)(921005)(356005)(8676002)(8936002)(2906002)(7636003)(36860700001)(5660300002)(86362001)(478600001)(36756003)(316002)(110136005)(336012)(54906003)(83380400001)(82310400005)(7696005)(186003)(40460700003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:04:47.7829 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae147af3-c374-4e2b-b0fd-08dae2a3eb32 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT110.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8055 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add OPP table and interconnects property required to scale DDR frequency for better performance. The OPP table has CPU frequency to per MC channel bandwidth mapping in each operating point entry. One table is added for each cluster even though the table data is same because the bandwidth request is per cluster. OPP framework is creating a single icc path if the table is marked 'opp-shared' and shared among all clusters. For us the OPP table is same but the MC client ID argument to interconnects property is different for each cluster which makes different icc path for all. Signed-off-by: Sumit Gupta --- arch/arm64/boot/dts/nvidia/tegra234.dtsi | 276 +++++++++++++++++++++++ 1 file changed, 276 insertions(+) diff --git a/arch/arm64/boot/dts/nvidia/tegra234.dtsi b/arch/arm64/boot/dts/nvidia/tegra234.dtsi index eaf05ee9acd1..ed7d0f7da431 100644 --- a/arch/arm64/boot/dts/nvidia/tegra234.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra234.dtsi @@ -2840,6 +2840,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl0_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER0 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2856,6 +2859,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl0_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER0 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2872,6 +2878,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl0_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER0 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2888,6 +2897,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl0_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER0 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2904,6 +2916,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl1_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER1 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2920,6 +2935,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl1_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER1 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2936,6 +2954,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl1_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER1 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2952,6 +2973,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl1_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER1 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2968,6 +2992,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl2_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER2 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -2984,6 +3011,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl2_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER2 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -3000,6 +3030,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl2_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER2 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -3016,6 +3049,9 @@ enable-method = "psci"; + operating-points-v2 = <&cl2_opp_tbl>; + interconnects = <&mc TEGRA_ICC_MC_CPU_CLUSTER2 &emc>; + i-cache-size = <65536>; i-cache-line-size = <64>; i-cache-sets = <256>; @@ -3272,4 +3308,244 @@ interrupt-parent = <&gic>; always-on; }; + + cl0_opp_tbl: opp-table-cluster0 { + compatible = "operating-points-v2"; + opp-shared; + + cl0_ch1_opp1: opp-115200000 { + opp-hz = /bits/ 64 <115200000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp2: opp-268800000 { + opp-hz = /bits/ 64 <268800000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp3: opp-422400000 { + opp-hz = /bits/ 64 <422400000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp4: opp-576000000 { + opp-hz = /bits/ 64 <576000000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp5: opp-729600000 { + opp-hz = /bits/ 64 <729600000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp6: opp-883200000 { + opp-hz = /bits/ 64 <883200000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp7: opp-1036800000 { + opp-hz = /bits/ 64 <1036800000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp8: opp-1190400000 { + opp-hz = /bits/ 64 <1190400000>; + opp-peak-kBps = <816000>; + }; + + cl0_ch1_opp9: opp-1344000000 { + opp-hz = /bits/ 64 <1344000000>; + opp-peak-kBps = <1632000>; + }; + + cl0_ch1_opp10: opp-1497600000 { + opp-hz = /bits/ 64 <1497600000>; + opp-peak-kBps = <1632000>; + }; + + cl0_ch1_opp11: opp-1651200000 { + opp-hz = /bits/ 64 <1651200000>; + opp-peak-kBps = <2660000>; + }; + + cl0_ch1_opp12: opp-1804800000 { + opp-hz = /bits/ 64 <1804800000>; + opp-peak-kBps = <2660000>; + }; + + cl0_ch1_opp13: opp-1958400000 { + opp-hz = /bits/ 64 <1958400000>; + opp-peak-kBps = <3200000>; + }; + + cl0_ch1_opp14: opp-2112000000 { + opp-hz = /bits/ 64 <2112000000>; + opp-peak-kBps = <6400000>; + }; + + cl0_ch1_opp15: opp-2201600000 { + opp-hz = /bits/ 64 <2201600000>; + opp-peak-kBps = <6400000>; + }; + }; + + cl1_opp_tbl: opp-table-cluster1 { + compatible = "operating-points-v2"; + opp-shared; + + cl1_ch1_opp1: opp-115200000 { + opp-hz = /bits/ 64 <115200000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp2: opp-268800000 { + opp-hz = /bits/ 64 <268800000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp3: opp-422400000 { + opp-hz = /bits/ 64 <422400000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp4: opp-576000000 { + opp-hz = /bits/ 64 <576000000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp5: opp-729600000 { + opp-hz = /bits/ 64 <729600000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp6: opp-883200000 { + opp-hz = /bits/ 64 <883200000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp7: opp-1036800000 { + opp-hz = /bits/ 64 <1036800000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp8: opp-1190400000 { + opp-hz = /bits/ 64 <1190400000>; + opp-peak-kBps = <816000>; + }; + + cl1_ch1_opp9: opp-1344000000 { + opp-hz = /bits/ 64 <1344000000>; + opp-peak-kBps = <1632000>; + }; + + cl1_ch1_opp10: opp-1497600000 { + opp-hz = /bits/ 64 <1497600000>; + opp-peak-kBps = <1632000>; + }; + + cl1_ch1_opp11: opp-1651200000 { + opp-hz = /bits/ 64 <1651200000>; + opp-peak-kBps = <2660000>; + }; + + cl1_ch1_opp12: opp-1804800000 { + opp-hz = /bits/ 64 <1804800000>; + opp-peak-kBps = <2660000>; + }; + + cl1_ch1_opp13: opp-1958400000 { + opp-hz = /bits/ 64 <1958400000>; + opp-peak-kBps = <3200000>; + }; + + cl1_ch1_opp14: opp-2112000000 { + opp-hz = /bits/ 64 <2112000000>; + opp-peak-kBps = <6400000>; + }; + + cl1_ch1_opp15: opp-2201600000 { + opp-hz = /bits/ 64 <2201600000>; + opp-peak-kBps = <6400000>; + }; + }; + + cl2_opp_tbl: opp-table-cluster2 { + compatible = "operating-points-v2"; + opp-shared; + + cl2_ch1_opp1: opp-115200000 { + opp-hz = /bits/ 64 <115200000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp2: opp-268800000 { + opp-hz = /bits/ 64 <268800000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp3: opp-422400000 { + opp-hz = /bits/ 64 <422400000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp4: opp-576000000 { + opp-hz = /bits/ 64 <576000000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp5: opp-729600000 { + opp-hz = /bits/ 64 <729600000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp6: opp-883200000 { + opp-hz = /bits/ 64 <883200000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp7: opp-1036800000 { + opp-hz = /bits/ 64 <1036800000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp8: opp-1190400000 { + opp-hz = /bits/ 64 <1190400000>; + opp-peak-kBps = <816000>; + }; + + cl2_ch1_opp9: opp-1344000000 { + opp-hz = /bits/ 64 <1344000000>; + opp-peak-kBps = <1632000>; + }; + + cl2_ch1_opp10: opp-1497600000 { + opp-hz = /bits/ 64 <1497600000>; + opp-peak-kBps = <1632000>; + }; + + cl2_ch1_opp11: opp-1651200000 { + opp-hz = /bits/ 64 <1651200000>; + opp-peak-kBps = <2660000>; + }; + + cl2_ch1_opp12: opp-1804800000 { + opp-hz = /bits/ 64 <1804800000>; + opp-peak-kBps = <2660000>; + }; + + cl2_ch1_opp13: opp-1958400000 { + opp-hz = /bits/ 64 <1958400000>; + opp-peak-kBps = <3200000>; + }; + + cl2_ch1_opp14: opp-2112000000 { + opp-hz = /bits/ 64 <2112000000>; + opp-peak-kBps = <6400000>; + }; + + cl2_ch1_opp15: opp-2201600000 { + opp-hz = /bits/ 64 <2201600000>; + opp-peak-kBps = <6400000>; + }; + }; }; From patchwork Tue Dec 20 16:02:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635916 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65A57C4167B for ; Tue, 20 Dec 2022 16:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233918AbiLTQFY (ORCPT ); Tue, 20 Dec 2022 11:05:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233939AbiLTQEp (ORCPT ); Tue, 20 Dec 2022 11:04:45 -0500 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2046.outbound.protection.outlook.com [40.107.244.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3CE7186BF; Tue, 20 Dec 2022 08:04:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VOwmNsMNrUd6BGRPihtWetGiPhtJ6pss7GirZwpynnEWZfZ/QnrCcAz2R1X4IvCUbhEHpfzI7QuCFI0db1n6dVc6Evnj8aJPm3vXv/OkUd7ZKThGIrsIHSA2rTLlzeTD8OL4r8agWidp/jhqNtJ740SgtO+ochc6xs5u0u94XFTa3wCE4O2aRBqjU5pPZkB/Fmv3bybJ2oISxGk2GN6zH8KJIvPm4orfdh0NaJB0fCwRfV25UPpgvReQunH2D/aRymksvXc9pephU39LLMnGhlMcaKl8CFdZBtGNPP6cyW5lC9HrZopQisYsrn/EzN+cn5PtFOva4Zz8hAQBMTOe8w== 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=qCil6ElgDOn+7uCawJScs+LzFmHK33zRGIRwlkx9z50=; b=T/nSHaOkEiBG033CV9CZ9cSAnjcvFig5nl6RMV+OJplKP4wWel1nOJBlrviqum2CtJbS8XOqFQ7nfGbAk+mZrZ5nYvgsOx6ZovrzBnWk1F4sSlP663CX8s4A1dZR0ku+AY5vYpO9x0k666oixHsk2ALoFSzDbOyh6SXT78+bgqw52ynW5C4HwcrS/Mh86jVZhkdvprEmI+wbFN/MvykOdassHhpqK5qz2gHQOt4/5eCEi8TQDpJeMBzyg32d6sbqpOz7062qTJGhz7PaPFUClmyuWwis7vM84c5RCpL7QQhdmEQjOvHZdPbPzmnaPz69Gg9VSG6KRvSNmgllNlYMtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qCil6ElgDOn+7uCawJScs+LzFmHK33zRGIRwlkx9z50=; b=ll6iFnjcLduLc7kDt67lCClKBw6DoEUY1yfiY0S0/Z9arlevJkEOuxdqRtInKUfHIyZ9wSDkBuwUT9Kd99WQd0wOMeZtafyE5gVMZoU3/WaKrVdVxNtPgVh7dQVGC6VaTg+08eYwEAC19G5YLaqyuDyNTnyhqlFnc7urilH3IC/LS8cc9xKyetXXAZPDi/F720blApHBlY7ov15nApnVTDN5s/hqw9zgSvHXA+Ag1ezF3725LjWdWM67WmT4n8WLQl7qF0vrlCDIqHbE1GRoG3o/QpfEVzEza+9yqhXYNITcCAT9P2JbPfho1OQUGqcFT/Cy21mIEPQiatsKAl4L2A== Received: from MW4P223CA0010.NAMP223.PROD.OUTLOOK.COM (2603:10b6:303:80::15) by PH7PR12MB7282.namprd12.prod.outlook.com (2603:10b6:510:209::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:04:43 +0000 Received: from CO1NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:303:80:cafe::2) by MW4P223CA0010.outlook.office365.com (2603:10b6:303:80::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:04:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT058.mail.protection.outlook.com (10.13.174.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16 via Frontend Transport; Tue, 20 Dec 2022 16:04:43 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:42 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:41 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:04:38 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 07/10] cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist Date: Tue, 20 Dec 2022 21:32:37 +0530 Message-ID: <20221220160240.27494-8-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT058:EE_|PH7PR12MB7282:EE_ X-MS-Office365-Filtering-Correlation-Id: 8351c522-591d-4329-da55-08dae2a3e84d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SZUFMRzlAtab0dW8Qrp6jJQOHvBJ9CDH8VKboDlrKVtbjPaT7cuoW6B0UVLHUHwMzXjCQVzi1JuJSiJHfsnIOVRgf/8OMdY1bqrFTnG2+ob3K2r8tmdfTcEqYU4QU8JER8Gx+5WByi4xfMmh5dW7lhIRfF6viEkPF9AHaFo2Gr4/UuwsdZ3yYDjj7NTc1BMt+p+9gBEEqhI/GtDktTne9JpRhY9A1kWjaEyIYjWaiDyC0pQnT06Oc/3iH9rsXlprl6DFkPAeXL0fiZi1M3WuPfnuzFOUJHOozB082aTcZtwTq3QRWPwGfN7nuNvYcBNrqPX8sFmUIH+vBCDVABZ7R/QNOM4/adIFJOPShMOFGEMvBPKv/oIDnT9CTBGk+3GcGI+5U5S3oc4qncgI6DpquIz8PpP+liUEp4XJ1SEnfc6KMyWk7D2X0uKNWhN4xjcf5CWC4ET3FyOqy66JAUZsnfxM2wTZJ23TxDYm1+xtQeyRsDumN7wNAC5uTGs98RE8hu5KgQFCoj86P/caHz6UMcQrhNyZPzAtSbw1Xk7PR8o17l0+UgRFik23IXuuUVAZnFqlQ8ukdXbv7mBQ1MZVADXDzOCOO6CEGL0X27xOmJwD4M9VDXHeFRHXwMmVh37jkXqk1Qcg0PgIojgAB3LopHDYz24mlwTnmV60sNokv/XCHO66FvKeMeUQehnJ+IR8r5sgdjLpc2yoCV/ZkoKbrMRsAS8TSdmtEuAqFYy4Iyg= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(136003)(376002)(346002)(396003)(451199015)(40470700004)(46966006)(36840700001)(40480700001)(2906002)(86362001)(8676002)(4326008)(336012)(41300700001)(186003)(70206006)(83380400001)(2616005)(478600001)(1076003)(110136005)(54906003)(316002)(107886003)(36860700001)(7696005)(921005)(356005)(7636003)(40460700003)(82740400003)(5660300002)(4744005)(426003)(47076005)(8936002)(26005)(82310400005)(70586007)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:04:43.0371 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8351c522-591d-4329-da55-08dae2a3e84d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7282 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Tegra234 platform uses the tegra194-cpufreq driver, so add it to the blocklist in cpufreq-dt-platdev driver to avoid the cpufreq driver registration from there. Signed-off-by: Sumit Gupta --- drivers/cpufreq/cpufreq-dt-platdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index 8ab672883043..e329d29d1f9d 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -137,6 +137,7 @@ static const struct of_device_id blocklist[] __initconst = { { .compatible = "nvidia,tegra30", }, { .compatible = "nvidia,tegra124", }, { .compatible = "nvidia,tegra210", }, + { .compatible = "nvidia,tegra234", }, { .compatible = "qcom,apq8096", }, { .compatible = "qcom,msm8996", }, From patchwork Tue Dec 20 16:02:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635915 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B969C10F1E for ; Tue, 20 Dec 2022 16:06:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233937AbiLTQGC (ORCPT ); Tue, 20 Dec 2022 11:06:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233977AbiLTQFR (ORCPT ); Tue, 20 Dec 2022 11:05:17 -0500 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BC481D66F; Tue, 20 Dec 2022 08:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aT9u0fsUyxsAzcFHp9lZj4dZqU/mR5mVbEPsBclI472xibvqMmWYFKRIbQSXxR0lklO1+UHmYJH8qBhMv4P5IKwmWrCDn+b5xiwsCJW3ADINwi3uNVBuEjHU87umoo0DZEMQk1uOWgcYaP2tbmtjvoHPs7ZseXpVgUfyrTAK2zvHzXYGzmjQxX2hWFKrguJefAqt0zHS8nemFL1c7ssc2qPM4vDvDV536YoAj0ldNI2/Y+CqO/8unLvoYqlfeVi3nwnLwIu6fmBV2SGGuuv0tl7HBWR3pSVDvF3oKKWHfFZBZiWbgefgRB8+lfctjIGaF/iXqAseKSdoKWDxnQLKPA== 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=SFg0B30anC8a79IQjW3OgeBVuprYW6M3vbPauAj2kWY=; b=LAecjMvRlxWC2uASJh2dAQ4ScNgqbvLwApANNOfEeqjVKGyHD5KtUNv7XXGwStDP8Gl52WBFXDw5Brx6M3J52amXI33nJTuGnpM/sJO4TSxxRn3iZiaVrp+JcVAh6gHGP8x0bGyRKjDSO4L1HeQfmHGx3HPTa403i8jUVjhfeBK4flXvdA7ViBBbGNb4GV8yrOExP5XLQFG9iRGBsi5qukGOtofkd7Pkj6WO8NyZPhodSLw6XHVTnKQAGymCGdebB7zXWiNLZDYa4Rjiua+Y99r8ZH151Pp5B8rO3V2d3ZlUs36o5SUgBPyPS8F9OlO+WcvTqaj2FRQmgJknH9uDpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SFg0B30anC8a79IQjW3OgeBVuprYW6M3vbPauAj2kWY=; b=EBVIT15SLO7wxgdF2d71m4tOQCCNIkhcfRG935uiHrqT4v4U1FiMGmP1DMNTrrgGgmTkmMWmZ0BavY6c2xjsimL9SUWXMbo+Qom6wD4wD9WDKFe6MCGn39gSCDUPfX2mtvx/TtwXVVG8gWBXIRDIFqGPa17np1C9n01jnUCB6VXBu4m4auTz+AMdAxkHNtkQIjiUpuaoT8SMXPl6In3VBY1QyXTzzSY/fn2BomCxT+dqPFjliVM706ZN2quKreiwod+q1L9ODaKmHE0Iy+wmcJVLqcnayMCuPW9E/9Y+XdH4nvGZw8U2S/MSI2tTyezuTbBtcpA5sj4N03hcjcvNcg== Received: from MW4PR03CA0233.namprd03.prod.outlook.com (2603:10b6:303:b9::28) by BY5PR12MB4856.namprd12.prod.outlook.com (2603:10b6:a03:1d5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:04:56 +0000 Received: from CO1NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b9:cafe::a0) by MW4PR03CA0233.outlook.office365.com (2603:10b6:303:b9::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:04:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT014.mail.protection.outlook.com (10.13.175.99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:04:56 +0000 Received: from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:51 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:04:50 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:04:47 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 08/10] cpufreq: tegra194: add OPP support and set bandwidth Date: Tue, 20 Dec 2022 21:32:38 +0530 Message-ID: <20221220160240.27494-9-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT014:EE_|BY5PR12MB4856:EE_ X-MS-Office365-Filtering-Correlation-Id: f9279096-3166-4cf3-63ba-08dae2a3f023 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b8Lsy9xSyEbrrneGrjK8uoWTgBjiWGbLs0pcIkElCf7+p9/8aEJVvyLeIECy43qIzidB9dto8/ESXyH6aFzE7SHfZHKBR02dbLoaH3FVKiFqJNetKJNoO+IGUkKcnWNIHTz5H1BJr11kX1cUv/8RhjukgEztzUAcGb7t1KctGSJV0gEUbIO+LSq5oR7w1jVi2gdOsgkO7JQrR2odosqKaKN+ujGbTFH2UGaXfbYxOMxpQ5xW+IYyx7bjBQWx2d7t3e8G5x4mCp4oWYqd/2t6+qUcQvM+FwcfI/aRIyHIfQ95Y3YTDaY8aNLU9nI3UAHTWRoCZsZVh7ngbOo/2LuUN0LdBLZ4KoS0CdQXWwF7S26R+zv5hY7vXxkXEhisHDYw6bVj4d4Mo0/WDQaE4Gp8v68dQCWOLsVDbKaPHQ5Y7ZXYcjbrCbRaIb4qugizpLYJdl6JWAF4lgH7+wu3ltFnaY+Y432AKUbTlJUFbEG2SRlyh42Cf6h02mEb3yIqycTQO6SdON3+DNR4ENKMnNYgMtugygkKX/8ZHKjiaCDBczqFlmPVxlCtsuRXcNopSti/uegnSRM5DJX1M28gD6njzcgOwar69oXFa/7EGe3FwBDVCDV4r6IRs6uRkEgkYvgWqtRilJGVY/0YNx6eGLQsXKZOee07hXllH7193ULC9PuVGmqNrgFQbtt5+FPna56h X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(136003)(396003)(346002)(376002)(39860400002)(451199015)(36840700001)(46966006)(54906003)(36860700001)(83380400001)(110136005)(41300700001)(70206006)(336012)(426003)(316002)(47076005)(8936002)(36756003)(5660300002)(40480700001)(2616005)(70586007)(2906002)(86362001)(4326008)(1076003)(8676002)(82310400005)(6666004)(107886003)(26005)(82740400003)(7636003)(478600001)(7696005)(186003)(356005)(921005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:04:56.1963 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9279096-3166-4cf3-63ba-08dae2a3f023 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4856 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add support to use OPP table from DT in Tegra194 cpufreq driver. Tegra SoC's receive the frequency lookup table (LUT) from BPMP-FW. Cross check the OPP's present in DT against the LUT from BPMP-FW and enable only those DT OPP's which are present in LUT also. The OPP table in DT has CPU Frequency to bandwidth mapping where the bandwidth value is per MC channel. DRAM bandwidth depends on the number of MC channels which can vary as per the boot configuration. This per channel bandwidth from OPP table will be later converted by MC driver to final bandwidth value by multiplying with number of channels before sending the request to BPMP-FW. If OPP table is not present in DT, then use the LUT from BPMP-FW directy as the frequency table and not do the DRAM frequency scaling which is same as the current behavior. Now, as the CPU Frequency table is being controlling through OPP table in DT. Keeping fewer entries in the table will create less frequency steps and scale fast to high frequencies if required. Signed-off-by: Sumit Gupta --- drivers/cpufreq/tegra194-cpufreq.c | 152 ++++++++++++++++++++++++++--- 1 file changed, 139 insertions(+), 13 deletions(-) diff --git a/drivers/cpufreq/tegra194-cpufreq.c b/drivers/cpufreq/tegra194-cpufreq.c index 4596c3e323aa..8155a9ea0815 100644 --- a/drivers/cpufreq/tegra194-cpufreq.c +++ b/drivers/cpufreq/tegra194-cpufreq.c @@ -12,6 +12,7 @@ #include #include #include +#include #include @@ -65,12 +66,32 @@ struct tegra_cpufreq_soc { struct tegra194_cpufreq_data { void __iomem *regs; - struct cpufreq_frequency_table **tables; + struct cpufreq_frequency_table **bpmp_luts; const struct tegra_cpufreq_soc *soc; + bool icc_dram_bw_scaling; }; static struct workqueue_struct *read_counters_wq; +static int tegra_cpufreq_set_bw(struct cpufreq_policy *policy, unsigned long freq_khz) +{ + struct dev_pm_opp *opp; + struct device *dev; + int ret; + + dev = get_cpu_device(policy->cpu); + if (!dev) + return -ENODEV; + + opp = dev_pm_opp_find_freq_exact(dev, freq_khz * KHZ, true); + if (IS_ERR(opp)) + return PTR_ERR(opp); + + ret = dev_pm_opp_set_opp(dev, opp); + dev_pm_opp_put(opp); + return ret; +} + static void tegra_get_cpu_mpidr(void *mpidr) { *((u64 *)mpidr) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK; @@ -354,7 +375,7 @@ static unsigned int tegra194_get_speed(u32 cpu) * to the last written ndiv value from freq_table. This is * done to return consistent value. */ - cpufreq_for_each_valid_entry(pos, data->tables[clusterid]) { + cpufreq_for_each_valid_entry(pos, data->bpmp_luts[clusterid]) { if (pos->driver_data != ndiv) continue; @@ -369,16 +390,93 @@ static unsigned int tegra194_get_speed(u32 cpu) return rate; } +int tegra_cpufreq_init_cpufreq_table(struct cpufreq_policy *policy, + struct cpufreq_frequency_table *bpmp_lut, + struct cpufreq_frequency_table **opp_table) +{ + struct tegra194_cpufreq_data *data = cpufreq_get_driver_data(); + struct cpufreq_frequency_table *freq_table = NULL; + struct cpufreq_frequency_table *pos; + int ret = 0, max_opps = 0; + struct device *cpu_dev; + struct dev_pm_opp *opp; + unsigned long rate; + int j = 0; + + cpu_dev = get_cpu_device(policy->cpu); + if (!cpu_dev) { + pr_err("%s: failed to get cpu%d device\n", __func__, policy->cpu); + return -ENODEV; + } + + /* Initialize OPP table mentioned in operating-points-v2 property in DT */ + ret = dev_pm_opp_of_add_table_indexed(cpu_dev, 0); + if (!ret) { + max_opps = dev_pm_opp_get_opp_count(cpu_dev); + if (max_opps <= 0) { + dev_err(cpu_dev, "Failed to add OPPs\n"); + return max_opps; + } + + /* Disable all opps and cross-validate against LUT later */ + for (rate = 0; ; rate++) { + opp = dev_pm_opp_find_freq_ceil(cpu_dev, &rate); + if (IS_ERR(opp)) + break; + + dev_pm_opp_put(opp); + dev_pm_opp_disable(cpu_dev, rate); + } + } else { + dev_err(cpu_dev, "Invalid or empty opp table in device tree\n"); + data->icc_dram_bw_scaling = false; + return ret; + } + + freq_table = kcalloc((max_opps + 1), sizeof(*freq_table), GFP_KERNEL); + if (!freq_table) + return -ENOMEM; + + /* + * Cross check the frequencies from BPMP-FW LUT against the OPP's present in DT. + * Enable only those DT OPP's which are present in LUT also. + */ + cpufreq_for_each_valid_entry(pos, bpmp_lut) { + opp = dev_pm_opp_find_freq_exact(cpu_dev, pos->frequency * KHZ, false); + if (IS_ERR(opp)) + continue; + + ret = dev_pm_opp_enable(cpu_dev, pos->frequency * KHZ); + if (ret < 0) + return ret; + + freq_table[j].driver_data = pos->driver_data; + freq_table[j].frequency = pos->frequency; + j++; + } + + freq_table[j].driver_data = pos->driver_data; + freq_table[j].frequency = CPUFREQ_TABLE_END; + + *opp_table = &freq_table[0]; + + dev_pm_opp_set_sharing_cpus(cpu_dev, policy->cpus); + + return ret; +} + static int tegra194_cpufreq_init(struct cpufreq_policy *policy) { struct tegra194_cpufreq_data *data = cpufreq_get_driver_data(); int maxcpus_per_cluster = data->soc->maxcpus_per_cluster; + struct cpufreq_frequency_table *freq_table; + struct cpufreq_frequency_table *bpmp_lut; u32 start_cpu, cpu; u32 clusterid; + int ret; data->soc->ops->get_cpu_cluster_id(policy->cpu, NULL, &clusterid); - - if (clusterid >= data->soc->num_clusters || !data->tables[clusterid]) + if (clusterid >= data->soc->num_clusters || !data->bpmp_luts[clusterid]) return -EINVAL; start_cpu = rounddown(policy->cpu, maxcpus_per_cluster); @@ -387,9 +485,22 @@ static int tegra194_cpufreq_init(struct cpufreq_policy *policy) if (cpu_possible(cpu)) cpumask_set_cpu(cpu, policy->cpus); } - policy->freq_table = data->tables[clusterid]; policy->cpuinfo.transition_latency = TEGRA_CPUFREQ_TRANSITION_LATENCY; + bpmp_lut = data->bpmp_luts[clusterid]; + + if (data->icc_dram_bw_scaling) { + ret = tegra_cpufreq_init_cpufreq_table(policy, bpmp_lut, &freq_table); + if (!ret) { + policy->freq_table = freq_table; + return 0; + } + } + + data->icc_dram_bw_scaling = false; + policy->freq_table = bpmp_lut; + pr_info("OPP tables missing from DT, EMC frequency scaling disabled\n"); + return 0; } @@ -406,6 +517,9 @@ static int tegra194_cpufreq_set_target(struct cpufreq_policy *policy, */ data->soc->ops->set_cpu_ndiv(policy, (u64)tbl->driver_data); + if (data->icc_dram_bw_scaling) + tegra_cpufreq_set_bw(policy, tbl->frequency); + return 0; } @@ -438,8 +552,8 @@ static void tegra194_cpufreq_free_resources(void) } static struct cpufreq_frequency_table * -init_freq_table(struct platform_device *pdev, struct tegra_bpmp *bpmp, - unsigned int cluster_id) +tegra_cpufreq_bpmp_read_lut(struct platform_device *pdev, struct tegra_bpmp *bpmp, + unsigned int cluster_id) { struct cpufreq_frequency_table *freq_table; struct mrq_cpu_ndiv_limits_response resp; @@ -514,6 +628,7 @@ static int tegra194_cpufreq_probe(struct platform_device *pdev) const struct tegra_cpufreq_soc *soc; struct tegra194_cpufreq_data *data; struct tegra_bpmp *bpmp; + struct device *cpu_dev; int err, i; data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); @@ -529,9 +644,9 @@ static int tegra194_cpufreq_probe(struct platform_device *pdev) return -EINVAL; } - data->tables = devm_kcalloc(&pdev->dev, data->soc->num_clusters, - sizeof(*data->tables), GFP_KERNEL); - if (!data->tables) + data->bpmp_luts = devm_kcalloc(&pdev->dev, data->soc->num_clusters, + sizeof(*data->bpmp_luts), GFP_KERNEL); + if (!data->bpmp_luts) return -ENOMEM; if (soc->actmon_cntr_base) { @@ -555,15 +670,26 @@ static int tegra194_cpufreq_probe(struct platform_device *pdev) } for (i = 0; i < data->soc->num_clusters; i++) { - data->tables[i] = init_freq_table(pdev, bpmp, i); - if (IS_ERR(data->tables[i])) { - err = PTR_ERR(data->tables[i]); + data->bpmp_luts[i] = tegra_cpufreq_bpmp_read_lut(pdev, bpmp, i); + if (IS_ERR(data->bpmp_luts[i])) { + err = PTR_ERR(data->bpmp_luts[i]); goto err_free_res; } } tegra194_cpufreq_driver.driver_data = data; + /* Check for optional OPPv2 and interconnect paths on CPU0 to enable ICC scaling */ + cpu_dev = get_cpu_device(0); + if (!cpu_dev) + return -EPROBE_DEFER; + + if (dev_pm_opp_of_get_opp_desc_node(cpu_dev)) { + err = dev_pm_opp_of_find_icc_paths(cpu_dev, NULL); + if (!err) + data->icc_dram_bw_scaling = true; + } + err = cpufreq_register_driver(&tegra194_cpufreq_driver); if (!err) goto put_bpmp; From patchwork Tue Dec 20 16:02:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635554 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1776CC46467 for ; Tue, 20 Dec 2022 16:06:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233909AbiLTQGc (ORCPT ); Tue, 20 Dec 2022 11:06:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234007AbiLTQFy (ORCPT ); Tue, 20 Dec 2022 11:05:54 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2042.outbound.protection.outlook.com [40.107.92.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D5C3193F7; Tue, 20 Dec 2022 08:05:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fjFdNs/FCI3a52qVf9TwtCSCqK6IC7Ibn90VK1ZlAEwqwqScD7Nr62q3R08iyEq2v1Wlh9n1V3zUYsPYIocusaOPAqiMO5fovq8iBXSPOFg63IeexG42TSRM5irWMzuo0sY1tjyJvw0Gc44VhYW68JIGKtlSjrU7MvjqG507iXGAtAAYWyuoiF28j1liTn2qI2dIShkfT+EVn+48m5cA3ySI7wnC1GeM/oJVtPyWzvg69nrSjy5Asjlz05jARMWwgeqVMA/AbmE6yzQtCeZoE89FMorL3965OO2LKcYSZJpuQ5GXe0CzNG1XUesu3Ltht757OBBtFN+asVMuzdN7ug== 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=ayHXz0RFp/GJvsgROWUbEQSYUAeWvM24puZbQyCdLkg=; b=iBU2p6vyEGl8OBaeJlNE2+F4rELEAnVMCdHuJvQBpH1YPZCWxbhjzYJbFlEWN1Tq1Zcoet3QcUzVQzzz95h676sAZg38SXTHM3zRlbYEt/lHYgC3kqTlfsUmdw5YuoHGs1zhmeHEjyFTJO34mOYxrM9SX65EZzvVfGR2lBZluOjRkN0lVy6fZpI6NKIy2lW9MOl6jDpF0Hay+XL/D0JW7v819RvPLg8h+TGTZhJDSDmCKTCCyCBIap7DiemUxHjCTwCxWfMJVhxjMOWzew4PPGJpX/EeSFoPtA5n9Z4pjv2JZaMLgsvf0LEOnRCnLWePXDKxFOmc3tg5Y/OgvUg9/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ayHXz0RFp/GJvsgROWUbEQSYUAeWvM24puZbQyCdLkg=; b=ldeVJvZK6ZAB0998z49+fee1hwuRaDR0qiikvKqYvy9yZVTr09VmZGWAQvyvNLPE14ns1O2eCcK2CQQrWBgNQpFWJ4QlE5jhgeL/U2B8T7A0vpXvalQN4JD3kZDxIFijx0XOgtL4WO8ee48+/73w1t5ESW1aLC++Z2NRJg576BJbpBRWzZzE9h3+JOI2bGs3hrKQNaq2Yex3jijE1YhwqzBzXKq8o/25Xd6yrI+Ey0GxX3FG5YfCcR2sWqT+XTTg5IoCLo+57P26yyhBOWOk9+4WZGLkv9yZcAa07FVLZifR2LbtD/08Oqn6tPPs2ESdvLQNcCN/hw82CAPGOPBVTQ== Received: from MW4P220CA0005.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::10) by CY8PR12MB8363.namprd12.prod.outlook.com (2603:10b6:930:7a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:05:24 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::fc) by MW4P220CA0005.outlook.office365.com (2603:10b6:303:115::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:05:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:05:24 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:05:17 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:05:17 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:05:13 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 09/10] memory: tegra: get number of enabled mc channels Date: Tue, 20 Dec 2022 21:32:39 +0530 Message-ID: <20221220160240.27494-10-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT043:EE_|CY8PR12MB8363:EE_ X-MS-Office365-Filtering-Correlation-Id: ce454167-ef3c-4bd4-1ecb-08dae2a400d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zNVS4NY7b4MuR5YDbm2Xb1dAc6uDkmh7QQBpRhGI5wfgCN5mn+11oS0buPU5I/1O9EjlIkfc5s8kGPVeHB6RE7sTjsBxW9yGJhT1NMKcmTN3kg+Mvs8ucU1rObFJ+dCvVQ7u42rYosKl0ZgdLaxSXB6b2VJy+sh8gOOXC0KSrFPqbk2GmpteOvaYGLJxIXPvNrpAG23FMnI4gzCwzWeAsIpHGmY6VI5WExvdVNbcsPn/bZrm7zPKuASDc8gFZOiBQ2f1kz4AkzBO6txsu0ltjNnQSnyl7wW+zKGS/nz6GZEamd/PoTNDHVcWIb7aHO+pTpjBRpTSPVNIOgAFS5eHlOiSDnW9JovMBNOPIaPGfANI1wBqYN+aO1pk1FJCpUr7NO803X7UHqnhGeHWIRVFeqm0Ma1TxzTrIkM/8DkqKPBCTCb3oXDUtdRKi0+WTJsOCwA0vKWhF6Eg3kh7IkJBzRMPxWqWiV1RQ93vGQUnOpcnZbqGZKQwowUAYjqX7HxNimhuXOTV4jadVKohZSE4GLFkSNmN2xlZUrQomtxYtEQSLQfWmFOWISasf5KKY7XXmAFS27oS/3s5HkNKi7jzhLYNCmNkt636B+A5plxF/KJhK0ZJSvmaIbu3+JdtyoLGVSDGpoVDHpDwcnjvqRCL0SkqVKVFAXdlDefNJtqgFcCtVWthmDPK1w9WYLyp1XJKmVH61y7dGbOwb0rC+Y7SAlQChos2iPdTk9aRu2C/Mtu6YAZGRpgibhspb3RtZ4RR X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(136003)(376002)(346002)(396003)(39860400002)(451199015)(46966006)(40470700004)(36840700001)(36860700001)(2906002)(356005)(426003)(336012)(36756003)(47076005)(40480700001)(110136005)(82740400003)(921005)(186003)(41300700001)(40460700003)(86362001)(26005)(82310400005)(7636003)(8936002)(70206006)(5660300002)(316002)(4326008)(2616005)(70586007)(1076003)(8676002)(478600001)(107886003)(6666004)(54906003)(7696005)(358055004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:05:24.2086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ce454167-ef3c-4bd4-1ecb-08dae2a400d8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8363 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Get number of MC channels which are actually enabled in current boot configuration. Signed-off-by: Sumit Gupta --- drivers/memory/tegra/mc.c | 19 +++++++++++++++++++ drivers/memory/tegra/mc.h | 1 + include/soc/tegra/mc.h | 1 + 3 files changed, 21 insertions(+) diff --git a/drivers/memory/tegra/mc.c b/drivers/memory/tegra/mc.c index 4ddf9808fe6b..3d52eb3e24e4 100644 --- a/drivers/memory/tegra/mc.c +++ b/drivers/memory/tegra/mc.c @@ -881,6 +881,23 @@ static int tegra_mc_interconnect_setup(struct tegra_mc *mc) return err; } +static void tegra_mc_num_channel_enabled(struct tegra_mc *mc) +{ + unsigned int i; + u32 value = 0; + + value = mc_ch_readl(mc, 0, MC_EMEM_ADR_CFG_CHANNEL_ENABLE); + if (value <= 0) { + mc->num_channels = mc->soc->num_channels; + return; + } + + for (i = 0; i < 32; i++) { + if (value & BIT(i)) + mc->num_channels++; + } +} + static int tegra_mc_probe(struct platform_device *pdev) { struct tegra_mc *mc; @@ -919,6 +936,8 @@ static int tegra_mc_probe(struct platform_device *pdev) return err; } + tegra_mc_num_channel_enabled(mc); + if (mc->soc->ops && mc->soc->ops->handle_irq) { mc->irq = platform_get_irq(pdev, 0); if (mc->irq < 0) diff --git a/drivers/memory/tegra/mc.h b/drivers/memory/tegra/mc.h index bc01586b6560..c3f6655bec60 100644 --- a/drivers/memory/tegra/mc.h +++ b/drivers/memory/tegra/mc.h @@ -53,6 +53,7 @@ #define MC_ERR_ROUTE_SANITY_ADR 0x9c4 #define MC_ERR_GENERALIZED_CARVEOUT_STATUS 0xc00 #define MC_ERR_GENERALIZED_CARVEOUT_ADR 0xc04 +#define MC_EMEM_ADR_CFG_CHANNEL_ENABLE 0xdf8 #define MC_GLOBAL_INTSTATUS 0xf24 #define MC_ERR_ADR_HI 0x11fc diff --git a/include/soc/tegra/mc.h b/include/soc/tegra/mc.h index 6a94e88b6100..815c7d5f6292 100644 --- a/include/soc/tegra/mc.h +++ b/include/soc/tegra/mc.h @@ -236,6 +236,7 @@ struct tegra_mc { struct tegra_mc_timing *timings; unsigned int num_timings; + unsigned int num_channels; struct reset_controller_dev reset; From patchwork Tue Dec 20 16:02:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Gupta X-Patchwork-Id: 635914 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46E00C10F1E for ; Tue, 20 Dec 2022 16:06:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234032AbiLTQGs (ORCPT ); Tue, 20 Dec 2022 11:06:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234037AbiLTQGF (ORCPT ); Tue, 20 Dec 2022 11:06:05 -0500 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2060.outbound.protection.outlook.com [40.107.244.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04351218F; Tue, 20 Dec 2022 08:05:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oO1Fk6I8olRhW/qxD6uS/Em4TwgH1mglADoTQ6tMEWS+LrwWK7KQGzq1YLgsM57CHF1RLTLMvoUQFc8y35EwQDq4HI8A4D1EmV0uoukFCYJR/8v9RznRFCtIVtsEuHpJDLBsMuJnguEpwxQmPRpiZtCc2zz7v8trwwA4zBHnj6eoT4V3thagS70dURomr+DuybuM8+eNHbIaTBqhDDW83H4SioD2p3ZiPKcnupcXwdr0E2yrdiAoNlTbNiiq/dS6D1ePnrx9Q5E3/BSbvj69YkicUO/Rs6c/5dFicLidJBwvUj2yjACR7e9bY0e125sYp0uxAt+Pve1ohVmdXVgjsg== 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=f7+QXpWUFrLpq09T95bIRvlU8/tN8LUwtOHD15PgyQk=; b=ZPwU/dah3D9ugr4Fv6c7cIYHW3kzEerPjbOhS7X9Ka/SZb48JOjVGCKasRBZFc+2FO8pkFZCl15CoF+itc5QjHrhGOCEL7F5kAGdzLAJIS71DlwONolV0YHx3H1UFk85vfYEfdpD/X2CCVuROJF7F9Fdrjw2Ej0BJZB1I82jPtZqGpms7DBmIDPNErcjBzk8ghgh13ub9NkhWdcYZrZMei8SOFc3daz/3tJN+m7LsS2PwMydM/KqYI6PMOCicn6URKYHPI2rZHUB1+vGEV5elXdeea8RWYlKWlbf82IP1Lj0yo8HjVhyd8bXxdRiYOEcn6xf/mSun8TKh4lcA6JnVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=linaro.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f7+QXpWUFrLpq09T95bIRvlU8/tN8LUwtOHD15PgyQk=; b=dZD0b0iVB453LjOmuZrZt31c+O4rFw9qaD+iBT0vnGc0SADhnBcEpTHA5rcXAcsYxc/cjN9mbvaCTerbx82JsrBDDPLNdQDMLISq+IbhV71MMEwnpTK8pG+/0f1FASleJcoZvq2fBrdMilbGSzl4KY+aVweNurmrswr6DOQhOrA21SNqcFBbxUBEMYI9c1X1cdMmhAfg4DEi2KjOfxdl0VoQjmQrukO4o4oyxb8qCm3sptg+E5AvZnJhUi2ZfdaS5DfHbx9RayebJfr0m3a8MWW0k4NCAtf/YR9TuvwqdpubaEoRVW114VELw6ITR/d/1lcCf/mYuCAZnKgQMQMxvA== Received: from BN8PR15CA0008.namprd15.prod.outlook.com (2603:10b6:408:c0::21) by MN2PR12MB4487.namprd12.prod.outlook.com (2603:10b6:208:264::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Tue, 20 Dec 2022 16:05:41 +0000 Received: from BN8NAM11FT106.eop-nam11.prod.protection.outlook.com (2603:10b6:408:c0:cafe::c2) by BN8PR15CA0008.outlook.office365.com (2603:10b6:408:c0::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.21 via Frontend Transport; Tue, 20 Dec 2022 16:05:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.232) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.118.232 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.232; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.232) by BN8NAM11FT106.mail.protection.outlook.com (10.13.177.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.6 via Frontend Transport; Tue, 20 Dec 2022 16:05:41 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:05:25 -0800 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Tue, 20 Dec 2022 08:05:25 -0800 Received: from sumitg-l4t.nvidia.com (10.127.8.10) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.36 via Frontend Transport; Tue, 20 Dec 2022 08:05:21 -0800 From: Sumit Gupta To: , , , , , , , , , , CC: , , , , Subject: [Patch v1 10/10] memory: tegra: make cluster bw request a multiple of mc_channels Date: Tue, 20 Dec 2022 21:32:40 +0530 Message-ID: <20221220160240.27494-11-sumitg@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221220160240.27494-1-sumitg@nvidia.com> References: <20221220160240.27494-1-sumitg@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT106:EE_|MN2PR12MB4487:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ccb5cd1-3ef7-4100-85dc-08dae2a40b23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E39BhzSpKJNVoaClfWttTnsavOwGqxI0Xc4jCYvANKu6WYQ4PaRKVj7s9TOlqby9SZXb0B4SJMSa6E2Sys0A4ZMOd+Pz4r3h799i5v3VtJF/vEblCq49jETe0neASogTyXMoXibbpDWggBcQWnTC58uW7CuLPk6gjeqQHijU8Ca9SFDqFVmxc5wNKetRnzgpMlPnW5/Yzh8e+NLj4iqHu5SOPzgogskqkkCAvIfGQvNTxYTAC9m5kQQeqeCfWyTbYFzDCKUAQYoSb3zhJiDiKeWFz2tN7HFkFhzVOLp0e9mgiV6pda7RgplKC+04j9sLMahFesiPQcrEpshyZsQp4qmuiO0o4rfTJRuq+6dCgtJ1GjS/38EpcFURHsrPPupPMj83G9C0wU509mKd3uPtZu3pxeY6irmJ8FOgl6P6IUpZIPEX5KqXGbiJXeZh4C06lW3q6NnFMzcGRaO9Sjai+0LW2YIXG9T2K/iNP19MT6sGutrMWMdUDHTji47eOpDoRcFmvpUCVui5jIU8gB1bfDIXzQVM5/XJ0yFcgs1JbeApf8qXmXqdmg2Rr1cp5CfO5OE0la0rRNX8qme3auYUZ+tu4QfigOwORqwAyJQGnuGGOXXf0ip+durzwvQ8AH/ujDbWlv4C+Kr6cbNt+TFS6Acq6YXjBbdbyOHIzA9z+i0VsQbrX3QEvRIzfPeqQPtmcJHndvg1uGRFCBvJkQZEPDwne3rPvOXYcXrMjJmOmbk= X-Forefront-Antispam-Report: CIP:216.228.118.232; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge1.nvidia.com; CAT:NONE; SFS:(13230022)(4636009)(39860400002)(396003)(376002)(346002)(136003)(451199015)(46966006)(40470700004)(36840700001)(86362001)(82740400003)(36756003)(8936002)(921005)(356005)(7636003)(36860700001)(107886003)(82310400005)(5660300002)(47076005)(40460700003)(83380400001)(2906002)(8676002)(1076003)(70586007)(41300700001)(70206006)(4326008)(2616005)(336012)(426003)(7696005)(186003)(478600001)(110136005)(6666004)(54906003)(316002)(40480700001)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2022 16:05:41.3706 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ccb5cd1-3ef7-4100-85dc-08dae2a40b23 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.232]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT106.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4487 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org CPU opp table have bandwidth data per MC channel. The actual bandwidth depends on number of MC channels which can change as per the boot config for a board. So, multiply the bandwidth request for CPU clusters with number of enabled MC channels. This is not required to be done for other MC clients. Signed-off-by: Sumit Gupta --- drivers/memory/tegra/tegra234.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/memory/tegra/tegra234.c b/drivers/memory/tegra/tegra234.c index 82ce6c3c3eb0..a45fc99b9c82 100644 --- a/drivers/memory/tegra/tegra234.c +++ b/drivers/memory/tegra/tegra234.c @@ -834,6 +834,29 @@ static int tegra234_mc_icc_set(struct icc_node *src, struct icc_node *dst) return 0; } +static int tegra234_mc_icc_aggregate(struct icc_node *node, u32 tag, u32 avg_bw, + u32 peak_bw, u32 *agg_avg, u32 *agg_peak) +{ + struct tegra_icc_node *tnode = NULL; + struct tegra_mc *mc = NULL; + + if (node->id == TEGRA_ICC_MC_CPU_CLUSTER0 || + node->id == TEGRA_ICC_MC_CPU_CLUSTER1 || + node->id == TEGRA_ICC_MC_CPU_CLUSTER2) { + if (node->data) { + tnode = node->data; + mc = tnode->mc; + if (mc) + peak_bw = peak_bw * mc->num_channels; + } + } + + *agg_avg += avg_bw; + *agg_peak = max(*agg_peak, peak_bw); + + return 0; +} + static struct icc_node* tegra234_mc_of_icc_xlate(struct of_phandle_args *spec, void *data) { @@ -866,7 +889,7 @@ static int tegra234_mc_icc_get_init_bw(struct icc_node *node, u32 *avg, u32 *pea static const struct tegra_mc_icc_ops tegra234_mc_icc_ops = { .xlate = tegra234_mc_of_icc_xlate, .get_bw = tegra234_mc_icc_get_init_bw, - .aggregate = icc_std_aggregate, + .aggregate = tegra234_mc_icc_aggregate, .set = tegra234_mc_icc_set, };