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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_MUTT 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 11CF7C282CE for ; Wed, 22 May 2019 12:54:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB57520868 for ; Wed, 22 May 2019 12:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729381AbfEVMyg (ORCPT ); Wed, 22 May 2019 08:54:36 -0400 Received: from foss.arm.com ([217.140.101.70]:49970 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728761AbfEVMyg (ORCPT ); Wed, 22 May 2019 08:54:36 -0400 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 0364880D; Wed, 22 May 2019 05:54:36 -0700 (PDT) Received: from fuggles.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C32D23F575; Wed, 22 May 2019 05:54:34 -0700 (PDT) Date: Wed, 22 May 2019 13:54:29 +0100 From: Will Deacon To: Christoph Hellwig Cc: jean-philippe.brucker@arm.com, lorenzo.pieralisi@arm.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ACPI/IORT: Fix build without CONFIG_IOMMU_API Message-ID: <20190522125429.GA7876@fuggles.cambridge.arm.com> References: <20190520065746.17068-1-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190520065746.17068-1-hch@lst.de> User-Agent: Mutt/1.11.1+86 (6f28e57d73f2) () Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi Christoph, On Mon, May 20, 2019 at 08:57:46AM +0200, Christoph Hellwig wrote: > IOMMU_FWSPEC_PCI_RC_ATS is only defined if CONFIG_IOMMU_API is > enabled. > > Fixes: 5702ee24182f ("ACPI/IORT: Check ATS capability in root complex nodes") > Signed-off-by: Christoph Hellwig > --- > drivers/acpi/arm64/iort.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index 9058cb084b91..3e542b5d2a2d 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1074,9 +1074,10 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > info.node = node; > err = pci_for_each_dma_alias(to_pci_dev(dev), > iort_pci_iommu_init, &info); > - > +#ifdef CONFIG_IOMMU_API > if (!err && iort_pci_rc_supports_ats(node)) > dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; > +#endif Cheers, although there's an alternative fix from Lorenzo that I'll send up for -rc2. Sorry for the delay; been having email issues this week. Will 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=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT 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 D6534C282CE for ; Wed, 22 May 2019 12:54:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 AB99620868 for ; Wed, 22 May 2019 12:54:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Pw6JDxfN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB99620868 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Xj1OVMS7byYfwjLnjgeX81UxLR9h/NRkkyVZ3u+YeGw=; b=Pw6JDxfNc2TzrC Gc6b+QNZ/ImriNTKjR4HRNImmOC7Mif7R6sWlMB5utQ+gE+nvNiumZgZW/r0kaH4gU6UNEhv1QJwo 1fYXaKjXc8VZJVl2o2KHqJVd8Ffp39vcGOU/oXg/yNbZSogAijLnHJGzdHgZHSWSncrMwORHDpoLF S5nAOl86l/J44/ztDxhNM5w8xLNOsEc3GSaLA1kLhYD0Ix2p359iyR3z4e78h6ZrxOkQMFvr606+i XKMGWLJIZ6f3nDTROoBJffi0D8mdaDsFErXgPDiAksegKi5Pq28wqOqGd4P2EomAx8datxGrJOwOX p1r68Af2bAmEVIbJdMFg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hTQlY-0003Lw-BN; Wed, 22 May 2019 12:54:44 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hTQlU-0003LI-R4 for linux-arm-kernel@lists.infradead.org; Wed, 22 May 2019 12:54:41 +0000 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 0364880D; Wed, 22 May 2019 05:54:36 -0700 (PDT) Received: from fuggles.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C32D23F575; Wed, 22 May 2019 05:54:34 -0700 (PDT) Date: Wed, 22 May 2019 13:54:29 +0100 From: Will Deacon To: Christoph Hellwig Subject: Re: [PATCH] ACPI/IORT: Fix build without CONFIG_IOMMU_API Message-ID: <20190522125429.GA7876@fuggles.cambridge.arm.com> References: <20190520065746.17068-1-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190520065746.17068-1-hch@lst.de> User-Agent: Mutt/1.11.1+86 (6f28e57d73f2) () X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190522_055440_877455_40BF8923 X-CRM114-Status: GOOD ( 16.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jean-philippe.brucker@arm.com, linux-acpi@vger.kernel.org, lorenzo.pieralisi@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Christoph, On Mon, May 20, 2019 at 08:57:46AM +0200, Christoph Hellwig wrote: > IOMMU_FWSPEC_PCI_RC_ATS is only defined if CONFIG_IOMMU_API is > enabled. > > Fixes: 5702ee24182f ("ACPI/IORT: Check ATS capability in root complex nodes") > Signed-off-by: Christoph Hellwig > --- > drivers/acpi/arm64/iort.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index 9058cb084b91..3e542b5d2a2d 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1074,9 +1074,10 @@ const struct iommu_ops *iort_iommu_configure(struct device *dev) > info.node = node; > err = pci_for_each_dma_alias(to_pci_dev(dev), > iort_pci_iommu_init, &info); > - > +#ifdef CONFIG_IOMMU_API > if (!err && iort_pci_rc_supports_ats(node)) > dev->iommu_fwspec->flags |= IOMMU_FWSPEC_PCI_RC_ATS; > +#endif Cheers, although there's an alternative fix from Lorenzo that I'll send up for -rc2. Sorry for the delay; been having email issues this week. Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel