Merge branch 'qed-File-split-and-rename-towards-iWARP-support'
Michal Kalderon says: ==================== qed*: File split and rename towards iWARP support This patch series makes a few more infrastructure changes towards adding iWARP support. Hopefully this is the last infrastructure change prior to the iWARP RFC. Patch #1-3 take care of taking all the common iWARP/RoCE code out of qed_roce.[ch] and placing it in qed_rdma.[ch] Patch #4 renames the roce interface file as it is common for RoCE and iWARP. This patch touches qedr as well. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
52f80dca7a
|
@ -36,7 +36,7 @@
|
|||
#include <rdma/ib_addr.h>
|
||||
#include <linux/qed/qed_if.h>
|
||||
#include <linux/qed/qed_chain.h>
|
||||
#include <linux/qed/qed_roce_if.h>
|
||||
#include <linux/qed/qed_rdma_if.h>
|
||||
#include <linux/qed/qede_rdma.h>
|
||||
#include <linux/qed/roce_common.h>
|
||||
#include "qedr_hsi_rdma.h"
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include <rdma/ib_cache.h>
|
||||
|
||||
#include <linux/qed/qed_if.h>
|
||||
#include <linux/qed/qed_roce_if.h>
|
||||
#include <linux/qed/qed_rdma_if.h>
|
||||
#include "qedr.h"
|
||||
#include "verbs.h"
|
||||
#include <rdma/qedr-abi.h>
|
||||
|
|
|
@ -5,6 +5,6 @@ qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \
|
|||
qed_selftest.o qed_dcbx.o qed_debug.o qed_ptp.o
|
||||
qed-$(CONFIG_QED_SRIOV) += qed_sriov.o qed_vf.o
|
||||
qed-$(CONFIG_QED_LL2) += qed_ll2.o
|
||||
qed-$(CONFIG_QED_RDMA) += qed_roce.o
|
||||
qed-$(CONFIG_QED_RDMA) += qed_roce.o qed_rdma.o
|
||||
qed-$(CONFIG_QED_ISCSI) += qed_iscsi.o qed_ooo.o
|
||||
qed-$(CONFIG_QED_FCOE) += qed_fcoe.o
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "qed_hsi.h"
|
||||
#include "qed_sp.h"
|
||||
#include "qed_sriov.h"
|
||||
#include "qed_roce.h"
|
||||
#include "qed_rdma.h"
|
||||
#ifdef CONFIG_DCB
|
||||
#include <linux/qed/qed_eth_if.h>
|
||||
#endif
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
#include "qed_sp.h"
|
||||
#include "qed_sriov.h"
|
||||
#include "qed_vf.h"
|
||||
#include "qed_roce.h"
|
||||
#include "qed_rdma.h"
|
||||
|
||||
static DEFINE_SPINLOCK(qm_lock);
|
||||
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
#include "qed_ooo.h"
|
||||
#include "qed_reg_addr.h"
|
||||
#include "qed_sp.h"
|
||||
#include "qed_roce.h"
|
||||
#include "qed_rdma.h"
|
||||
|
||||
#define QED_LL2_RX_REGISTERED(ll2) ((ll2)->rx_queue.b_cb_registred)
|
||||
#define QED_LL2_TX_REGISTERED(ll2) ((ll2)->tx_queue.b_cb_registred)
|
||||
|
|
1722
drivers/net/ethernet/qlogic/qed/qed_rdma.c
Normal file
1722
drivers/net/ethernet/qlogic/qed/qed_rdma.c
Normal file
File diff suppressed because it is too large
Load diff
201
drivers/net/ethernet/qlogic/qed/qed_rdma.h
Normal file
201
drivers/net/ethernet/qlogic/qed/qed_rdma.h
Normal file
|
@ -0,0 +1,201 @@
|
|||
/* 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 _QED_RDMA_H
|
||||
#define _QED_RDMA_H
|
||||
#include <linux/types.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/qed/qed_if.h>
|
||||
#include <linux/qed/qed_rdma_if.h>
|
||||
#include "qed.h"
|
||||
#include "qed_dev_api.h"
|
||||
#include "qed_hsi.h"
|
||||
#include "qed_roce.h"
|
||||
|
||||
#define QED_RDMA_MAX_FMR (RDMA_MAX_TIDS)
|
||||
#define QED_RDMA_MAX_P_KEY (1)
|
||||
#define QED_RDMA_MAX_WQE (0x7FFF)
|
||||
#define QED_RDMA_MAX_SRQ_WQE_ELEM (0x7FFF)
|
||||
#define QED_RDMA_PAGE_SIZE_CAPS (0xFFFFF000)
|
||||
#define QED_RDMA_ACK_DELAY (15)
|
||||
#define QED_RDMA_MAX_MR_SIZE (0x10000000000ULL)
|
||||
#define QED_RDMA_MAX_CQS (RDMA_MAX_CQS)
|
||||
#define QED_RDMA_MAX_MRS (RDMA_MAX_TIDS)
|
||||
/* Add 1 for header element */
|
||||
#define QED_RDMA_MAX_SRQ_ELEM_PER_WQE (RDMA_MAX_SGE_PER_RQ_WQE + 1)
|
||||
#define QED_RDMA_MAX_SGE_PER_SRQ_WQE (RDMA_MAX_SGE_PER_RQ_WQE)
|
||||
#define QED_RDMA_SRQ_WQE_ELEM_SIZE (16)
|
||||
#define QED_RDMA_MAX_SRQS (32 * 1024)
|
||||
|
||||
#define QED_RDMA_MAX_CQE_32_BIT (0x7FFFFFFF - 1)
|
||||
#define QED_RDMA_MAX_CQE_16_BIT (0x7FFF - 1)
|
||||
|
||||
enum qed_rdma_toggle_bit {
|
||||
QED_RDMA_TOGGLE_BIT_CLEAR = 0,
|
||||
QED_RDMA_TOGGLE_BIT_SET = 1
|
||||
};
|
||||
|
||||
#define QED_RDMA_MAX_BMAP_NAME (10)
|
||||
struct qed_bmap {
|
||||
unsigned long *bitmap;
|
||||
u32 max_count;
|
||||
char name[QED_RDMA_MAX_BMAP_NAME];
|
||||
};
|
||||
|
||||
struct qed_rdma_info {
|
||||
/* spin lock to protect bitmaps */
|
||||
spinlock_t lock;
|
||||
|
||||
struct qed_bmap cq_map;
|
||||
struct qed_bmap pd_map;
|
||||
struct qed_bmap tid_map;
|
||||
struct qed_bmap qp_map;
|
||||
struct qed_bmap srq_map;
|
||||
struct qed_bmap cid_map;
|
||||
struct qed_bmap real_cid_map;
|
||||
struct qed_bmap dpi_map;
|
||||
struct qed_bmap toggle_bits;
|
||||
struct qed_rdma_events events;
|
||||
struct qed_rdma_device *dev;
|
||||
struct qed_rdma_port *port;
|
||||
u32 last_tid;
|
||||
u8 num_cnqs;
|
||||
u32 num_qps;
|
||||
u32 num_mrs;
|
||||
u16 queue_zone_base;
|
||||
u16 max_queue_zones;
|
||||
enum protocol_type proto;
|
||||
};
|
||||
|
||||
struct qed_rdma_qp {
|
||||
struct regpair qp_handle;
|
||||
struct regpair qp_handle_async;
|
||||
u32 qpid;
|
||||
u16 icid;
|
||||
enum qed_roce_qp_state cur_state;
|
||||
bool use_srq;
|
||||
bool signal_all;
|
||||
bool fmr_and_reserved_lkey;
|
||||
|
||||
bool incoming_rdma_read_en;
|
||||
bool incoming_rdma_write_en;
|
||||
bool incoming_atomic_en;
|
||||
bool e2e_flow_control_en;
|
||||
|
||||
u16 pd;
|
||||
u16 pkey;
|
||||
u32 dest_qp;
|
||||
u16 mtu;
|
||||
u16 srq_id;
|
||||
u8 traffic_class_tos;
|
||||
u8 hop_limit_ttl;
|
||||
u16 dpi;
|
||||
u32 flow_label;
|
||||
bool lb_indication;
|
||||
u16 vlan_id;
|
||||
u32 ack_timeout;
|
||||
u8 retry_cnt;
|
||||
u8 rnr_retry_cnt;
|
||||
u8 min_rnr_nak_timer;
|
||||
bool sqd_async;
|
||||
union qed_gid sgid;
|
||||
union qed_gid dgid;
|
||||
enum roce_mode roce_mode;
|
||||
u16 udp_src_port;
|
||||
u8 stats_queue;
|
||||
|
||||
/* requeseter */
|
||||
u8 max_rd_atomic_req;
|
||||
u32 sq_psn;
|
||||
u16 sq_cq_id;
|
||||
u16 sq_num_pages;
|
||||
dma_addr_t sq_pbl_ptr;
|
||||
void *orq;
|
||||
dma_addr_t orq_phys_addr;
|
||||
u8 orq_num_pages;
|
||||
bool req_offloaded;
|
||||
|
||||
/* responder */
|
||||
u8 max_rd_atomic_resp;
|
||||
u32 rq_psn;
|
||||
u16 rq_cq_id;
|
||||
u16 rq_num_pages;
|
||||
dma_addr_t rq_pbl_ptr;
|
||||
void *irq;
|
||||
dma_addr_t irq_phys_addr;
|
||||
u8 irq_num_pages;
|
||||
bool resp_offloaded;
|
||||
u32 cq_prod;
|
||||
|
||||
u8 remote_mac_addr[6];
|
||||
u8 local_mac_addr[6];
|
||||
|
||||
void *shared_queue;
|
||||
dma_addr_t shared_queue_phys_addr;
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_QED_RDMA)
|
||||
void qed_rdma_dpm_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
|
||||
void qed_rdma_dpm_conf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
|
||||
#else
|
||||
static inline void qed_rdma_dpm_conf(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) {}
|
||||
static inline void qed_rdma_dpm_bar(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt) {}
|
||||
#endif
|
||||
|
||||
int
|
||||
qed_rdma_bmap_alloc(struct qed_hwfn *p_hwfn,
|
||||
struct qed_bmap *bmap, u32 max_count, char *name);
|
||||
|
||||
void
|
||||
qed_rdma_bmap_free(struct qed_hwfn *p_hwfn, struct qed_bmap *bmap, bool check);
|
||||
|
||||
int
|
||||
qed_rdma_bmap_alloc_id(struct qed_hwfn *p_hwfn,
|
||||
struct qed_bmap *bmap, u32 *id_num);
|
||||
|
||||
void
|
||||
qed_bmap_set_id(struct qed_hwfn *p_hwfn, struct qed_bmap *bmap, u32 id_num);
|
||||
|
||||
void
|
||||
qed_bmap_release_id(struct qed_hwfn *p_hwfn, struct qed_bmap *bmap, u32 id_num);
|
||||
|
||||
int
|
||||
qed_bmap_test_id(struct qed_hwfn *p_hwfn, struct qed_bmap *bmap, u32 id_num);
|
||||
|
||||
void qed_rdma_set_fw_mac(u16 *p_fw_mac, u8 *p_qed_mac);
|
||||
|
||||
bool qed_rdma_allocated_qps(struct qed_hwfn *p_hwfn);
|
||||
#endif
|
File diff suppressed because it is too large
Load diff
|
@ -32,147 +32,28 @@
|
|||
#ifndef _QED_ROCE_H
|
||||
#define _QED_ROCE_H
|
||||
#include <linux/types.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/qed/qed_if.h>
|
||||
#include <linux/qed/qed_roce_if.h>
|
||||
#include "qed.h"
|
||||
#include "qed_dev_api.h"
|
||||
#include "qed_hsi.h"
|
||||
#include "qed_ll2.h"
|
||||
|
||||
#define QED_RDMA_MAX_FMR (RDMA_MAX_TIDS)
|
||||
#define QED_RDMA_MAX_P_KEY (1)
|
||||
#define QED_RDMA_MAX_WQE (0x7FFF)
|
||||
#define QED_RDMA_MAX_SRQ_WQE_ELEM (0x7FFF)
|
||||
#define QED_RDMA_PAGE_SIZE_CAPS (0xFFFFF000)
|
||||
#define QED_RDMA_ACK_DELAY (15)
|
||||
#define QED_RDMA_MAX_MR_SIZE (0x10000000000ULL)
|
||||
#define QED_RDMA_MAX_CQS (RDMA_MAX_CQS)
|
||||
#define QED_RDMA_MAX_MRS (RDMA_MAX_TIDS)
|
||||
/* Add 1 for header element */
|
||||
#define QED_RDMA_MAX_SRQ_ELEM_PER_WQE (RDMA_MAX_SGE_PER_RQ_WQE + 1)
|
||||
#define QED_RDMA_MAX_SGE_PER_SRQ_WQE (RDMA_MAX_SGE_PER_RQ_WQE)
|
||||
#define QED_RDMA_SRQ_WQE_ELEM_SIZE (16)
|
||||
#define QED_RDMA_MAX_SRQS (32 * 1024)
|
||||
|
||||
#define QED_RDMA_MAX_CQE_32_BIT (0x7FFFFFFF - 1)
|
||||
#define QED_RDMA_MAX_CQE_16_BIT (0x7FFF - 1)
|
||||
|
||||
enum qed_rdma_toggle_bit {
|
||||
QED_RDMA_TOGGLE_BIT_CLEAR = 0,
|
||||
QED_RDMA_TOGGLE_BIT_SET = 1
|
||||
};
|
||||
|
||||
#define QED_RDMA_MAX_BMAP_NAME (10)
|
||||
struct qed_bmap {
|
||||
unsigned long *bitmap;
|
||||
u32 max_count;
|
||||
char name[QED_RDMA_MAX_BMAP_NAME];
|
||||
};
|
||||
|
||||
struct qed_rdma_info {
|
||||
/* spin lock to protect bitmaps */
|
||||
spinlock_t lock;
|
||||
|
||||
struct qed_bmap cq_map;
|
||||
struct qed_bmap pd_map;
|
||||
struct qed_bmap tid_map;
|
||||
struct qed_bmap qp_map;
|
||||
struct qed_bmap srq_map;
|
||||
struct qed_bmap cid_map;
|
||||
struct qed_bmap real_cid_map;
|
||||
struct qed_bmap dpi_map;
|
||||
struct qed_bmap toggle_bits;
|
||||
struct qed_rdma_events events;
|
||||
struct qed_rdma_device *dev;
|
||||
struct qed_rdma_port *port;
|
||||
u32 last_tid;
|
||||
u8 num_cnqs;
|
||||
u32 num_qps;
|
||||
u32 num_mrs;
|
||||
u16 queue_zone_base;
|
||||
u16 max_queue_zones;
|
||||
enum protocol_type proto;
|
||||
};
|
||||
|
||||
struct qed_rdma_qp {
|
||||
struct regpair qp_handle;
|
||||
struct regpair qp_handle_async;
|
||||
u32 qpid;
|
||||
u16 icid;
|
||||
enum qed_roce_qp_state cur_state;
|
||||
bool use_srq;
|
||||
bool signal_all;
|
||||
bool fmr_and_reserved_lkey;
|
||||
|
||||
bool incoming_rdma_read_en;
|
||||
bool incoming_rdma_write_en;
|
||||
bool incoming_atomic_en;
|
||||
bool e2e_flow_control_en;
|
||||
|
||||
u16 pd;
|
||||
u16 pkey;
|
||||
u32 dest_qp;
|
||||
u16 mtu;
|
||||
u16 srq_id;
|
||||
u8 traffic_class_tos;
|
||||
u8 hop_limit_ttl;
|
||||
u16 dpi;
|
||||
u32 flow_label;
|
||||
bool lb_indication;
|
||||
u16 vlan_id;
|
||||
u32 ack_timeout;
|
||||
u8 retry_cnt;
|
||||
u8 rnr_retry_cnt;
|
||||
u8 min_rnr_nak_timer;
|
||||
bool sqd_async;
|
||||
union qed_gid sgid;
|
||||
union qed_gid dgid;
|
||||
enum roce_mode roce_mode;
|
||||
u16 udp_src_port;
|
||||
u8 stats_queue;
|
||||
|
||||
/* requeseter */
|
||||
u8 max_rd_atomic_req;
|
||||
u32 sq_psn;
|
||||
u16 sq_cq_id;
|
||||
u16 sq_num_pages;
|
||||
dma_addr_t sq_pbl_ptr;
|
||||
void *orq;
|
||||
dma_addr_t orq_phys_addr;
|
||||
u8 orq_num_pages;
|
||||
bool req_offloaded;
|
||||
|
||||
/* responder */
|
||||
u8 max_rd_atomic_resp;
|
||||
u32 rq_psn;
|
||||
u16 rq_cq_id;
|
||||
u16 rq_num_pages;
|
||||
dma_addr_t rq_pbl_ptr;
|
||||
void *irq;
|
||||
dma_addr_t irq_phys_addr;
|
||||
u8 irq_num_pages;
|
||||
bool resp_offloaded;
|
||||
u32 cq_prod;
|
||||
|
||||
u8 remote_mac_addr[6];
|
||||
u8 local_mac_addr[6];
|
||||
|
||||
void *shared_queue;
|
||||
dma_addr_t shared_queue_phys_addr;
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_QED_RDMA)
|
||||
void qed_rdma_dpm_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
|
||||
void qed_roce_dpm_dcbx(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
|
||||
#else
|
||||
static inline void qed_rdma_dpm_bar(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) {}
|
||||
|
||||
static inline void qed_roce_dpm_dcbx(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt) {}
|
||||
#endif
|
||||
|
||||
int qed_roce_setup(struct qed_hwfn *p_hwfn);
|
||||
void qed_roce_stop(struct qed_hwfn *p_hwfn);
|
||||
int qed_roce_init_hw(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt);
|
||||
int qed_roce_alloc_cid(struct qed_hwfn *p_hwfn, u16 *cid);
|
||||
int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp);
|
||||
|
||||
int qed_roce_query_qp(struct qed_hwfn *p_hwfn,
|
||||
struct qed_rdma_qp *qp,
|
||||
struct qed_rdma_query_qp_out_params *out_params);
|
||||
|
||||
int qed_roce_modify_qp(struct qed_hwfn *p_hwfn,
|
||||
struct qed_rdma_qp *qp,
|
||||
enum qed_roce_qp_state prev_state,
|
||||
struct qed_rdma_modify_qp_in_params *params);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#include "qed_reg_addr.h"
|
||||
#include "qed_sp.h"
|
||||
#include "qed_sriov.h"
|
||||
#include "qed_roce.h"
|
||||
#include "qed_rdma.h"
|
||||
|
||||
/***************************************************************************
|
||||
* Structures & Definitions
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
#ifndef _QED_ROCE_IF_H
|
||||
#define _QED_ROCE_IF_H
|
||||
#ifndef _QED_RDMA_IF_H
|
||||
#define _QED_RDMA_IF_H
|
||||
#include <linux/types.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/list.h>
|
Loading…
Reference in a new issue