diff options
Diffstat (limited to 'sys/ofed/drivers')
19 files changed, 25 insertions, 282 deletions
diff --git a/sys/ofed/drivers/infiniband/core/addr.c b/sys/ofed/drivers/infiniband/core/addr.c index f454ffb..f608244 100644 --- a/sys/ofed/drivers/infiniband/core/addr.c +++ b/sys/ofed/drivers/infiniband/core/addr.c @@ -35,10 +35,15 @@ #include <linux/mutex.h> #include <linux/inetdevice.h> +#include <linux/slab.h> #include <linux/workqueue.h> +#include <linux/module.h> +#include <linux/notifier.h> #include <net/route.h> #include <net/netevent.h> #include <rdma/ib_addr.h> +#include <netinet/if_ether.h> + MODULE_AUTHOR("Sean Hefty"); MODULE_DESCRIPTION("IB Address Translation"); @@ -189,13 +194,11 @@ static void set_timeout(unsigned long time) { unsigned long delay; - cancel_delayed_work(&work); - delay = time - jiffies; if ((long)delay <= 0) delay = 1; - queue_delayed_work(addr_wq, &work, delay); + mod_delayed_work(addr_wq, &work, delay); } static void queue_req(struct addr_req *req) @@ -620,7 +623,7 @@ static struct notifier_block nb = { .notifier_call = netevent_callback }; -static int addr_init(void) +static int __init addr_init(void) { INIT_DELAYED_WORK(&work, process_req); addr_wq = create_singlethread_workqueue("ib_addr"); @@ -631,7 +634,7 @@ static int addr_init(void) return 0; } -static void addr_cleanup(void) +static void __exit addr_cleanup(void) { unregister_netevent_notifier(&nb); destroy_workqueue(addr_wq); diff --git a/sys/ofed/drivers/infiniband/core/agent.c b/sys/ofed/drivers/infiniband/core/agent.c index 91916a8..2bc7f5a 100644 --- a/sys/ofed/drivers/infiniband/core/agent.c +++ b/sys/ofed/drivers/infiniband/core/agent.c @@ -101,7 +101,8 @@ void agent_send_response(struct ib_mad *mad, struct ib_grh *grh, agent = port_priv->agent[qpn]; ah = ib_create_ah_from_wc(agent->qp->pd, wc, grh, port_num); if (IS_ERR(ah)) { - printk(KERN_ERR SPFX "ib_create_ah_from_wc error\n"); + printk(KERN_ERR SPFX "ib_create_ah_from_wc error %ld\n", + PTR_ERR(ah)); return; } diff --git a/sys/ofed/drivers/infiniband/core/ucm.c b/sys/ofed/drivers/infiniband/core/ucm.c index 5494da3..b912ebe 100644 --- a/sys/ofed/drivers/infiniband/core/ucm.c +++ b/sys/ofed/drivers/infiniband/core/ucm.c @@ -38,7 +38,6 @@ #include <linux/err.h> #include <linux/poll.h> #include <linux/file.h> -#include <linux/mount.h> #include <linux/cdev.h> #include <linux/idr.h> #include <linux/mutex.h> diff --git a/sys/ofed/drivers/infiniband/core/uverbs_main.c b/sys/ofed/drivers/infiniband/core/uverbs_main.c index c51b810..30b9259 100644 --- a/sys/ofed/drivers/infiniband/core/uverbs_main.c +++ b/sys/ofed/drivers/infiniband/core/uverbs_main.c @@ -40,7 +40,6 @@ #include <linux/fs.h> #include <linux/poll.h> #include <linux/file.h> -#include <linux/mount.h> #include <linux/cdev.h> #include <asm/uaccess.h> diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/ah.c b/sys/ofed/drivers/infiniband/hw/mlx4/ah.c index 47c9aa0..fe35e62 100644 --- a/sys/ofed/drivers/infiniband/hw/mlx4/ah.c +++ b/sys/ofed/drivers/infiniband/hw/mlx4/ah.c @@ -38,7 +38,6 @@ #include <rdma/ib_cache.h> #include <linux/slab.h> -#include <linux/inet.h> #include <linux/string.h> #include "mlx4_ib.h" diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h b/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h index 75671f7..43c0894 100644 --- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h +++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_config_reg.h @@ -34,7 +34,7 @@ #ifndef MTHCA_CONFIG_REG_H #define MTHCA_CONFIG_REG_H -#include <asm/page.h> +#include <linux/page.h> #define MTHCA_HCR_BASE 0x80680 #define MTHCA_HCR_SIZE 0x0001c diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c index ab139bf..6d7a363 100644 --- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_memfree.c @@ -36,7 +36,7 @@ #include <linux/scatterlist.h> #include <linux/sched.h> -#include <asm/page.h> +#include <linux/page.h> #include "mthca_memfree.h" #include "mthca_dev.h" diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c index ca5900c..5c9ad23 100644 --- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c +++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_uar.c @@ -30,7 +30,7 @@ * SOFTWARE. */ -#include <asm/page.h> /* PAGE_SHIFT */ +#include <linux/page.h> #include "mthca_dev.h" #include "mthca_memfree.h" diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c index ec52712..04819a9 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ethtool.c @@ -31,7 +31,6 @@ */ #include <linux/kernel.h> -#include <linux/ethtool.h> #include <linux/netdevice.h> #include "ipoib.h" diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c index fb9a27a..214f81a 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c @@ -32,7 +32,6 @@ */ #include "ipoib.h" -#include <linux/ethtool.h> int ipoib_mcast_attach(struct ipoib_dev_priv *priv, u16 mlid, union ib_gid *mgid, int set_qkey) { diff --git a/sys/ofed/drivers/net/mlx4/Makefile b/sys/ofed/drivers/net/mlx4/Makefile index 2e2ba35..1327215 100644 --- a/sys/ofed/drivers/net/mlx4/Makefile +++ b/sys/ofed/drivers/net/mlx4/Makefile @@ -31,4 +31,3 @@ opt_inet6.h: .include <bsd.kmod.mk> CFLAGS+= -Wno-cast-qual -Wno-pointer-arith ${GCC_MS_EXTENSIONS} - diff --git a/sys/ofed/drivers/net/mlx4/en_ethtool.c b/sys/ofed/drivers/net/mlx4/en_ethtool.c index 6569a53..3ebeaf4 100644 --- a/sys/ofed/drivers/net/mlx4/en_ethtool.c +++ b/sys/ofed/drivers/net/mlx4/en_ethtool.c @@ -32,7 +32,6 @@ */ #include <linux/kernel.h> -#include <linux/ethtool.h> #include <linux/netdevice.h> #include <linux/mlx4/driver.h> #include <linux/in.h> diff --git a/sys/ofed/drivers/net/mlx4/en_frag.c b/sys/ofed/drivers/net/mlx4/en_frag.c deleted file mode 100644 index c8429e4..0000000 --- a/sys/ofed/drivers/net/mlx4/en_frag.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) 2007 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 "opt_inet.h" -#include "mlx4_en.h" - -#ifdef INET - -#include <net/ethernet.h> -#include <netinet/ip.h> -#include <machine/in_cksum.h> - -static struct mlx4_en_ipfrag *find_session(struct mlx4_en_rx_ring *ring, - struct ip *iph) -{ - struct mlx4_en_ipfrag *session; - int i; - - for (i = 0; i < MLX4_EN_NUM_IPFRAG_SESSIONS; i++) { - session = &ring->ipfrag[i]; - if (session->fragments == NULL) - continue; - if (session->daddr == iph->ip_dst.s_addr && - session->saddr == iph->ip_src.s_addr && - session->id == iph->ip_id && - session->protocol == iph->ip_p) { - return session; - } - } - return NULL; -} - -static struct mlx4_en_ipfrag *start_session(struct mlx4_en_rx_ring *ring, - struct ip *iph) -{ - struct mlx4_en_ipfrag *session; - int index = -1; - int i; - - for (i = 0; i < MLX4_EN_NUM_IPFRAG_SESSIONS; i++) { - if (ring->ipfrag[i].fragments == NULL) { - index = i; - break; - } - } - if (index < 0) - return NULL; - - session = &ring->ipfrag[index]; - - return session; -} - - -static void flush_session(struct mlx4_en_priv *priv, - struct mlx4_en_ipfrag *session, - u16 more) -{ - struct mbuf *mb = session->fragments; - struct ip *iph = mb->m_pkthdr.PH_loc.ptr; - struct net_device *dev = mb->m_pkthdr.rcvif; - - /* Update IP length and checksum */ - iph->ip_len = htons(session->total_len); - iph->ip_off = htons(more | (session->offset >> 3)); - iph->ip_sum = 0; - iph->ip_sum = in_cksum_skip(mb, iph->ip_hl * 4, - (char *)iph - mb->m_data); - - dev->if_input(dev, mb); - session->fragments = NULL; - session->last = NULL; -} - - -static inline void frag_append(struct mlx4_en_priv *priv, - struct mlx4_en_ipfrag *session, - struct mbuf *mb, - unsigned int data_len) -{ - struct mbuf *parent = session->fragments; - - /* Update mb bookkeeping */ - parent->m_pkthdr.len += data_len; - session->total_len += data_len; - - m_adj(mb, mb->m_pkthdr.len - data_len); - - session->last->m_next = mb; - for (; mb->m_next != NULL; mb = mb->m_next); - session->last = mb; -} - -int mlx4_en_rx_frags(struct mlx4_en_priv *priv, struct mlx4_en_rx_ring *ring, - struct mbuf *mb, struct mlx4_cqe *cqe) -{ - struct mlx4_en_ipfrag *session; - struct ip *iph; - u16 ip_len; - u16 ip_hlen; - int data_len; - u16 offset; - - iph = (struct ip *)(mtod(mb, char *) + ETHER_HDR_LEN); - mb->m_pkthdr.PH_loc.ptr = iph; - ip_len = ntohs(iph->ip_len); - ip_hlen = iph->ip_hl * 4; - data_len = ip_len - ip_hlen; - offset = ntohs(iph->ip_off); - offset &= IP_OFFMASK; - offset <<= 3; - - session = find_session(ring, iph); - if (unlikely(in_cksum_skip(mb, ip_hlen, (char *)iph - mb->m_data))) { - if (session) - flush_session(priv, session, IP_MF); - return -EINVAL; - } - if (session) { - if (unlikely(session->offset + session->total_len != - offset + ip_hlen || - session->total_len + mb->m_pkthdr.len > 65536)) { - flush_session(priv, session, IP_MF); - goto new_session; - } - frag_append(priv, session, mb, data_len); - } else { -new_session: - session = start_session(ring, iph); - if (unlikely(!session)) - return -ENOSPC; - - session->fragments = mb; - session->daddr = iph->ip_dst.s_addr; - session->saddr = iph->ip_src.s_addr; - session->id = iph->ip_id; - session->protocol = iph->ip_p; - session->total_len = ip_len; - session->offset = offset; - for (; mb->m_next != NULL; mb = mb->m_next); - session->last = mb; - } - if (!(ntohs(iph->ip_off) & IP_MF)) - flush_session(priv, session, 0); - - return 0; -} - - -void mlx4_en_flush_frags(struct mlx4_en_priv *priv, - struct mlx4_en_rx_ring *ring) -{ - struct mlx4_en_ipfrag *session; - int i; - - for (i = 0; i < MLX4_EN_NUM_IPFRAG_SESSIONS; i++) { - session = &ring->ipfrag[i]; - if (session->fragments) - flush_session(priv, session, IP_MF); - } -} -#endif diff --git a/sys/ofed/drivers/net/mlx4/en_netdev.c b/sys/ofed/drivers/net/mlx4/en_netdev.c index 3df4493..a3236c3 100644 --- a/sys/ofed/drivers/net/mlx4/en_netdev.c +++ b/sys/ofed/drivers/net/mlx4/en_netdev.c @@ -2335,9 +2335,11 @@ static void mlx4_en_sysctl_conf(struct mlx4_en_priv *priv) struct sysctl_oid_list *node_list; struct sysctl_oid *coal; struct sysctl_oid_list *coal_list; + const char *pnameunit; dev = priv->dev; ctx = &priv->conf_ctx; + pnameunit = device_get_nameunit(priv->mdev->pdev->dev.bsddev); sysctl_ctx_init(ctx); priv->sysctl = SYSCTL_ADD_NODE(ctx, SYSCTL_STATIC_CHILDREN(_hw), @@ -2350,10 +2352,10 @@ static void mlx4_en_sysctl_conf(struct mlx4_en_priv *priv) CTLFLAG_RW, &priv->msg_enable, 0, "Driver message enable bitfield"); SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "rx_rings", - CTLTYPE_INT | CTLFLAG_RD, &priv->rx_ring_num, 0, + CTLFLAG_RD, &priv->rx_ring_num, 0, "Number of receive rings"); SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "tx_rings", - CTLTYPE_INT | CTLFLAG_RD, &priv->tx_ring_num, 0, + CTLFLAG_RD, &priv->tx_ring_num, 0, "Number of transmit rings"); SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "rx_size", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0, @@ -2367,6 +2369,12 @@ static void mlx4_en_sysctl_conf(struct mlx4_en_priv *priv) SYSCTL_ADD_PROC(ctx, node_list, OID_AUTO, "rx_ppp", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, priv, 0, mlx4_en_set_rx_ppp, "I", "RX Per-priority pause"); + SYSCTL_ADD_UINT(ctx, node_list, OID_AUTO, "port_num", + CTLFLAG_RD, &priv->port, 0, + "Port Number"); + SYSCTL_ADD_STRING(ctx, node_list, OID_AUTO, "device_name", + CTLFLAG_RD, __DECONST(void *, pnameunit), 0, + "PCI device name"); /* Add coalescer configuration. */ coal = SYSCTL_ADD_NODE(ctx, node_list, OID_AUTO, diff --git a/sys/ofed/drivers/net/mlx4/en_params.c b/sys/ofed/drivers/net/mlx4/en_params.c deleted file mode 100644 index e69de29..0000000 --- a/sys/ofed/drivers/net/mlx4/en_params.c +++ /dev/null diff --git a/sys/ofed/drivers/net/mlx4/en_selftest.c b/sys/ofed/drivers/net/mlx4/en_selftest.c index 2a28315..fb13bd6 100644 --- a/sys/ofed/drivers/net/mlx4/en_selftest.c +++ b/sys/ofed/drivers/net/mlx4/en_selftest.c @@ -32,7 +32,6 @@ */ #include <linux/kernel.h> -#include <linux/ethtool.h> #include <linux/netdevice.h> #include <linux/delay.h> #include <linux/mlx4/driver.h> diff --git a/sys/ofed/drivers/net/mlx4/en_tx.c b/sys/ofed/drivers/net/mlx4/en_tx.c index 59539ae..10f3606 100644 --- a/sys/ofed/drivers/net/mlx4/en_tx.c +++ b/sys/ofed/drivers/net/mlx4/en_tx.c @@ -31,7 +31,7 @@ * */ -#include <asm/page.h> +#include <linux/page.h> #include <linux/mlx4/cq.h> #include <linux/slab.h> #include <linux/mlx4/qp.h> diff --git a/sys/ofed/drivers/net/mlx4/pd.c b/sys/ofed/drivers/net/mlx4/pd.c index 5162a47..89a8854 100644 --- a/sys/ofed/drivers/net/mlx4/pd.c +++ b/sys/ofed/drivers/net/mlx4/pd.c @@ -35,7 +35,7 @@ #include <linux/module.h> #include <linux/io-mapping.h> -#include <asm/page.h> +#include <linux/page.h> #include "mlx4.h" #include "icm.h" diff --git a/sys/ofed/drivers/net/mlx4/xrcd.c b/sys/ofed/drivers/net/mlx4/xrcd.c deleted file mode 100644 index 6e3c341..0000000 --- a/sys/ofed/drivers/net/mlx4/xrcd.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2006, 2007 Cisco Systems, Inc. All rights reserved. - * Copyright (c) 2007 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/errno.h> - -#include "mlx4.h" - -int mlx4_xrcd_alloc(struct mlx4_dev *dev, u32 *xrcdn) -{ - struct mlx4_priv *priv = mlx4_priv(dev); - - *xrcdn = mlx4_bitmap_alloc(&priv->xrcd_bitmap); - if (*xrcdn == -1) - return -ENOMEM; - - return 0; -} -EXPORT_SYMBOL_GPL(mlx4_xrcd_alloc); - -void mlx4_xrcd_free(struct mlx4_dev *dev, u32 xrcdn) -{ - mlx4_bitmap_free(&mlx4_priv(dev)->xrcd_bitmap, xrcdn); -} -EXPORT_SYMBOL_GPL(mlx4_xrcd_free); - -int __devinit mlx4_init_xrcd_table(struct mlx4_dev *dev) -{ - struct mlx4_priv *priv = mlx4_priv(dev); - - return mlx4_bitmap_init(&priv->xrcd_bitmap, (1 << 16), - (1 << 16) - 1, dev->caps.reserved_xrcds + 1, 0); -} - -void mlx4_cleanup_xrcd_table(struct mlx4_dev *dev) -{ - mlx4_bitmap_cleanup(&mlx4_priv(dev)->xrcd_bitmap); -} - - |
