From patchwork Fri Jul 17 21:32:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6819471 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A67CAC05AC for ; Fri, 17 Jul 2015 21:32:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B05ED2081B for ; Fri, 17 Jul 2015 21:32:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EBD620810 for ; Fri, 17 Jul 2015 21:32:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753287AbbGQVcw (ORCPT ); Fri, 17 Jul 2015 17:32:52 -0400 Received: from mail-ob0-f182.google.com ([209.85.214.182]:33767 "EHLO mail-ob0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753091AbbGQVcv (ORCPT ); Fri, 17 Jul 2015 17:32:51 -0400 Received: by obbgp5 with SMTP id gp5so73126930obb.0 for ; Fri, 17 Jul 2015 14:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=V9rMFUXphtNvGkUC3oU3eYRDBnLZw72j1TJkqK80tT0=; b=W05B7qescuZzrwVhB9GFRcLnHIIE3aHii3F+322K5mUlydTFGoYta9d5X84v61A6ib 7CZHzcTGiTcfY+D6+c0eC7ZXa//b9dBIrdDQ9k8J0wgFQctBrz5X5o3W79P/uwKmZdr3 DgLQvDaZNkI9N8ZgO6I8BLnrJLoXfEbvbXRJYbvL/Ue5mPz6MDhbFLz0OpzvAHxBwqB8 5Q9Wd5Cba0S9jvjQzmNfH9I12jtpR3Xv7nJYQDTHxQeiu9G2+gHmhBdYnXGtwxWfydH/ bcEVqpydHObEFrJfNiyeVeCPIFpIWnePDVv5h4FJ5n+xt0wn1d3ekXEVtPW1v+HOIWPW WOOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=V9rMFUXphtNvGkUC3oU3eYRDBnLZw72j1TJkqK80tT0=; b=W5/E7KI9Uu/r3BF6b0sR0xyoOBfhNScKJGpy6TqQWJOvc+cfpguCSwONNaRUAJVztT N7zLM2Tsb0361TYPiNgtYG8Mrvs/grPINdXWhQEA50Ve7tQW2DHoC99zFYar/0+761bB P+Cdo1CAY0zv+VF3tHNPQCipkHwQgWdN4NtPWNrqQ3LEkdLuIO1u5X9aNNhEjpifZcJq /6XsxjlRtTr7rtw/1z7Iee/szSUA0qzJiMqk65NQHZfN2tsU/o1g+yBJdsctP1/Cbnh8 hkrNNyXXvMNTk4bWeIDakDUNwq/znfZNEFSjiTo+UTQeWaENS9wo1dI6NAtm1/wCCdCv JAiw== X-Gm-Message-State: ALoCoQlP8w3blBqgBQF4Eg+mQJEUaJnvQSuUCoGNsB0lDWBBrCh/kctcAdYFqu7r/FfS00r15NoK X-Received: by 10.182.176.36 with SMTP id cf4mr16073209obc.40.1437168770931; Fri, 17 Jul 2015 14:32:50 -0700 (PDT) Received: from localhost ([146.7.4.71]) by smtp.gmail.com with ESMTPSA id j1sm6996610obj.19.2015.07.17.14.32.48 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jul 2015 14:32:49 -0700 (PDT) Subject: [PATCH 8/8] PCI: Move ATS declarations to linux/pci.h so they're all together To: linux-pci@vger.kernel.org, Joerg Roedel From: Bjorn Helgaas Cc: Gregor Dick Date: Fri, 17 Jul 2015 16:32:47 -0500 Message-ID: <20150717213247.18379.66315.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150717212759.18379.44858.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150717212759.18379.44858.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move ATS declarations to linux/pci.h so they're all in one place. Signed-off-by: Bjorn Helgaas Reviewed-by: Joerg Roedel --- include/linux/pci-ats.h | 41 ----------------------------------------- include/linux/pci.h | 8 ++++++++ 2 files changed, 8 insertions(+), 41 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index 5d81d47..57e0b82 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h @@ -3,47 +3,6 @@ #include -/* Address Translation Service */ -#ifdef CONFIG_PCI_ATS - -int pci_enable_ats(struct pci_dev *dev, int ps); -void pci_disable_ats(struct pci_dev *dev); -int pci_ats_queue_depth(struct pci_dev *dev); - -/** - * pci_ats_enabled - query the ATS status - * @dev: the PCI device - * - * Returns 1 if ATS capability is enabled, or 0 if not. - */ -static inline int pci_ats_enabled(struct pci_dev *dev) -{ - return dev->ats_cap && dev->ats_enabled; -} - -#else /* CONFIG_PCI_ATS */ - -static inline int pci_enable_ats(struct pci_dev *dev, int ps) -{ - return -ENODEV; -} - -static inline void pci_disable_ats(struct pci_dev *dev) -{ -} - -static inline int pci_ats_queue_depth(struct pci_dev *dev) -{ - return -ENODEV; -} - -static inline int pci_ats_enabled(struct pci_dev *dev) -{ - return 0; -} - -#endif /* CONFIG_PCI_ATS */ - #ifdef CONFIG_PCI_PRI int pci_enable_pri(struct pci_dev *pdev, u32 reqs); diff --git a/include/linux/pci.h b/include/linux/pci.h index 1997853..744a5e9 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1300,8 +1300,16 @@ void ht_destroy_irq(unsigned int irq); #ifdef CONFIG_PCI_ATS /* Address Translation Service */ void pci_ats_init(struct pci_dev *dev); +int pci_enable_ats(struct pci_dev *dev, int ps); +void pci_disable_ats(struct pci_dev *dev); +int pci_ats_queue_depth(struct pci_dev *dev); +static inline int pci_ats_enabled(struct pci_dev *dev) { return dev->ats_enabled; } #else static inline void pci_ats_init(struct pci_dev *) { } +static inline int pci_enable_ats(struct pci_dev *, int) { return -ENODEV; } +static inline void pci_disable_ats(struct pci_dev *) { } +static inline int pci_ats_queue_depth(struct pci_dev *) { return -ENODEV; } +static inline int pci_ats_enabled(struct pci_dev *dev) { return 0; } #endif void pci_cfg_access_lock(struct pci_dev *dev);