From patchwork Fri Aug 24 17:14:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 43881 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D7BB11ADD3; Fri, 24 Aug 2018 19:14:27 +0200 (CEST) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id 7D21D7EE3 for ; Fri, 24 Aug 2018 19:14:26 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id n11-v6so2327038wmc.2 for ; Fri, 24 Aug 2018 10:14:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8jA1rguQNQsWxOIHsHF/vAjDwGqJikL8hM7ycAKTsa4=; b=ty+YyxVUwq8wlrvaEZeluXaLAgdl4ax18zCqobEZ5tc8rPkhHIzjalnGMUuinVFvw1 Z0krT1HiMrlKvZVtxQhoMaCJ7lGsrsteCxnQJJlsYTc1RhwCTTnJvvH9yTtoTUCuHGZM nqmNx+gzmCCU/X1R3svJ2NheETqk3DmCYsrVArjFbeVWBFw/cTevVsaWGhtabcdAzW2J LJeEHP5Lr4oBAB7cTuCnkBfmSY67WamCxUsNn1wIrO6tOOAwuv61OvbnrEW9QatflGtR rDDvagfZfjuHFkEELZU+zbq6x+fULf2IJA5bbhP+ZHCObK9FmiTUs3lHPMyMR/kjaEdy chmQ== X-Gm-Message-State: APzg51CtcLYK9ak3yhVypq1M/irFhztWxsr35JQj6pXYTIR/kYits/3Q DYHQxOZ2gMe4Ty0ik9b91u8Wpj3Y X-Google-Smtp-Source: ANB0VdbQ4HodbCHcOPWH8IFJQ5Gl3EstZy8JD2nxd4l0OTYmSKPvVUBt5ZAGU4ax6a76jFmkcBjTcw== X-Received: by 2002:a1c:f001:: with SMTP id a1-v6mr2051235wmb.160.1535130864929; Fri, 24 Aug 2018 10:14:24 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id x16-v6sm11624842wrm.69.2018.08.24.10.14.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Aug 2018 10:14:23 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: maxime.coquelin@redhat.com, zhihong.wang@intel.com, tiwei.bie@intel.com, bruce.richardson@intel.com, brian.russell@intl.att.com Date: Fri, 24 Aug 2018 18:14:19 +0100 Message-Id: <20180824171420.31246-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180820164421.28763-1-bluca@debian.org> References: <20180820164421.28763-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v4 1/2] bus/pci: harmonize and document rte_pci_read_config return value X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Linux, rte_pci_read_config on success returns the number of read bytes, but on BSD it returns 0. Document the return values, and have BSD behave as Linux does. At least one case (bnx2x PMD) treats 0 as an error, so the change makes sense also for that. Signed-off-by: Luca Boccassi --- drivers/bus/pci/bsd/pci.c | 4 +++- drivers/bus/pci/rte_bus_pci.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/bus/pci/bsd/pci.c b/drivers/bus/pci/bsd/pci.c index 655b34b7e4..175d83cf1b 100644 --- a/drivers/bus/pci/bsd/pci.c +++ b/drivers/bus/pci/bsd/pci.c @@ -439,6 +439,8 @@ int rte_pci_read_config(const struct rte_pci_device *dev, { int fd = -1; int size; + /* Copy Linux implementation's behaviour */ + const int return_len = len; struct pci_io pi = { .pi_sel = { .pc_domain = dev->addr.domain, @@ -469,7 +471,7 @@ int rte_pci_read_config(const struct rte_pci_device *dev, } close(fd); - return 0; + return return_len; error: if (fd >= 0) diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h index 0d1955ffe0..df8f64798d 100644 --- a/drivers/bus/pci/rte_bus_pci.h +++ b/drivers/bus/pci/rte_bus_pci.h @@ -219,6 +219,8 @@ void rte_pci_unregister(struct rte_pci_driver *driver); * The length of the data buffer. * @param offset * The offset into PCI config space + * @return + * Number of bytes read on success, negative on error. */ int rte_pci_read_config(const struct rte_pci_device *device, void *buf, size_t len, off_t offset);