Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
To:     linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org
Cc:     joro@8bytes.org, Jon.Grimm@amd.com, Wei.Huang2@amd.com,
        Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Subject: [RFC PATCH 2/7] iommu/amd: Update sanity check when enable PRI/ATS
Date:   Fri, 12 Mar 2021 03:04:06 -0600
Message-Id: <20210312090411.6030-3-suravee.suthikulpanit@amd.com>
In-Reply-To: <20210312090411.6030-1-suravee.suthikulpanit@amd.com>
References: <20210312090411.6030-1-suravee.suthikulpanit@amd.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from ethanolx5673host.amd.com (165.204.78.2) by SN7PR04CA0040.namprd04.prod.outlook.com (2603:10b6:806:120::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.18 via Frontend Transport; Fri, 12 Mar 2021 08:55:13 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 6d34620c-a661-4028-1bc3-08d8e5348d71
X-MS-TrafficTypeDiagnostic: BYAPR12MB3144:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR12MB31442E93B2D061994276BFB8F36F9@BYAPR12MB3144.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:7219;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: KngpBwoENgKBx+8IQ7V8RuOggOSNtk7bdt6VkggZcFSbBjPef2803Tq+iknZJInfpKmywr0g8rvFxBkB0M7ZFbILMIn8uKeEMA/Ru0k9V7YfugbVjJuDJeHgVioZS2Urg+8JX8BDtEk91vkbIToxXlAISAmfPx/9WQ/uGD8Wdr+zHjv7J5bazcDvMQfMeXgNKXTJzzozf3OETrH/yLHwUsNZ9FHOLuxzHsKtE0u9LcX294Vq8yZov6ux2dUPAP9+IfBftMWGF671tePkUZ9x92YtzuZcDlGDGM3nJwH9lBjRsQS0lhgk7j2dmifHE2hVzwTVgLJH2doBWlLc9L1Rg7NeDngwmjerlOaq37XeyUuGFYB2qFhIqYx7VjHcBxhQY5JJPeaeV9mUpU0yQOhtnk8agNScLjtywyVHW813DnCcOQVsFclLNjtO4dCXjqZ5/2F4vWjzqGBqnBJale7yJ45/65oQbwmjTr3YOWTJh2zKGYG1JgrvTgAx61eOCyDM0Q6cu+gHcolvvRTfgtV5/J04w/6KHNqFFIfEamp2LC7V7/0Q0jLOhgO75W0dvMHr
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR12MB4597.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(39860400002)(366004)(396003)(376002)(346002)(6486002)(6666004)(316002)(15650500001)(7696005)(8676002)(16526019)(1076003)(5660300002)(956004)(66556008)(86362001)(52116002)(478600001)(44832011)(2616005)(8936002)(66946007)(36756003)(4326008)(26005)(2906002)(66476007)(186003)(83380400001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?R0oVmubGDhR4/1xxlsfs/NwFjMxo43xNkJgFlNiCCK3eabCdwUpAxct6/u9y?=
 =?us-ascii?Q?kq6kwzrTNdfyGInOoGsmbaJDOmhFnSEdVs8s0bXkd3ao94v9AWK6QemmBgi2?=
 =?us-ascii?Q?S4xnjn3R6tLi9g+iMcY3QQcuaW8xXFXTKc61EpTQRSEuJGiFaO010hZbi7Pe?=
 =?us-ascii?Q?rwKf3+0AbZPri74+11Xg9wg71DdKgijzkic6oMeUVXkiLDk/7MHr59jpBDCS?=
 =?us-ascii?Q?B6+euA3DraUFlPqrslHZul/EI9VeM39dVC534WzvKw4nQi1D5thRdRaxZc5E?=
 =?us-ascii?Q?zxd3ApIuENrWOfJ88Q+E9u+DhMb+E/G5hTFaK0StEaWfiD8I/8cB852XDQmY?=
 =?us-ascii?Q?C9V2lVjuRWer6O/oaIhieOvrpuPOAJorCeJyZ86pQ4CIUp77U9nbfLVw2qHA?=
 =?us-ascii?Q?h2o+UrLaOfRv5kWB1LuL0LxiZpMp3IOzDS4VDy0pFdQ4+q1sZSHlNMIErzdv?=
 =?us-ascii?Q?KUdtGNSxs/ZU1KSQ7h8bBZTTvaJDkYVOBP+o6eBTVS51hUgrTC77I2caXZFy?=
 =?us-ascii?Q?dxZZuCUYXOt1ZCwzdRphv0a5i/kvBxj2CSsOJX75gkrWKL1BaNfJzx/vW+tX?=
 =?us-ascii?Q?KvRbGdw38BuiWcW22Ys1gbrnipIY+tVWZeXZGiYj3TaiIVuFMX4+gawsu0/N?=
 =?us-ascii?Q?FIUY2wdhH4E3mnPWpnCNQ48/ixwVk4EdAMeaPRUZ3igbOdRN0Q3/QE0b6q1a?=
 =?us-ascii?Q?R0EhYFQBeIIlezz6yMXZ9xPxZe+uHugtZEh7xiDuMo2iJ+EWNWpSIiPgcEPD?=
 =?us-ascii?Q?IrVc9SlMg+x7bWDmJhK/LoExPdfwwxLoWJR51SkhW2IyMWX9Vn0lMPUPgbvl?=
 =?us-ascii?Q?kuBhYoc/Bo+b5A+X76ZWf1EbP6yF0q69biN7blSQiQCL3DWQSaICTJrzeRyk?=
 =?us-ascii?Q?i89qP5c/MMI8tHNZPDntCdwsX2pmsY5LxaJd3wfTtscNzkcJN4BBwjreeuk1?=
 =?us-ascii?Q?DAUXT/7MP9h6uIMnQXjYHQKhVeiuF1op1dYABiVBLIcAixxU6Wnf/3BVrpZs?=
 =?us-ascii?Q?zQ9ftLkoBGUMW9IebQo4qRrt7WDmo6vB/o/8kSYwyyIKbsKZ7dCOLqyk6fWD?=
 =?us-ascii?Q?d+2HqPhRYasJm5I9AZqCNexOtenFEc7G+GzjU10it7NTQ/L0ksWkxzWS5ENc?=
 =?us-ascii?Q?vKDQPF+bMUNGpEDbjph86du+mUVSCzBbYo98qhZ8S6sSH8dWagzN6HKthEF3?=
 =?us-ascii?Q?V2kyY04nrXwkdOQXDJ2wVzFbCEABiw2fb/PSqG/8uKf3lmesiSgrXAfN5OsF?=
 =?us-ascii?Q?aoiSYihO48YGcaeK6wDG6xGjzhAcnZ/gXhhw0bDyG1/RYM2XvKwZjP+cT61S?=
 =?us-ascii?Q?NpI4wQeI2cW9Fw7JVw+tCmCZ?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d34620c-a661-4028-1bc3-08d8e5348d71
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB4597.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2021 08:55:14.9484
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wc8tBBJLm7wXZqK/blKNo8ecmyGkMrNupLyNKX8gvOlYUC0CpmAcmo6Hix7T2dng1PF6P6RKlcye5827dOx7Hg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3144
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Currently, PPR/ATS can be enabled only if the domain is type
identity mapping. However, when we allow the IOMMU v2 page table
to be used for DMA-API, the sanity check needs to be updated to
only apply for the case when using AMD_IOMMU_V1 page table mode.

Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
---
 drivers/iommu/amd/iommu.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index 6f3e42495709..f3800efdbb29 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -1549,7 +1549,7 @@ static int pri_reset_while_enabled(struct pci_dev *pdev)
 	return 0;
 }
 
-static int pdev_iommuv2_enable(struct pci_dev *pdev)
+static int pdev_pri_ats_enable(struct pci_dev *pdev)
 {
 	bool reset_enable;
 	int reqs, ret;
@@ -1624,11 +1624,19 @@ static int attach_device(struct device *dev,
 		struct iommu_domain *def_domain = iommu_get_dma_domain(dev);
 
 		ret = -EINVAL;
-		if (def_domain->type != IOMMU_DOMAIN_IDENTITY)
+
+		/*
+		 * In case of using AMD_IOMMU_V1 page table mode, and the device
+		 * is enabling for PPR/ATS support (using v2 table),
+		 * we need to make sure that the domain type is identity map.
+		 */
+		if ((amd_iommu_pgtable == AMD_IOMMU_V1) &&
+		    def_domain->type != IOMMU_DOMAIN_IDENTITY) {
 			goto out;
+		}
 
 		if (dev_data->iommu_v2) {
-			if (pdev_iommuv2_enable(pdev) != 0)
+			if (pdev_pri_ats_enable(pdev) != 0)
 				goto out;
 
 			dev_data->ats.enabled = true;
-- 
2.17.1