From patchwork Wed Mar 27 18:08:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 13607263 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 2E37CC54E67 for ; Wed, 27 Mar 2024 18:13:48 +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=EHjhasjBYi7M2PWTu7YJ7wBN+4u1caWqgoQnKYzmk9c=; b=N/xGFYtVkc6Zmb Z5SZXq2dlUdgnlZhqWnGPSduHKIpcq4YKpWi3PqA2N+556Dim3OuJ02jFFCDh8kxJmgKW5fz6yp12 9eM5qQy+ZP91lDbZBdf3yJ8zsiwfCs2W4cmc2GxKtNFU6jWSVVdk5m/OIuxKOBTn6EpF0h5BBKKb4 zmn+9UoVFTVhesdiHLbub+LA1Z0RlFrrh0XpD2vcgOZxdF/OJPaUg8ZlCQsntBXwluqmHJC+8/1Mu 1Ucpw3vJFj/+VS4nf4OT7hpFL3+Gzu4l39d+LxzryXrHS8ixm/H/Z0d/ayVI43HgAYxO1kywUqslm W1dpWl7zxsiRzbDrR50A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpXmG-0000000AW4g-1SKA; Wed, 27 Mar 2024 18:13:32 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpXhj-0000000ATr8-3BBI for linux-arm-kernel@bombadil.infradead.org; Wed, 27 Mar 2024 18:08:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=MIME-Version:Content-Type: Content-Transfer-Encoding:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Sender:Reply-To:Content-ID:Content-Description; bh=7STOWmLSNyS2xjMxQ1maFHfALEUKGwqSgk/uQYibJkI=; b=NjkYe8xI2jOQLwLpU+9v5scFaJ FBSBZbWc/9I4BlIHLisQFdTWDLVY8wK8eN1xQPoNxlsQUpaJsJI5j0gWoUakAsXIkpUhlI2qVN/4Z A0Zz7qkJVw9v33IwQ9mXKM6BicVP7tx1wG+rLmnoM/cAxwoE5/Xz75j5yRazMyYpF+HNjjp5tDrOy mekoxDtigtqEuuQakBIJBLnPQyy6ethWwFBOvlNs3R7oVGsJJdu09rCEWfrBPPlvcTkINaAc4nYK2 2FvL1981DO84E0YWAalTzjdB32Bj2v2pvx7iTOSY/mAaVTEy8nrLmWaFDTAiR//Yh3PbisMYPv6TP j4DPC88A==; Received: from mail-dm6nam10on2062e.outbound.protection.outlook.com ([2a01:111:f400:7e88::62e] helo=NAM10-DM6-obe.outbound.protection.outlook.com) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpXhg-00000000RvW-1n8i for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 18:08:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PWr0SW3I/7tVSK8mu2s8GbK/Yd3H3zsi9m2763R8/0IX+BtI/PGvHiP3g5rWWAhPnMdlC3FC4v7Ne+8NzWj/AFP5GQPDFPA0if5Flu6BIFy8siwpN05pl85e3T5IcXNlnlaY0elrMVoZMAYiROPiqVWpjXsGIXc8I0gGU7dEotS763isTdmjmjPoKpFaYJ1kvm49OApAaPM0CN08IFUTLuIpReihSVgJ/kL/PORfmRs82SodmeIUnSlZV1oS3WP0c4tQ2U83515dNcu6UdxOQ8LYK4y4Q0uRnaxMDMyBT5mkU5ON1/S7xXeyl1NlFwzuCKqNyuVfy3ypzPCKl6pjpw== 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=7STOWmLSNyS2xjMxQ1maFHfALEUKGwqSgk/uQYibJkI=; b=il+TzTmbOV3xfAtzsx/DtKPIIbyNdPBtEo0imym8Kzdg1mi63VXRW4ukw69sjYPb8orIBmxXtXYvMMdGhJyWXU9mP9KE4qlAAGyxN3C32Yepk2o+NBNhbPXTmzS1ddgbsAOODoNbWaJ/AOOErvfDiJsF+29Pph40/FeOP3mLgT/Dnr2eUp6PpTw/xG4+miy/01JhOclqn8ooq7lcM6x8zEljHVnFqYprPtQQFUSXFLg+MsYuGfdrdfAXSXZAyjQ5WggI4OCljDQaHUNJ7iSzqvObI59eIx15TE7ZEGqw5f9FfEa6EU3rRJo8CMCQS+LSeOlFXEEI4Wfj+TiEJJxV5w== 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=7STOWmLSNyS2xjMxQ1maFHfALEUKGwqSgk/uQYibJkI=; b=YPOya+o/cpWd+YMNY+9Vmh46jRASEsl3maBhGs4JIkaQ7yjOidHhnd46y/eF9kPBJGf+N09lVucvvhmcJ7bcDluxY06lACjXYPMn5E6iqTn21wWFH+GxB5/xriz3Ks00tmO+AECuw7bMIBjaKqZjhHzfvfXPlQ4edEY6sgzuJaxK8ECD+f5p36M4ErXpLwvUsztIylghZGLLF9Clx1G6V+TNhEfgXp2ZajuXB1UAFyUUWlcYilhtqL7rkrRDgVXZDYvfgkMwF3oRWnzosuS2L6tUGhI0W/GP55StVzwihshUfZCJ63ZWlFs5CgqQpYykDFrDpVfaF/q4Rlucpy/M1g== 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 CH0PR12MB8487.namprd12.prod.outlook.com (2603:10b6:610:18c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 18:08:29 +0000 Received: from DM6PR12MB3849.namprd12.prod.outlook.com ([fe80::6aec:dbca:a593:a222]) by DM6PR12MB3849.namprd12.prod.outlook.com ([fe80::6aec:dbca:a593:a222%5]) with mapi id 15.20.7409.031; Wed, 27 Mar 2024 18:08:29 +0000 From: Jason Gunthorpe To: iommu@lists.linux.dev, Joerg Roedel , linux-arm-kernel@lists.infradead.org, Robin Murphy , Will Deacon Cc: Lu Baolu , Eric Auger , Jean-Philippe Brucker , Joerg Roedel , Kevin Tian , kernel test robot , Moritz Fischer , Moritz Fischer , Michael Shavit , Nicolin Chen , patches@lists.linux.dev, Shameer Kolothum , Mostafa Saleh , Tony Zhu , Yi Liu , Zhangfei Gao Subject: [PATCH v6 27/29] iommu/arm-smmu-v3: Allow IDENTITY/BLOCKED to be set while PASID is used Date: Wed, 27 Mar 2024 15:08:13 -0300 Message-ID: <27-v6-228e7adf25eb+4155-smmuv3_newapi_p2_jgg@nvidia.com> In-Reply-To: <0-v6-228e7adf25eb+4155-smmuv3_newapi_p2_jgg@nvidia.com> References: X-ClientProxiedBy: BL1PR13CA0302.namprd13.prod.outlook.com (2603:10b6:208:2c1::7) To DM6PR12MB3849.namprd12.prod.outlook.com (2603:10b6:5:1c7::26) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR12MB3849:EE_|CH0PR12MB8487:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f7d57e0-d3de-4e17-fa17-08dc4e88e19b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qFX8F/p5iEXqE6tml/BXo+kyN4aKWbmKtdi1WXRo3146UuF5jsxqMmH7t+YCTfVF6z6gvng9m1nSd1a+Y8TEpFaPJJ5CynD+UT1z+l3jxzfqO+cLw03pC7u8VNpL1VVu1yoIcx8zyVEiUW5G3Ip6ZFzYPTT9PFS+VW9ycfFOJxL5MzQ05ySTJPRBPJoGTvEJn6uKc4aXEMTgU5XldzKQCyNjUp4uFzTOGFYznkHzA19aysrTdfZAWikCOhJrhcWCztadEhb5EHS+tHjB0Hc10Lxv7xIvJQXbeeYJvO3AGLa30veu9GLBrkDls0co/ktR7jGu5DalHuSXPKVABZaEaxRrWdLF+leee1QoUtvLnUUjCqltJKluqyV+1PmrlmWh+DDeh3dEzaWGnGLpDB7rXvdamZ4D+0Eix9ZS1JBTUNkAleh9AlZXq86zVEmoTDGw2MrjsHMAVjsLzb3mDDfqjm7SwCYlCew+Ul8DM9emCKQti9dv4M443fKK0b8X+m9aAGM6ostZ4v4i8zxUFQFTN94uSxQng9sTjjNwH/iIXEmJMrgUjcs/tdZUwTdnzgpCvrdLzLWxG2WILcd3yBgDhrUDZhTqwf/Bb3FeW198NSmeOyvDOXZicYEefcH01jjL960uGWF0lSZ7M8MGj65yyw+sRwND4EuxiCx0TOp7N7o= 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)(376005)(366007)(1800799015)(7416005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1UudNqNLMGj2t2xPzJI/uBrPR1WeNINg/jwgfljS3dN9JFZLoBFVKD2tPt5smKgHylMcZD0oqC9rfJTT3VfLdRlxKHb6g9HpE96IJYSz3PYDkA5LmpfCcVm51FZkHva/ytlB3QtYGPU9JyTEb65kmcR5GIWl+c0TNel/SxklXnRtfzQoBLfFq3cH7bq3Eh5zyqYg8HwEai4o36uHWR6xgJRtrH8Ko91mWvZZDdaogXshCv6Q67VeugdoAHgTsKfIkjlvNCI2hPPoI7fOFFLpUnLWvP3EqIgIH2Ix4emkf29P0yx8o/xeu7WvYiIwk3Kt34yZVuDJLDbfFR70AJ9s0Q3DOIyma5B7QTtQlBCOIbyOggdclzVjkQ0tXi8iwkMXA5z3jn4FNdas6gygU7gSfDtMBJjCM0eKYgpq2H2SvmMsNSnMR0mhk4eRe9Mgb7UtzAXwjthd1YKX113eLjQM+/DbCfWmcav7iBguKdZNnL8l/UBtBJW6mmonh/wEPh5o8Jf0yADk5dwuJ72F+Wgvw+bGM3uWODbH4PqevFckMUn54uGsnarke6wG0wKMzZLKHu4PSv8odEFn96upiL6OiVKrcXiZZOmg3l4l3ilThbeYsxi/A2QB7Orux3HxPCkYGxX0ALgCVx/zMRquC/gsRLYuIQv/fvPMnEOWA0u8v4oun3vXaWO+UiVhhLLCPHLiY4n34sfiFnmmdMJ7gUL14L9O8G0g+Vcee29/3DIRXXhNQWYaLIU4rbXpMdiEFQB+bQZPaUED2oLYauNzRDyjjCw3YE2MMKanwIIn7m+J4GxClA6WAYiRw/YiElH9/qaK9juX/3UYI/BcC+BwruPtQF7xtP5O/e30f2rIPBAQ4VkYuenZnL9jISOKNPS3xKG79vahbo+EMXPslo+X1RvS7fhrYpKcFaYynmjd8f6g3BlZkjI0coEcIDniRZGnimodM6X4sDQfH74W+1g+tHZ4m0mC6G/y6n+pAycWTBbTE+BwjKdrOlGTwP2IkoAFjYMxsSB0DnH+wEjwvtYCulFGphd083Db6NEbCcqD8M/gEMzR2+P8p1fMne+Yv55h7/bTxgIx/FjiUdREhM3T2kplfpKBHfTZvnJtsa0RKOjXkEQ9MqeOffReZN6CpLJUrKdY0FaMMEZnFW15CY6isISeU6P4uORbOb5Z2UXEakw1vO9jK71fzmmbLW33x/rtDKNSBtsy/kTZ7wc5TkXwJK+wiiXxUypcG7Vs3GouV3U5pUFP7YFDo1gMz71YsBvpfc5oNHuZENNzUbEHc3f/hBUev0TZLmPn2W3HwJKjA5ovL1mKPIVktTzXgIiI9FnjzuBJ6WDmwaOTR8bEjdZI+RWryRLU2wRQ6lmQkKpahNN6ohxmQFIEFZPAs+ZyMNiqxTS9+3d+CXeetjMQg9CL9qGQUTsV8Jc9Bd86cHI6T/riE4n21YZPgdbLNCbZXqMVSov+ywaUEpy8Ta2g7N9Xs4M5dnpL0tVpp3GC8wdyymlJKf4sCJWcDVSscgb+gTM4cAE4qR99CRyVhdxf/9Xt/l28helXLNRQLWzO09iFjQDWjdnMkb2PVjjw6oiKZKZpJMQb X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f7d57e0-d3de-4e17-fa17-08dc4e88e19b X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3849.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 18:08:18.8791 (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: FqtanR7C6CH99JegimZGlnXeSrmesVYkBE6UU7c4RvDhYQgyz2dwzQEiJ8ykF0Rv X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8487 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_180848_661615_7156B71E X-CRM114-Status: GOOD ( 26.65 ) 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 The HW supports this, use the S1DSS bits to configure the behavior of SSID=0 which is the RID's translation. If SSID's are currently being used in the CD table then just update the S1DSS bits in the STE, remove the master_domain and leave ATS alone. For iommufd the driver design has a small problem that all the unused CD table entries are set with V=0 which will generate an event if VFIO userspace tries to use the CD entry. This patch extends this problem to include the RID as well if PASID is being used. For BLOCKED with used PASIDs the F_STREAM_DISABLED (STRTAB_STE_1_S1DSS_TERMINATE) event is generated on untagged traffic and a substream CD table entry with V=0 (removed pasid) will generate C_BAD_CD. Arguably there is no advantage to using S1DSS over the CD entry 0 with V=0. As we don't yet support PASID in iommufd this is a problem to resolve later, possibly by using EPD0 for unused CD table entries instead of V=0, and not using S1DSS for BLOCKED. Tested-by: Nicolin Chen Tested-by: Shameer Kolothum Signed-off-by: Jason Gunthorpe --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 65 +++++++++++++++------ 1 file changed, 47 insertions(+), 18 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 5a2c6d099008ed..69b628c4aaacdf 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1003,6 +1003,14 @@ static void arm_smmu_get_ste_used(const __le64 *ent, __le64 *used_bits) STRTAB_STE_1_S1STALLD | STRTAB_STE_1_STRW | STRTAB_STE_1_EATS); used_bits[2] |= cpu_to_le64(STRTAB_STE_2_S2VMID); + + /* + * See 13.5 Summary of attribute/permission configuration fields + * for the SHCFG behavior. + */ + if (FIELD_GET(STRTAB_STE_1_S1DSS, le64_to_cpu(ent[1])) == + STRTAB_STE_1_S1DSS_BYPASS) + used_bits[1] |= cpu_to_le64(STRTAB_STE_1_SHCFG); } /* S2 translates */ @@ -1531,7 +1539,7 @@ static void arm_smmu_make_bypass_ste(struct arm_smmu_ste *target) static void arm_smmu_make_cdtable_ste(struct arm_smmu_ste *target, struct arm_smmu_master *master, - bool ats_enabled) + bool ats_enabled, unsigned int s1dss) { struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table; struct arm_smmu_device *smmu = master->smmu; @@ -1545,7 +1553,7 @@ static void arm_smmu_make_cdtable_ste(struct arm_smmu_ste *target, FIELD_PREP(STRTAB_STE_0_S1CDMAX, cd_table->s1cdmax)); target->data[1] = cpu_to_le64( - FIELD_PREP(STRTAB_STE_1_S1DSS, STRTAB_STE_1_S1DSS_SSID0) | + FIELD_PREP(STRTAB_STE_1_S1DSS, s1dss) | FIELD_PREP(STRTAB_STE_1_S1CIR, STRTAB_STE_1_S1C_CACHE_WBRA) | FIELD_PREP(STRTAB_STE_1_S1COR, STRTAB_STE_1_S1C_CACHE_WBRA) | FIELD_PREP(STRTAB_STE_1_S1CSH, ARM_SMMU_SH_ISH) | @@ -1556,6 +1564,10 @@ static void arm_smmu_make_cdtable_ste(struct arm_smmu_ste *target, FIELD_PREP(STRTAB_STE_1_EATS, ats_enabled ? STRTAB_STE_1_EATS_TRANS : 0)); + if (s1dss == STRTAB_STE_1_S1DSS_BYPASS) + target->data[1] |= cpu_to_le64(FIELD_PREP( + STRTAB_STE_1_SHCFG, STRTAB_STE_1_SHCFG_INCOMING)); + if (smmu->features & ARM_SMMU_FEAT_E2H) { /* * To support BTM the streamworld needs to match the @@ -2732,7 +2744,8 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) arm_smmu_make_s1_cd(&target_cd, master, smmu_domain); arm_smmu_write_cd_entry(master, IOMMU_NO_PASID, cdptr, &target_cd); - arm_smmu_make_cdtable_ste(&target, master, state.want_ats); + arm_smmu_make_cdtable_ste(&target, master, state.want_ats, + STRTAB_STE_1_S1DSS_SSID0); arm_smmu_install_ste_for_dev(master, &target); break; } @@ -2809,8 +2822,10 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid) mutex_unlock(&master->smmu->asid_lock); } -static int arm_smmu_attach_dev_ste(struct iommu_domain *domain, - struct device *dev, struct arm_smmu_ste *ste) +static void arm_smmu_attach_dev_ste(struct iommu_domain *domain, + struct device *dev, + struct arm_smmu_ste *ste, + unsigned int s1dss) { struct arm_smmu_master *master = dev_iommu_priv_get(dev); struct attach_state state = { @@ -2818,9 +2833,6 @@ static int arm_smmu_attach_dev_ste(struct iommu_domain *domain, .ssid = IOMMU_NO_PASID, }; - if (arm_smmu_ssids_in_use(&master->cd_table)) - return -EBUSY; - /* * Do not allow any ASID to be changed while are working on the STE, * otherwise we could miss invalidations. @@ -2828,14 +2840,29 @@ static int arm_smmu_attach_dev_ste(struct iommu_domain *domain, mutex_lock(&master->smmu->asid_lock); /* - * The SMMU does not support enabling ATS with bypass/abort. When the - * STE is in bypass (STE.Config[2:0] == 0b100), ATS Translation Requests - * and Translated transactions are denied as though ATS is disabled for - * the stream (STE.EATS == 0b00), causing F_BAD_ATS_TREQ and - * F_TRANSL_FORBIDDEN events (IHI0070Ea 5.2 Stream Table Entry). + * If the CD table is not in use we can use the provided STE, otherwise + * we use a cdtable STE with the provided S1DSS. */ - state.disable_ats = true; - arm_smmu_attach_prepare(master, domain, &state); + if (arm_smmu_ssids_in_use(&master->cd_table)) { + /* + * If a CD table has to be present then we need to run with ATS + * on even though the RID will fail ATS queries with UR. This is + * because we have no idea what the PASID's need. + */ + arm_smmu_attach_prepare(master, domain, &state); + arm_smmu_make_cdtable_ste(ste, master, state.want_ats, s1dss); + } else { + /* + * The SMMU does not support enabling ATS with bypass/abort. + * When the STE is in bypass (STE.Config[2:0] == 0b100), ATS + * Translation Requests and Translated transactions are denied + * as though ATS is disabled for the stream (STE.EATS == 0b00), + * causing F_BAD_ATS_TREQ and F_TRANSL_FORBIDDEN events + * (IHI0070Ea 5.2 Stream Table Entry). + */ + state.disable_ats = true; + arm_smmu_attach_prepare(master, domain, &state); + } arm_smmu_install_ste_for_dev(master, ste); arm_smmu_attach_commit(master, &state); mutex_unlock(&master->smmu->asid_lock); @@ -2846,7 +2873,6 @@ static int arm_smmu_attach_dev_ste(struct iommu_domain *domain, * descriptor from arm_smmu_share_asid(). */ arm_smmu_clear_cd(master, IOMMU_NO_PASID); - return 0; } static int arm_smmu_attach_dev_identity(struct iommu_domain *domain, @@ -2855,7 +2881,8 @@ static int arm_smmu_attach_dev_identity(struct iommu_domain *domain, struct arm_smmu_ste ste; arm_smmu_make_bypass_ste(&ste); - return arm_smmu_attach_dev_ste(domain, dev, &ste); + arm_smmu_attach_dev_ste(domain, dev, &ste, STRTAB_STE_1_S1DSS_BYPASS); + return 0; } static const struct iommu_domain_ops arm_smmu_identity_ops = { @@ -2873,7 +2900,9 @@ static int arm_smmu_attach_dev_blocked(struct iommu_domain *domain, struct arm_smmu_ste ste; arm_smmu_make_abort_ste(&ste); - return arm_smmu_attach_dev_ste(domain, dev, &ste); + arm_smmu_attach_dev_ste(domain, dev, &ste, + STRTAB_STE_1_S1DSS_TERMINATE); + return 0; } static const struct iommu_domain_ops arm_smmu_blocked_ops = {