 32aaeffbd4
			
		
	
	
	32aaeffbd4
	
	
	
		
			
			* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...
Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
		
	
			
		
			
				
	
	
		
			260 lines
		
	
	
	
		
			7.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			260 lines
		
	
	
	
		
			7.1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved.
 | |
|  * Copyright (c) 2007, 2008 Mellanox Technologies. All rights reserved.
 | |
|  *
 | |
|  * 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.
 | |
|  */
 | |
| 
 | |
| #include <linux/mlx4/cmd.h>
 | |
| #include <linux/export.h>
 | |
| #include <linux/gfp.h>
 | |
| 
 | |
| #include "mlx4.h"
 | |
| #include "icm.h"
 | |
| 
 | |
| struct mlx4_srq_context {
 | |
| 	__be32			state_logsize_srqn;
 | |
| 	u8			logstride;
 | |
| 	u8			reserved1;
 | |
| 	__be16			xrcd;
 | |
| 	__be32			pg_offset_cqn;
 | |
| 	u32			reserved2;
 | |
| 	u8			log_page_size;
 | |
| 	u8			reserved3[2];
 | |
| 	u8			mtt_base_addr_h;
 | |
| 	__be32			mtt_base_addr_l;
 | |
| 	__be32			pd;
 | |
| 	__be16			limit_watermark;
 | |
| 	__be16			wqe_cnt;
 | |
| 	u16			reserved4;
 | |
| 	__be16			wqe_counter;
 | |
| 	u32			reserved5;
 | |
| 	__be64			db_rec_addr;
 | |
| };
 | |
| 
 | |
| void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type)
 | |
| {
 | |
| 	struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
 | |
| 	struct mlx4_srq *srq;
 | |
| 
 | |
| 	spin_lock(&srq_table->lock);
 | |
| 
 | |
| 	srq = radix_tree_lookup(&srq_table->tree, srqn & (dev->caps.num_srqs - 1));
 | |
| 	if (srq)
 | |
| 		atomic_inc(&srq->refcount);
 | |
| 
 | |
| 	spin_unlock(&srq_table->lock);
 | |
| 
 | |
| 	if (!srq) {
 | |
| 		mlx4_warn(dev, "Async event for bogus SRQ %08x\n", srqn);
 | |
| 		return;
 | |
| 	}
 | |
| 
 | |
| 	srq->event(srq, event_type);
 | |
| 
 | |
| 	if (atomic_dec_and_test(&srq->refcount))
 | |
| 		complete(&srq->free);
 | |
| }
 | |
| 
 | |
| static int mlx4_SW2HW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
 | |
| 			  int srq_num)
 | |
| {
 | |
| 	return mlx4_cmd(dev, mailbox->dma, srq_num, 0, MLX4_CMD_SW2HW_SRQ,
 | |
| 			MLX4_CMD_TIME_CLASS_A);
 | |
| }
 | |
| 
 | |
| static int mlx4_HW2SW_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
 | |
| 			  int srq_num)
 | |
| {
 | |
| 	return mlx4_cmd_box(dev, 0, mailbox ? mailbox->dma : 0, srq_num,
 | |
| 			    mailbox ? 0 : 1, MLX4_CMD_HW2SW_SRQ,
 | |
| 			    MLX4_CMD_TIME_CLASS_A);
 | |
| }
 | |
| 
 | |
| static int mlx4_ARM_SRQ(struct mlx4_dev *dev, int srq_num, int limit_watermark)
 | |
| {
 | |
| 	return mlx4_cmd(dev, limit_watermark, srq_num, 0, MLX4_CMD_ARM_SRQ,
 | |
| 			MLX4_CMD_TIME_CLASS_B);
 | |
| }
 | |
| 
 | |
| static int mlx4_QUERY_SRQ(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox,
 | |
| 			  int srq_num)
 | |
| {
 | |
| 	return mlx4_cmd_box(dev, 0, mailbox->dma, srq_num, 0, MLX4_CMD_QUERY_SRQ,
 | |
| 			    MLX4_CMD_TIME_CLASS_A);
 | |
| }
 | |
| 
 | |
| int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcd,
 | |
| 		   struct mlx4_mtt *mtt, u64 db_rec, struct mlx4_srq *srq)
 | |
| {
 | |
| 	struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
 | |
| 	struct mlx4_cmd_mailbox *mailbox;
 | |
| 	struct mlx4_srq_context *srq_context;
 | |
| 	u64 mtt_addr;
 | |
| 	int err;
 | |
| 
 | |
| 	srq->srqn = mlx4_bitmap_alloc(&srq_table->bitmap);
 | |
| 	if (srq->srqn == -1)
 | |
| 		return -ENOMEM;
 | |
| 
 | |
| 	err = mlx4_table_get(dev, &srq_table->table, srq->srqn);
 | |
| 	if (err)
 | |
| 		goto err_out;
 | |
| 
 | |
| 	err = mlx4_table_get(dev, &srq_table->cmpt_table, srq->srqn);
 | |
| 	if (err)
 | |
| 		goto err_put;
 | |
| 
 | |
| 	spin_lock_irq(&srq_table->lock);
 | |
| 	err = radix_tree_insert(&srq_table->tree, srq->srqn, srq);
 | |
| 	spin_unlock_irq(&srq_table->lock);
 | |
| 	if (err)
 | |
| 		goto err_cmpt_put;
 | |
| 
 | |
| 	mailbox = mlx4_alloc_cmd_mailbox(dev);
 | |
| 	if (IS_ERR(mailbox)) {
 | |
| 		err = PTR_ERR(mailbox);
 | |
| 		goto err_radix;
 | |
| 	}
 | |
| 
 | |
| 	srq_context = mailbox->buf;
 | |
| 	memset(srq_context, 0, sizeof *srq_context);
 | |
| 
 | |
| 	srq_context->state_logsize_srqn = cpu_to_be32((ilog2(srq->max) << 24) |
 | |
| 						      srq->srqn);
 | |
| 	srq_context->logstride          = srq->wqe_shift - 4;
 | |
| 	srq_context->xrcd		= cpu_to_be16(xrcd);
 | |
| 	srq_context->pg_offset_cqn	= cpu_to_be32(cqn & 0xffffff);
 | |
| 	srq_context->log_page_size      = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;
 | |
| 
 | |
| 	mtt_addr = mlx4_mtt_addr(dev, mtt);
 | |
| 	srq_context->mtt_base_addr_h    = mtt_addr >> 32;
 | |
| 	srq_context->mtt_base_addr_l    = cpu_to_be32(mtt_addr & 0xffffffff);
 | |
| 	srq_context->pd			= cpu_to_be32(pdn);
 | |
| 	srq_context->db_rec_addr        = cpu_to_be64(db_rec);
 | |
| 
 | |
| 	err = mlx4_SW2HW_SRQ(dev, mailbox, srq->srqn);
 | |
| 	mlx4_free_cmd_mailbox(dev, mailbox);
 | |
| 	if (err)
 | |
| 		goto err_radix;
 | |
| 
 | |
| 	atomic_set(&srq->refcount, 1);
 | |
| 	init_completion(&srq->free);
 | |
| 
 | |
| 	return 0;
 | |
| 
 | |
| err_radix:
 | |
| 	spin_lock_irq(&srq_table->lock);
 | |
| 	radix_tree_delete(&srq_table->tree, srq->srqn);
 | |
| 	spin_unlock_irq(&srq_table->lock);
 | |
| 
 | |
| err_cmpt_put:
 | |
| 	mlx4_table_put(dev, &srq_table->cmpt_table, srq->srqn);
 | |
| 
 | |
| err_put:
 | |
| 	mlx4_table_put(dev, &srq_table->table, srq->srqn);
 | |
| 
 | |
| err_out:
 | |
| 	mlx4_bitmap_free(&srq_table->bitmap, srq->srqn);
 | |
| 
 | |
| 	return err;
 | |
| }
 | |
| EXPORT_SYMBOL_GPL(mlx4_srq_alloc);
 | |
| 
 | |
| void mlx4_srq_free(struct mlx4_dev *dev, struct mlx4_srq *srq)
 | |
| {
 | |
| 	struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
 | |
| 	int err;
 | |
| 
 | |
| 	err = mlx4_HW2SW_SRQ(dev, NULL, srq->srqn);
 | |
| 	if (err)
 | |
| 		mlx4_warn(dev, "HW2SW_SRQ failed (%d) for SRQN %06x\n", err, srq->srqn);
 | |
| 
 | |
| 	spin_lock_irq(&srq_table->lock);
 | |
| 	radix_tree_delete(&srq_table->tree, srq->srqn);
 | |
| 	spin_unlock_irq(&srq_table->lock);
 | |
| 
 | |
| 	if (atomic_dec_and_test(&srq->refcount))
 | |
| 		complete(&srq->free);
 | |
| 	wait_for_completion(&srq->free);
 | |
| 
 | |
| 	mlx4_table_put(dev, &srq_table->table, srq->srqn);
 | |
| 	mlx4_bitmap_free(&srq_table->bitmap, srq->srqn);
 | |
| }
 | |
| EXPORT_SYMBOL_GPL(mlx4_srq_free);
 | |
| 
 | |
| int mlx4_srq_arm(struct mlx4_dev *dev, struct mlx4_srq *srq, int limit_watermark)
 | |
| {
 | |
| 	return mlx4_ARM_SRQ(dev, srq->srqn, limit_watermark);
 | |
| }
 | |
| EXPORT_SYMBOL_GPL(mlx4_srq_arm);
 | |
| 
 | |
| int mlx4_srq_query(struct mlx4_dev *dev, struct mlx4_srq *srq, int *limit_watermark)
 | |
| {
 | |
| 	struct mlx4_cmd_mailbox *mailbox;
 | |
| 	struct mlx4_srq_context *srq_context;
 | |
| 	int err;
 | |
| 
 | |
| 	mailbox = mlx4_alloc_cmd_mailbox(dev);
 | |
| 	if (IS_ERR(mailbox))
 | |
| 		return PTR_ERR(mailbox);
 | |
| 
 | |
| 	srq_context = mailbox->buf;
 | |
| 
 | |
| 	err = mlx4_QUERY_SRQ(dev, mailbox, srq->srqn);
 | |
| 	if (err)
 | |
| 		goto err_out;
 | |
| 	*limit_watermark = be16_to_cpu(srq_context->limit_watermark);
 | |
| 
 | |
| err_out:
 | |
| 	mlx4_free_cmd_mailbox(dev, mailbox);
 | |
| 	return err;
 | |
| }
 | |
| EXPORT_SYMBOL_GPL(mlx4_srq_query);
 | |
| 
 | |
| int mlx4_init_srq_table(struct mlx4_dev *dev)
 | |
| {
 | |
| 	struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table;
 | |
| 	int err;
 | |
| 
 | |
| 	spin_lock_init(&srq_table->lock);
 | |
| 	INIT_RADIX_TREE(&srq_table->tree, GFP_ATOMIC);
 | |
| 
 | |
| 	err = mlx4_bitmap_init(&srq_table->bitmap, dev->caps.num_srqs,
 | |
| 			       dev->caps.num_srqs - 1, dev->caps.reserved_srqs, 0);
 | |
| 	if (err)
 | |
| 		return err;
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| void mlx4_cleanup_srq_table(struct mlx4_dev *dev)
 | |
| {
 | |
| 	mlx4_bitmap_cleanup(&mlx4_priv(dev)->srq_table.bitmap);
 | |
| }
 |