From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75CD3C4320E for ; Fri, 20 Aug 2021 19:57:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61F296113B for ; Fri, 20 Aug 2021 19:57:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238711AbhHTT56 (ORCPT ); Fri, 20 Aug 2021 15:57:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:43976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238427AbhHTT5x (ORCPT ); Fri, 20 Aug 2021 15:57:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 71C576115A; Fri, 20 Aug 2021 19:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629489433; bh=oXG50X/22uTzFUboG7/PpKEBPWt2Csv6a5jCy+z/ccY=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=Z+9074sEzmiVFaCRvwMytW8rZxrRTSyhyY0TEn010k6sr3ooIX8QVzteNOifz+2b2 RcvXkzSiK1WQnvJrmaXd6ve6Ah7SR9LOB8HcYrzkys8Sep5RUmuki8SpCx2UymxqLq 3ok9NxBS2JMMrH7BQAnYsDWHC96CMnN13JYcCFzcJy/hd6EqvBRSRIUVvzTr5km6sJ NXuUuRnN5a7Q4lGS16Hg7yp3sJwxiNnOl7DgkxygPUNbtu++uQKLQAXb5xZVjhf6Qz K1GkPx9bMOBIWsn/oI5lt7kkgki9RCzq3A2DlYYincueSVFVHyAl5FLSEN0nUA/PxT SqqnkNShr+APg== Date: Fri, 20 Aug 2021 14:57:12 -0500 From: Bjorn Helgaas To: Wang Xingang Cc: robh@kernel.org, will@kernel.org, joro@8bytes.org, robh+dt@kernel.org, gregkh@linuxfoundation.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, xieyingtai@huawei.com Subject: Re: [PATCH v4] iommu/of: Fix pci_request_acs() before enumerating PCI devices Message-ID: <20210820195712.GA3342877@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1621566204-37456-1-git-send-email-wangxingang5@huawei.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 21, 2021 at 03:03:24AM +0000, Wang Xingang wrote: > From: Xingang Wang > > When booting with devicetree, the pci_request_acs() is called after the > enumeration and initialization of PCI devices, thus the ACS is not > enabled. And ACS should be enabled when IOMMU is detected for the > PCI host bridge, so add check for IOMMU before probe of PCI host and call > pci_request_acs() to make sure ACS will be enabled when enumerating PCI > devices. > > Fixes: 6bf6c24720d33 ("iommu/of: Request ACS from the PCI core when > configuring IOMMU linkage") > Signed-off-by: Xingang Wang Applied to pci/virtualization for v5.15, thanks! > --- > drivers/iommu/of_iommu.c | 1 - > drivers/pci/of.c | 8 +++++++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index a9d2df001149..54a14da242cc 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -205,7 +205,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, > .np = master_np, > }; > > - pci_request_acs(); > err = pci_for_each_dma_alias(to_pci_dev(dev), > of_pci_iommu_init, &info); > } else { > diff --git a/drivers/pci/of.c b/drivers/pci/of.c > index da5b414d585a..2313c3f848b0 100644 > --- a/drivers/pci/of.c > +++ b/drivers/pci/of.c > @@ -581,9 +581,15 @@ static int pci_parse_request_of_pci_ranges(struct device *dev, > > int devm_of_pci_bridge_init(struct device *dev, struct pci_host_bridge *bridge) > { > - if (!dev->of_node) > + struct device_node *node = dev->of_node; > + > + if (!node) > return 0; > > + /* Detect IOMMU and make sure ACS will be enabled */ > + if (of_property_read_bool(node, "iommu-map")) > + pci_request_acs(); > + > bridge->swizzle_irq = pci_common_swizzle; > bridge->map_irq = of_irq_parse_and_map_pci; > > -- > 2.19.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2B4CC432BE for ; Fri, 20 Aug 2021 19:57:20 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 58C2B6113B for ; Fri, 20 Aug 2021 19:57:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 58C2B6113B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 174C242543; Fri, 20 Aug 2021 19:57:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id igx0IYTasM-8; Fri, 20 Aug 2021 19:57:16 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id CDEAF42538; Fri, 20 Aug 2021 19:57:15 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 9F724C001A; Fri, 20 Aug 2021 19:57:15 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id BB756C000E for ; Fri, 20 Aug 2021 19:57:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 994E960712 for ; Fri, 20 Aug 2021 19:57:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=kernel.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7c9rCSCLkefZ for ; Fri, 20 Aug 2021 19:57:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp3.osuosl.org (Postfix) with ESMTPS id 26EB8606CF for ; Fri, 20 Aug 2021 19:57:14 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 71C576115A; Fri, 20 Aug 2021 19:57:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629489433; bh=oXG50X/22uTzFUboG7/PpKEBPWt2Csv6a5jCy+z/ccY=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=Z+9074sEzmiVFaCRvwMytW8rZxrRTSyhyY0TEn010k6sr3ooIX8QVzteNOifz+2b2 RcvXkzSiK1WQnvJrmaXd6ve6Ah7SR9LOB8HcYrzkys8Sep5RUmuki8SpCx2UymxqLq 3ok9NxBS2JMMrH7BQAnYsDWHC96CMnN13JYcCFzcJy/hd6EqvBRSRIUVvzTr5km6sJ NXuUuRnN5a7Q4lGS16Hg7yp3sJwxiNnOl7DgkxygPUNbtu++uQKLQAXb5xZVjhf6Qz K1GkPx9bMOBIWsn/oI5lt7kkgki9RCzq3A2DlYYincueSVFVHyAl5FLSEN0nUA/PxT SqqnkNShr+APg== Date: Fri, 20 Aug 2021 14:57:12 -0500 From: Bjorn Helgaas To: Wang Xingang Subject: Re: [PATCH v4] iommu/of: Fix pci_request_acs() before enumerating PCI devices Message-ID: <20210820195712.GA3342877@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1621566204-37456-1-git-send-email-wangxingang5@huawei.com> Cc: xieyingtai@huawei.com, robh@kernel.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-pci@vger.kernel.org, will@kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Fri, May 21, 2021 at 03:03:24AM +0000, Wang Xingang wrote: > From: Xingang Wang > > When booting with devicetree, the pci_request_acs() is called after the > enumeration and initialization of PCI devices, thus the ACS is not > enabled. And ACS should be enabled when IOMMU is detected for the > PCI host bridge, so add check for IOMMU before probe of PCI host and call > pci_request_acs() to make sure ACS will be enabled when enumerating PCI > devices. > > Fixes: 6bf6c24720d33 ("iommu/of: Request ACS from the PCI core when > configuring IOMMU linkage") > Signed-off-by: Xingang Wang Applied to pci/virtualization for v5.15, thanks! > --- > drivers/iommu/of_iommu.c | 1 - > drivers/pci/of.c | 8 +++++++- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index a9d2df001149..54a14da242cc 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -205,7 +205,6 @@ const struct iommu_ops *of_iommu_configure(struct device *dev, > .np = master_np, > }; > > - pci_request_acs(); > err = pci_for_each_dma_alias(to_pci_dev(dev), > of_pci_iommu_init, &info); > } else { > diff --git a/drivers/pci/of.c b/drivers/pci/of.c > index da5b414d585a..2313c3f848b0 100644 > --- a/drivers/pci/of.c > +++ b/drivers/pci/of.c > @@ -581,9 +581,15 @@ static int pci_parse_request_of_pci_ranges(struct device *dev, > > int devm_of_pci_bridge_init(struct device *dev, struct pci_host_bridge *bridge) > { > - if (!dev->of_node) > + struct device_node *node = dev->of_node; > + > + if (!node) > return 0; > > + /* Detect IOMMU and make sure ACS will be enabled */ > + if (of_property_read_bool(node, "iommu-map")) > + pci_request_acs(); > + > bridge->swizzle_irq = pci_common_swizzle; > bridge->map_irq = of_irq_parse_and_map_pci; > > -- > 2.19.1 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu