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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 9FE2CC10F27 for ; Mon, 9 Mar 2020 16:32:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EA5422525 for ; Mon, 9 Mar 2020 16:32:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbgCIQcF (ORCPT ); Mon, 9 Mar 2020 12:32:05 -0400 Received: from 8bytes.org ([81.169.241.247]:50386 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727061AbgCIQcF (ORCPT ); Mon, 9 Mar 2020 12:32:05 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 29E2E39B; Mon, 9 Mar 2020 17:32:04 +0100 (CET) Date: Mon, 9 Mar 2020 17:32:02 +0100 From: Joerg Roedel To: Jean-Philippe Brucker Cc: Hanjun Guo , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, virtualization@lists.linux-foundation.org, Lorenzo Pieralisi , Sudeep Holla , Rob Clark , Sean Paul , Will Deacon , Robin Murphy , Matthias Brugger , Thierry Reding , Andy Gross , Bjorn Andersson , Linuxarm Subject: Re: [PATCH 00/14] iommu: Move iommu_fwspec out of 'struct device' Message-ID: <20200309163202.nk7yotb7awzido7b@8bytes.org> References: <20200228150820.15340-1-joro@8bytes.org> <20200306100955.GB50020@myrica> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200306100955.GB50020@myrica> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi Jean-Philippe, On Fri, Mar 06, 2020 at 11:09:55AM +0100, Jean-Philippe Brucker wrote: > I think that's because patch 01/14 move the fwspec access too early. In > > err = pci_for_each_dma_alias(to_pci_dev(dev), > iort_pci_iommu_init, &info); > > if (!err && iort_pci_rc_supports_ats(node)) > dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; > > the iommu_fwspec is only valid if iort_pci_iommu_init() initialized it > successfully, if err == 0. The following might fix it: > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index 0e981d7f3c7d..7d04424189df 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1015,7 +1015,7 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > return ops; > > if (dev_is_pci(dev)) { > - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > + struct iommu_fwspec *fwspec; > struct pci_bus *bus = to_pci_dev(dev)->bus; > struct iort_pci_alias_info info = { .dev = dev }; > > @@ -1028,7 +1028,8 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > err = pci_for_each_dma_alias(to_pci_dev(dev), > iort_pci_iommu_init, &info); > > - if (!err && iort_pci_rc_supports_ats(node)) > + fwspec = dev_iommu_fwspec_get(dev); > + if (fwspec && iort_pci_rc_supports_ats(node)) > fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; > } else { > int i = 0; Thanks a lot for the fix! I added it to patch 1/14. Regards, Joerg