Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp3922071iog; Tue, 21 Jun 2022 08:30:12 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vMMK4i+2nMV/sjK02DyDPSNTgszEbQTurpFO8tEGtR+GbB9r2OpRDlbfxkwzQUYLbJrb3q X-Received: by 2002:a17:906:3f51:b0:712:3945:8c0d with SMTP id f17-20020a1709063f5100b0071239458c0dmr26234893ejj.302.1655825411858; Tue, 21 Jun 2022 08:30:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655825411; cv=none; d=google.com; s=arc-20160816; b=vKyLO02hdtqA8ZfadqxjoFgbapB16EgY+CewR/VsRoys7wph8wipLvDEsAiBZex6Yt gnXbA4gF4ICXzlkD22coww3LIG09MHUSGapf1ZTbJWfMYsCEEF83S39hTrAi0EfhcQHQ nR+gwZxDEK6+iKKc+QIa0Fx8NlNsQ4LUjNUmr26s+O54+Wq45mGxw7MV0aOWiIz9EXGN Ub8F0VYOr029Byi2iNmCBwL4zgLJVC+p4talX2ss8pxih6rFBARz/hZioSjpMg7Q2C48 GHCoqa/jaigLYHaAI2PjXAdOkgGPdq/U7EQ6KyAslV/ofJdJeL9swdIJ54UauyPeXEsc BHOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=EdHiRulRXS7euTxdnHB7MF1zOxKXRUC71f1DEoIQSNE=; b=I2IKySgpwEdVhlGykhPoLWwUzGgsd8hB7jmN0QzxvvOd0iuO6YqPr+381X37rKxPaV MyTItyzAFq35C1fNyhP8mkoyA++dbQz3gRQLfnPgAIrtr1eINAQR/h4c4E6UO/wwB7f8 pYKDbG3luyzAaitgM+mYhw5SYRAb1d5HPD1Bu/pxA3mS+9+CFS5ffIWZIPQktHA3Fz2s IVnp1usyQZoEJiG0B64X+RZditUf0Zc5yADJMaePbMaeEXufINrRClW/uBWnQi1My9RV Hy17w59wDDHqt/dSE4w6pph4Bsm+cx7EK6wVRFcZDzIHCGOsFyGpI0X3FypQIUSqp29z KU1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mAtz7G9I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t6-20020a170906608600b006fec3023067si664632ejj.343.2022.06.21.08.29.45; Tue, 21 Jun 2022 08:30:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mAtz7G9I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229681AbiFUOsN (ORCPT + 99 others); Tue, 21 Jun 2022 10:48:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351755AbiFUOsM (ORCPT ); Tue, 21 Jun 2022 10:48:12 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 443F65FAF for ; Tue, 21 Jun 2022 07:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655822892; x=1687358892; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=94P/M6zY35Hbp1ad0YH4YbldOnp70bxJt+frPbZ+6yw=; b=mAtz7G9IXC8CinJKaWwF6A/QzaVMZSufMda/SWGM/XGxixEcdfJzmr2g la28YNkhiN1eGMRo+v83qgpdEQF+9aES+UjnwRHp4NNcevn9i7zfWp9Ls LmnLdm8WUcom27TQSLaLKZnqZV23EU1WAxwE0mL0jzUaCIwixkEog5XlV 9I6iyZzfazdmHiLiaA7DBzj/6p9sY++3At7XFyQWQy1KYmD7oPacRAKJk yWmY28iamFo/8f7UR8pa4ILA1J7jjZjaocoUejSff9DN83s07LBZg4p3X yzl+UIafeFpils63OZXgOmwP5qk0blL/29ZVZRt3F/MAeW3FG3LhHdBoW g==; X-IronPort-AV: E=McAfee;i="6400,9594,10384"; a="305579735" X-IronPort-AV: E=Sophos;i="5.92,209,1650956400"; d="scan'208";a="305579735" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jun 2022 07:48:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,209,1650956400"; d="scan'208";a="643659224" Received: from allen-box.sh.intel.com ([10.239.159.48]) by fmsmga008.fm.intel.com with ESMTP; 21 Jun 2022 07:48:08 -0700 From: Lu Baolu To: Joerg Roedel , Jason Gunthorpe , Christoph Hellwig , Kevin Tian , Ashok Raj , Will Deacon , Robin Murphy , Jean-Philippe Brucker , Dave Jiang , Vinod Koul Cc: Eric Auger , Liu Yi L , Jacob jun Pan , iommu@lists.linux-foundation.org, iommu@lists.linux.dev, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v9 02/11] iommu: Add max_pasids field in struct dev_iommu Date: Tue, 21 Jun 2022 22:43:44 +0800 Message-Id: <20220621144353.17547-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220621144353.17547-1-baolu.lu@linux.intel.com> References: <20220621144353.17547-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use this field to save the number of PASIDs that a device is able to consume. It is a generic attribute of a device and lifting it into the per-device dev_iommu struct could help to avoid the boilerplate code in various IOMMU drivers. Signed-off-by: Lu Baolu --- include/linux/iommu.h | 2 ++ drivers/iommu/iommu.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 03fbb1b71536..d50afb2c9a09 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -364,6 +364,7 @@ struct iommu_fault_param { * @fwspec: IOMMU fwspec data * @iommu_dev: IOMMU device this device is linked to * @priv: IOMMU Driver private data + * @max_pasids: number of PASIDs device can consume * * TODO: migrate other per device data pointers under iommu_dev_data, e.g. * struct iommu_group *iommu_group; @@ -375,6 +376,7 @@ struct dev_iommu { struct iommu_fwspec *fwspec; struct iommu_device *iommu_dev; void *priv; + u32 max_pasids; }; int iommu_device_register(struct iommu_device *iommu, diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 847ad47a2dfd..6b731568efff 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -218,6 +219,24 @@ static void dev_iommu_free(struct device *dev) kfree(param); } +static u32 dev_iommu_get_max_pasids(struct device *dev) +{ + u32 max_pasids = 0, bits = 0; + int ret; + + if (dev_is_pci(dev)) { + ret = pci_max_pasids(to_pci_dev(dev)); + if (ret > 0) + max_pasids = ret; + } else { + ret = device_property_read_u32(dev, "pasid-num-bits", &bits); + if (!ret) + max_pasids = 1UL << bits; + } + + return min_t(u32, max_pasids, dev->iommu->iommu_dev->max_pasids); +} + static int __iommu_probe_device(struct device *dev, struct list_head *group_list) { const struct iommu_ops *ops = dev->bus->iommu_ops; @@ -243,6 +262,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list } dev->iommu->iommu_dev = iommu_dev; + dev->iommu->max_pasids = dev_iommu_get_max_pasids(dev); group = iommu_group_get_for_dev(dev); if (IS_ERR(group)) { -- 2.25.1