From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id B6CCE1D8A for ; Tue, 28 Aug 2018 12:13:04 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id 20-v6so1005258wrb.12 for ; Tue, 28 Aug 2018 03:13:04 -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=Ou21WytRzwLp3SUofY8JE1Pi1dYmHn7rxFj0nTc9I4y7dZKRspbgHFHibGWgOWPGiw BOSVT0LOHSwASW0v2vqs4AA0k/B3rZiwQKphX/af33TjfF2d7cgNNZFYP8BgYiMUScMI r38vWpL8VE8FAS6wUblwyCLjNZzp87vPQ5TQTSNGWTxltUdp/D8wx1M8DoMdCScG2bwQ ISNLZX7E6jwdfn5lmOJSTBm8mwQGIrisGXkQhB9NSW2odSfThXIAd1WEHMuO3OIaUhcx +R26iPVo2ho1OKNbheHHZoG0MRnZP1KzIvAj2aC+S2Cdka/HcdMbomwvmlw/1ioT62ti 5nwA== X-Gm-Message-State: APzg51CXhl/vk5AQXgzJhGFLbNRt0KIXua0cXR/p4/f255gDwCG8677n DNC1FlESreST7n8CFr8+c1L5DxiJMOo= X-Google-Smtp-Source: ANB0Vdak+DhXboqw5KVyQVJiONsAK0bsI32os4+kiqpEAvvvbxQDhpFYaukE+6nBYH7U8LSddcI3rA== X-Received: by 2002:adf:a41c:: with SMTP id d28-v6mr637551wra.121.1535451184008; Tue, 28 Aug 2018 03:13:04 -0700 (PDT) Received: from localhost ([2001:1be0:110d:fcfe:41aa:5bfa:6cf3:7531]) by smtp.gmail.com with ESMTPSA id 1-v6sm1611732wmf.47.2018.08.28.03.13.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Aug 2018 03:13:02 -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: Tue, 28 Aug 2018 11:12:39 +0100 Message-Id: <20180828101240.12597-1-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180827165240.28322-1-bluca@debian.org> References: <20180827165240.28322-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH v6 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: , X-List-Received-Date: Tue, 28 Aug 2018 10:13:04 -0000 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); -- 2.18.0