From patchwork Fri Jul 17 21:32:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6819431 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 52B9F9F2E8 for ; Fri, 17 Jul 2015 21:32:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B0E62081B for ; Fri, 17 Jul 2015 21:32:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A452720815 for ; Fri, 17 Jul 2015 21:32:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbbGQVcU (ORCPT ); Fri, 17 Jul 2015 17:32:20 -0400 Received: from mail-ob0-f180.google.com ([209.85.214.180]:34582 "EHLO mail-ob0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753091AbbGQVcT (ORCPT ); Fri, 17 Jul 2015 17:32:19 -0400 Received: by obre1 with SMTP id e1so73281975obr.1 for ; Fri, 17 Jul 2015 14:32:18 -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=v1eKm9LXY/xWb0iVkOQ/7+jjtRG4SBYKZf/sRtCZ1us=; b=mkPMtVzvaAocSX0ibqnDftRGzLnX2Acp/GxA/igKH8yB9QBA77scqyYpzqyZw+f38H mt/WE6GJPGg/KRJqq0qa2j6UvO65j9Mlf1DSOmEuRxkLqKtrd+fgYKlki6X3vGtbt4um LdxA/0K1PfLuNPSYRC94H8mWxhyvMT8i+uBiilJr6V0dfE8cOwWz8oT8YRCxaR6hgwhg h8uWJVeuDU+xMILDaVA4yUL4VOx2KNFwPaEuaMGVdk4n+XMcyeQ44EBKotjEWD8PkCdA M0o3w4UjzNp2v4foGLU8ipUPDQFsKzl9VMyMNc78YbqAWZCNaQL5/tnoV3lw2ieJp3nB TvEg== 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=v1eKm9LXY/xWb0iVkOQ/7+jjtRG4SBYKZf/sRtCZ1us=; b=m1p0eXCr09ZJau01fSuPxxHPk3HaqlK5IueqF3I1XNXJKxTWf1whDJ9Fb0fnFgZRZu BMwjQOFwX72rdW/wE6/XUc5qNeS1sMBP2U4dFvpFMoX8bKjpIO1n1K//uvHI3HwS1JcK vI7k/i+f6oBXExhEj6kfiwCK3vqaXUwZfJrSCbYMyrJ3nSTgWn0KedRVv+1qcS7MsDSm gDknAMn2JmhkhgiWgTFQLhinPsG77GzaJHkKM2fCuWFheUYOVM4hqmMJyICA7ysCjlvm AEKxYWUh71QuTv42O6XKeM57nqT4YujQYSkOLrGQApkHpq7HC2xxupfapeoLbtaU37X/ 0qwA== X-Gm-Message-State: ALoCoQm5sBIFRKOWUOeBiuXiergDIEgWxR9zdwuSDdyYxxvvgW+EiMKmdIfKjCcGZ1pxAxkTvjUV X-Received: by 10.182.186.106 with SMTP id fj10mr14957616obc.54.1437168738841; Fri, 17 Jul 2015 14:32:18 -0700 (PDT) Received: from localhost ([146.7.4.71]) by smtp.gmail.com with ESMTPSA id k129sm7022626oia.14.2015.07.17.14.32.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 17 Jul 2015 14:32:17 -0700 (PDT) Subject: [PATCH 4/8] PCI: Rationalize pci_ats_queue_depth() error checking To: linux-pci@vger.kernel.org, Joerg Roedel From: Bjorn Helgaas Cc: Gregor Dick Date: Fri, 17 Jul 2015 16:32:16 -0500 Message-ID: <20150717213215.18379.59848.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=ham 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 We previously returned -ENODEV for devices that don't support ATS (except that we always returned 0 for VFs, whether or not they support ATS). For consistency, always return -EINVAL (not -ENODEV) if the device doesn't support ATS. Return zero for VFs that support ATS. Signed-off-by: Bjorn Helgaas Reviewed-by: Joerg Roedel --- drivers/pci/ats.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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/drivers/pci/ats.c b/drivers/pci/ats.c index 2f1fb9c..ea459b3 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -121,13 +121,13 @@ EXPORT_SYMBOL_GPL(pci_restore_ats_state); */ int pci_ats_queue_depth(struct pci_dev *dev) { + if (!dev->ats_cap) + return -EINVAL; + if (dev->is_virtfn) return 0; - if (dev->ats_cap) - return dev->ats_qdep; - - return -ENODEV; + return dev->ats_qdep; } EXPORT_SYMBOL_GPL(pci_ats_queue_depth);