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 21337C433EF for ; Tue, 15 Mar 2022 05:11:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344867AbiCOFMk (ORCPT ); Tue, 15 Mar 2022 01:12:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344841AbiCOFMT (ORCPT ); Tue, 15 Mar 2022 01:12:19 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE36A49253 for ; Mon, 14 Mar 2022 22:11:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647321067; x=1678857067; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PtNrYq5SgtOh4S5p2eFwtPOoZIVbpRJnL3OhUjSFkCY=; b=Mo1Lr7yD0yFf6gtoIdn2x0RT+Y94tfmQaHISTDPk+sm2cI7NKYJ5rli3 8IjQi7VPk7vewlIoiRoK8Y9MuUhZpju3hIHNAdWJG6cDUpTbkZckqP7tn cTLF2dCyPfwKXMs8/bNIpddUK9hiZEXdg0edfRyGQWptMpcLx3SZXWlVp q5EK6t6QpD/3fRnEJv5NnXqfLZzoQq/h7wvIALwA7mmDC4swthco1mylK WWxo6JDGVKV8Z42eUuic3TgRZgVlrjgM/0jPg/9rL81m+eVjV6yUM5JPE 5T3I/N6XaySPnvSF4X8PzeI0JXWcDfrypcyhxvqA5/+bS5EkxtqanU+fV Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10286"; a="236159102" X-IronPort-AV: E=Sophos;i="5.90,182,1643702400"; d="scan'208";a="236159102" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Mar 2022 22:03:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,182,1643702400"; d="scan'208";a="580383579" Received: from otc-wp-03.jf.intel.com (HELO jacob-builder.jf.intel.com) ([10.54.39.79]) by orsmga001.jf.intel.com with ESMTP; 14 Mar 2022 22:03:58 -0700 From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , Jason Gunthorpe , "Christoph Hellwig" , "Lu Baolu" , Jean-Philippe Brucker Cc: Jacob Pan , Raj Ashok , "Kumar, Sanjay K" , Dave Jiang , Tony Luck , "Zanussi, Tom" , Dan Williams , "Tian, Kevin" , Yi Liu Subject: [PATCH v2 4/8] iommu/vt-d: Use device_pasid attach op for RID2PASID Date: Mon, 14 Mar 2022 22:07:08 -0700 Message-Id: <20220315050713.2000518-5-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220315050713.2000518-1-jacob.jun.pan@linux.intel.com> References: <20220315050713.2000518-1-jacob.jun.pan@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With the availability of a generic device-PASID-domain attachment API, there's no need to special case RID2PASID. Use the API to replace duplicated code. Signed-off-by: Jacob Pan --- drivers/iommu/intel/iommu.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 9267194eaed3..f832b7599d21 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1683,9 +1683,6 @@ static void domain_flush_piotlb(struct intel_iommu *iommu, qi_flush_piotlb(iommu, did, domain->default_pasid, addr, npages, ih); - if (!list_empty(&domain->devices)) - qi_flush_piotlb(iommu, did, PASID_RID2PASID, addr, npages, ih); - if (list_empty(&domain->devices) || xa_empty(&domain->pasids)) return; @@ -2826,17 +2823,7 @@ static struct dmar_domain *dmar_insert_one_dev_info(struct intel_iommu *iommu, } /* Setup the PASID entry for requests without PASID: */ - spin_lock_irqsave(&iommu->lock, flags); - if (hw_pass_through && domain_type_is_si(domain)) - ret = intel_pasid_setup_pass_through(iommu, domain, - dev, PASID_RID2PASID); - else if (domain_use_first_level(domain)) - ret = domain_setup_first_level(iommu, domain, dev, - PASID_RID2PASID); - else - ret = intel_pasid_setup_second_level(iommu, domain, - dev, PASID_RID2PASID); - spin_unlock_irqrestore(&iommu->lock, flags); + ret = intel_iommu_attach_dev_pasid(&domain->domain, dev, PASID_RID2PASID); if (ret) { dev_err(dev, "Setup RID2PASID failed\n"); dmar_remove_one_dev_info(dev); @@ -4618,8 +4605,7 @@ static void __dmar_remove_one_dev_info(struct device_domain_info *info) if (info->dev && !dev_is_real_dma_subdevice(info->dev)) { if (dev_is_pci(info->dev) && sm_supported(iommu)) - intel_pasid_tear_down_entry(iommu, info->dev, - PASID_RID2PASID, false); + intel_iommu_detach_dev_pasid(&domain->domain, info->dev, PASID_RID2PASID); iommu_disable_dev_iotlb(info); domain_context_clear(info); -- 2.25.1