staging/rdma/hfi1: move txreq header code (45842abb) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/staging/rdma/hfi1/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,8 @@ hfi1-y := affinity.o chip.o device.o diag.o driver.o efivar.o \
		eprom.o file_ops.o firmware.o \
		init.o intr.o mad.o pcie.o pio.o pio_copy.o platform.o \
		qp.o qsfp.o rc.o ruc.o sdma.o sysfs.o trace.o twsi.o \
		uc.o ud.o user_exp_rcv.o user_pages.o user_sdma.o verbs.o
		uc.o ud.o user_exp_rcv.o user_pages.o user_sdma.o verbs.o \
		verbs_txreq.o
		hfi1-$(CONFIG_DEBUG_FS) += debugfs.o

		CFLAGS_trace.o = -I$(src)

drivers/staging/rdma/hfi1/qp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@
		#include "hfi.h"
		#include "qp.h"
		#include "trace.h"
		#include "sdma.h"
		#include "verbs_txreq.h"

		unsigned int hfi1_qp_table_size = 256;
		module_param_named(qp_table_size, hfi1_qp_table_size, uint, S_IRUGO);

drivers/staging/rdma/hfi1/ruc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		#include "hfi.h"
		#include "mad.h"
		#include "qp.h"
		#include "sdma.h"
		#include "verbs_txreq.h"

		/*
		* Convert the AETH RNR timeout code into the number of microseconds.

drivers/staging/rdma/hfi1/sdma.h

+1 −79

Original line number	Diff line number	Diff line
		@@ -58,9 +58,8 @@

		#include "hfi.h"
		#include "verbs.h"
		#include "sdma_txreq.h"

		/* increased for AHG */
		#define NUM_DESC 6
		/* Hardware limit */
		#define MAX_DESC 64
		/* Hardware limit for SDMA packet size */
		@@ -311,83 +310,6 @@ struct hw_sdma_desc {
		__le64 qw[2];
		};

		/*
		* struct sdma_desc - canonical fragment descriptor
		*
		* This is the descriptor carried in the tx request
		* corresponding to each fragment.
		*
		*/
		struct sdma_desc {
		/* private: don't use directly */
		u64 qw[2];
		};

		struct sdma_txreq;
		typedef void (callback_t)(struct sdma_txreq , int, int);

		/**
		* struct sdma_txreq - the sdma_txreq structure (one per packet)
		* @list: for use by user and by queuing for wait
		*
		* This is the representation of a packet which consists of some
		* number of fragments. Storage is provided to within the structure.
		* for all fragments.
		*
		* The storage for the descriptors are automatically extended as needed
		* when the currently allocation is exceeded.
		*
		* The user (Verbs or PSM) may overload this structure with fields
		* specific to their use by putting this struct first in their struct.
		* The method of allocation of the overloaded structure is user dependent
		*
		* The list is the only public field in the structure.
		*
		*/

		struct sdma_txreq {
		struct list_head list;
		/* private: */
		struct sdma_desc *descp;
		/* private: */
		void *coalesce_buf;
		/* private: */
		u16 coalesce_idx;
		/* private: */
		struct iowait *wait;
		/* private: */
		callback_t complete;
		#ifdef CONFIG_HFI1_DEBUG_SDMA_ORDER
		u64 sn;
		#endif
		/* private: - used in coalesce/pad processing */
		u16 packet_len;
		/* private: - down-counted to trigger last */
		u16 tlen;
		/* private: flags */
		u16 flags;
		/* private: */
		u16 num_desc;
		/* private: */
		u16 desc_limit;
		/* private: */
		u16 next_descq_idx;
		/* private: */
		struct sdma_desc descs[NUM_DESC];
		};

		struct verbs_txreq {
		struct hfi1_pio_header phdr;
		struct sdma_txreq txreq;
		struct rvt_qp *qp;
		struct rvt_swqe *wqe;
		struct rvt_mregion *mr;
		struct rvt_sge_state *ss;
		struct sdma_engine *sde;
		u16 hdr_dwords;
		u16 hdr_inx;
		};

		/**
		* struct sdma_engine - Data pertaining to each SDMA engine.
		* @dd: a back-pointer to the device data

drivers/staging/rdma/hfi1/sdma_txreq.h

0 → 100644

+130 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright(c) 2016 Intel Corporation.
		*
		* This file is provided under a dual BSD/GPLv2 license. When using or
		* redistributing this file, you may do so under either license.
		*
		* GPL LICENSE SUMMARY
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of version 2 of the GNU General Public License as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* BSD LICENSE
		*
		* 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.
		* - Neither the name of Intel Corporation nor the names of its
		* contributors may be used to endorse or promote products derived
		* from this software without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
		* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
		* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
		* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
		* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
		* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
		* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		*
		*/

		#ifndef HFI1_SDMA_TXREQ_H
		#define HFI1_SDMA_TXREQ_H

		/* increased for AHG */
		#define NUM_DESC 6

		/*
		* struct sdma_desc - canonical fragment descriptor
		*
		* This is the descriptor carried in the tx request
		* corresponding to each fragment.
		*
		*/
		struct sdma_desc {
		/* private: don't use directly */
		u64 qw[2];
		};

		/**
		* struct sdma_txreq - the sdma_txreq structure (one per packet)
		* @list: for use by user and by queuing for wait
		*
		* This is the representation of a packet which consists of some
		* number of fragments. Storage is provided to within the structure.
		* for all fragments.
		*
		* The storage for the descriptors are automatically extended as needed
		* when the currently allocation is exceeded.
		*
		* The user (Verbs or PSM) may overload this structure with fields
		* specific to their use by putting this struct first in their struct.
		* The method of allocation of the overloaded structure is user dependent
		*
		* The list is the only public field in the structure.
		*
		*/

		#define SDMA_TXREQ_S_OK 0
		#define SDMA_TXREQ_S_SENDERROR 1
		#define SDMA_TXREQ_S_ABORTED 2
		#define SDMA_TXREQ_S_SHUTDOWN 3

		/* flags bits */
		#define SDMA_TXREQ_F_URGENT 0x0001
		#define SDMA_TXREQ_F_AHG_COPY 0x0002
		#define SDMA_TXREQ_F_USE_AHG 0x0004

		struct sdma_txreq;
		typedef void (callback_t)(struct sdma_txreq , int, int);

		struct iowait;
		struct sdma_txreq {
		struct list_head list;
		/* private: */
		struct sdma_desc *descp;
		/* private: */
		void *coalesce_buf;
		/* private: */
		struct iowait *wait;
		/* private: */
		callback_t complete;
		#ifdef CONFIG_HFI1_DEBUG_SDMA_ORDER
		u64 sn;
		#endif
		/* private: - used in coalesce/pad processing */
		u16 packet_len;
		/* private: - down-counted to trigger last */
		u16 tlen;
		/* private: */
		u16 num_desc;
		/* private: */
		u16 desc_limit;
		/* private: */
		u16 next_descq_idx;
		/* private: */
		u16 coalesce_idx;
		/* private: flags */
		u16 flags;
		/* private: */
		struct sdma_desc descs[NUM_DESC];
		};

		#endif /* HFI1_SDMA_TXREQ_H */