From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3633C433F5 for ; Wed, 8 Dec 2021 08:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbhLHIv1 (ORCPT ); Wed, 8 Dec 2021 03:51:27 -0500 Received: from mail-bn8nam12on2075.outbound.protection.outlook.com ([40.107.237.75]:9697 "EHLO NAM12-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229636AbhLHIvV (ORCPT ); Wed, 8 Dec 2021 03:51:21 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SQ0iJwrf2OIyXtF4yFyZ/KQqes1aVta6kzSkwryr0zRjOcSOywomq65w1+9+88Dwu1rJmUb4qTTFC9y81QBrz48UTdQTD5nB/VaUIhVExeemLCD12U/r59BnHmQ2tLliJSk/SFn03IiVZUxQjZTzMC6rzlyDvqudleB7QNNaHLPCeG1YR8xJgC8BKJwXMR1TX+ySJdtphg7550/ZxArPOjkuFp3c0u+FWLlFWTXLvCQPCMnCOZgzixumfOC/N75Y/Pzierzhj249n1TGy3GQdYsUo47pZ0+e/x2Ph9P8i0x+voX99x7IEHcej/wkuNk+a9zsxy2anSCeqSApbP/isA== 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=QS65vfo0WoHBvmAzmr0pIExlBIg0ScMsocsaJTs1wiM=; b=gkcGy7pPsosnHgfAPXR1FMyJi8Fa4vtXvkt31FLOf9swLhGn8o1tOMWdHxAJe07uU9dSPTUcLWo+8+hf3VJ+A6p+lM8WpB5w2U9osPWCpyqsc1fxtFxRqT3gmmgOiL5+KwqyzL0vhFNM7/mkiiVrNUq8qCs/gPxp07XtOLLsXbnIorYp14KtvFAbb2po7uKnuCDpLHRvF77ITFKDgD7nMemsgmdEQTWEGS0dQHI00eNo90wZ5RnKGL+aom1ENvLNFRg7yZ+gZ7WTiIlGvxBC+tLHdVHecB9qQN7f8fy2pEe95gPJeuu/QugRNUJ8PI7Ix+b3kuPK8IlqlmGRVXQxUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 203.18.50.12) smtp.rcpttodomain=gmail.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=QS65vfo0WoHBvmAzmr0pIExlBIg0ScMsocsaJTs1wiM=; b=d0Ac8fJvpRzJhNHAtq4r9s4xqjcI6yFrotsXWV1ewk1JRAqCyFE0M57THgfmWHiGQ5D8AF4tle+5xiUySM5khwGX+Fi69MvgLmqMLD2N1QC4H4CsMTFzauODyixTR5X31w8AfObiuPGK4alwxSVTwLfaqTtsgpfMIai2eUoGcJqvzzoQDGqZ1cL4VnTRtdhftJQw1KUgUkJXyfVqltagmYZWTwsaG/byH8X/hGCsROgojly0A2rHzhk0sv2IFGpnzrBu4bZbrelOUYAuRp6FkX7hz2Fdge7pDusAUbQg0/f0p3XAeYwcUX7DAcgRq+DdFzjNBTJgPpfAj1pe9yhnKQ== Received: from MWHPR21CA0034.namprd21.prod.outlook.com (2603:10b6:300:129::20) by MN2PR12MB3168.namprd12.prod.outlook.com (2603:10b6:208:af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 08:47:48 +0000 Received: from CO1NAM11FT026.eop-nam11.prod.protection.outlook.com (2603:10b6:300:129:cafe::1e) by MWHPR21CA0034.outlook.office365.com (2603:10b6:300:129::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.7 via Frontend Transport; Wed, 8 Dec 2021 08:47:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 203.18.50.12) 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 203.18.50.12 as permitted sender) receiver=protection.outlook.com; client-ip=203.18.50.12; helo=mail.nvidia.com; Received: from mail.nvidia.com (203.18.50.12) by CO1NAM11FT026.mail.protection.outlook.com (10.13.175.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4755.13 via Frontend Transport; Wed, 8 Dec 2021 08:47:47 +0000 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HKMAIL101.nvidia.com (10.18.16.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 8 Dec 2021 08:47:44 +0000 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 8 Dec 2021 08:47:43 +0000 Received: from Asurada-Nvidia.nvidia.com (172.20.187.5) by mail.nvidia.com (172.20.187.15) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 8 Dec 2021 00:47:42 -0800 From: Nicolin Chen To: , , CC: , , , , , Subject: [PATCH v7 4/6] iommu/tegra-smmu: Use swgrp pointer instead of swgroup id Date: Wed, 8 Dec 2021 00:47:30 -0800 Message-ID: <20211208084732.23363-5-nicolinc@nvidia.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211208084732.23363-1-nicolinc@nvidia.com> References: <20211208084732.23363-1-nicolinc@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9f5ae65-d996-450a-d0ae-08d9ba27694d X-MS-TrafficTypeDiagnostic: MN2PR12MB3168:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dhaCpL1pbDnuwp8kT4MA/8jcVSiZkXb7+8jP6l3vWsgmw7GK3luVQh/K4xoSITYYNNTuleU4MoINd8KwGzWI0rCfLMTKb+4oQuTY2+MvSVmdZt5l1JEqtb1ktM2kwIfj1MOiYPwOoHllRpETqqSTV7F2C9Iz9oDAIie5b8Lg3gQsnxDwQS1wy/vYRpMa+G+IbolecS9gkE19It2JYw7isajT8G/603usP/tXIOq8G6eMF5L4xyHk4CLaUrB9JI/3yNXOluezdBbfjrdvajNfRkcORl13nLSzgVNsV94FEW8eHn/CALLyLu7U3d83N2HOotc+C7dQ5EfGH37EMQliLJZv3hGh79muXw3l4Cn14tx07PsoMXlP6lbj719cnwCtZhNapsHzAXHT/gLsbBtnKAfdVxYnGyVL41KkZs3MzMRUahHM9BzRipkWb1xRukpmVjMEeqvlZe1OdlR0TqH/gOkVeVezoAuB79sSdjHi0qzS9paBpwu05jUtHPENp4/EpQUnD0THsYGghlYwK5WvoJYmcH8mgzh8swXESnxdoFWABiO9llY4rwC7aNG3j36+0tyHyaCihUN0M6dlAZXza3J0tCemGCsX+CkZXgYzutj+W5fUZnhqmwSfJ4j6WgAbl5MiIvONHGagjKfu+aWoO7ZO5Me6ISyoaBm3sPdH4YwqG6HD0vtqCebq2zDt8X+0HR3rOfChEsURh6H6Pij4Jf2J+RDdrfTckyBP0GGv1EuPRrOI6zUpcJv/bfg8IkSfA+llwbcvWL9cCYEaDG4EWwZMN+OfFxi2LXoKHbcos60= X-Forefront-Antispam-Report: CIP:203.18.50.12;CTRY:HK;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:hkhybrid01.nvidia.com;CAT:NONE;SFS:(4636009)(36840700001)(46966006)(40470700001)(83380400001)(110136005)(54906003)(2906002)(6666004)(426003)(336012)(36860700001)(8676002)(2616005)(4326008)(186003)(26005)(508600001)(70586007)(86362001)(1076003)(7696005)(316002)(5660300002)(7636003)(36756003)(356005)(8936002)(70206006)(34070700002)(40460700001)(47076005)(82310400004);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 08:47:47.9240 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9f5ae65-d996-450a-d0ae-08d9ba27694d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[203.18.50.12];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT026.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3168 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch changes in struct tegra_smmu_group to use swgrp pointer instead of swgroup, as a preparational change for the "mappings" debugfs feature. Acked-by: Thierry Reding Signed-off-by: Nicolin Chen --- drivers/iommu/tegra-smmu.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 42af216ef65c..b0a04cc8f560 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -23,8 +23,8 @@ struct tegra_smmu_group { struct list_head list; struct tegra_smmu *smmu; const struct tegra_smmu_group_soc *soc; + const struct tegra_smmu_swgroup *swgrp; struct iommu_group *grp; - unsigned int swgroup; }; struct tegra_smmu { @@ -897,18 +897,22 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev) struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); struct tegra_smmu *smmu = dev_iommu_priv_get(dev); const struct tegra_smmu_group_soc *soc; + const struct tegra_smmu_swgroup *swgrp; unsigned int swgroup = fwspec->ids[0]; struct tegra_smmu_group *group; struct iommu_group *grp; + /* Find swgrp according to the swgroup id */ + swgrp = tegra_smmu_find_swgrp(smmu, swgroup); + /* Find group_soc associating with swgroup */ soc = tegra_smmu_find_group_soc(smmu, swgroup); mutex_lock(&smmu->lock); - /* Find existing iommu_group associating with swgroup or group_soc */ + /* Find existing iommu_group associating with swgrp or group_soc */ list_for_each_entry(group, &smmu->groups, list) - if ((group->swgroup == swgroup) || (soc && group->soc == soc)) { + if ((swgrp && group->swgrp == swgrp) || (soc && group->soc == soc)) { grp = iommu_group_ref_get(group->grp); mutex_unlock(&smmu->lock); return grp; @@ -921,7 +925,7 @@ static struct iommu_group *tegra_smmu_device_group(struct device *dev) } INIT_LIST_HEAD(&group->list); - group->swgroup = swgroup; + group->swgrp = swgrp; group->smmu = smmu; group->soc = soc; -- 2.17.1