mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
6473d160b4
I noticed that many source files include <linux/pci.h> while they do not appear to need it. Here is an attempt to clean it all up. In order to find all possibly affected files, I searched for all files including <linux/pci.h> but without any other occurence of "pci" or "PCI". I removed the include statement from all of these, then I compiled an allmodconfig kernel on both i386 and x86_64 and fixed the false positives manually. My tests covered 66% of the affected files, so there could be false positives remaining. Untested files are: arch/alpha/kernel/err_common.c arch/alpha/kernel/err_ev6.c arch/alpha/kernel/err_ev7.c arch/ia64/sn/kernel/huberror.c arch/ia64/sn/kernel/xpnet.c arch/m68knommu/kernel/dma.c arch/mips/lib/iomap.c arch/powerpc/platforms/pseries/ras.c arch/ppc/8260_io/enet.c arch/ppc/8260_io/fcc_enet.c arch/ppc/8xx_io/enet.c arch/ppc/syslib/ppc4xx_sgdma.c arch/sh64/mach-cayman/iomap.c arch/xtensa/kernel/xtensa_ksyms.c arch/xtensa/platform-iss/setup.c drivers/i2c/busses/i2c-at91.c drivers/i2c/busses/i2c-mpc.c drivers/media/video/saa711x.c drivers/misc/hdpuftrs/hdpu_cpustate.c drivers/misc/hdpuftrs/hdpu_nexus.c drivers/net/au1000_eth.c drivers/net/fec_8xx/fec_main.c drivers/net/fec_8xx/fec_mii.c drivers/net/fs_enet/fs_enet-main.c drivers/net/fs_enet/mac-fcc.c drivers/net/fs_enet/mac-fec.c drivers/net/fs_enet/mac-scc.c drivers/net/fs_enet/mii-bitbang.c drivers/net/fs_enet/mii-fec.c drivers/net/ibm_emac/ibm_emac_core.c drivers/net/lasi_82596.c drivers/parisc/hppb.c drivers/sbus/sbus.c drivers/video/g364fb.c drivers/video/platinumfb.c drivers/video/stifb.c drivers/video/valkyriefb.c include/asm-arm/arch-ixp4xx/dma.h sound/oss/au1550_ac97.c I would welcome test reports for these files. I am fine with removing the untested files from the patch if the general opinion is that these changes aren't safe. The tested part would still be nice to have. Note that this patch depends on another header fixup patch I submitted to LKML yesterday: [PATCH] scatterlist.h needs types.h http://lkml.org/lkml/2007/3/01/141 Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Badari Pulavarty <pbadari@us.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
229 lines
6.0 KiB
C
229 lines
6.0 KiB
C
/*
|
|
* Copyright (c) 2004, 2005, Voltaire, Inc. All rights reserved.
|
|
* Copyright (c) 2005 Intel Corporation. All rights reserved.
|
|
* Copyright (c) 2005 Sun Microsystems, Inc. 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.
|
|
*
|
|
* $Id: mad_priv.h 5596 2006-03-03 01:00:07Z sean.hefty $
|
|
*/
|
|
|
|
#ifndef __IB_MAD_PRIV_H__
|
|
#define __IB_MAD_PRIV_H__
|
|
|
|
#include <linux/completion.h>
|
|
#include <linux/err.h>
|
|
#include <linux/workqueue.h>
|
|
#include <rdma/ib_mad.h>
|
|
#include <rdma/ib_smi.h>
|
|
|
|
|
|
#define PFX "ib_mad: "
|
|
|
|
#define IB_MAD_QPS_CORE 2 /* Always QP0 and QP1 as a minimum */
|
|
|
|
/* QP and CQ parameters */
|
|
#define IB_MAD_QP_SEND_SIZE 128
|
|
#define IB_MAD_QP_RECV_SIZE 512
|
|
#define IB_MAD_SEND_REQ_MAX_SG 2
|
|
#define IB_MAD_RECV_REQ_MAX_SG 1
|
|
|
|
#define IB_MAD_SEND_Q_PSN 0
|
|
|
|
/* Registration table sizes */
|
|
#define MAX_MGMT_CLASS 80
|
|
#define MAX_MGMT_VERSION 8
|
|
#define MAX_MGMT_OUI 8
|
|
#define MAX_MGMT_VENDOR_RANGE2 (IB_MGMT_CLASS_VENDOR_RANGE2_END - \
|
|
IB_MGMT_CLASS_VENDOR_RANGE2_START + 1)
|
|
|
|
struct ib_mad_list_head {
|
|
struct list_head list;
|
|
struct ib_mad_queue *mad_queue;
|
|
};
|
|
|
|
struct ib_mad_private_header {
|
|
struct ib_mad_list_head mad_list;
|
|
struct ib_mad_recv_wc recv_wc;
|
|
struct ib_wc wc;
|
|
u64 mapping;
|
|
} __attribute__ ((packed));
|
|
|
|
struct ib_mad_private {
|
|
struct ib_mad_private_header header;
|
|
struct ib_grh grh;
|
|
union {
|
|
struct ib_mad mad;
|
|
struct ib_rmpp_mad rmpp_mad;
|
|
struct ib_smp smp;
|
|
} mad;
|
|
} __attribute__ ((packed));
|
|
|
|
struct ib_rmpp_segment {
|
|
struct list_head list;
|
|
u32 num;
|
|
u8 data[0];
|
|
};
|
|
|
|
struct ib_mad_agent_private {
|
|
struct list_head agent_list;
|
|
struct ib_mad_agent agent;
|
|
struct ib_mad_reg_req *reg_req;
|
|
struct ib_mad_qp_info *qp_info;
|
|
|
|
spinlock_t lock;
|
|
struct list_head send_list;
|
|
struct list_head wait_list;
|
|
struct list_head done_list;
|
|
struct delayed_work timed_work;
|
|
unsigned long timeout;
|
|
struct list_head local_list;
|
|
struct work_struct local_work;
|
|
struct list_head rmpp_list;
|
|
|
|
atomic_t refcount;
|
|
struct completion comp;
|
|
};
|
|
|
|
struct ib_mad_snoop_private {
|
|
struct ib_mad_agent agent;
|
|
struct ib_mad_qp_info *qp_info;
|
|
int snoop_index;
|
|
int mad_snoop_flags;
|
|
atomic_t refcount;
|
|
struct completion comp;
|
|
};
|
|
|
|
struct ib_mad_send_wr_private {
|
|
struct ib_mad_list_head mad_list;
|
|
struct list_head agent_list;
|
|
struct ib_mad_agent_private *mad_agent_priv;
|
|
struct ib_mad_send_buf send_buf;
|
|
u64 header_mapping;
|
|
u64 payload_mapping;
|
|
struct ib_send_wr send_wr;
|
|
struct ib_sge sg_list[IB_MAD_SEND_REQ_MAX_SG];
|
|
__be64 tid;
|
|
unsigned long timeout;
|
|
int retries;
|
|
int retry;
|
|
int refcount;
|
|
enum ib_wc_status status;
|
|
|
|
/* RMPP control */
|
|
struct list_head rmpp_list;
|
|
struct ib_rmpp_segment *last_ack_seg;
|
|
struct ib_rmpp_segment *cur_seg;
|
|
int last_ack;
|
|
int seg_num;
|
|
int newwin;
|
|
int pad;
|
|
};
|
|
|
|
struct ib_mad_local_private {
|
|
struct list_head completion_list;
|
|
struct ib_mad_private *mad_priv;
|
|
struct ib_mad_agent_private *recv_mad_agent;
|
|
struct ib_mad_send_wr_private *mad_send_wr;
|
|
};
|
|
|
|
struct ib_mad_mgmt_method_table {
|
|
struct ib_mad_agent_private *agent[IB_MGMT_MAX_METHODS];
|
|
};
|
|
|
|
struct ib_mad_mgmt_class_table {
|
|
struct ib_mad_mgmt_method_table *method_table[MAX_MGMT_CLASS];
|
|
};
|
|
|
|
struct ib_mad_mgmt_vendor_class {
|
|
u8 oui[MAX_MGMT_OUI][3];
|
|
struct ib_mad_mgmt_method_table *method_table[MAX_MGMT_OUI];
|
|
};
|
|
|
|
struct ib_mad_mgmt_vendor_class_table {
|
|
struct ib_mad_mgmt_vendor_class *vendor_class[MAX_MGMT_VENDOR_RANGE2];
|
|
};
|
|
|
|
struct ib_mad_mgmt_version_table {
|
|
struct ib_mad_mgmt_class_table *class;
|
|
struct ib_mad_mgmt_vendor_class_table *vendor;
|
|
};
|
|
|
|
struct ib_mad_queue {
|
|
spinlock_t lock;
|
|
struct list_head list;
|
|
int count;
|
|
int max_active;
|
|
struct ib_mad_qp_info *qp_info;
|
|
};
|
|
|
|
struct ib_mad_qp_info {
|
|
struct ib_mad_port_private *port_priv;
|
|
struct ib_qp *qp;
|
|
struct ib_mad_queue send_queue;
|
|
struct ib_mad_queue recv_queue;
|
|
struct list_head overflow_list;
|
|
spinlock_t snoop_lock;
|
|
struct ib_mad_snoop_private **snoop_table;
|
|
int snoop_table_size;
|
|
atomic_t snoop_count;
|
|
};
|
|
|
|
struct ib_mad_port_private {
|
|
struct list_head port_list;
|
|
struct ib_device *device;
|
|
int port_num;
|
|
struct ib_cq *cq;
|
|
struct ib_pd *pd;
|
|
struct ib_mr *mr;
|
|
|
|
spinlock_t reg_lock;
|
|
struct ib_mad_mgmt_version_table version[MAX_MGMT_VERSION];
|
|
struct list_head agent_list;
|
|
struct workqueue_struct *wq;
|
|
struct work_struct work;
|
|
struct ib_mad_qp_info qp_info[IB_MAD_QPS_CORE];
|
|
};
|
|
|
|
int ib_send_mad(struct ib_mad_send_wr_private *mad_send_wr);
|
|
|
|
struct ib_mad_send_wr_private *
|
|
ib_find_send_mad(struct ib_mad_agent_private *mad_agent_priv,
|
|
struct ib_mad_recv_wc *mad_recv_wc);
|
|
|
|
void ib_mad_complete_send_wr(struct ib_mad_send_wr_private *mad_send_wr,
|
|
struct ib_mad_send_wc *mad_send_wc);
|
|
|
|
void ib_mark_mad_done(struct ib_mad_send_wr_private *mad_send_wr);
|
|
|
|
void ib_reset_mad_timeout(struct ib_mad_send_wr_private *mad_send_wr,
|
|
int timeout_ms);
|
|
|
|
#endif /* __IB_MAD_PRIV_H__ */
|