IB/ipath: New sysfs entries to control 7220 features
IBA7220 includes many more configurable IB settings. Getting/setting these is now grouped into a pair of chip specific functions accessed via function pointers. Provide sysfs access to these settings. Signed-off-by: Michael Albaugh <michael.albaugh@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>wifi-calibration
Michael Albaugh
Roland Dreier
parent
c4bce8032e
commit
359193ef43
|
|
@ -824,6 +824,9 @@ int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv);
|
|||
/* Use GPIO interrupts for new counters */
|
||||
#define IPATH_GPIO_ERRINTRS 0x100000
|
||||
#define IPATH_SWAP_PIOBUFS 0x200000
|
||||
/* Suppress heartbeat, even if turning off loopback */
|
||||
#define IPATH_NO_HRTBT 0x1000000
|
||||
#define IPATH_HAS_MULT_IB_SPEED 0x8000000
|
||||
|
||||
/* Bits in GPIO for the added interrupts */
|
||||
#define IPATH_GPIO_PORT0_BIT 2
|
||||
|
|
|
|||
|
|
@ -363,6 +363,60 @@ static ssize_t show_unit(struct device *dev,
|
|||
return scnprintf(buf, PAGE_SIZE, "%u\n", dd->ipath_unit);
|
||||
}
|
||||
|
||||
static ssize_t show_jint_max_packets(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
|
||||
return scnprintf(buf, PAGE_SIZE, "%hu\n", dd->ipath_jint_max_packets);
|
||||
}
|
||||
|
||||
static ssize_t store_jint_max_packets(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
u16 v = 0;
|
||||
int ret;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &v);
|
||||
if (ret < 0)
|
||||
ipath_dev_err(dd, "invalid jint_max_packets.\n");
|
||||
else
|
||||
dd->ipath_f_config_jint(dd, dd->ipath_jint_idle_ticks, v);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t show_jint_idle_ticks(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
|
||||
return scnprintf(buf, PAGE_SIZE, "%hu\n", dd->ipath_jint_idle_ticks);
|
||||
}
|
||||
|
||||
static ssize_t store_jint_idle_ticks(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
u16 v = 0;
|
||||
int ret;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &v);
|
||||
if (ret < 0)
|
||||
ipath_dev_err(dd, "invalid jint_idle_ticks.\n");
|
||||
else
|
||||
dd->ipath_f_config_jint(dd, v, dd->ipath_jint_max_packets);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#define DEVICE_COUNTER(name, attr) \
|
||||
static ssize_t show_counter_##name(struct device *dev, \
|
||||
struct device_attribute *attr, \
|
||||
|
|
@ -670,6 +724,257 @@ static ssize_t show_logged_errs(struct device *dev,
|
|||
return count;
|
||||
}
|
||||
|
||||
/*
|
||||
* New sysfs entries to control various IB config. These all turn into
|
||||
* accesses via ipath_f_get/set_ib_cfg.
|
||||
*
|
||||
* Get/Set heartbeat enable. Or of 1=enabled, 2=auto
|
||||
*/
|
||||
static ssize_t show_hrtbt_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_HRTBT);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_hrtbt_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret, r;
|
||||
u16 val;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &val);
|
||||
if (ret >= 0 && val > 3)
|
||||
ret = -EINVAL;
|
||||
if (ret < 0) {
|
||||
ipath_dev_err(dd, "attempt to set invalid Heartbeat enable\n");
|
||||
goto bail;
|
||||
}
|
||||
|
||||
/*
|
||||
* Set the "intentional" heartbeat enable per either of
|
||||
* "Enable" and "Auto", as these are normally set together.
|
||||
* This bit is consulted when leaving loopback mode,
|
||||
* because entering loopback mode overrides it and automatically
|
||||
* disables heartbeat.
|
||||
*/
|
||||
r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_HRTBT, val);
|
||||
if (r < 0)
|
||||
ret = r;
|
||||
else if (val == IPATH_IB_HRTBT_OFF)
|
||||
dd->ipath_flags |= IPATH_NO_HRTBT;
|
||||
else
|
||||
dd->ipath_flags &= ~IPATH_NO_HRTBT;
|
||||
|
||||
bail:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get/Set Link-widths enabled. Or of 1=1x, 2=4x (this is human/IB centric,
|
||||
* _not_ the particular encoding of any given chip)
|
||||
*/
|
||||
static ssize_t show_lwid_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_LWID_ENB);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_lwid_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret, r;
|
||||
u16 val;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &val);
|
||||
if (ret >= 0 && (val == 0 || val > 3))
|
||||
ret = -EINVAL;
|
||||
if (ret < 0) {
|
||||
ipath_dev_err(dd,
|
||||
"attempt to set invalid Link Width (enable)\n");
|
||||
goto bail;
|
||||
}
|
||||
|
||||
r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_LWID_ENB, val);
|
||||
if (r < 0)
|
||||
ret = r;
|
||||
|
||||
bail:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Get current link width */
|
||||
static ssize_t show_lwid(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_LWID);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get/Set Link-speeds enabled. Or of 1=SDR 2=DDR.
|
||||
*/
|
||||
static ssize_t show_spd_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_SPD_ENB);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_spd_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret, r;
|
||||
u16 val;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &val);
|
||||
if (ret >= 0 && (val == 0 || val > (IPATH_IB_SDR | IPATH_IB_DDR)))
|
||||
ret = -EINVAL;
|
||||
if (ret < 0) {
|
||||
ipath_dev_err(dd,
|
||||
"attempt to set invalid Link Speed (enable)\n");
|
||||
goto bail;
|
||||
}
|
||||
|
||||
r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_SPD_ENB, val);
|
||||
if (r < 0)
|
||||
ret = r;
|
||||
|
||||
bail:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* Get current link speed */
|
||||
static ssize_t show_spd(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_SPD);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get/Set RX polarity-invert enable. 0=no, 1=yes.
|
||||
*/
|
||||
static ssize_t show_rx_polinv_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_RXPOL_ENB);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_rx_polinv_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret, r;
|
||||
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;
|
||||
goto bail;
|
||||
}
|
||||
|
||||
goto bail;
|
||||
invalid:
|
||||
ipath_dev_err(dd, "attempt to set invalid Rx Polarity (enable)\n");
|
||||
bail:
|
||||
return ret;
|
||||
}
|
||||
/*
|
||||
* Get/Set RX lane-reversal enable. 0=no, 1=yes.
|
||||
*/
|
||||
static ssize_t show_lanerev_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret;
|
||||
|
||||
ret = dd->ipath_f_get_ib_cfg(dd, IPATH_IB_CFG_LREV_ENB);
|
||||
if (ret >= 0)
|
||||
ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static ssize_t store_lanerev_enb(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
const char *buf,
|
||||
size_t count)
|
||||
{
|
||||
struct ipath_devdata *dd = dev_get_drvdata(dev);
|
||||
int ret, r;
|
||||
u16 val;
|
||||
|
||||
ret = ipath_parse_ushort(buf, &val);
|
||||
if (ret >= 0 && val > 1) {
|
||||
ret = -EINVAL;
|
||||
ipath_dev_err(dd,
|
||||
"attempt to set invalid Lane reversal (enable)\n");
|
||||
goto bail;
|
||||
}
|
||||
|
||||
r = dd->ipath_f_set_ib_cfg(dd, IPATH_IB_CFG_LREV_ENB, val);
|
||||
if (r < 0)
|
||||
ret = r;
|
||||
|
||||
bail:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static DRIVER_ATTR(num_units, S_IRUGO, show_num_units, NULL);
|
||||
static DRIVER_ATTR(version, S_IRUGO, show_version, NULL);
|
||||
|
||||
|
|
@ -706,6 +1011,10 @@ static DEVICE_ATTR(unit, S_IRUGO, show_unit, NULL);
|
|||
static DEVICE_ATTR(rx_pol_inv, S_IWUSR, NULL, store_rx_pol_inv);
|
||||
static DEVICE_ATTR(led_override, S_IWUSR, NULL, store_led_override);
|
||||
static DEVICE_ATTR(logged_errors, S_IRUGO, show_logged_errs, NULL);
|
||||
static DEVICE_ATTR(jint_max_packets, S_IWUSR | S_IRUGO,
|
||||
show_jint_max_packets, store_jint_max_packets);
|
||||
static DEVICE_ATTR(jint_idle_ticks, S_IWUSR | S_IRUGO,
|
||||
show_jint_idle_ticks, store_jint_idle_ticks);
|
||||
|
||||
static struct attribute *dev_attributes[] = {
|
||||
&dev_attr_guid.attr,
|
||||
|
|
@ -732,6 +1041,34 @@ static struct attribute_group dev_attr_group = {
|
|||
.attrs = dev_attributes
|
||||
};
|
||||
|
||||
static DEVICE_ATTR(hrtbt_enable, S_IWUSR | S_IRUGO, show_hrtbt_enb,
|
||||
store_hrtbt_enb);
|
||||
static DEVICE_ATTR(link_width_enable, S_IWUSR | S_IRUGO, show_lwid_enb,
|
||||
store_lwid_enb);
|
||||
static DEVICE_ATTR(link_width, S_IRUGO, show_lwid, NULL);
|
||||
static DEVICE_ATTR(link_speed_enable, S_IWUSR | S_IRUGO, show_spd_enb,
|
||||
store_spd_enb);
|
||||
static DEVICE_ATTR(link_speed, S_IRUGO, show_spd, NULL);
|
||||
static DEVICE_ATTR(rx_pol_inv_enable, S_IWUSR | S_IRUGO, show_rx_polinv_enb,
|
||||
store_rx_polinv_enb);
|
||||
static DEVICE_ATTR(rx_lane_rev_enable, S_IWUSR | S_IRUGO, show_lanerev_enb,
|
||||
store_lanerev_enb);
|
||||
|
||||
static struct attribute *dev_ibcfg_attributes[] = {
|
||||
&dev_attr_hrtbt_enable.attr,
|
||||
&dev_attr_link_width_enable.attr,
|
||||
&dev_attr_link_width.attr,
|
||||
&dev_attr_link_speed_enable.attr,
|
||||
&dev_attr_link_speed.attr,
|
||||
&dev_attr_rx_pol_inv_enable.attr,
|
||||
&dev_attr_rx_lane_rev_enable.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static struct attribute_group dev_ibcfg_attr_group = {
|
||||
.attrs = dev_ibcfg_attributes
|
||||
};
|
||||
|
||||
/**
|
||||
* ipath_expose_reset - create a device reset file
|
||||
* @dev: the device structure
|
||||
|
|
@ -770,8 +1107,27 @@ int ipath_device_create_group(struct device *dev, struct ipath_devdata *dd)
|
|||
if (ret)
|
||||
goto bail_attrs;
|
||||
|
||||
if (dd->ipath_flags & IPATH_HAS_MULT_IB_SPEED) {
|
||||
ret = device_create_file(dev, &dev_attr_jint_idle_ticks);
|
||||
if (ret)
|
||||
goto bail_counter;
|
||||
ret = device_create_file(dev, &dev_attr_jint_max_packets);
|
||||
if (ret)
|
||||
goto bail_idle;
|
||||
|
||||
ret = sysfs_create_group(&dev->kobj, &dev_ibcfg_attr_group);
|
||||
if (ret)
|
||||
goto bail_max;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
bail_max:
|
||||
device_remove_file(dev, &dev_attr_jint_max_packets);
|
||||
bail_idle:
|
||||
device_remove_file(dev, &dev_attr_jint_idle_ticks);
|
||||
bail_counter:
|
||||
sysfs_remove_group(&dev->kobj, &dev_counter_attr_group);
|
||||
bail_attrs:
|
||||
sysfs_remove_group(&dev->kobj, &dev_attr_group);
|
||||
bail:
|
||||
|
|
@ -781,6 +1137,13 @@ bail:
|
|||
void ipath_device_remove_group(struct device *dev, struct ipath_devdata *dd)
|
||||
{
|
||||
sysfs_remove_group(&dev->kobj, &dev_counter_attr_group);
|
||||
|
||||
if (dd->ipath_flags & IPATH_HAS_MULT_IB_SPEED) {
|
||||
sysfs_remove_group(&dev->kobj, &dev_ibcfg_attr_group);
|
||||
device_remove_file(dev, &dev_attr_jint_idle_ticks);
|
||||
device_remove_file(dev, &dev_attr_jint_max_packets);
|
||||
}
|
||||
|
||||
sysfs_remove_group(&dev->kobj, &dev_attr_group);
|
||||
|
||||
device_remove_file(dev, &dev_attr_reset);
|
||||
|
|
|
|||
Loading…
Reference in New Issue