From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <rasesh.mody@qlogic.com>
Received: from mx0a-0016ce01.pphosted.com (mx0a-0016ce01.pphosted.com
[67.231.148.157]) by dpdk.org (Postfix) with ESMTP id 7593D8D38
for <dev@dpdk.org>; Tue, 24 Nov 2015 08:45:11 +0100 (CET)
Received: from pps.filterd (m0045602.ppops.net [127.0.0.1])
by mx0a-0016ce01.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id
tAO7hbg7007104; Mon, 23 Nov 2015 23:45:10 -0800
Received: from avcashub1.qlogic.com (avcashub2.qlogic.com [198.70.193.116])
by mx0a-0016ce01.pphosted.com with ESMTP id 1yceg1g9n3-1
(version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);
Mon, 23 Nov 2015 23:45:10 -0800
Received: from avluser05.qlc.com (10.1.113.115) by qlc.com (10.1.4.191) with
Microsoft SMTP Server id 14.3.235.1; Mon, 23 Nov 2015 23:45:09 -0800
Received: (from rmody@localhost) by avluser05.qlc.com (8.14.4/8.14.4/Submit)
id tAO7j9Xb023482; Mon, 23 Nov 2015 23:45:09 -0800
X-Authentication-Warning: avluser05.qlc.com: rmody set sender to
rasesh.mody@qlogic.com using -f
From: Rasesh Mody <rasesh.mody@qlogic.com>
To: <thomas.monjalon@6wind.com>, <dev@dpdk.org>
Date: Mon, 23 Nov 2015 23:44:31 -0800
Message-ID: <1448351076-23161-7-git-send-email-rasesh.mody@qlogic.com>
X-Mailer: git-send-email 1.7.10.3
In-Reply-To: <1448351076-23161-1-git-send-email-rasesh.mody@qlogic.com>
References: <1448351076-23161-1-git-send-email-rasesh.mody@qlogic.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7994
signatures=670662
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0
clxscore=1015
suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0
classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000
definitions=main-1511240145
Cc: sony.chacko@qlogic.com
Subject: [dpdk-dev] [PATCH v3 06/11] bnx2x: FreeBSD enablement
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2015 07:45:11 -0000
Compile tested.
Signed-off-by: Rasesh Mody <rasesh.mody@qlogic.com>
---
doc/guides/nics/bnx2x.rst | 8 ++++++++
drivers/net/bnx2x/bnx2x.c | 9 +++++++++
drivers/net/bnx2x/bnx2x.h | 23 +++++++++++++++++++++++
drivers/net/bnx2x/ecore_sp.h | 6 ++++++
4 files changed, 46 insertions(+)
diff --git a/doc/guides/nics/bnx2x.rst b/doc/guides/nics/bnx2x.rst
index 7a94080..5647a90 100644
--- a/doc/guides/nics/bnx2x.rst
+++ b/doc/guides/nics/bnx2x.rst
@@ -155,6 +155,14 @@ command::
cd <DPDK-source-directory>
gmake config T=x86_64-native-bsdapp-gcc install -Wl,-rpath=/usr/local/lib/gcc48 CC=gcc48
+To compile BNX2X PMD for FreeBSD x86_64 gcc target, run the following "gmake"
+command:
+
+.. code-block:: console
+
+ cd <DPDK-source-directory>
+ gmake config T=x86_64-native-bsdapp-gcc install -Wl,-rpath=/usr/local/lib/gcc48 CC=gcc48
+
Linux
-----
diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c
index c149ac5..f125c79 100644
--- a/drivers/net/bnx2x/bnx2x.c
+++ b/drivers/net/bnx2x/bnx2x.c
@@ -9505,13 +9505,22 @@ static int bnx2x_pci_get_caps(struct bnx2x_softc *sc)
return -ENOMEM;
}
+#ifndef __FreeBSD__
pci_read(sc, PCI_STATUS, &status, 2);
if (!(status & PCI_STATUS_CAP_LIST)) {
+#else
+ pci_read(sc, PCIR_STATUS, &status, 2);
+ if (!(status & PCIM_STATUS_CAPPRESENT)) {
+#endif
PMD_DRV_LOG(NOTICE, "PCIe capability reading failed");
return -1;
}
+#ifndef __FreeBSD__
pci_read(sc, PCI_CAPABILITY_LIST, &pci_cap.next, 1);
+#else
+ pci_read(sc, PCIR_CAP_PTR, &pci_cap.next, 1);
+#endif
while (pci_cap.next) {
cap->addr = pci_cap.next & ~3;
pci_read(sc, pci_cap.next & ~3, &pci_cap, 2);
diff --git a/drivers/net/bnx2x/bnx2x.h b/drivers/net/bnx2x/bnx2x.h
index b049bd1..0362e4b 100644
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@ -16,6 +16,12 @@
#ifndef __BNX2X_H__
#define __BNX2X_H__
+#ifdef __FreeBSD__
+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#define __BIG_ENDIAN _BIG_ENDIAN
+#define __BYTE_ORDER _BYTE_ORDER
+#endif
+
#include "bnx2x_ethdev.h"
#if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -47,6 +53,7 @@
#include "elink.h"
+#ifndef __FreeBSD__
#include <linux/pci_regs.h>
#define PCIY_PMG PCI_CAP_ID_PM
@@ -68,11 +75,15 @@
#define PCIM_PSTAT_PMEENABLE PCI_PM_CTRL_PME_ENABLE
#define PCIR_MSIX_CTRL PCI_MSIX_FLAGS
#define PCIM_MSIXCTRL_TABLE_SIZE PCI_MSIX_FLAGS_QSIZE
+#else
+#include <dev/pci/pcireg.h>
+#endif
#define IFM_10G_CX4 20 /* 10GBase CX4 copper */
#define IFM_10G_TWINAX 22 /* 10GBase Twinax copper */
#define IFM_10G_T 26 /* 10GBase-T - RJ45 */
+#ifndef __FreeBSD__
#define PCIR_EXPRESS_DEVICE_STA PCI_EXP_TYPE_RC_EC
#define PCIM_EXP_STA_TRANSACTION_PND PCI_EXP_DEVSTA_TRPND
#define PCIR_EXPRESS_LINK_STA PCI_EXP_LNKSTA
@@ -81,6 +92,16 @@
#define PCIR_EXPRESS_DEVICE_CTL PCI_EXP_DEVCTL
#define PCIM_EXP_CTL_MAX_PAYLOAD PCI_EXP_DEVCTL_PAYLOAD
#define PCIM_EXP_CTL_MAX_READ_REQUEST PCI_EXP_DEVCTL_READRQ
+#else
+#define PCIR_EXPRESS_DEVICE_STA PCIER_DEVICE_STA
+#define PCIM_EXP_STA_TRANSACTION_PND PCIEM_STA_TRANSACTION_PND
+#define PCIR_EXPRESS_LINK_STA PCIER_LINK_STA
+#define PCIM_LINK_STA_WIDTH PCIEM_LINK_STA_WIDTH
+#define PCIM_LINK_STA_SPEED PCIEM_LINK_STA_SPEED
+#define PCIR_EXPRESS_DEVICE_CTL PCIER_DEVICE_CTL
+#define PCIM_EXP_CTL_MAX_PAYLOAD PCIEM_CTL_MAX_PAYLOAD
+#define PCIM_EXP_CTL_MAX_READ_REQUEST PCIEM_CTL_MAX_READ_REQUEST
+#endif
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -148,6 +169,7 @@ struct bnx2x_device_type {
#endif
#define MCLBYTES (1 << MCLSHIFT)
+#if !defined(MJUMPAGESIZE)
#if BNX2X_PAGE_SIZE < 2048
#define MJUMPAGESIZE MCLBYTES
#elif BNX2X_PAGE_SIZE <= 8192
@@ -155,6 +177,7 @@ struct bnx2x_device_type {
#else
#define MJUMPAGESIZE (8 * 1024)
#endif
+#endif
#define MJUM9BYTES (9 * 1024)
#define MJUM16BYTES (16 * 1024)
diff --git a/drivers/net/bnx2x/ecore_sp.h b/drivers/net/bnx2x/ecore_sp.h
index 8e65584..a0b7b75 100644
--- a/drivers/net/bnx2x/ecore_sp.h
+++ b/drivers/net/bnx2x/ecore_sp.h
@@ -16,6 +16,12 @@
#ifndef ECORE_SP_H
#define ECORE_SP_H
+#ifdef __FreeBSD__
+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#define __BIG_ENDIAN _BIG_ENDIAN
+#define __BYTE_ORDER _BYTE_ORDER
+#endif
+
#if __BYTE_ORDER == __LITTLE_ENDIAN
#ifndef LITTLE_ENDIAN
#define LITTLE_ENDIAN
--
1.7.10.3