From patchwork Tue Apr 30 17:21:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13649707 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 D124AC4345F for ; Tue, 30 Apr 2024 17:22:27 +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=L/aedMc0V7/9vG5UeOpx55sOYHwXQQRWo6JbrhSPPGQ=; b=oUdvz4km5j1udd 3M56jyU96uI845Q/xwAy67by0VQ8WMkvPGqNJsIALahK0UyAdNVcKf829fEWSu1NZOXRYVcMuJckU K4Xi00RgZmmrV7gVJqG46kAYXzYvcsbj4hDUCnxDSjCTxb74nC0pl6b0UtBlAuG9aAknbmQ3Ijb/U 3xlVNATcAFNX3+zX403jdm7ll32LwMgI4Mrb+rbfFY9+d7eKNQE1iNMfO5rOKIu24BL9shPBB7W/L ttV0LrDx53JokfNovpOAjSy4KGe851xwbCvaZzF6iheP73Q35GeEHSK90Zq5/SOnI6tQB09bNSlVx tqeMzAQsI2b7EAHt6HoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1rBC-00000007OfJ-2BYE; Tue, 30 Apr 2024 17:22:10 +0000 Received: from mail-bn8nam12on20600.outbound.protection.outlook.com ([2a01:111:f403:2418::600] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1rAw-00000007OVf-1yj7 for linux-arm-kernel@lists.infradead.org; Tue, 30 Apr 2024 17:21:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NpDtcfD/t1TeUVpPfYQEwOBiakauJWFlEfRXUn1w8VNi6uhs8xZHTz4b3CVp640i2xedQoL5hezyGZmQDU5fzNFQ1WaU4SZWLPVwqRpzLEfQwpw6KWRR7yUTN2AvPxXmlOMIZEdgjt68aLvlMilVcBLB4mUW9wD1SvP+aQUtNrtkIIhTSIA01sUZmMAi/AZqO+GGBoPaCM2OVQxUM4uBibrb1wAsOzbn+mUeB3NMUwpcCgIS6r5gaj/Zgaeqd7h8YP6wdl9tvY2rqBNViQFpTg1eR0cv8G7tN6kEp0HYPiYwXCVcblvkypV68i552/2xHMFXTX3d8jLz0+4Oa6Tlog== 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=P9Gc0ljTfkZiDfNYJqusXC0QJBdqdT4d4ljYV+FyCtw=; b=DJbg9T3DRgqoj9rF9VhdeecSe95M3rGZ1u33eqfo4GRGLkoTWbJPUrbt6/zFmvUJs+8GmMoPnXV840ZIaFg03PF9aUT4NaUB0OxRuGvA9VR49eqoH5lXDURwzw2j/Etz5UsQQcG4xTzcy1dsHXj9pN7TjJTlsgMz750cYEHXDu4BVfuaaXC3m5423hhp1omjsS+HNl2naNwmwp4pdjFW/PkGRVFXXkb8w0ngQoY+vIfPJksHWjDyHNkRBq5KwCcXdvSxJnxhVPAmR8LnU15LqQWRLOeIjfqhxk0To/2c0UUTa+0dw1hC9uK7AEmVrL+jh2W9h01CZ4y5Y+h65T4fUQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; 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=P9Gc0ljTfkZiDfNYJqusXC0QJBdqdT4d4ljYV+FyCtw=; b=bppu1QebjTl792WWmbgatin3EdNzn0fZ5+0RJLMkN63mIX42Cd93nGQX3UffH7/55XLW/dwDDwmRApr/cRVJwb1VBpNb0ebIcSBF77nuQktmj4rEzqhoCDswQBnQmdlXofDCIpEk0YKI2KAAFE5hOH5UneSCsr6AEa0+efbF06hCrxL7WY2Tj7gnpPcMmbYcoQnUfFTwA8zgArwpSIR1PF3JjEfaBdWyr4G+eDWVBNa4cZ3oRbP87VnMW9mTLyhrlWSPEGc7/MOj0b0JLMInVN1hjGwdbRE2MYS9hm2XUxUZD1AtfeDzs+W1J9FT2Y7nSCjmFIYS4HeA47zcNNDnhA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DM6PR12MB3849.namprd12.prod.outlook.com (2603:10b6:5:1c7::26) by DM6PR12MB4172.namprd12.prod.outlook.com (2603:10b6:5:212::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.35; Tue, 30 Apr 2024 17:21:43 +0000 Received: from DM6PR12MB3849.namprd12.prod.outlook.com ([fe80::c296:774b:a5fc:965e]) by DM6PR12MB3849.namprd12.prod.outlook.com ([fe80::c296:774b:a5fc:965e%3]) with mapi id 15.20.7519.031; Tue, 30 Apr 2024 17:21:43 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Eric Auger , Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum , Mostafa Saleh Subject: [PATCH v9 8/9] iommu/arm-smmu-v3: Build the whole CD in arm_smmu_make_s1_cd() Date: Tue, 30 Apr 2024 14:21:40 -0300 Message-ID: <8-v9-5040dc602008+177d7-smmuv3_newapi_p2_jgg@nvidia.com> In-Reply-To: <0-v9-5040dc602008+177d7-smmuv3_newapi_p2_jgg@nvidia.com> References: X-ClientProxiedBy: MN2PR17CA0001.namprd17.prod.outlook.com (2603:10b6:208:15e::14) To DM6PR12MB3849.namprd12.prod.outlook.com (2603:10b6:5:1c7::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR12MB3849:EE_|DM6PR12MB4172:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f0de155-62b7-4edc-c4e1-08dc693a0114 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|1800799015|376005|7416005|366007; X-Microsoft-Antispam-Message-Info: zA1rzPIVp/tALkc5JFnesolGay2D61kb3LBD0dfLgGBrWy+enVZmL9hPpe58Q+H04IBcQgcOgICcNed8btzHfyuQ9qNLL2PLptItjkOeXVy52OQjGZbfH+bMGlGjeZLxoe5L2fGePo0KJRQkdZ1A/DS0bl955X8XiwCQwBIRFfzPd6M4gZBlg1DuWDs0bSHEgi5I9YCXDX8EztZABJC7IgBX/wnsn8z8WKvY76oPkMwtVXQSZdUUEbRPcJQbyEtJmhWVnTM05sVdCwDiQnHRaOvhby4374uYnn1NonjHV/vV0wTHDSIcO2zyhZp/lJ6Pc0g3I6nTE8Oa3rzotLS9hxOeqFmBxHrB/+jX/R1yk/MVolhDBSckM+d280tVBIULUPC0LnrX4FIWB3NZFv8uFgv168rBXgon7F6axeNvDocEbYX/s/83xoQE1hjWomqu7UbhYnxiVC3lKPjo+tjsFJMKMunh0fZzlScOFD1HOqmt5k+yH4YGGcLX6TYpEege0m0QRRpPRw/15D52PZ+yjMWEkKvNmA4hTIk3Vf8wyNd7RuK4OFOv95ted8wAwaz6cyYtnJxvPVaPlEeR5znukrDYZZfN4j+AMdtPFAvcRUIxGt7hoGO18cfwxI+lonMMd57zUa0GfEj5a0jtqzXnWGIwaEfi/3xx8ozE7DEEqjaZw3DZUCepIlbYa6Kpft1IAqRKxgRSxEAw4/ZFb8rNqaCOT41gmrUgw7j4lkHJQDsCYJCln68abMbichGPRBJwtjXZ40u35zLT4SwfbX03iUttZYrHHb64LbBTdiOXSG+ayj/+kW6iQFX2bLAqR8CLwK2TTBNWR1UnLAtppaUwrZXpUzP89n92CE2mSLUPkFfpn1vCF7NKKRQ/sn9Fd6obeUOoBP1Kth2N9EnmB00gL9jf5A6QchAeRdgOw+66uGLa1feMHQ0QtjiJPlw4w1KXDRMczidH+w7Sgpov/TkzLM86dygw8jdanafQR85RZPTLmgzQc4mZJ7mD0EJFkKm4nrxEegwJumbq5pw1jpqP/AjAuEBNN12FoklTXQJt04LRTe3NUU6CNJXEW2dHUQDLuXcM3igkgOxU2+4Z8k2YQUgZmfwSobLP7IJ8+vhYBt95+p0dCEb1lYi9vXpD77apshNrHDpHYj9PY4WbM9C/PUVcXMThek6et5klQ82I8GBLilE3vC5R1K+cygvS36k3fVWbnS7/XQKyUQ4MQmJg+IzlCkQxr9isJfks7wEh7yXcd9EwGWEIVL2XIc/RHSui/U74gh+XtgJmVn3+baHHFg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3849.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(1800799015)(376005)(7416005)(366007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oy+MTZ0NUvNfrOLqlr75y2msnutpBwmV5Ih6srzdX44dduQkMUgL+UGBF4XUET9s2eUV34oyhlNQZTpvFqZkH3pQlDRwdDOjrsMgcd6/zRw3h2taD5ASOgdEXGA7wGE4YhxY9LWCSHooyLLBjaglosNgUZuG3dOb8gdUwCE1Iy+qXUPcyNB5Ws8NTyOM3Hyfj9/5m8g7VBV3BXp/U7YzWUUlSPvcgv55je10/kg7NRg2EA2xkXMPxYkisIP6O7zjmZr2H7LNqh1fMECBDTRDCvEAlwSRwwlcFau2+mzQ1XGm2PZ4+xB871oJdCMIk4TMlI4qtHhP+nvv8TzNNnQlJlt8AnqfcB4GtmEbTqgmLC/3sKJ9wHVYtJ37N7SJdjXCK5DQ8XihUkx+YsmgehEVGSL1Wi3weDxPrbz2q3fd/KXmY1XA3oBRIOjuiOENcZY673iXl2en67oZhrmV6aBNyqZ1Gs6CXwoYvfR37AQJOoJOAYtb2vDbCW42Iuu9TMT+RFq/8dWHoe5YFMO/eAc+vniATp7CiXJ7VdiC7DNTebUcVZxU77lGtljvfv0cAvsWtFo2WKPnq6utoaV64u+rU5SRwG2aPpXxYreeNPGFxHyPhWu6dYbdhJeetxfU09ZS055BDnaecOMmBVSLVxT93bOBo8Q5Q5ziS4zweUuQxYOYYfMXk1FsvkqHFK+LUamstoAaGiur4qIWaSr1KVf5gWQqKbbXIQm4Gip+AemneVu9623YK4egBAn0i1JOVJ6CUHApg/zHIOcJp/BQNHs8R6tEaWN0jVuBbxdL6Mg6p5fQS5ksjjf1xOsHNDoXQKSgrN26xs2dv6ggbX/jsV5gv3to5gHLW9UkvlCHqLJCiv0C+z1JmOK1hI8VGDz1fgCjur3t3G0smEBoPsY9qpmUs+YQNzScjWSEWXtDPeckwZZ/tot6vEKl8YeovnGcTrcRerU26IO0EuWonXLv1az/pQ7NgYXU7QHYd+1kevZi4sY17edYV3W4vGA2VdmS3vnm110Slwi48JzOnKPXiiSynYCKXMBsLbdp6rL9gic9Fy/C2nefSp+gnG6tmCvetdwFrRecAuP06EuG8ccFPoJ8TYnnh6ZY1NFJfeSOKpwd/PA4Sli8ys9mhZvTXv58oS2SL4Ecyb7YfXAXyt2Fs+e+QS3yK0GxSAEPKAisAqX7GbD/QRt/WHLX9VlWjQRsI03JIBs1qwwyW0rKcRZA7gTcFp5L3SH+p8/6wyQ0UqMOewapWpaR+3tPmOSjiI7IJQBMmKhMDulMK4M14HQM+WUtMCe6AElRGY7yucoBaDoUxIBhDq6W1qoLlgUXBcr/BNAU03RkkbOTCEo6l7meO0OBKwayaxZ14q3nI96ioIDITGWfOaX7I9/OEbRbeTmlcN3BDY2Oi1Lzf/Eh4n0zd+c9aM59uCodevdIL4hT3JyS9SB+TNCCy9bCebLW7Sl5f+J0O6r1MhSmX9YHF1xqQ8VZgja5XF2FliACeAwDwyv9yUxqXY5BA3ZY8eXVjVKTcDj6HJBejJHjC9mCjqArz8lv/9gtScdJEkniLAQkrFp76BrCoHF0EI5EvrkY2PhBMIfy X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f0de155-62b7-4edc-c4e1-08dc693a0114 X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3849.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2024 17:21:42.8413 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ET7ppnV3UMdLqQbyN2e9XojGALFLn+fhOUL7Ib0VqeJhaGgANoutt6nxH2dYx1p7 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4172 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240430_102154_544497_B6D9B4E2 X-CRM114-Status: GOOD ( 13.56 ) 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 Half the code was living in arm_smmu_domain_finalise_s1(), just move it here and take the values directly from the pgtbl_ops instead of storing copies. Tested-by: Nicolin Chen Tested-by: Shameer Kolothum Reviewed-by: Michael Shavit Reviewed-by: Mostafa Saleh Reviewed-by: Nicolin Chen Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 47 ++++++++------------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 3 -- 2 files changed, 18 insertions(+), 32 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 f021268dab4763..3817bc99d7e319 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1309,15 +1309,25 @@ void arm_smmu_make_s1_cd(struct arm_smmu_cd *target, struct arm_smmu_domain *smmu_domain) { struct arm_smmu_ctx_desc *cd = &smmu_domain->cd; + const struct io_pgtable_cfg *pgtbl_cfg = + &io_pgtable_ops_to_pgtable(smmu_domain->pgtbl_ops)->cfg; + typeof(&pgtbl_cfg->arm_lpae_s1_cfg.tcr) tcr = + &pgtbl_cfg->arm_lpae_s1_cfg.tcr; memset(target, 0, sizeof(*target)); target->data[0] = cpu_to_le64( - cd->tcr | + FIELD_PREP(CTXDESC_CD_0_TCR_T0SZ, tcr->tsz) | + FIELD_PREP(CTXDESC_CD_0_TCR_TG0, tcr->tg) | + FIELD_PREP(CTXDESC_CD_0_TCR_IRGN0, tcr->irgn) | + FIELD_PREP(CTXDESC_CD_0_TCR_ORGN0, tcr->orgn) | + FIELD_PREP(CTXDESC_CD_0_TCR_SH0, tcr->sh) | #ifdef __BIG_ENDIAN CTXDESC_CD_0_ENDI | #endif + CTXDESC_CD_0_TCR_EPD1 | CTXDESC_CD_0_V | + FIELD_PREP(CTXDESC_CD_0_TCR_IPS, tcr->ips) | CTXDESC_CD_0_AA64 | (master->stall_enabled ? CTXDESC_CD_0_S : 0) | CTXDESC_CD_0_R | @@ -1325,9 +1335,9 @@ void arm_smmu_make_s1_cd(struct arm_smmu_cd *target, CTXDESC_CD_0_ASET | FIELD_PREP(CTXDESC_CD_0_ASID, cd->asid) ); - - target->data[1] = cpu_to_le64(cd->ttbr & CTXDESC_CD_1_TTB0_MASK); - target->data[3] = cpu_to_le64(cd->mair); + target->data[1] = cpu_to_le64(pgtbl_cfg->arm_lpae_s1_cfg.ttbr & + CTXDESC_CD_1_TTB0_MASK); + target->data[3] = cpu_to_le64(pgtbl_cfg->arm_lpae_s1_cfg.mair); } void arm_smmu_clear_cd(struct arm_smmu_master *master, ioasid_t ssid) @@ -2284,13 +2294,11 @@ static void arm_smmu_domain_free(struct iommu_domain *domain) } static int arm_smmu_domain_finalise_s1(struct arm_smmu_device *smmu, - struct arm_smmu_domain *smmu_domain, - struct io_pgtable_cfg *pgtbl_cfg) + struct arm_smmu_domain *smmu_domain) { int ret; u32 asid; struct arm_smmu_ctx_desc *cd = &smmu_domain->cd; - typeof(&pgtbl_cfg->arm_lpae_s1_cfg.tcr) tcr = &pgtbl_cfg->arm_lpae_s1_cfg.tcr; refcount_set(&cd->refs, 1); @@ -2298,31 +2306,13 @@ static int arm_smmu_domain_finalise_s1(struct arm_smmu_device *smmu, mutex_lock(&arm_smmu_asid_lock); ret = xa_alloc(&arm_smmu_asid_xa, &asid, cd, XA_LIMIT(1, (1 << smmu->asid_bits) - 1), GFP_KERNEL); - if (ret) - goto out_unlock; - cd->asid = (u16)asid; - cd->ttbr = pgtbl_cfg->arm_lpae_s1_cfg.ttbr; - cd->tcr = FIELD_PREP(CTXDESC_CD_0_TCR_T0SZ, tcr->tsz) | - FIELD_PREP(CTXDESC_CD_0_TCR_TG0, tcr->tg) | - FIELD_PREP(CTXDESC_CD_0_TCR_IRGN0, tcr->irgn) | - FIELD_PREP(CTXDESC_CD_0_TCR_ORGN0, tcr->orgn) | - FIELD_PREP(CTXDESC_CD_0_TCR_SH0, tcr->sh) | - FIELD_PREP(CTXDESC_CD_0_TCR_IPS, tcr->ips) | - CTXDESC_CD_0_TCR_EPD1 | CTXDESC_CD_0_AA64; - cd->mair = pgtbl_cfg->arm_lpae_s1_cfg.mair; - - mutex_unlock(&arm_smmu_asid_lock); - return 0; - -out_unlock: mutex_unlock(&arm_smmu_asid_lock); return ret; } static int arm_smmu_domain_finalise_s2(struct arm_smmu_device *smmu, - struct arm_smmu_domain *smmu_domain, - struct io_pgtable_cfg *pgtbl_cfg) + struct arm_smmu_domain *smmu_domain) { int vmid; struct arm_smmu_s2_cfg *cfg = &smmu_domain->s2_cfg; @@ -2346,8 +2336,7 @@ static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain, struct io_pgtable_cfg pgtbl_cfg; struct io_pgtable_ops *pgtbl_ops; int (*finalise_stage_fn)(struct arm_smmu_device *smmu, - struct arm_smmu_domain *smmu_domain, - struct io_pgtable_cfg *pgtbl_cfg); + struct arm_smmu_domain *smmu_domain); /* Restrict the stage to what we can actually support */ if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1)) @@ -2390,7 +2379,7 @@ static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain, smmu_domain->domain.geometry.aperture_end = (1UL << pgtbl_cfg.ias) - 1; smmu_domain->domain.geometry.force_aperture = true; - ret = finalise_stage_fn(smmu, smmu_domain, &pgtbl_cfg); + ret = finalise_stage_fn(smmu, smmu_domain); if (ret < 0) { free_io_pgtable_ops(pgtbl_ops); return ret; diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h index 5540609069fcd0..392130b840d55b 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h @@ -587,9 +587,6 @@ struct arm_smmu_strtab_l1_desc { struct arm_smmu_ctx_desc { u16 asid; - u64 ttbr; - u64 tcr; - u64 mair; refcount_t refs; struct mm_struct *mm;