From patchwork Fri May 11 19:06:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 10395091 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8054860348 for ; Fri, 11 May 2018 19:11:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7126A28F8B for ; Fri, 11 May 2018 19:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6581328FA6; Fri, 11 May 2018 19:11:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC34928F8E for ; Fri, 11 May 2018 19:11:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 46F2A6B06CD; Fri, 11 May 2018 15:11:15 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3F8C36B06D0; Fri, 11 May 2018 15:11:15 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C2516B06D1; Fri, 11 May 2018 15:11:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot0-f197.google.com (mail-ot0-f197.google.com [74.125.82.197]) by kanga.kvack.org (Postfix) with ESMTP id F0C496B06CD for ; Fri, 11 May 2018 15:11:14 -0400 (EDT) Received: by mail-ot0-f197.google.com with SMTP id v10-v6so4294444oth.16 for ; Fri, 11 May 2018 12:11:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=WFNKFbDRaLwpQtIlDS0LgTltlsgkigf+CjN4AkaSO0Q=; b=Zy2PKY28Gwpodt3Nnzs+NCBtwIEjSdB2J4Gu9pTGl1s89pl4dqkeMx+TMvVciz2B5z 1AGigEzJ+9vMsO7ei9RMWP4eYYk5SQWniLbGZosGYCHpHKkEyvszxLeDeGO1FhTYUf+O PlvF00nDi/tTUCI2Fmaq8IIK8388c2igGc89xgSTN4avo7Pi+6ks2maDM9YKPwbe51je 0ptGhE4F7uHWFxltxv/pGRp57Zv9b9B2vppUKUiE032DQvpvaK3daBr6eo6ie6UnIfSk Ml0+8j3ZQ/HXIbGm5kkDqS1zG4fNYgb+HFFASWht77WAY2/MzjoqaOnlBpnKuuYIwMAa M4Rw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=jean-philippe.brucker@arm.com X-Gm-Message-State: ALKqPwf0eGh5+XxpAjI1jg9KDROoejYUfWEzY0RrB6api42w9/tGfK+5 fdBJbrm4qIvACw9nBCVLuLoXRjPMAB3Xhe9iVFVVK+54zRMOrBdT5umopjIXvhLMcK/z5i+57qG LAAZvKuS81tVgFEd9bt52M8CQG55A9yzALBnkaNneEsseAexNEg3hrlC1IyZ24iLjkw== X-Received: by 2002:a9d:133c:: with SMTP id f57-v6mr4501166ote.219.1526065874782; Fri, 11 May 2018 12:11:14 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqMRzarUod8FxVIc/Tpr1aouIqs8eN8yGc4iXBSegN1cR3H2gdxDfkYNaR1MjJy0yg06/KX X-Received: by 2002:a9d:133c:: with SMTP id f57-v6mr4501137ote.219.1526065874114; Fri, 11 May 2018 12:11:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526065874; cv=none; d=google.com; s=arc-20160816; b=JuikSQ9Kc5oeZdHLvbd7rB96PyGK5LBMUo4IR8l9Ja+LVqRGludaNJ8Lm27RBbIw5z Ni3O7G1fsCArJrpIo52wP2z+b7VpdbrstWj9rpHz/BnTZ5JjNWr92OQeaT6ghcIDIbBX fPpj+O+x1fR7vTf2QSyltXqccbAAnlVimlQ3OBVC88gMV5yX1Xnihdhu1DhmVgI6OwkX SXH3AYzSIFDTDEgozKNw5JlS2hEYVH/gqs5YmTx5lJu6UHpYZ288xFcFoTiMLYS0CnXB tVD6V9l5Z9OeNhK9Yx3Phj4jPJKLtXt/UiUpbkiS4MgQohNCRWYMOezIBAQtrY14J81/ wSDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=WFNKFbDRaLwpQtIlDS0LgTltlsgkigf+CjN4AkaSO0Q=; b=Ci9BdDSb7Zblq+PBrsrGEZed9hv/71bxKfOJWPuL+KRYedXeu2qjrLsWBpN9w3/Ma4 VcbkKkWrZ1VL6UcwStpbhLCyoUGX3PL9TKnedh3oz4d94sFkSTWnWnXqkQSmN3ZnQfmc /xLzUNvN7ORsgXfrQC2W+HpBffhusoEK8sGGxUNZiCR7x+R0mreyEwS91kNX07ZEbpNh 37DWu9cS9Qw8mTNuPjJxAxmeynZLbQyxdKH0HbXcFW1pAez6ME1q6pXoGgtAlRM/6KpG oxQovRdKF121wWOwHpecd+10O9sts7CNPHELS+PQEzLQ2b2dATMX+GH1Am7cbM7Nb3b+ 2SIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=jean-philippe.brucker@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id a20-v6si1255842oih.294.2018.05.11.12.11.13 for ; Fri, 11 May 2018 12:11:14 -0700 (PDT) Received-SPF: pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jean-philippe.brucker@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=jean-philippe.brucker@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A93D419E8; Fri, 11 May 2018 12:11:13 -0700 (PDT) Received: from ostrya.cambridge.arm.com (ostrya.cambridge.arm.com [10.1.210.33]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6C06F3F23C; Fri, 11 May 2018 12:11:08 -0700 (PDT) From: Jean-Philippe Brucker To: linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, iommu@lists.linux-foundation.org, kvm@vger.kernel.org, linux-mm@kvack.org Cc: joro@8bytes.org, will.deacon@arm.com, robin.murphy@arm.com, alex.williamson@redhat.com, tn@semihalf.com, liubo95@huawei.com, thunder.leizhen@huawei.com, xieyisheng1@huawei.com, xuzaibo@huawei.com, ilias.apalodimas@linaro.org, jonathan.cameron@huawei.com, liudongdong3@huawei.com, shunyong.yang@hxt-semitech.com, nwatters@codeaurora.org, okaya@codeaurora.org, jcrouse@codeaurora.org, rfranz@cavium.com, dwmw2@infradead.org, jacob.jun.pan@linux.intel.com, yi.l.liu@intel.com, ashok.raj@intel.com, kevin.tian@intel.com, baolu.lu@linux.intel.com, robdclark@gmail.com, christian.koenig@amd.com, bharatku@xilinx.com, rgummal@xilinx.com Subject: [PATCH v2 40/40] iommu/arm-smmu-v3: Add support for PCI PASID Date: Fri, 11 May 2018 20:06:41 +0100 Message-Id: <20180511190641.23008-41-jean-philippe.brucker@arm.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511190641.23008-1-jean-philippe.brucker@arm.com> References: <20180511190641.23008-1-jean-philippe.brucker@arm.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Enable PASID for PCI devices that support it. Unlike PRI, we can't enable PASID lazily in iommu_sva_device_init(), because it has to be enabled before ATS, and because we have to allocate substream tables early. Signed-off-by: Jean-Philippe Brucker --- drivers/iommu/arm-smmu-v3.c | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 0edbb8d19579..ac6e69f25893 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2542,6 +2542,52 @@ static bool arm_smmu_sid_in_range(struct arm_smmu_device *smmu, u32 sid) return sid < limit; } +static int arm_smmu_enable_pasid(struct arm_smmu_master_data *master) +{ + int ret; + int features; + u8 pasid_bits; + int num_pasids; + struct pci_dev *pdev; + + if (!dev_is_pci(master->dev)) + return -ENOSYS; + + pdev = to_pci_dev(master->dev); + + features = pci_pasid_features(pdev); + if (features < 0) + return -ENOSYS; + + num_pasids = pci_max_pasids(pdev); + if (num_pasids <= 0) + return -ENOSYS; + + pasid_bits = min_t(u8, ilog2(num_pasids), master->smmu->ssid_bits); + + dev_dbg(&pdev->dev, "device supports %#x PASID bits [%s%s]\n", pasid_bits, + (features & PCI_PASID_CAP_EXEC) ? "x" : "", + (features & PCI_PASID_CAP_PRIV) ? "p" : ""); + + ret = pci_enable_pasid(pdev, features); + return ret ? ret : pasid_bits; +} + +static void arm_smmu_disable_pasid(struct arm_smmu_master_data *master) +{ + struct pci_dev *pdev; + + if (!dev_is_pci(master->dev)) + return; + + pdev = to_pci_dev(master->dev); + + if (!pdev->pasid_enabled) + return; + + pci_disable_pasid(pdev); +} + static int arm_smmu_enable_ats(struct arm_smmu_master_data *master) { size_t stu; @@ -2712,6 +2758,11 @@ static int arm_smmu_add_device(struct device *dev) master->ste.can_stall = true; } + /* PASID must be enabled before ATS */ + ret = arm_smmu_enable_pasid(master); + if (ret > 0) + master->ssid_bits = ret; + arm_smmu_enable_ats(master); ret = iommu_device_link(&smmu->iommu, dev); @@ -2740,6 +2791,7 @@ static int arm_smmu_add_device(struct device *dev) err_disable_ats: arm_smmu_disable_ats(master); + arm_smmu_disable_pasid(master); err_free_master: kfree(master); @@ -2769,7 +2821,9 @@ static void arm_smmu_remove_device(struct device *dev) arm_smmu_remove_master(smmu, master); iommu_device_unlink(&smmu->iommu, dev); arm_smmu_disable_pri(master); + /* PASID must be disabled after ATS */ arm_smmu_disable_ats(master); + arm_smmu_disable_pasid(master); kfree(master); iommu_fwspec_free(dev); }