From nobody Fri Dec 19 21:50:10 2025 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 48F02C433FE for ; Fri, 18 Nov 2022 13:33:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242163AbiKRNdA (ORCPT ); Fri, 18 Nov 2022 08:33:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242101AbiKRNcS (ORCPT ); Fri, 18 Nov 2022 08:32:18 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D03D8E099 for ; Fri, 18 Nov 2022 05:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668778337; x=1700314337; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=s/w7ewn2Z2fzzXVOi/5St6iNlwdnhB5gDm3EIe34F8c=; b=Mx4jOwVs6qWF4Bz7aEkU8BBDORvSk3KYuE2aGtWgdLSuUgTJymjRdKJo yhjGrg26tjfemma287Zn+ecekwKrF7uj2j94A8yDJnbQ2Mueo/47m1zrU ywYR9AYfLQgyL2jeJaOiIFTi4tg3GaRg4YqU2oz1GcI7AxPSJWU0/5OD1 vPsg1uzpU1OKI5mNQqrJi2io0nfUzm0x4D/EWkHPbrzmbFSifgn+H/PP4 dRsJIUUsmfSFj9z6Dor2AEVqrCOaZ4XOyiDpW1Tk0Zscb9j/0ATbv2Zi3 bOooA6CDpq2XlQ4+olCTj8XevIkal+d6PRa1Mc6+US6CTu5cOMfGUzJSt Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="314285104" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="314285104" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2022 05:32:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="642512033" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="642512033" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga007.fm.intel.com with ESMTP; 18 Nov 2022 05:32:13 -0800 From: Lu Baolu To: iommu@lists.linux.dev Cc: Joerg Roedel , Kevin Tian , Will Deacon , Robin Murphy , Liu Yi L , Jacob jun Pan , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v4 4/7] iommu/vt-d: Rename iommu_disable_dev_iotlb() Date: Fri, 18 Nov 2022 21:24:48 +0800 Message-Id: <20221118132451.114406-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221118132451.114406-1-baolu.lu@linux.intel.com> References: <20221118132451.114406-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename iommu_disable_dev_iotlb() to iommu_disable_pci_caps() to pair with iommu_enable_pci_caps(). Signed-off-by: Lu Baolu Reviewed-by: Kevin Tian --- drivers/iommu/intel/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index 25c772e8106f..a5885665ccef 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1441,7 +1441,7 @@ static void iommu_enable_pci_caps(struct device_domai= n_info *info) } } =20 -static void iommu_disable_dev_iotlb(struct device_domain_info *info) +static void iommu_disable_pci_caps(struct device_domain_info *info) { struct pci_dev *pdev; =20 @@ -4099,7 +4099,7 @@ static void dmar_remove_one_dev_info(struct device *d= ev) intel_pasid_tear_down_entry(iommu, info->dev, PASID_RID2PASID, false); =20 - iommu_disable_dev_iotlb(info); + iommu_disable_pci_caps(info); domain_context_clear(info); } =20 @@ -4122,7 +4122,7 @@ static void device_block_translation(struct device *d= ev) struct intel_iommu *iommu =3D info->iommu; unsigned long flags; =20 - iommu_disable_dev_iotlb(info); + iommu_disable_pci_caps(info); if (!dev_is_real_dma_subdevice(dev)) { if (sm_supported(iommu)) intel_pasid_tear_down_entry(iommu, dev, --=20 2.34.1