Skip to content

L
linux
Commit 956325bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma fixes from Doug Ledford:

 - two minor bug fixes

 - relicense ocrdma driver to dual license, GPL or BSD

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  RDMA/ocrdma: update ocrdma module license string
  RDMA/ocrdma: update ocrdma license to dual-license
  IB/ipoib: Fix CONFIG_INFINIBAND_IPOIB_CM
  RDMA/cxgb3: fail get_dma_mr on 64 bit arches
parents d4ec1f18 b8f5595e
Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 230 deletions
drivers/infiniband/hw/cxgb3/iwch_provider.c
View file @ 956325bd
...@@ -736,6 +736,10 @@ static struct ib_mr *iwch_get_dma_mr(struct ib_pd *pd, int acc) ...@@ -736,6 +736,10 @@ static struct ib_mr *iwch_get_dma_mr(struct ib_pd *pd, int acc)
/* /*
* T3 only supports 32 bits of size. * T3 only supports 32 bits of size.
*/ */
if (sizeof(phys_addr_t) > 4) {
pr_warn_once(MOD "Cannot support dma_mrs on this platform.\n");
return ERR_PTR(-ENOTSUPP);
}
bl.size = 0xffffffff; bl.size = 0xffffffff;
bl.addr = 0; bl.addr = 0;
kva = 0; kva = 0;
......
drivers/infiniband/hw/ocrdma/ocrdma.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_H__ #ifndef __OCRDMA_H__
#define __OCRDMA_H__ #define __OCRDMA_H__
......
drivers/infiniband/hw/ocrdma/ocrdma_abi.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_ABI_H__ #ifndef __OCRDMA_ABI_H__
#define __OCRDMA_ABI_H__ #define __OCRDMA_ABI_H__
......
drivers/infiniband/hw/ocrdma/ocrdma_ah.c
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#include <net/neighbour.h> #include <net/neighbour.h>
#include <net/netevent.h> #include <net/netevent.h>
......
drivers/infiniband/hw/ocrdma/ocrdma_ah.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_AH_H__ #ifndef __OCRDMA_AH_H__
#define __OCRDMA_AH_H__ #define __OCRDMA_AH_H__
......
drivers/infiniband/hw/ocrdma/ocrdma_hw.c
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) CNA Adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
......
drivers/infiniband/hw/ocrdma/ocrdma_hw.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) CNA Adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_HW_H__ #ifndef __OCRDMA_HW_H__
#define __OCRDMA_HW_H__ #define __OCRDMA_HW_H__
......
drivers/infiniband/hw/ocrdma/ocrdma_main.c
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/idr.h> #include <linux/idr.h>
...@@ -46,7 +61,7 @@ ...@@ -46,7 +61,7 @@
MODULE_VERSION(OCRDMA_ROCE_DRV_VERSION); MODULE_VERSION(OCRDMA_ROCE_DRV_VERSION);
MODULE_DESCRIPTION(OCRDMA_ROCE_DRV_DESC " " OCRDMA_ROCE_DRV_VERSION); MODULE_DESCRIPTION(OCRDMA_ROCE_DRV_DESC " " OCRDMA_ROCE_DRV_VERSION);
MODULE_AUTHOR("Emulex Corporation"); MODULE_AUTHOR("Emulex Corporation");
MODULE_LICENSE("GPL"); MODULE_LICENSE("Dual BSD/GPL");
static LIST_HEAD(ocrdma_dev_list); static LIST_HEAD(ocrdma_dev_list);
static DEFINE_SPINLOCK(ocrdma_devlist_lock); static DEFINE_SPINLOCK(ocrdma_devlist_lock);
......
drivers/infiniband/hw/ocrdma/ocrdma_sli.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_SLI_H__ #ifndef __OCRDMA_SLI_H__
#define __OCRDMA_SLI_H__ #define __OCRDMA_SLI_H__
......
drivers/infiniband/hw/ocrdma/ocrdma_stats.c
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2014 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#include <rdma/ib_addr.h> #include <rdma/ib_addr.h>
#include <rdma/ib_pma.h> #include <rdma/ib_pma.h>
......
drivers/infiniband/hw/ocrdma/ocrdma_stats.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2014 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_STATS_H__ #ifndef __OCRDMA_STATS_H__
#define __OCRDMA_STATS_H__ #define __OCRDMA_STATS_H__
......
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <rdma/ib_verbs.h> #include <rdma/ib_verbs.h>
......
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h
View file @ 956325bd
/******************************************************************* /* This file is part of the Emulex RoCE Device Driver for
* This file is part of the Emulex RoCE Device Driver for * * RoCE (RDMA over Converged Ethernet) adapters.
* RoCE (RDMA over Converged Ethernet) adapters. * * Copyright (C) 2012-2015 Emulex. All rights reserved.
* Copyright (C) 2008-2012 Emulex. All rights reserved. * * EMULEX and SLI are trademarks of Emulex.
* EMULEX and SLI are trademarks of Emulex. * * www.emulex.com
* www.emulex.com * *
* * * This software is available to you under a choice of one of two licenses.
* This program is free software; you can redistribute it and/or * * You may choose to be licensed under the terms of the GNU General Public
* modify it under the terms of version 2 of the GNU General * * License (GPL) Version 2, available from the file COPYING in the main
* Public License as published by the Free Software Foundation. * * directory of this source tree, or the BSD license below:
* This program is distributed in the hope that it will be useful. * *
* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND * * Redistribution and use in source and binary forms, with or without
* WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, * * modification, are permitted provided that the following conditions
* FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE * * are met:
* DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD * *
* TO BE LEGALLY INVALID. See the GNU General Public License for * * - Redistributions of source code must retain the above copyright notice,
* more details, a copy of which can be found in the file COPYING * * this list of conditions and the following disclaimer.
* included with this package. * *
* - 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.
*
* 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 HOLDER 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.
* *
* Contact Information: * Contact Information:
* linux-drivers@emulex.com * linux-drivers@emulex.com
...@@ -23,7 +38,7 @@ ...@@ -23,7 +38,7 @@
* Emulex * Emulex
* 3333 Susan Street * 3333 Susan Street
* Costa Mesa, CA 92626 * Costa Mesa, CA 92626
*******************************************************************/ */
#ifndef __OCRDMA_VERBS_H__ #ifndef __OCRDMA_VERBS_H__
#define __OCRDMA_VERBS_H__ #define __OCRDMA_VERBS_H__
......
drivers/infiniband/ulp/ipoib/ipoib_verbs.c
View file @ 956325bd
...@@ -177,7 +177,8 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca) ...@@ -177,7 +177,8 @@ int ipoib_transport_dev_init(struct net_device *dev, struct ib_device *ca)
else else
size += ipoib_recvq_size * ipoib_max_conn_qp; size += ipoib_recvq_size * ipoib_max_conn_qp;
} else } else
goto out_free_wq; if (ret != -ENOSYS)
goto out_free_wq;
cq_attr.cqe = size; cq_attr.cqe = size;
priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL, priv->recv_cq = ib_create_cq(priv->ca, ipoib_ib_completion, NULL,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7