From nobody Mon Feb 9 05:38:42 2026 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 9089CC6FD1C for ; Fri, 24 Mar 2023 12:02:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231855AbjCXMCt (ORCPT ); Fri, 24 Mar 2023 08:02:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231792AbjCXMCm (ORCPT ); Fri, 24 Mar 2023 08:02:42 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D6C7241DA; Fri, 24 Mar 2023 05:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679659355; x=1711195355; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J8yNL0xsswqSZQ3dx1kUSPhIC1pxHFcfvF18SpMWQe8=; b=iEwNKOgjgV1jHggFkxUNPb36K7099jnco1mNGGWu5Dev1nys4vh3/aGz MhoowBbaUW72dKTqhh9D1NqGe5svBoA9MSEh/Ss6N+xLAOsiqTTqmwZ2H D3hKajKQ2ztElwm+THeM5m56GVv2ulRIRLM4JEbx7+5xpuUJ5nVG4urah 6meXjltwSHPxnhb8km19C19x8EAGZBpyP/0Om8C6n/ZzcvKYJZU1ueQ6E qFkAsLyWZdRhoI8EEUlXMJ/4ut5yUorAy909ExoUVCVQx4UUkdNv6SbKj iB/UEubMwxxXHwxNpCBOJqKXbmo84WbOzaJiO3eWq/0wklIqIQwl2uNKA A==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="323634165" X-IronPort-AV: E=Sophos;i="5.98,287,1673942400"; d="scan'208";a="323634165" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2023 05:02:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="682674824" X-IronPort-AV: E=Sophos;i="5.98,287,1673942400"; d="scan'208";a="682674824" Received: from allen-box.sh.intel.com ([10.239.159.48]) by orsmga002.jf.intel.com with ESMTP; 24 Mar 2023 05:02:32 -0700 From: Lu Baolu To: iommu@lists.linux.dev, dmaengine@vger.kernel.org Cc: Joerg Roedel , Will Deacon , Robin Murphy , Kevin Tian , Fenghua Yu , Dave Jiang , Vinod Koul , Jacob Pan , linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v3 4/6] iommu/vt-d: Move pfsid and ats_qdep calculation to device probe path Date: Fri, 24 Mar 2023 20:02:32 +0800 Message-Id: <20230324120234.313643-5-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230324120234.313643-1-baolu.lu@linux.intel.com> References: <20230324120234.313643-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" They should be part of the per-device iommu private data initialization. Reviewed-by: Jacob Pan Reviewed-by: Kevin Tian Signed-off-by: Lu Baolu --- drivers/iommu/intel/iommu.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index a6f07c74da2d..6d77b4072fdd 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -1406,20 +1406,6 @@ static void iommu_enable_pci_caps(struct device_doma= in_info *info) return; =20 pdev =3D to_pci_dev(info->dev); - /* For IOMMU that supports device IOTLB throttling (DIT), we assign - * PFSID to the invalidation desc of a VF such that IOMMU HW can gauge - * queue depth at PF level. If DIT is not set, PFSID will be treated as - * reserved, which should be set to 0. - */ - if (!ecap_dit(info->iommu->ecap)) - info->pfsid =3D 0; - else { - struct pci_dev *pf_pdev; - - /* pdev will be returned if device is not a vf */ - pf_pdev =3D pci_physfn(pdev); - info->pfsid =3D pci_dev_id(pf_pdev); - } =20 /* The PCIe spec, in its wisdom, declares that the behaviour of the device if you enable PASID support after ATS support is @@ -1438,7 +1424,6 @@ static void iommu_enable_pci_caps(struct device_domai= n_info *info) !pci_enable_ats(pdev, VTD_PAGE_SHIFT)) { info->ats_enabled =3D 1; domain_update_iotlb(info->domain); - info->ats_qdep =3D pci_ats_queue_depth(pdev); } } =20 @@ -4521,6 +4506,17 @@ static struct iommu_device *intel_iommu_probe_device= (struct device *dev) dmar_ats_supported(pdev, iommu)) { info->ats_supported =3D 1; info->dtlb_extra_inval =3D dev_needs_extra_dtlb_flush(pdev); + + /* + * For IOMMU that supports device IOTLB throttling + * (DIT), we assign PFSID to the invalidation desc + * of a VF such that IOMMU HW can gauge queue depth + * at PF level. If DIT is not set, PFSID will be + * treated as reserved, which should be set to 0. + */ + if (ecap_dit(iommu->ecap)) + info->pfsid =3D pci_dev_id(pci_physfn(pdev)); + info->ats_qdep =3D pci_ats_queue_depth(pdev); } if (sm_supported(iommu)) { if (pasid_supported(iommu)) { --=20 2.34.1