From patchwork Tue Aug 11 15:51:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6993071 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 E92C0C05AC for ; Tue, 11 Aug 2015 15:51:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 97231205F5 for ; Tue, 11 Aug 2015 15:51:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73799205D4 for ; Tue, 11 Aug 2015 15:51:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965245AbbHKPvm (ORCPT ); Tue, 11 Aug 2015 11:51:42 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:34901 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965225AbbHKPvm (ORCPT ); Tue, 11 Aug 2015 11:51:42 -0400 Received: by iodt126 with SMTP id t126so15333777iod.2 for ; Tue, 11 Aug 2015 08:51:41 -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=jfona8HyVqMVWATHs2EzEHvEAavzhN3SFolNfxPKZWw=; b=AMSpAJ27V4aZx9a+dnpVTkVnxT5ep4nUREuxZj3gOcaH+2LTepZ4CA4Xn1f5/JkYos v96Lte1QCSiFeLPyc2aetZGOziQvSmgYsMLA5VPEYJ+cR/C1GrabhifRlJPrv+RBoXRE jynXdNMDoBkaSAIN2SFmb4wpWJuwEnrW4NL9bN2Z8Aplu1vE87eSC7KIa6/XU/NT0hGm O3xvvBdldNaTCrrhoi5LbtRXBBZ57kBXMO6cJUUr2eUejhRkxmB3TtddebFkkBxUu9Gx OMJEwjqaCINP7D2tl4O5qvoFWrqJqcfKzjTGWuQJVSTWa55DeV5ZrPFaURBHKSdY/eJ/ 7E/Q== 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=jfona8HyVqMVWATHs2EzEHvEAavzhN3SFolNfxPKZWw=; b=SsFl3MQNNXpmNqYt97X7kQLvML/FPTu/Flrlawk2/Yldw1abQyxpqEh7yYEASXddJO myV4eyNjypOAB9QVEsfV+mq17oAuY0C0q5zAL2hdU5B0UCxnugxAQnNhBlQxFSK4dDiv e0FRMDZJcWs+PK12B6pDLuyQ73NfWYc/eTL/tmZNamROMmYgzu8yrTLMKLN8kPccFDvI ZdjGYHiwkcHEh6mYihxUZPPXDRHXZOa94nUJpXvkQ6zg5YM4XpyuP499G1qUOaRKuzQr KbuTcsSYXsotVTyg7Epmh0BsOw9sKD0RaNvJyTO59IFfAp+LVEbtmNoawY7V+SiHhJeH Q9XA== X-Gm-Message-State: ALoCoQnSRxWKPwRqZjhW2OGhSNAE0uPHW3pdRtbIBax4GHPIff0F6vzldi6jbcx9/v81NYQ9kjKj X-Received: by 10.107.135.13 with SMTP id j13mr1936245iod.50.1439308301699; Tue, 11 Aug 2015 08:51:41 -0700 (PDT) Received: from localhost ([2620:0:1007:b:254d:7b22:9adf:e278]) by smtp.gmail.com with ESMTPSA id g123sm1758938iog.31.2015.08.11.08.51.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Aug 2015 08:51:40 -0700 (PDT) Subject: [PATCH v3 05/11] PCI: Rationalize pci_ats_queue_depth() error checking To: linux-pci@vger.kernel.org, Joerg Roedel , David Woodhouse From: Bjorn Helgaas Cc: Gregor Dick , iommu@lists.linux-foundation.org, Yinghai Lu Date: Tue, 11 Aug 2015 10:51:39 -0500 Message-ID: <20150811155139.21078.30228.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150811154525.21078.85310.stgit@bhelgaas-glaptop2.roam.corp.google.com> References: <20150811154525.21078.85310.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=-7.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 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 690ae6e..9a98b3a 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c @@ -136,13 +136,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);