IB/ipath: Misc changes to prepare for IB7220 introduction
The patch adds a number of minor changes to support newer HCAs: - New send buffer control bits - New error condition bits - Locking and initialization changes - More send buffers Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:

committed by
Roland Dreier

parent
8babfa4fb9
commit
bb9171448d
@@ -34,6 +34,7 @@
|
||||
#include <linux/ctype.h>
|
||||
|
||||
#include "ipath_kernel.h"
|
||||
#include "ipath_verbs.h"
|
||||
#include "ipath_common.h"
|
||||
|
||||
/**
|
||||
@@ -320,6 +321,8 @@ static ssize_t store_guid(struct device *dev,
|
||||
|
||||
dd->ipath_guid = new_guid;
|
||||
dd->ipath_nguid = 1;
|
||||
if (dd->verbs_dev)
|
||||
dd->verbs_dev->ibdev.node_guid = new_guid;
|
||||
|
||||
ret = strlen(buf);
|
||||
goto bail;
|
||||
@@ -928,18 +931,17 @@ static ssize_t store_rx_polinv_enb(struct device *dev,
|
||||
u16 val;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &val);
|
||||
if (ret < 0 || val > 1)
|
||||
goto invalid;
|
||||
|
||||
r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_RXPOL_ENB, val);
|
||||
if (r < 0) {
|
||||
ret = r;
|
||||
if (ret >= 0 && val > 1) {
|
||||
ipath_dev_err(dd,
|
||||
"attempt to set invalid Rx Polarity (enable)\n");
|
||||
ret = -EINVAL;
|
||||
goto bail;
|
||||
}
|
||||
|
||||
goto bail;
|
||||
invalid:
|
||||
ipath_dev_err(dd, "attempt to set invalid Rx Polarity (enable)\n");
|
||||
r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_RXPOL_ENB, val);
|
||||
if (r < 0)
|
||||
ret = r;
|
||||
|
||||
bail:
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user