Merge branch 'qed-Add-iWARP-support-for-QL4xxxx'

Michal Kalderon says:

====================
qed: Add iWARP support for QL4xxxx

This patch series adds iWARP support to our QL4xxxx networking adapters.
The code changes span across qed and qedr drivers, but this series contains
changes to qed only. Once the series is accepted, the qedr series will
be submitted to the rdma tree.
There is one additional qed patch which enables the iWARP, this patch is
delayed until the qedr series will be accepted.

The patches were previously sent as an RFC, and these are the first 12
patches in the RFC series:
https://www.spinics.net/lists/linux-rdma/msg51416.html

This series was tested and built against net-next.

MAINTAINERS file is not updated in this PATCH as there is a pending patch
for qedr driver update https://patchwork.kernel.org/patch/9752761.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 172 insertions, 2 deletions

diff --git a/include/linux/qed/common_hsi.h b/include/linux/qed/common_hsi.h
index a567cbf8c5b4..39e2a2ac2471 100644
--- a/include/linux/qed/common_hsi.h
+++ b/include/linux/qed/common_hsi.h
@@ -38,6 +38,8 @@
 #include <linux/slab.h>
 
 /* dma_addr_t manip */
+#define PTR_LO(x)               ((u32)(((uintptr_t)(x)) & 0xffffffff))
+#define PTR_HI(x)               ((u32)((((uintptr_t)(x)) >> 16) >> 16))
 #define DMA_LO_LE(x)            cpu_to_le32(lower_32_bits(x))
 #define DMA_HI_LE(x)            cpu_to_le32(upper_32_bits(x))
 #define DMA_REGPAIR_LE(x, val)  do { \
@@ -778,7 +780,7 @@ enum protocol_type {
         PROTOCOLID_ROCE,
         PROTOCOLID_CORE,
         PROTOCOLID_ETH,
-        PROTOCOLID_RESERVED4,
+        PROTOCOLID_IWARP,
         PROTOCOLID_RESERVED5,
         PROTOCOLID_PREROCE,
         PROTOCOLID_COMMON,
diff --git a/include/linux/qed/iwarp_common.h b/include/linux/qed/iwarp_common.h
new file mode 100644
index 000000000000..b8b3e1cfae90
--- /dev/null
+++ b/include/linux/qed/iwarp_common.h
@@ -0,0 +1,53 @@
+/* QLogic qed NIC Driver
+ * Copyright (c) 2015-2017  QLogic Corporation
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and /or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef __IWARP_COMMON__
+#define __IWARP_COMMON__
+#include <linux/qed/rdma_common.h>
+/************************/
+/* IWARP FW CONSTANTS   */
+/************************/
+
+#define IWARP_ACTIVE_MODE 0
+#define IWARP_PASSIVE_MODE 1
+
+#define IWARP_SHARED_QUEUE_PAGE_SIZE            (0x8000)
+#define IWARP_SHARED_QUEUE_PAGE_RQ_PBL_OFFSET   (0x4000)
+#define IWARP_SHARED_QUEUE_PAGE_RQ_PBL_MAX_SIZE (0x1000)
+#define IWARP_SHARED_QUEUE_PAGE_SQ_PBL_OFFSET   (0x5000)
+#define IWARP_SHARED_QUEUE_PAGE_SQ_PBL_MAX_SIZE (0x3000)
+
+#define IWARP_REQ_MAX_INLINE_DATA_SIZE          (128)
+#define IWARP_REQ_MAX_SINGLE_SQ_WQE_SIZE        (176)
+
+#define IWARP_MAX_QPS                           (64 * 1024)
+
+#endif /* __IWARP_COMMON__ */
diff --git a/include/linux/qed/qed_ll2_if.h b/include/linux/qed/qed_ll2_if.h
index 5958b45eb699..dd7a3b86bb9e 100644
--- a/include/linux/qed/qed_ll2_if.h
+++ b/include/linux/qed/qed_ll2_if.h
@@ -47,9 +47,10 @@ enum qed_ll2_conn_type {
         QED_LL2_TYPE_FCOE,
         QED_LL2_TYPE_ISCSI,
         QED_LL2_TYPE_TEST,
-        QED_LL2_TYPE_ISCSI_OOO,
+        QED_LL2_TYPE_OOO,
         QED_LL2_TYPE_RESERVED2,
         QED_LL2_TYPE_ROCE,
+        QED_LL2_TYPE_IWARP,
         QED_LL2_TYPE_RESERVED3,
         MAX_QED_LL2_RX_CONN_TYPE
 };
diff --git a/include/linux/qed/qed_rdma_if.h b/include/linux/qed/qed_rdma_if.h
index ff9be01b5f53..4dd72ba210f5 100644
--- a/include/linux/qed/qed_rdma_if.h
+++ b/include/linux/qed/qed_rdma_if.h
@@ -470,6 +470,101 @@ struct qed_rdma_counters_out_params {
 #define QED_ROCE_TX_HEAD_FAILURE        (1)
 #define QED_ROCE_TX_FRAG_FAILURE        (2)
 
+enum qed_iwarp_event_type {
+        QED_IWARP_EVENT_MPA_REQUEST,      /* Passive side request received */
+        QED_IWARP_EVENT_PASSIVE_COMPLETE, /* ack on mpa response */
+        QED_IWARP_EVENT_ACTIVE_COMPLETE,  /* Active side reply received */
+        QED_IWARP_EVENT_DISCONNECT,
+        QED_IWARP_EVENT_CLOSE,
+        QED_IWARP_EVENT_IRQ_FULL,
+        QED_IWARP_EVENT_RQ_EMPTY,
+        QED_IWARP_EVENT_LLP_TIMEOUT,
+        QED_IWARP_EVENT_REMOTE_PROTECTION_ERROR,
+        QED_IWARP_EVENT_CQ_OVERFLOW,
+        QED_IWARP_EVENT_QP_CATASTROPHIC,
+        QED_IWARP_EVENT_ACTIVE_MPA_REPLY,
+        QED_IWARP_EVENT_LOCAL_ACCESS_ERROR,
+        QED_IWARP_EVENT_REMOTE_OPERATION_ERROR,
+        QED_IWARP_EVENT_TERMINATE_RECEIVED
+};
+
+enum qed_tcp_ip_version {
+        QED_TCP_IPV4,
+        QED_TCP_IPV6,
+};
+
+struct qed_iwarp_cm_info {
+        enum qed_tcp_ip_version ip_version;
+        u32 remote_ip[4];
+        u32 local_ip[4];
+        u16 remote_port;
+        u16 local_port;
+        u16 vlan;
+        u8 ord;
+        u8 ird;
+        u16 private_data_len;
+        const void *private_data;
+};
+
+struct qed_iwarp_cm_event_params {
+        enum qed_iwarp_event_type event;
+        const struct qed_iwarp_cm_info *cm_info;
+        void *ep_context;       /* To be passed to accept call */
+        int status;
+};
+
+typedef int (*iwarp_event_handler) (void *context,
+                                    struct qed_iwarp_cm_event_params *event);
+
+struct qed_iwarp_connect_in {
+        iwarp_event_handler event_cb;
+        void *cb_context;
+        struct qed_rdma_qp *qp;
+        struct qed_iwarp_cm_info cm_info;
+        u16 mss;
+        u8 remote_mac_addr[ETH_ALEN];
+        u8 local_mac_addr[ETH_ALEN];
+};
+
+struct qed_iwarp_connect_out {
+        void *ep_context;
+};
+
+struct qed_iwarp_listen_in {
+        iwarp_event_handler event_cb;
+        void *cb_context;       /* passed to event_cb */
+        u32 max_backlog;
+        enum qed_tcp_ip_version ip_version;
+        u32 ip_addr[4];
+        u16 port;
+        u16 vlan;
+};
+
+struct qed_iwarp_listen_out {
+        void *handle;
+};
+
+struct qed_iwarp_accept_in {
+        void *ep_context;
+        void *cb_context;
+        struct qed_rdma_qp *qp;
+        const void *private_data;
+        u16 private_data_len;
+        u8 ord;
+        u8 ird;
+};
+
+struct qed_iwarp_reject_in {
+        void *ep_context;
+        void *cb_context;
+        const void *private_data;
+        u16 private_data_len;
+};
+
+struct qed_iwarp_send_rtr_in {
+        void *ep_context;
+};
+