hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IB/SA: Integrate ib_sa module into ib_core module 

Consolidate ib_sa into ib_core, this commit eliminates
ib_sa.ko and makes it part of ib_core.ko

Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Mark Bloch 2016-05-19 17:12:33 +03:00 committed by Doug Ledford
parent 4c2cb42204
commit c2e49c9232
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/infiniband/core/Makefile
View File

@ -1,8 +1,7 @@
infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_cm.o infiniband-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_cm.o
user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o user_access-$(CONFIG_INFINIBAND_ADDR_TRANS) := rdma_ucm.o
obj-$(CONFIG_INFINIBAND) += ib_core.o ib_sa.o \ obj-$(CONFIG_INFINIBAND) += ib_core.o ib_cm.o iw_cm.o \
ib_cm.o iw_cm.o \
$(infiniband-y) $(infiniband-y)
obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o
obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \ obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \
@ -10,13 +9,11 @@ obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o ib_ucm.o \
ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \ ib_core-y := packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
device.o fmr_pool.o cache.o netlink.o \ device.o fmr_pool.o cache.o netlink.o \
roce_gid_mgmt.o mr_pool.o addr.o \ roce_gid_mgmt.o mr_pool.o addr.o sa_query.o \
mad.o smi.o agent.o mad_rmpp.o multicast.o mad.o smi.o agent.o mad_rmpp.o
ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o
ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o
ib_sa-y := sa_query.o multicast.o
ib_cm-y := cm.o ib_cm-y := cm.o
iw_cm-y := iwcm.o iwpm_util.o iwpm_msg.o iw_cm-y := iwcm.o iwpm_util.o iwpm_msg.o

3
drivers/infiniband/core/core_priv.h
View File

@ -143,4 +143,7 @@ void addr_cleanup(void);
int ib_mad_init(void); int ib_mad_init(void);
void ib_mad_cleanup(void); void ib_mad_cleanup(void);
int ib_sa_init(void);
void ib_sa_cleanup(void);
#endif /* _CORE_PRIV_H */ #endif /* _CORE_PRIV_H */

9
drivers/infiniband/core/device.c
View File

@ -995,10 +995,18 @@ static int __init ib_core_init(void)
goto err_addr; goto err_addr;
} }
ret = ib_sa_init();
if (ret) {
pr_warn("Couldn't init SA\n");
goto err_mad;
}
ib_cache_setup(); ib_cache_setup();
return 0; return 0;
err_mad:
ib_mad_cleanup();
err_addr: err_addr:
addr_cleanup(); addr_cleanup();
err_ibnl: err_ibnl:
@ -1015,6 +1023,7 @@ err:
static void __exit ib_core_cleanup(void) static void __exit ib_core_cleanup(void)
{ {
ib_cache_cleanup(); ib_cache_cleanup();
ib_sa_cleanup();
ib_mad_cleanup(); ib_mad_cleanup();
addr_cleanup(); addr_cleanup();
ibnl_cleanup(); ibnl_cleanup();

11
drivers/infiniband/core/sa_query.c
View File

@ -53,10 +53,6 @@
#include "sa.h" #include "sa.h"
#include "core_priv.h" #include "core_priv.h"
MODULE_AUTHOR("Roland Dreier");
MODULE_DESCRIPTION("InfiniBand subnet administration query support");
MODULE_LICENSE("Dual BSD/GPL");
#define IB_SA_LOCAL_SVC_TIMEOUT_MIN 100 #define IB_SA_LOCAL_SVC_TIMEOUT_MIN 100
#define IB_SA_LOCAL_SVC_TIMEOUT_DEFAULT 2000 #define IB_SA_LOCAL_SVC_TIMEOUT_DEFAULT 2000
#define IB_SA_LOCAL_SVC_TIMEOUT_MAX 200000 #define IB_SA_LOCAL_SVC_TIMEOUT_MAX 200000
@ -1794,7 +1790,7 @@ static void ib_sa_remove_one(struct ib_device *device, void *client_data)
kfree(sa_dev); kfree(sa_dev);
} }
static int __init ib_sa_init(void) int ib_sa_init(void)
{ {
int ret; int ret;
@ -1839,7 +1835,7 @@ err1:
return ret; return ret;
} }
static void __exit ib_sa_cleanup(void) void ib_sa_cleanup(void)
{ {
ibnl_remove_client(RDMA_NL_LS); ibnl_remove_client(RDMA_NL_LS);
cancel_delayed_work(&ib_nl_timed_work); cancel_delayed_work(&ib_nl_timed_work);
@ -1849,6 +1845,3 @@ static void __exit ib_sa_cleanup(void)
ib_unregister_client(&sa_client); ib_unregister_client(&sa_client);
idr_destroy(&query_idr); idr_destroy(&query_idr);
} }
module_init(ib_sa_init);
module_exit(ib_sa_cleanup);