From patchwork Tue Aug 22 08:45:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 13360377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51326EE49A3 for ; Tue, 22 Aug 2023 08:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d9QU4mnsb5SLxLz0Dyt3w60Q6AIISf5Li7w10ltR8rg=; b=BTWb5F250h96AV luVRobOwyuLpCpValfwFPGwWj1zfqGuAj8TyvC0e7E5McAzSCF02iu1pLRQYqbRFfvDORefZLeZbD Nshm0tZmXjp24ohiyCnZ6EFhMYXlzNG7u3ZhLZ9VVZb3oVLswWStbTI1Xi5ghwPsPXQkURrDEsO1I FzIm8KOQU0rzpDIta/f6sX2ZNXr73vtwy3PDtUwZZ7h/KhkH0smB0UYN/kVczzSfnm5F1vx2T1qcK PGxLGepca8mtBM5iBMdIc/lFxO8oHTMlRBNhlIa+0Ji1ak2OoB6VXsVT9BM0F+S73bWLOjqv2BK9J ZPWigJquMYumhWYuMI2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qYN2C-00FUsC-1H; Tue, 22 Aug 2023 08:46:44 +0000 Received: from mail-bn1nam02on20628.outbound.protection.outlook.com ([2a01:111:f400:7eb2::628] helo=NAM02-BN1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qYN1n-00FUVo-2I for linux-arm-kernel@lists.infradead.org; Tue, 22 Aug 2023 08:46:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wy0uIhFEiyWVL8FtGfH1+T/1b5ELQ3WLPjjykDPamCP04oMMJKQdeSbf9lwv289NYi0qfV5WvPuYqwRwfCvXpdG3d3cFGwANER77BjIZOK5N8N0j1dnbqihJcjUSmFuozsL8DRaj4I3esrQJ8Y8sz4WijOv1VH7qF1cQrFum50qMcP9NaC6bCA7PNyCoTq/sqxDY6n6J3RG9+7aknrMFtIyVs6mi3tIK/SSDPzC7Dy+HQvQQKSG9/54keBxX0+9gJJ8bMBZqr63xP8CPIhUKaQlS6GuEd/RUqHVnYvddPtYzEVmMkgZU7zltIW/5WP76Wr1uF9E5ROVrSToVjH5z0w== 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=hBT4ZsDhU4UK0CWceL4+KblEiHJflSJKZAmSIR8AOps=; b=Ne9ualEglkcgiLDIGZGbc1Iidmm6ZsPlvWn+kgUnNMOpm+12ztoH5i4W5tuigy/szscgRyMSAyEhX+SQRl5wd9RyW4zX9ipCP6VVuU5MbhfPFIZEN0CQaJRPWUlhJ6ngR2Hwa9jLH1h8Hs+eH+8Bqm+VbjIKf5SZYV0ZJEKJLAI7EMM+p4x/+xZqjl0KH3bkn/poGUZ5g9rOlBv9gjPUV+UtjAaRxZbfjzoip7kuNxXdkM9mMLfATHCF9UofcJ/LgrlVGqamjR/FE/Jvwb6uAcQav8YloxWWm2KeF/WbS2lWuad2F5UBS612qNO3IolfEqq0L/HBPGA+GmhHTcd1bQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.232) smtp.rcpttodomain=kernel.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=hBT4ZsDhU4UK0CWceL4+KblEiHJflSJKZAmSIR8AOps=; b=H0TgMWZFGyjotTSQMVYPcqy16900K9ywafqYUzVpYePZg8HxoT+oUqlrOuEv4HGTQi1q2NBgSjbqCm6LL5r7Ouyzth+XHGA2uNgVzQWOb7tBt7/l91qv/c3TQowz/qVwTxp/Dx5z82TZD70cx1g15HM53dl/VMBDLFvXJFXHmh2Y5izNm0eZUrK/ZSgIiw/HPoe0f/56TObIyMSfyaSyySITmjiQjFBwWpUuZHrsh7jwMkjP6Fv9SbK37YxFVsbtZKDu00AcA796WMDUAgjYzAKzfaiqW5KjeiwyPsBdu9tpteayBc1nmbDsOq7u/uhew9H/FntjNIru08F8AT7Q7w== Received: from CY8PR10CA0040.namprd10.prod.outlook.com (2603:10b6:930:4b::16) by IA0PR12MB7580.namprd12.prod.outlook.com (2603:10b6:208:43b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20; Tue, 22 Aug 2023 08:46:15 +0000 Received: from CY4PEPF0000EDD6.namprd03.prod.outlook.com (2603:10b6:930:4b:cafe::28) by CY8PR10CA0040.outlook.office365.com (2603:10b6:930:4b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.20 via Frontend Transport; Tue, 22 Aug 2023 08:46:15 +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 CY4PEPF0000EDD6.mail.protection.outlook.com (10.167.241.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.15 via Frontend Transport; Tue, 22 Aug 2023 08:46:15 +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.5; Tue, 22 Aug 2023 01:46:05 -0700 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.37; Tue, 22 Aug 2023 01:46:04 -0700 Received: from Asurada-Nvidia.nvidia.com (10.127.8.13) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Tue, 22 Aug 2023 01:46:04 -0700 From: Nicolin Chen To: , , CC: , , , , , Subject: [PATCH 2/3] iommu/arm-smmu-v3: Add an arm_smmu_tlb_inv_domain helper Date: Tue, 22 Aug 2023 01:45:52 -0700 Message-ID: <854e2b3f2d4f1b76f916fcfc288b34526d4d4162.1692693557.git.nicolinc@nvidia.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD6:EE_|IA0PR12MB7580:EE_ X-MS-Office365-Filtering-Correlation-Id: 636e6c5b-866d-4a3d-3055-08dba2ec3ed4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DK36KIL1VDsTw4rF2ebdcvpHKHNyTrGOT8fkGAG93zVBB6R5WvMJbJPMiBdJxr4u1lxVmhiglU4N+46YEugLD7yeKMhGJwT9eUf4dNhnsjMBJU8j9r7U5KxRTmqhQw3c9Z6CaiXRrTer9S59/moBJtDKf97uRUKrwVXIS7PqrlENVyJiFsWs1KJOsNVttrt3A+WPO0FsyDXgWWUmNxKJktrTfJnToq/q+TS+VwQI2Xwq6rL1QvClpF2GZOeKss1O4QF2+aL8FJSg2FEXfefcQ/SAi2Ejd9p5ZzBASMyuWgG6ddLDx9fgClKaAL5yjYLEb6w5rOpBXsCmKvJGz9BKymMBgxFgtdPLMhUpRA5hmU9Mql7/rMbX6XAoNmnmAldv4smMEe/mafiY6C8lP3dKxxqHhR4gwe6zf+9S9eNUZhKV+1k3fD80NqUilcuJdLxxtjz6+dIYXMN4OUa8oAUEKJaldTqtScTE7PIhWLFMO/huze+amyA7O18QJZpJGkb0BbglfClYkHlGxg8vCb3X88dEtybW82rfizjP3uttJ+C4iJQ9Jt9A2h3IZU9AI8/yG3DNSHo1gZchBAz78pROQlhm/19s7oRfhYL5Oczljfs5xJUZsAaGJkq5TpUjhhBGqxbtBv2JyNFP5+qeRatUhS7ntBqvk8/hmshVPXZABLl6GybBycaph1Pg++E141DzkwWG6BXTHGJyyA+/c09j0M5tO+7H7K4fF7TOtbwHZefJaKGoC4o/wi05tHiJnoO5 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:(13230031)(4636009)(396003)(136003)(39860400002)(346002)(376002)(1800799009)(186009)(451199024)(82310400011)(46966006)(36840700001)(40470700004)(54906003)(6636002)(70206006)(70586007)(316002)(110136005)(8676002)(8936002)(2616005)(4326008)(7636003)(40460700003)(36756003)(41300700001)(82740400003)(356005)(478600001)(6666004)(40480700001)(83380400001)(2906002)(86362001)(7696005)(47076005)(36860700001)(336012)(426003)(5660300002)(26005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Aug 2023 08:46:15.2194 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 636e6c5b-866d-4a3d-3055-08dba2ec3ed4 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: CY4PEPF0000EDD6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7580 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230822_014619_765135_D78848E5 X-CRM114-Status: GOOD ( 13.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move the part of per-asid or per-vmid invalidation command issuing into a new helper function, which will be used in the following change. Signed-off-by: Nicolin Chen --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 24 +++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 9b0dc3505601..d6c647e1eb01 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1854,12 +1854,24 @@ int arm_smmu_atc_inv_domain(struct arm_smmu_domain *smmu_domain, int ssid, return arm_smmu_cmdq_batch_submit(smmu_domain->smmu, &cmds); } +static void arm_smmu_tlb_inv_domain(struct arm_smmu_domain *smmu_domain) +{ + struct arm_smmu_device *smmu = smmu_domain->smmu; + struct arm_smmu_cmdq_ent cmd; + + if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { + arm_smmu_tlb_inv_asid(smmu, smmu_domain->s1_cfg.cd.asid); + } else { + cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; + cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; + arm_smmu_cmdq_issue_cmd_with_sync(smmu, &cmd); + } +} + /* IO_PGTABLE API */ static void arm_smmu_tlb_inv_context(void *cookie) { struct arm_smmu_domain *smmu_domain = cookie; - struct arm_smmu_device *smmu = smmu_domain->smmu; - struct arm_smmu_cmdq_ent cmd; /* * NOTE: when io-pgtable is in non-strict mode, we may get here with @@ -1868,13 +1880,7 @@ static void arm_smmu_tlb_inv_context(void *cookie) * insertion to guarantee those are observed before the TLBI. Do be * careful, 007. */ - if (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) { - arm_smmu_tlb_inv_asid(smmu, smmu_domain->s1_cfg.cd.asid); - } else { - cmd.opcode = CMDQ_OP_TLBI_S12_VMALL; - cmd.tlbi.vmid = smmu_domain->s2_cfg.vmid; - arm_smmu_cmdq_issue_cmd_with_sync(smmu, &cmd); - } + arm_smmu_tlb_inv_domain(smmu_domain); arm_smmu_atc_inv_domain(smmu_domain, 0, 0, 0); }