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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 D9C97C3815B for ; Tue, 14 Apr 2020 18:03:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B89EB2076B for ; Tue, 14 Apr 2020 18:03:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407746AbgDNSDg (ORCPT ); Tue, 14 Apr 2020 14:03:36 -0400 Received: from mga06.intel.com ([134.134.136.31]:43163 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407740AbgDNSDd (ORCPT ); Tue, 14 Apr 2020 14:03:33 -0400 IronPort-SDR: x8rRgoPDPLAJKqR99Bj142EoFIexz0sjoFTYVBvp66/JYLLo7xztYppSojeXo5VqKtmREh6kqb qZhev8Zj9G0A== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 11:03:32 -0700 IronPort-SDR: SFfWWKn9a+9EaRfpA/3Wbs/x3kQaNMzka6GrGJ2jeWBmbZqBLlTRxdEhB2Ad2MBBRdX9vd5tu9 ICwTpVsFz5Dw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,383,1580803200"; d="scan'208";a="271475675" Received: from swwoldee-mobl1.amr.corp.intel.com (HELO [10.251.15.118]) ([10.251.15.118]) by orsmga002.jf.intel.com with ESMTP; 14 Apr 2020 11:03:28 -0700 Subject: Re: [PATCH v5 23/25] PCI/ATS: Add PRI stubs To: Jean-Philippe Brucker , iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, linux-mm@kvack.org Cc: joro@8bytes.org, catalin.marinas@arm.com, will@kernel.org, robin.murphy@arm.com, kevin.tian@intel.com, baolu.lu@linux.intel.com, Jonathan.Cameron@huawei.com, jacob.jun.pan@linux.intel.com, christian.koenig@amd.com, zhangfei.gao@linaro.org, jgg@ziepe.ca, xuzaibo@huawei.com, Bjorn Helgaas References: <20200414170252.714402-1-jean-philippe@linaro.org> <20200414170252.714402-24-jean-philippe@linaro.org> From: "Kuppuswamy, Sathyanarayanan" Message-ID: Date: Tue, 14 Apr 2020 11:03:25 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200414170252.714402-24-jean-philippe@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Hi, On 4/14/20 10:02 AM, Jean-Philippe Brucker wrote: > The SMMUv3 driver, which can be built without CONFIG_PCI, will soon gain > support for PRI. Partially revert commit c6e9aefbf9db ("PCI/ATS: Remove > unused PRI and PASID stubs") to re-introduce the PRI stubs, and avoid > adding more #ifdefs to the SMMU driver. > > Acked-by: Bjorn Helgaas > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Kuppuswamy Sathyanarayanan > --- > include/linux/pci-ats.h | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h > index f75c307f346de..e9e266df9b37c 100644 > --- a/include/linux/pci-ats.h > +++ b/include/linux/pci-ats.h > @@ -28,6 +28,14 @@ int pci_enable_pri(struct pci_dev *pdev, u32 reqs); > void pci_disable_pri(struct pci_dev *pdev); > int pci_reset_pri(struct pci_dev *pdev); > int pci_prg_resp_pasid_required(struct pci_dev *pdev); > +#else /* CONFIG_PCI_PRI */ > +static inline int pci_enable_pri(struct pci_dev *pdev, u32 reqs) > +{ return -ENODEV; } > +static inline void pci_disable_pri(struct pci_dev *pdev) { } > +static inline int pci_reset_pri(struct pci_dev *pdev) > +{ return -ENODEV; } > +static inline int pci_prg_resp_pasid_required(struct pci_dev *pdev) > +{ return 0; } > #endif /* CONFIG_PCI_PRI */ > > #ifdef CONFIG_PCI_PASID >