From nobody Tue Feb 10 04:12:37 2026 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 14FCFC7EE2E for ; Mon, 29 May 2023 14:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229971AbjE2OAh (ORCPT ); Mon, 29 May 2023 10:00:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230174AbjE2OAa (ORCPT ); Mon, 29 May 2023 10:00:30 -0400 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2073.outbound.protection.outlook.com [40.107.96.73]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97F88B1; Mon, 29 May 2023 07:00:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oNouaViJz+W2FXfqQvGxzfhgoyd5kjmCv+wlOSYo3iiQAAxjyqwJe9inBrVVjo1LskwN+oJ1oiV/NL+bJkPH9tCn+mS4MCRT8coeUknq4/i4eqZObNy3Lbho5EasZhNR3LTUb5UUP6mSppMbyNemnIAj4bOq0tAdjTGgkc7aSPxE2UlObInru31SedIKxhBvCx9VOUy/npojkZ6WlCcYs9kbkkbJIQshzyGYf4zECMBbbCkCY0d+RSTozXLnMV7bNmIPiIjp1L/9kxg1ciJk98+ptwW1U7e8+BNyg28hCHicNoe0VErYQotMQR206pk5hnTpCb6gE7Oo0MCD0+8x9A== 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=eFBCHiy+M7HwlZO96Bn/CSzp2WmuXHkLD84OZT09A3A=; b=RfpRxIbjMYfJtK+/ABfkHVlyEZzHYcpk4k0u1z4wF+31jEPkqJ0JaqxvRLXDVYWzreEzQSM90wqR1pShzgZ7N21palfglb3NBo35dSo3C193me9xV8FlriFDNid5tMKX2sd6GWGibvM2tSq47tIn/nMZromykw4qVBQW0S8KvOi73KpWvo5ppPZ9GtxtKfmlsp/AmhcPnzP0wkOYzbEKUKdrIiUFblaC88QV6AD1jtL1m3//Ii0d/beTsGrgKot7jtpiCXvS3+tOnmA/x+WpQIRTGnnBsoAA2ZdYdkRtc2rJPydidkmnW43i/CbZt5D7HfYMMDCFJyK9x2Rnk6HvPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=gmail.com 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=eFBCHiy+M7HwlZO96Bn/CSzp2WmuXHkLD84OZT09A3A=; b=nr+x2dcZ4aYxikJddD2FuUAg5Se9or6pDHjnQizMNr66tL2cZDgvqluKjrq2o5uM30MM7OCDOXP6HYoZIVEA3S53amocVO5LqHelekYE/ZeaIe52JWETSNgN9/xrbHu61ZaJlesnLq7/YSx0n2y96FagVOHOOXZItBB+euc28Z2P1r7HOWBMWcIE7QJwyqcB80VwaqqIx0iH2bxPeTYm+/31EBpvRZPOTV5ibOgeXYdBN9uoeykIlIdB1Oh+D7qQ4H+hcq/Zp7mwybwyKEDbCsLbtYDtPKv0zgkV/MyMjsk9poT+7BjH2ZxxAC8gEMuL/ui/9385wwiCJsWfzIc5Mg== Received: from DM6PR08CA0055.namprd08.prod.outlook.com (2603:10b6:5:1e0::29) by SA1PR12MB7127.namprd12.prod.outlook.com (2603:10b6:806:29e::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.23; Mon, 29 May 2023 13:58:48 +0000 Received: from DM6NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1e0:cafe::4f) by DM6PR08CA0055.outlook.office365.com (2603:10b6:5:1e0::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.23 via Frontend Transport; Mon, 29 May 2023 13:58:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT068.mail.protection.outlook.com (10.13.173.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.21 via Frontend Transport; Mon, 29 May 2023 13:58:48 +0000 Received: from rnnvmail205.nvidia.com (10.129.68.10) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 29 May 2023 06:58:37 -0700 Received: from rnnvmail203.nvidia.com (10.129.68.9) by rnnvmail205.nvidia.com (10.129.68.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Mon, 29 May 2023 06:58:36 -0700 Received: from 44189d9-lcedt.nvidia.com (10.127.8.9) by mail.nvidia.com (10.129.68.9) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Mon, 29 May 2023 06:58:34 -0700 From: Peter De Schrijver To: Peter De Schrijver , , , CC: Jassi Brar , Krzysztof Kozlowski , Conor Dooley , "Joe Perches" , , Subject: [PATCH v5 5/5] firmware: tegra: bpmp: Add support for DRAM MRQ GSCs Date: Mon, 29 May 2023 16:50:51 +0300 Message-ID: <20230529135044.2746339-6-pdeschrijver@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230529135044.2746339-1-pdeschrijver@nvidia.com> References: <20230529135044.2746339-1-pdeschrijver@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT068:EE_|SA1PR12MB7127:EE_ X-MS-Office365-Filtering-Correlation-Id: e38a3554-e74f-4fdc-f751-08db604cd34b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gEoc+3i1PHsb3IXSwwnrq/ilqGd9+l8Ls5Z4o74sOvikKyaYBN0jLBYkz7NrwvsjxHFtyhFxTlqFkQ7LLYqCviwi07mYdd6Re/8mtyaJ9vDvCIbmZuGF9mXNJTdUoZDrShTdRwCUn79EHdA5X6/ye1Z5rkkO7H24fjNrGua3wXVGxpSCYGs62vGqGMCPE/Krg38XuJ9d0z+RjK7sWP8lBEuU0Le2fT0OkayzwVU/rJ0gupjGuvO6dtoIrIA4mo5ypzJCTgxGUILiWWF/RPEUy1UxoXG+gmCWyY7ahufTLVBSch5DyQhcIVpbazpfHqXHsS0C1cUlOuQXqokR3ipdp5NADma+QzE4mihhaP1mDgcFs/GD8rqKCd52cXQjjyTKyyTAlENN8ep+OGuakyyWnz+ea5+jZiuG162zmVYvdPCE9JbOEJAhZ0Y7q1/nG9QCOv7QBjTwycmmRNgipkWHcR6P0/iOiJRO+Ocp5yZuhCYeC6a32xTzlZEWHunmfKVSs9D4I5KxWPB2YHZUVi4tA2KfJm2DLSzLsvZd065Z0kQcckWHjaiejbb7oJmzfHVWgeZujNuNQJ8YuIv4Oe7tBNoTUZ/HZkE90VJGsmissqPcV5YgSNW/7k1qUsX2EkSThgcO3QrVhENmT78r0iJ+RMtVHZX0sZjbU/bn56jevTUhaA7OJ010UGmYpGBazmcymzuy+D+MQsY0OwPXqxiINba015Xqowjo7aEOE/zO8xf8L4sUw9ttxoOrGVGXjriI X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230028)(4636009)(136003)(396003)(376002)(346002)(39860400002)(451199021)(46966006)(40470700004)(36840700001)(336012)(426003)(478600001)(83380400001)(40460700003)(36860700001)(40480700001)(47076005)(5660300002)(186003)(6636002)(4326008)(86362001)(7696005)(8676002)(8936002)(2906002)(82310400005)(41300700001)(316002)(6666004)(82740400003)(7636003)(356005)(1076003)(26005)(70586007)(70206006)(2616005)(54906003)(110136005)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2023 13:58:48.0246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e38a3554-e74f-4fdc-f751-08db604cd34b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7127 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Implement support for DRAM MRQ GSCs. Signed-off-by: Peter De Schrijver --- drivers/firmware/tegra/bpmp-tegra186.c | 232 ++++++++++++++++++------- drivers/firmware/tegra/bpmp.c | 4 +- 2 files changed, 168 insertions(+), 68 deletions(-) diff --git a/drivers/firmware/tegra/bpmp-tegra186.c b/drivers/firmware/tegr= a/bpmp-tegra186.c index 2e26199041cd..d1c1af793b6f 100644 --- a/drivers/firmware/tegra/bpmp-tegra186.c +++ b/drivers/firmware/tegra/bpmp-tegra186.c @@ -4,7 +4,9 @@ */ =20 #include +#include #include +#include #include =20 #include @@ -13,12 +15,22 @@ =20 #include "bpmp-private.h" =20 +/* Discriminating enum for the union below */ +enum tegra_bpmp_mem_type { TEGRA_INVALID, TEGRA_SRAM, TEGRA_DRAM }; struct tegra186_bpmp { struct tegra_bpmp *parent; =20 + enum tegra_bpmp_mem_type type; struct { - struct gen_pool *pool; - void __iomem *virt; + union { + struct { + void __iomem *virt; + struct gen_pool *pool; + } sram; + struct { + void *virt; + } dram; + }; dma_addr_t phys; } tx, rx; =20 @@ -26,6 +38,7 @@ struct tegra186_bpmp { struct mbox_client client; struct mbox_chan *channel; } mbox; + }; =20 static inline struct tegra_bpmp * @@ -118,8 +131,17 @@ static int tegra186_bpmp_channel_init(struct tegra_bpm= p_channel *channel, queue_size =3D tegra_ivc_total_queue_size(message_size); offset =3D queue_size * index; =20 - iosys_map_set_vaddr_iomem(&rx, priv->rx.virt + offset); - iosys_map_set_vaddr_iomem(&tx, priv->tx.virt + offset); + if (priv->type =3D=3D TEGRA_SRAM) { + iosys_map_set_vaddr_iomem(&rx, priv->rx.sram.virt + offset); + iosys_map_set_vaddr_iomem(&tx, priv->tx.sram.virt + offset); + } else if (priv->type =3D=3D TEGRA_DRAM) { + iosys_map_set_vaddr(&rx, priv->rx.dram.virt + offset); + iosys_map_set_vaddr(&tx, priv->tx.dram.virt + offset); + } else { + dev_err(bpmp->dev, "Inconsistent state %d of priv->type detected in %s\n= ", + priv->type, __func__); + return -EINVAL; + } =20 err =3D tegra_ivc_init(channel->ivc, NULL, &rx, priv->rx.phys + offset, &= tx, priv->tx.phys + offset, 1, message_size, tegra186_bpmp_ivc_notify, @@ -158,54 +180,135 @@ static void mbox_handle_rx(struct mbox_client *clien= t, void *data) tegra_bpmp_handle_rx(bpmp); } =20 -static int tegra186_bpmp_init(struct tegra_bpmp *bpmp) +static void tegra186_bpmp_teardown_channels(struct tegra_bpmp *bpmp) { - struct tegra186_bpmp *priv; - unsigned int i; - int err; + size_t i; + struct tegra186_bpmp *priv =3D bpmp->priv; =20 - priv =3D devm_kzalloc(bpmp->dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; + for (i =3D 0; i < bpmp->threaded.count; i++) { + if (!bpmp->threaded_channels[i].bpmp) + continue; =20 - bpmp->priv =3D priv; - priv->parent =3D bpmp; + tegra186_bpmp_channel_cleanup(&bpmp->threaded_channels[i]); + } =20 - priv->tx.pool =3D of_gen_pool_get(bpmp->dev->of_node, "shmem", 0); - if (!priv->tx.pool) { + tegra186_bpmp_channel_cleanup(bpmp->rx_channel); + tegra186_bpmp_channel_cleanup(bpmp->tx_channel); + + if (priv->type =3D=3D TEGRA_SRAM) { + gen_pool_free(priv->tx.sram.pool, (unsigned long)priv->tx.sram.virt, 409= 6); + gen_pool_free(priv->rx.sram.pool, (unsigned long)priv->rx.sram.virt, 409= 6); + } else if (priv->type =3D=3D TEGRA_DRAM) { + memunmap(priv->tx.dram.virt); + } +} + +static int tegra186_bpmp_sram_init(struct tegra_bpmp *bpmp) +{ + int err; + struct tegra186_bpmp *priv =3D bpmp->priv; + + priv->tx.sram.pool =3D of_gen_pool_get(bpmp->dev->of_node, "shmem", 0); + if (!priv->tx.sram.pool) { dev_err(bpmp->dev, "TX shmem pool not found\n"); return -EPROBE_DEFER; } =20 - priv->tx.virt =3D (void __iomem *)gen_pool_dma_alloc(priv->tx.pool, 4096,= &priv->tx.phys); - if (!priv->tx.virt) { + priv->tx.sram.virt =3D (void __iomem *)gen_pool_dma_alloc(priv->tx.sram.p= ool, 4096, + &priv->tx.phys); + if (!priv->tx.sram.virt) { dev_err(bpmp->dev, "failed to allocate from TX pool\n"); return -ENOMEM; } =20 - priv->rx.pool =3D of_gen_pool_get(bpmp->dev->of_node, "shmem", 1); - if (!priv->rx.pool) { + priv->rx.sram.pool =3D of_gen_pool_get(bpmp->dev->of_node, "shmem", 1); + if (!priv->rx.sram.pool) { dev_err(bpmp->dev, "RX shmem pool not found\n"); err =3D -EPROBE_DEFER; goto free_tx; } =20 - priv->rx.virt =3D (void __iomem *)gen_pool_dma_alloc(priv->rx.pool, 4096,= &priv->rx.phys); - if (!priv->rx.virt) { + priv->rx.sram.virt =3D (void __iomem *)gen_pool_dma_alloc(priv->rx.sram.p= ool, 4096, + &priv->rx.phys); + if (!priv->rx.sram.virt) { dev_err(bpmp->dev, "failed to allocate from RX pool\n"); err =3D -ENOMEM; goto free_tx; } =20 + priv->type =3D TEGRA_SRAM; + + return 0; + +free_tx: + gen_pool_free(priv->tx.sram.pool, (unsigned long)priv->tx.sram.virt, 4096= ); + + return err; +} + +static int tegra186_bpmp_dram_init(struct tegra_bpmp *bpmp) +{ + int err; + resource_size_t size; + struct resource res; + struct device_node *np; + struct tegra186_bpmp *priv =3D bpmp->priv; + + np =3D of_parse_phandle(bpmp->dev->of_node, "memory-region", 0); + if (!np) + return -ENOENT; + + err =3D of_address_to_resource(np, 0, &res); + if (err) { + dev_warn(bpmp->dev, "Parsing memory region returned: %d\n", err); + return -EINVAL; + } + + size =3D resource_size(&res); + if (size < SZ_8K) { + dev_warn(bpmp->dev, "DRAM region must be larger than 8 KiB\n"); + return -EINVAL; + } + + priv->tx.phys =3D res.start; + priv->rx.phys =3D res.start + SZ_4K; + + priv->tx.dram.virt =3D memremap(priv->tx.phys, size, MEMREMAP_WC); + if (priv->tx.dram.virt =3D=3D NULL) { + dev_warn(bpmp->dev, "DRAM region mapping failed\n"); + return -EINVAL; + } + priv->rx.dram.virt =3D priv->tx.dram.virt + SZ_4K; + priv->type =3D TEGRA_DRAM; + + return 0; +} + +static int tegra186_bpmp_setup_channels(struct tegra_bpmp *bpmp) +{ + int err; + size_t i; + struct tegra186_bpmp *priv =3D bpmp->priv; + + priv->type =3D TEGRA_INVALID; + + err =3D tegra186_bpmp_dram_init(bpmp); + if (err =3D=3D -ENOENT) + err =3D tegra186_bpmp_sram_init(bpmp); + if (err < 0) + return err; + err =3D tegra186_bpmp_channel_init(bpmp->tx_channel, bpmp, bpmp->soc->channels.cpu_tx.offset); if (err < 0) - goto free_rx; + return err; =20 err =3D tegra186_bpmp_channel_init(bpmp->rx_channel, bpmp, bpmp->soc->channels.cpu_rx.offset); - if (err < 0) - goto cleanup_tx_channel; + if (err < 0) { + tegra186_bpmp_channel_cleanup(bpmp->tx_channel); + return err; + } =20 for (i =3D 0; i < bpmp->threaded.count; i++) { unsigned int index =3D bpmp->soc->channels.thread.offset + i; @@ -213,9 +316,42 @@ static int tegra186_bpmp_init(struct tegra_bpmp *bpmp) err =3D tegra186_bpmp_channel_init(&bpmp->threaded_channels[i], bpmp, index); if (err < 0) - goto cleanup_channels; + break; } =20 + if (err < 0) + tegra186_bpmp_teardown_channels(bpmp); + + return err; +} + +static void tegra186_bpmp_reset_channels(struct tegra_bpmp *bpmp) +{ + size_t i; + + tegra186_bpmp_channel_reset(bpmp->tx_channel); + tegra186_bpmp_channel_reset(bpmp->rx_channel); + + for (i =3D 0; i < bpmp->threaded.count; i++) + tegra186_bpmp_channel_reset(&bpmp->threaded_channels[i]); +} + +static int tegra186_bpmp_init(struct tegra_bpmp *bpmp) +{ + int err; + struct tegra186_bpmp *priv; + + priv =3D devm_kzalloc(bpmp->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + bpmp->priv =3D priv; + priv->parent =3D bpmp; + + err =3D tegra186_bpmp_setup_channels(bpmp); + if (err < 0) + return err; + /* mbox registration */ priv->mbox.client.dev =3D bpmp->dev; priv->mbox.client.rx_callback =3D mbox_handle_rx; @@ -226,63 +362,27 @@ static int tegra186_bpmp_init(struct tegra_bpmp *bpmp) if (IS_ERR(priv->mbox.channel)) { err =3D PTR_ERR(priv->mbox.channel); dev_err(bpmp->dev, "failed to get HSP mailbox: %d\n", err); - goto cleanup_channels; + tegra186_bpmp_teardown_channels(bpmp); + return err; } =20 - tegra186_bpmp_channel_reset(bpmp->tx_channel); - tegra186_bpmp_channel_reset(bpmp->rx_channel); - - for (i =3D 0; i < bpmp->threaded.count; i++) - tegra186_bpmp_channel_reset(&bpmp->threaded_channels[i]); + tegra186_bpmp_reset_channels(bpmp); =20 return 0; - -cleanup_channels: - for (i =3D 0; i < bpmp->threaded.count; i++) { - if (!bpmp->threaded_channels[i].bpmp) - continue; - - tegra186_bpmp_channel_cleanup(&bpmp->threaded_channels[i]); - } - - tegra186_bpmp_channel_cleanup(bpmp->rx_channel); -cleanup_tx_channel: - tegra186_bpmp_channel_cleanup(bpmp->tx_channel); -free_rx: - gen_pool_free(priv->rx.pool, (unsigned long)priv->rx.virt, 4096); -free_tx: - gen_pool_free(priv->tx.pool, (unsigned long)priv->tx.virt, 4096); - - return err; } =20 static void tegra186_bpmp_deinit(struct tegra_bpmp *bpmp) { struct tegra186_bpmp *priv =3D bpmp->priv; - unsigned int i; =20 mbox_free_channel(priv->mbox.channel); =20 - for (i =3D 0; i < bpmp->threaded.count; i++) - tegra186_bpmp_channel_cleanup(&bpmp->threaded_channels[i]); - - tegra186_bpmp_channel_cleanup(bpmp->rx_channel); - tegra186_bpmp_channel_cleanup(bpmp->tx_channel); - - gen_pool_free(priv->rx.pool, (unsigned long)priv->rx.virt, 4096); - gen_pool_free(priv->tx.pool, (unsigned long)priv->tx.virt, 4096); + tegra186_bpmp_teardown_channels(bpmp); } =20 static int tegra186_bpmp_resume(struct tegra_bpmp *bpmp) { - unsigned int i; - - /* reset message channels */ - tegra186_bpmp_channel_reset(bpmp->tx_channel); - tegra186_bpmp_channel_reset(bpmp->rx_channel); - - for (i =3D 0; i < bpmp->threaded.count; i++) - tegra186_bpmp_channel_reset(&bpmp->threaded_channels[i]); + tegra186_bpmp_reset_channels(bpmp); =20 return 0; } diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c index 8b5e5daa9fae..17bd3590aaa2 100644 --- a/drivers/firmware/tegra/bpmp.c +++ b/drivers/firmware/tegra/bpmp.c @@ -735,6 +735,8 @@ static int tegra_bpmp_probe(struct platform_device *pde= v) if (!bpmp->threaded_channels) return -ENOMEM; =20 + platform_set_drvdata(pdev, bpmp); + err =3D bpmp->soc->ops->init(bpmp); if (err < 0) return err; @@ -758,8 +760,6 @@ static int tegra_bpmp_probe(struct platform_device *pde= v) =20 dev_info(&pdev->dev, "firmware: %.*s\n", (int)sizeof(tag), tag); =20 - platform_set_drvdata(pdev, bpmp); - err =3D of_platform_default_populate(pdev->dev.of_node, NULL, &pdev->dev); if (err < 0) goto free_mrq; --=20 2.34.1