Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp4291080rwb; Tue, 16 Aug 2022 19:05:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR4eQL2QWl5bBJn8Z8lcec+PHHxKUvGFHB9sgwmfoItZY9J0bxGz+ylJHR+i2SQnwSWikwNC X-Received: by 2002:a17:907:3f8d:b0:730:bbf0:6629 with SMTP id hr13-20020a1709073f8d00b00730bbf06629mr15067998ejc.644.1660701922351; Tue, 16 Aug 2022 19:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660701922; cv=none; d=google.com; s=arc-20160816; b=t0DhsdvqIKBmPaAgNlKO5qwlCwIQl/2ZKnbBvGWntCo8ArymUSpkw04+9tWW9PCslg JpfrmCQG7G8KVxtPj9AX6ogL2QndcpsELL3IvCGdTKPjnO4wO3P2ifcNqbXu6+qR0BWM doZQYYcD3EfBtR5p7/7GcJSfyXPd7xx0XhpqKhx2zo56FZJPm4MmxkArxZ/0JxZSBB7C dUameeHQxpKAGFpaLBhkCbpF/mRfOTOiD28qkO7iyC4yLf5oqHjlg1uIOgewb0V4LXd0 OacRJ77TVqxc9G5NeHCurN5uSOPFulU47d4mC/R7SFQt5QqljYvvlLZcFMymyI8WTolX Vj4Q== 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=TazotDOBdXgMbNU5EzEkF/36sArLlVt83nRiUsrSfxU=; b=sTDAf7zKdndsyK2MSjOuexW7N6hF8EFTK+5ef+wx7fnFAVpdXHM0EwpUNFnPgObcfh Wlo65Hmg36Jb+rD2Kpi+pWUTeL/+30thcr5L+YWbcTO/ndrYNaLk0tQJRHR0rGIjsuhI AptXmzLLwolP/QyXb5tcq4wxq0adPd8SopbSZbUeBXyj/j962k1XcaG8VMAuuWPa/few 3U+hYU5Q31DQuvXoXka7HjuIZppbVjquAUcWykWbG0FbVOqZEdoCVNnKTvrYxoHmfT2l nMWg/IkpIDTElYUs3s96+oImE6kh+u7R7ydOQWrSxeqiRJQ3nP+50HHjvH53nRbJaqbN 6U7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="D/yZTxnu"; 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 nd42-20020a17090762aa00b007307a4f5102si12219383ejc.830.2022.08.16.19.04.57; Tue, 16 Aug 2022 19:05:22 -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="D/yZTxnu"; 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 S238132AbiHQB0D (ORCPT + 99 others); Tue, 16 Aug 2022 21:26:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237979AbiHQBZ7 (ORCPT ); Tue, 16 Aug 2022 21:25:59 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80C68754AE; Tue, 16 Aug 2022 18:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660699558; x=1692235558; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9EWNVIJ3Obwmegy5JEKe9iHLOL2CubC0tKLAl7NIs3g=; b=D/yZTxnuPtLDp5SVl3tybU2N+MZzebc3di8N9alhKdRT3j4P62ThfzdH vEkkUAe1MbrXufUekyw/o0dEa1hjQVkafBgjkanoqQXS45gWJLJQg29Wq n32ZvTMaAgB4913m6bfKo51U8K53wrtHsS144cND0pvIsKeZjvG2pX2XE Njp9JfCU3Arm8xdWhfL8tLvHvxe026nFaDt6aGq+kXlNy5G88AeJggxax Kh4qBn43KJgzs1m5DJe1OYubsBizmejr/ZAOyQ1WzAH8qShDfg/XYnddh JsBns9Cw0UOF4qoj/KMK2TBhMAO1cVtf9G9BECV7R4J9LIMojZ7zf5TlG A==; X-IronPort-AV: E=McAfee;i="6400,9594,10441"; a="291126268" X-IronPort-AV: E=Sophos;i="5.93,242,1654585200"; d="scan'208";a="291126268" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Aug 2022 18:25:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,242,1654585200"; d="scan'208";a="696587864" Received: from allen-box.sh.intel.com ([10.239.159.48]) by FMSMGA003.fm.intel.com with ESMTP; 16 Aug 2022 18:25:54 -0700 From: Lu Baolu To: Joerg Roedel , Jason Gunthorpe , Christoph Hellwig , Bjorn Helgaas , Kevin Tian , Ashok Raj , Will Deacon , Robin Murphy , Jean-Philippe Brucker , Dave Jiang , Vinod Koul Cc: Eric Auger , Liu Yi L , Jacob jun Pan , Zhangfei Gao , Zhu Tony , iommu@lists.linux.dev, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Lu Baolu Subject: [PATCH v11 02/13] iommu: Add max_pasids field in struct dev_iommu Date: Wed, 17 Aug 2022 09:20:13 +0800 Message-Id: <20220817012024.3251276-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220817012024.3251276-1-baolu.lu@linux.intel.com> References: <20220817012024.3251276-1-baolu.lu@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 Reviewed-by: Kevin Tian Reviewed-by: Jason Gunthorpe Reviewed-by: Yi Liu --- 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 ed172cbdabf2..0d9ce209a501 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -368,6 +368,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 this device can consume * * TODO: migrate other per device data pointers under iommu_dev_data, e.g. * struct iommu_group *iommu_group; @@ -379,6 +380,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 780fb7071577..e9f6a8d33b58 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