diff mbox

[v2,39/49] IB/hfi1: add sysfs routines

Message ID 20150615132929.29741.87559.stgit@phlsvslse11.ph.intel.com (mailing list archive)
State Superseded
Headers show

Commit Message

Marciniszyn, Mike June 15, 2015, 1:29 p.m. UTC
Signed-off-by: Andrew Friedley <andrew.friedley@intel.com>
Signed-off-by: Arthur Kepner <arthur.kepner@intel.com>
Signed-off-by: Brendan Cunningham <brendan.cunningham@intel.com>
Signed-off-by: Brian Welty <brian.welty@intel.com>
Signed-off-by: Caz Yokoyama <caz.yokoyama@intel.com>
Signed-off-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: Harish Chegondi <harish.chegondi@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Jim Snow <jim.m.snow@intel.com>
Signed-off-by: John Gregor <john.a.gregor@intel.com>
Signed-off-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Kevin Pine <kevin.pine@intel.com>
Signed-off-by: Kyle Liddell <kyle.liddell@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Mitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: Ravi Krishnaswamy <ravi.krishnaswamy@intel.com>
Signed-off-by: Sadanand Warrier <sadanand.warrier@intel.com>
Signed-off-by: Sanath Kumar <sanath.s.kumar@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Vlad Danushevsky <vladimir.danusevsky@intel.com>
---
 drivers/infiniband/hw/hfi1/sysfs.c | 1083 ++++++++++++++++++++++++++++++++++++
 1 file changed, 1083 insertions(+)
 create mode 100644 drivers/infiniband/hw/hfi1/sysfs.c


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Or Gerlitz June 15, 2015, 7:14 p.m. UTC | #1
On Mon, Jun 15, 2015 at 4:29 PM, Mike Marciniszyn
<mike.marciniszyn@intel.com> wrote:

58K LOC with a single non-empty change log line saying "This patch
series adds the OPA gen1 driver" is surely a nice candidate for all
times record of how not to submit upstream drivers. Why not sparing
few words for the reviewers what is OPA, how the driver is designed,
if/what is the relation to the ipath and qib driver, etc 22 other
things you need to mention for someone to try and look on you 60000
lines of code, so?

Or.



Or.



> ---
>  drivers/infiniband/hw/hfi1/sysfs.c | 1083 ++++++++++++++++++++++++++++++++++++
>  1 file changed, 1083 insertions(+)
>  create mode 100644 drivers/infiniband/hw/hfi1/sysfs.c
>
> diff --git a/drivers/infiniband/hw/hfi1/sysfs.c b/drivers/infiniband/hw/hfi1/sysfs.c
> new file mode 100644
> index 0000000..fdedb20
> --- /dev/null
> +++ b/drivers/infiniband/hw/hfi1/sysfs.c
> @@ -0,0 +1,1083 @@
> +/*
> + *
> + * This file is provided under a dual BSD/GPLv2 license.  When using or
> + * redistributing this file, you may do so under either license.
> + *
> + * GPL LICENSE SUMMARY
> + *
> + * Copyright(c) 2015 Intel Corporation.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of version 2 of the GNU General Public License as
> + * published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * General Public License for more details.
> + *
> + * BSD LICENSE
> + *
> + * Copyright(c) 2015 Intel Corporation.
> + *
> + * 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.
> + *  - Neither the name of Intel Corporation nor the names of its
> + *    contributors may be used to endorse or promote products derived
> + *    from this software without specific prior written permission.
> + *
> + * 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
> + * OWNER 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.
> + *
> + */
> +#include <linux/ctype.h>
> +
> +#include "hfi.h"
> +#include "mad.h"
> +#include "trace.h"
> +
> +/* start of per-port functions */
> +/*
> + * Get/Set heartbeat enable. OR of 1=enabled, 2=auto
> + */
> +static ssize_t show_hrtbt_enb(struct hfi1_pportdata *ppd, char *buf)
> +{
> +       int ret;
> +
> +       ret = hfi1_get_ib_cfg(ppd, HFI1_IB_CFG_HRTBT);
> +       ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
> +       return ret;
> +}
> +
> +static ssize_t store_hrtbt_enb(struct hfi1_pportdata *ppd, const char *buf,
> +                              size_t count)
> +{
> +       struct hfi1_devdata *dd = ppd->dd;
> +       int ret;
> +       u16 val;
> +
> +       ret = kstrtou16(buf, 0, &val);
> +       if (ret) {
> +               dd_dev_err(dd, "attempt to set invalid Heartbeat enable\n");
> +               return ret;
> +       }
> +
> +       /*
> +        * 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.
> +        */
> +       ret = hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_HRTBT, val);
> +       return ret < 0 ? ret : count;
> +}
> +
> +static ssize_t store_led_override(struct hfi1_pportdata *ppd, const char *buf,
> +                                 size_t count)
> +{
> +       struct hfi1_devdata *dd = ppd->dd;
> +       int ret;
> +       u16 val;
> +
> +       ret = kstrtou16(buf, 0, &val);
> +       if (ret) {
> +               dd_dev_err(dd, "attempt to set invalid LED override\n");
> +               return ret;
> +       }
> +
> +       hfi1_set_led_override(ppd, val);
> +       return count;
> +}
> +
> +static ssize_t show_status(struct hfi1_pportdata *ppd, char *buf)
> +{
> +       ssize_t ret;
> +
> +       if (!ppd->statusp)
> +               ret = -EINVAL;
> +       else
> +               ret = scnprintf(buf, PAGE_SIZE, "0x%llx\n",
> +                               (unsigned long long) *(ppd->statusp));
> +       return ret;
> +}
> +
> +/*
> + * For userland compatibility, these offsets must remain fixed.
> + * They are strings for HFI1_STATUS_*
> + */
> +static const char * const hfi1_status_str[] = {
> +       "Initted",
> +       "",
> +       "",
> +       "",
> +       "",
> +       "Present",
> +       "IB_link_up",
> +       "IB_configured",
> +       "",
> +       "Fatal_Hardware_Error",
> +       NULL,
> +};
> +
> +static ssize_t show_status_str(struct hfi1_pportdata *ppd, char *buf)
> +{
> +       int i, any;
> +       u64 s;
> +       ssize_t ret;
> +
> +       if (!ppd->statusp) {
> +               ret = -EINVAL;
> +               goto bail;
> +       }
> +
> +       s = *(ppd->statusp);
> +       *buf = '\0';
> +       for (any = i = 0; s && hfi1_status_str[i]; i++) {
> +               if (s & 1) {
> +                       /* if overflow */
> +                       if (any && strlcat(buf, " ", PAGE_SIZE) >= PAGE_SIZE)
> +                               break;
> +                       if (strlcat(buf, hfi1_status_str[i], PAGE_SIZE) >=
> +                                       PAGE_SIZE)
> +                               break;
> +                       any = 1;
> +               }
> +               s >>= 1;
> +       }
> +       if (any)
> +               strlcat(buf, "\n", PAGE_SIZE);
> +
> +       ret = strlen(buf);
> +
> +bail:
> +       return ret;
> +}
> +
> +/* end of per-port functions */
> +
> +/*
> + * Start of per-port file structures and support code
> + * Because we are fitting into other infrastructure, we have to supply the
> + * full set of kobject/sysfs_ops structures and routines.
> + */
> +#define HFI1_PORT_ATTR(name, mode, show, store) \
> +       static struct hfi1_port_attr port_attr_##name = \
> +               __ATTR(name, mode, show, store)
> +
> +struct hfi1_port_attr {
> +       struct attribute attr;
> +       ssize_t (*show)(struct hfi1_pportdata *, char *);
> +       ssize_t (*store)(struct hfi1_pportdata *, const char *, size_t);
> +};
> +
> +HFI1_PORT_ATTR(led_override, S_IWUSR, NULL, store_led_override);
> +HFI1_PORT_ATTR(hrtbt_enable, S_IWUSR | S_IRUGO, show_hrtbt_enb,
> +              store_hrtbt_enb);
> +HFI1_PORT_ATTR(status, S_IRUGO, show_status, NULL);
> +HFI1_PORT_ATTR(status_str, S_IRUGO, show_status_str, NULL);
> +
> +static struct attribute *port_default_attributes[] = {
> +       &port_attr_led_override.attr,
> +       &port_attr_hrtbt_enable.attr,
> +       &port_attr_status.attr,
> +       &port_attr_status_str.attr,
> +       NULL
> +};
> +
> +/*
> + * Start of per-port congestion control structures and support code
> + */
> +
> +/*
> + * Congestion control table size followed by table entries
> + */
> +static ssize_t read_cc_table_bin(struct file *filp, struct kobject *kobj,
> +               struct bin_attribute *bin_attr,
> +               char *buf, loff_t pos, size_t count)
> +{
> +       int ret;
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, pport_cc_kobj);
> +       struct cc_state *cc_state;
> +
> +       ret = ppd->total_cct_entry * sizeof(struct ib_cc_table_entry_shadow)
> +                + sizeof(__be16);
> +
> +       if (pos > ret)
> +               return -EINVAL;
> +
> +       if (count > ret - pos)
> +               count = ret - pos;
> +
> +       if (!count)
> +               return count;
> +
> +       rcu_read_lock();
> +       cc_state = get_cc_state(ppd);
> +       if (cc_state == NULL) {
> +               rcu_read_unlock();
> +               return -EINVAL;
> +       }
> +       memcpy(buf, &cc_state->cct, count);
> +       rcu_read_unlock();
> +
> +       return count;
> +}
> +
> +static void port_release(struct kobject *kobj)
> +{
> +       /* nothing to do since memory is freed by hfi1_free_devdata() */
> +}
> +
> +static struct kobj_type port_cc_ktype = {
> +       .release = port_release,
> +};
> +
> +static struct bin_attribute cc_table_bin_attr = {
> +       .attr = {.name = "cc_table_bin", .mode = 0444},
> +       .read = read_cc_table_bin,
> +       .size = PAGE_SIZE,
> +};
> +
> +/*
> + * Congestion settings: port control, control map and an array of 16
> + * entries for the congestion entries - increase, timer, event log
> + * trigger threshold and the minimum injection rate delay.
> + */
> +static ssize_t read_cc_setting_bin(struct file *filp, struct kobject *kobj,
> +               struct bin_attribute *bin_attr,
> +               char *buf, loff_t pos, size_t count)
> +{
> +       int ret;
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, pport_cc_kobj);
> +       struct cc_state *cc_state;
> +
> +       ret = sizeof(struct opa_congestion_setting_attr_shadow);
> +
> +       if (pos > ret)
> +               return -EINVAL;
> +       if (count > ret - pos)
> +               count = ret - pos;
> +
> +       if (!count)
> +               return count;
> +
> +       rcu_read_lock();
> +       cc_state = get_cc_state(ppd);
> +       if (cc_state == NULL) {
> +               rcu_read_unlock();
> +               return -EINVAL;
> +       }
> +       memcpy(buf, &cc_state->cong_setting, count);
> +       rcu_read_unlock();
> +
> +       return count;
> +}
> +
> +static struct bin_attribute cc_setting_bin_attr = {
> +       .attr = {.name = "cc_settings_bin", .mode = 0444},
> +       .read = read_cc_setting_bin,
> +       .size = PAGE_SIZE,
> +};
> +
> +
> +static ssize_t portattr_show(struct kobject *kobj,
> +                            struct attribute *attr, char *buf)
> +{
> +       struct hfi1_port_attr *pattr =
> +               container_of(attr, struct hfi1_port_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, pport_kobj);
> +
> +       return pattr->show(ppd, buf);
> +}
> +
> +static ssize_t portattr_store(struct kobject *kobj,
> +                             struct attribute *attr,
> +                             const char *buf, size_t len)
> +{
> +       struct hfi1_port_attr *pattr =
> +               container_of(attr, struct hfi1_port_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, pport_kobj);
> +
> +       return pattr->store(ppd, buf, len);
> +}
> +
> +
> +static const struct sysfs_ops hfi1_port_ops = {
> +       .show = portattr_show,
> +       .store = portattr_store,
> +};
> +
> +static struct kobj_type hfi1_port_ktype = {
> +       .release = port_release,
> +       .sysfs_ops = &hfi1_port_ops,
> +       .default_attrs = port_default_attributes
> +};
> +
> +/* Start sc2vl */
> +#define HFI1_SC2VL_ATTR(N)                                 \
> +       static struct hfi1_sc2vl_attr hfi1_sc2vl_attr_##N = { \
> +               .attr = { .name = __stringify(N), .mode = 0444 }, \
> +               .sc = N \
> +       }
> +
> +struct hfi1_sc2vl_attr {
> +       struct attribute attr;
> +       int sc;
> +};
> +
> +HFI1_SC2VL_ATTR(0);
> +HFI1_SC2VL_ATTR(1);
> +HFI1_SC2VL_ATTR(2);
> +HFI1_SC2VL_ATTR(3);
> +HFI1_SC2VL_ATTR(4);
> +HFI1_SC2VL_ATTR(5);
> +HFI1_SC2VL_ATTR(6);
> +HFI1_SC2VL_ATTR(7);
> +HFI1_SC2VL_ATTR(8);
> +HFI1_SC2VL_ATTR(9);
> +HFI1_SC2VL_ATTR(10);
> +HFI1_SC2VL_ATTR(11);
> +HFI1_SC2VL_ATTR(12);
> +HFI1_SC2VL_ATTR(13);
> +HFI1_SC2VL_ATTR(14);
> +HFI1_SC2VL_ATTR(15);
> +HFI1_SC2VL_ATTR(16);
> +HFI1_SC2VL_ATTR(17);
> +HFI1_SC2VL_ATTR(18);
> +HFI1_SC2VL_ATTR(19);
> +HFI1_SC2VL_ATTR(20);
> +HFI1_SC2VL_ATTR(21);
> +HFI1_SC2VL_ATTR(22);
> +HFI1_SC2VL_ATTR(23);
> +HFI1_SC2VL_ATTR(24);
> +HFI1_SC2VL_ATTR(25);
> +HFI1_SC2VL_ATTR(26);
> +HFI1_SC2VL_ATTR(27);
> +HFI1_SC2VL_ATTR(28);
> +HFI1_SC2VL_ATTR(29);
> +HFI1_SC2VL_ATTR(30);
> +HFI1_SC2VL_ATTR(31);
> +
> +
> +static struct attribute *sc2vl_default_attributes[] = {
> +       &hfi1_sc2vl_attr_0.attr,
> +       &hfi1_sc2vl_attr_1.attr,
> +       &hfi1_sc2vl_attr_2.attr,
> +       &hfi1_sc2vl_attr_3.attr,
> +       &hfi1_sc2vl_attr_4.attr,
> +       &hfi1_sc2vl_attr_5.attr,
> +       &hfi1_sc2vl_attr_6.attr,
> +       &hfi1_sc2vl_attr_7.attr,
> +       &hfi1_sc2vl_attr_8.attr,
> +       &hfi1_sc2vl_attr_9.attr,
> +       &hfi1_sc2vl_attr_10.attr,
> +       &hfi1_sc2vl_attr_11.attr,
> +       &hfi1_sc2vl_attr_12.attr,
> +       &hfi1_sc2vl_attr_13.attr,
> +       &hfi1_sc2vl_attr_14.attr,
> +       &hfi1_sc2vl_attr_15.attr,
> +       &hfi1_sc2vl_attr_16.attr,
> +       &hfi1_sc2vl_attr_17.attr,
> +       &hfi1_sc2vl_attr_18.attr,
> +       &hfi1_sc2vl_attr_19.attr,
> +       &hfi1_sc2vl_attr_20.attr,
> +       &hfi1_sc2vl_attr_21.attr,
> +       &hfi1_sc2vl_attr_22.attr,
> +       &hfi1_sc2vl_attr_23.attr,
> +       &hfi1_sc2vl_attr_24.attr,
> +       &hfi1_sc2vl_attr_25.attr,
> +       &hfi1_sc2vl_attr_26.attr,
> +       &hfi1_sc2vl_attr_27.attr,
> +       &hfi1_sc2vl_attr_28.attr,
> +       &hfi1_sc2vl_attr_29.attr,
> +       &hfi1_sc2vl_attr_30.attr,
> +       &hfi1_sc2vl_attr_31.attr,
> +       NULL
> +};
> +
> +static ssize_t sc2vl_attr_show(struct kobject *kobj, struct attribute *attr,
> +                              char *buf)
> +{
> +       struct hfi1_sc2vl_attr *sattr =
> +               container_of(attr, struct hfi1_sc2vl_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, sc2vl_kobj);
> +       struct hfi1_devdata *dd = ppd->dd;
> +
> +       return sprintf(buf, "%u\n", *((u8 *)dd->sc2vl + sattr->sc));
> +}
> +
> +static const struct sysfs_ops hfi1_sc2vl_ops = {
> +       .show = sc2vl_attr_show,
> +};
> +
> +static struct kobj_type hfi1_sc2vl_ktype = {
> +       .release = port_release,
> +       .sysfs_ops = &hfi1_sc2vl_ops,
> +       .default_attrs = sc2vl_default_attributes
> +};
> +
> +/* End sc2vl */
> +
> +/* Start sl2sc */
> +#define HFI1_SL2SC_ATTR(N)                                 \
> +       static struct hfi1_sl2sc_attr hfi1_sl2sc_attr_##N = {     \
> +               .attr = { .name = __stringify(N), .mode = 0444 }, \
> +               .sl = N                                           \
> +       }
> +
> +struct hfi1_sl2sc_attr {
> +       struct attribute attr;
> +       int sl;
> +};
> +
> +HFI1_SL2SC_ATTR(0);
> +HFI1_SL2SC_ATTR(1);
> +HFI1_SL2SC_ATTR(2);
> +HFI1_SL2SC_ATTR(3);
> +HFI1_SL2SC_ATTR(4);
> +HFI1_SL2SC_ATTR(5);
> +HFI1_SL2SC_ATTR(6);
> +HFI1_SL2SC_ATTR(7);
> +HFI1_SL2SC_ATTR(8);
> +HFI1_SL2SC_ATTR(9);
> +HFI1_SL2SC_ATTR(10);
> +HFI1_SL2SC_ATTR(11);
> +HFI1_SL2SC_ATTR(12);
> +HFI1_SL2SC_ATTR(13);
> +HFI1_SL2SC_ATTR(14);
> +HFI1_SL2SC_ATTR(15);
> +HFI1_SL2SC_ATTR(16);
> +HFI1_SL2SC_ATTR(17);
> +HFI1_SL2SC_ATTR(18);
> +HFI1_SL2SC_ATTR(19);
> +HFI1_SL2SC_ATTR(20);
> +HFI1_SL2SC_ATTR(21);
> +HFI1_SL2SC_ATTR(22);
> +HFI1_SL2SC_ATTR(23);
> +HFI1_SL2SC_ATTR(24);
> +HFI1_SL2SC_ATTR(25);
> +HFI1_SL2SC_ATTR(26);
> +HFI1_SL2SC_ATTR(27);
> +HFI1_SL2SC_ATTR(28);
> +HFI1_SL2SC_ATTR(29);
> +HFI1_SL2SC_ATTR(30);
> +HFI1_SL2SC_ATTR(31);
> +
> +
> +static struct attribute *sl2sc_default_attributes[] = {
> +       &hfi1_sl2sc_attr_0.attr,
> +       &hfi1_sl2sc_attr_1.attr,
> +       &hfi1_sl2sc_attr_2.attr,
> +       &hfi1_sl2sc_attr_3.attr,
> +       &hfi1_sl2sc_attr_4.attr,
> +       &hfi1_sl2sc_attr_5.attr,
> +       &hfi1_sl2sc_attr_6.attr,
> +       &hfi1_sl2sc_attr_7.attr,
> +       &hfi1_sl2sc_attr_8.attr,
> +       &hfi1_sl2sc_attr_9.attr,
> +       &hfi1_sl2sc_attr_10.attr,
> +       &hfi1_sl2sc_attr_11.attr,
> +       &hfi1_sl2sc_attr_12.attr,
> +       &hfi1_sl2sc_attr_13.attr,
> +       &hfi1_sl2sc_attr_14.attr,
> +       &hfi1_sl2sc_attr_15.attr,
> +       &hfi1_sl2sc_attr_16.attr,
> +       &hfi1_sl2sc_attr_17.attr,
> +       &hfi1_sl2sc_attr_18.attr,
> +       &hfi1_sl2sc_attr_19.attr,
> +       &hfi1_sl2sc_attr_20.attr,
> +       &hfi1_sl2sc_attr_21.attr,
> +       &hfi1_sl2sc_attr_22.attr,
> +       &hfi1_sl2sc_attr_23.attr,
> +       &hfi1_sl2sc_attr_24.attr,
> +       &hfi1_sl2sc_attr_25.attr,
> +       &hfi1_sl2sc_attr_26.attr,
> +       &hfi1_sl2sc_attr_27.attr,
> +       &hfi1_sl2sc_attr_28.attr,
> +       &hfi1_sl2sc_attr_29.attr,
> +       &hfi1_sl2sc_attr_30.attr,
> +       &hfi1_sl2sc_attr_31.attr,
> +       NULL
> +};
> +
> +static ssize_t sl2sc_attr_show(struct kobject *kobj, struct attribute *attr,
> +                              char *buf)
> +{
> +       struct hfi1_sl2sc_attr *sattr =
> +               container_of(attr, struct hfi1_sl2sc_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, sl2sc_kobj);
> +       struct hfi1_ibport *ibp = &ppd->ibport_data;
> +
> +       return sprintf(buf, "%u\n", ibp->sl_to_sc[sattr->sl]);
> +}
> +
> +static const struct sysfs_ops hfi1_sl2sc_ops = {
> +       .show = sl2sc_attr_show,
> +};
> +
> +static struct kobj_type hfi1_sl2sc_ktype = {
> +       .release = port_release,
> +       .sysfs_ops = &hfi1_sl2sc_ops,
> +       .default_attrs = sl2sc_default_attributes
> +};
> +
> +/* End sl2sc */
> +
> +/* Start vl2mtu */
> +
> +#define HFI1_VL2MTU_ATTR(N) \
> +       static struct hfi1_vl2mtu_attr hfi1_vl2mtu_attr_##N = { \
> +               .attr = { .name = __stringify(N), .mode = 0444 }, \
> +               .vl = N                                           \
> +       }
> +
> +struct hfi1_vl2mtu_attr {
> +       struct attribute attr;
> +       int vl;
> +};
> +
> +HFI1_VL2MTU_ATTR(0);
> +HFI1_VL2MTU_ATTR(1);
> +HFI1_VL2MTU_ATTR(2);
> +HFI1_VL2MTU_ATTR(3);
> +HFI1_VL2MTU_ATTR(4);
> +HFI1_VL2MTU_ATTR(5);
> +HFI1_VL2MTU_ATTR(6);
> +HFI1_VL2MTU_ATTR(7);
> +HFI1_VL2MTU_ATTR(8);
> +HFI1_VL2MTU_ATTR(9);
> +HFI1_VL2MTU_ATTR(10);
> +HFI1_VL2MTU_ATTR(11);
> +HFI1_VL2MTU_ATTR(12);
> +HFI1_VL2MTU_ATTR(13);
> +HFI1_VL2MTU_ATTR(14);
> +HFI1_VL2MTU_ATTR(15);
> +
> +static struct attribute *vl2mtu_default_attributes[] = {
> +       &hfi1_vl2mtu_attr_0.attr,
> +       &hfi1_vl2mtu_attr_1.attr,
> +       &hfi1_vl2mtu_attr_2.attr,
> +       &hfi1_vl2mtu_attr_3.attr,
> +       &hfi1_vl2mtu_attr_4.attr,
> +       &hfi1_vl2mtu_attr_5.attr,
> +       &hfi1_vl2mtu_attr_6.attr,
> +       &hfi1_vl2mtu_attr_7.attr,
> +       &hfi1_vl2mtu_attr_8.attr,
> +       &hfi1_vl2mtu_attr_9.attr,
> +       &hfi1_vl2mtu_attr_10.attr,
> +       &hfi1_vl2mtu_attr_11.attr,
> +       &hfi1_vl2mtu_attr_12.attr,
> +       &hfi1_vl2mtu_attr_13.attr,
> +       &hfi1_vl2mtu_attr_14.attr,
> +       &hfi1_vl2mtu_attr_15.attr,
> +       NULL
> +};
> +
> +static ssize_t vl2mtu_attr_show(struct kobject *kobj, struct attribute *attr,
> +                               char *buf)
> +{
> +       struct hfi1_vl2mtu_attr *vlattr =
> +               container_of(attr, struct hfi1_vl2mtu_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, vl2mtu_kobj);
> +       struct hfi1_devdata *dd = ppd->dd;
> +
> +       return sprintf(buf, "%u\n", dd->vld[vlattr->vl].mtu);
> +}
> +
> +static const struct sysfs_ops hfi1_vl2mtu_ops = {
> +       .show = vl2mtu_attr_show,
> +};
> +
> +static struct kobj_type hfi1_vl2mtu_ktype = {
> +       .release = port_release,
> +       .sysfs_ops = &hfi1_vl2mtu_ops,
> +       .default_attrs = vl2mtu_default_attributes
> +};
> +
> +/* Start diag_counters */
> +#define HFI1_DIAGC_NORMAL 0x0
> +#define HFI1_DIAGC_PCPU   0x1
> +
> +#define HFI1_DIAGC_ATTR(N) \
> +       static struct hfi1_diagc_attr diagc_attr_##N = { \
> +               .attr = { .name = __stringify(N), .mode = 0664 }, \
> +               .counter = offsetof(struct hfi1_ibport, n_##N), \
> +               .type = HFI1_DIAGC_NORMAL, \
> +               .vl = CNTR_INVALID_VL \
> +       }
> +
> +#define HFI1_DIAGC_ATTR_PCPU(N, V, L) \
> +       static struct hfi1_diagc_attr diagc_attr_##N = { \
> +               .attr = { .name = __stringify(N), .mode = 0664 }, \
> +               .counter = V, \
> +               .type = HFI1_DIAGC_PCPU, \
> +               .vl = L \
> +       }
> +
> +struct hfi1_diagc_attr {
> +       struct attribute attr;
> +       size_t counter;
> +       int type;
> +       int vl;
> +};
> +
> +HFI1_DIAGC_ATTR(rc_resends);
> +HFI1_DIAGC_ATTR_PCPU(rc_acks, C_SW_CPU_RC_ACKS, CNTR_INVALID_VL);
> +HFI1_DIAGC_ATTR_PCPU(rc_qacks, C_SW_CPU_RC_QACKS, CNTR_INVALID_VL);
> +HFI1_DIAGC_ATTR_PCPU(rc_delayed_comp, C_SW_CPU_RC_DELAYED_COMP,
> +       CNTR_INVALID_VL);
> +HFI1_DIAGC_ATTR(seq_naks);
> +HFI1_DIAGC_ATTR(rdma_seq);
> +HFI1_DIAGC_ATTR(rnr_naks);
> +HFI1_DIAGC_ATTR(other_naks);
> +HFI1_DIAGC_ATTR(rc_timeouts);
> +HFI1_DIAGC_ATTR(loop_pkts);
> +HFI1_DIAGC_ATTR(pkt_drops);
> +HFI1_DIAGC_ATTR(dmawait);
> +HFI1_DIAGC_ATTR(unaligned);
> +HFI1_DIAGC_ATTR(rc_dupreq);
> +HFI1_DIAGC_ATTR(rc_seqnak);
> +
> +static struct attribute *diagc_default_attributes[] = {
> +       &diagc_attr_rc_resends.attr,
> +       &diagc_attr_rc_acks.attr,
> +       &diagc_attr_rc_qacks.attr,
> +       &diagc_attr_rc_delayed_comp.attr,
> +       &diagc_attr_seq_naks.attr,
> +       &diagc_attr_rdma_seq.attr,
> +       &diagc_attr_rnr_naks.attr,
> +       &diagc_attr_other_naks.attr,
> +       &diagc_attr_rc_timeouts.attr,
> +       &diagc_attr_loop_pkts.attr,
> +       &diagc_attr_pkt_drops.attr,
> +       &diagc_attr_dmawait.attr,
> +       &diagc_attr_unaligned.attr,
> +       &diagc_attr_rc_dupreq.attr,
> +       &diagc_attr_rc_seqnak.attr,
> +       NULL
> +};
> +
> +static ssize_t diagc_attr_show(struct kobject *kobj, struct attribute *attr,
> +                              char *buf)
> +{
> +       struct hfi1_diagc_attr *dattr =
> +               container_of(attr, struct hfi1_diagc_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, diagc_kobj);
> +       struct hfi1_ibport *hfip = &ppd->ibport_data;
> +
> +       switch (dattr->type) {
> +       case (HFI1_DIAGC_PCPU):
> +               return(sprintf(buf, "%lld\n",
> +                       read_port_cntr(ppd,
> +                                      dattr->counter,
> +                                      dattr->vl)));
> +       case (HFI1_DIAGC_NORMAL):
> +               /* Fall through */
> +       default:
> +               return sprintf(buf, "%u\n",
> +                       *(u32 *)((char *)hfip + dattr->counter));
> +       }
> +}
> +
> +static ssize_t diagc_attr_store(struct kobject *kobj, struct attribute *attr,
> +                               const char *buf, size_t size)
> +{
> +       struct hfi1_diagc_attr *dattr =
> +               container_of(attr, struct hfi1_diagc_attr, attr);
> +       struct hfi1_pportdata *ppd =
> +               container_of(kobj, struct hfi1_pportdata, diagc_kobj);
> +       struct hfi1_ibport *hfip = &ppd->ibport_data;
> +       u32 val;
> +       int ret;
> +
> +       ret = kstrtou32(buf, 0, &val);
> +       if (ret)
> +               return ret;
> +       *(u32 *)((char *)hfip + dattr->counter) = val;
> +       return size;
> +}
> +
> +static const struct sysfs_ops hfi1_diagc_ops = {
> +       .show = diagc_attr_show,
> +       .store = diagc_attr_store,
> +};
> +
> +static struct kobj_type diagc_ktype = {
> +       .release = port_release,
> +       .sysfs_ops = &hfi1_diagc_ops,
> +       .default_attrs = diagc_default_attributes
> +};
> +
> +/* End diag_counters */
> +
> +/* end of per-port file structures and support code */
> +
> +/*
> + * Start of per-unit (or driver, in some cases, but replicated
> + * per unit) functions (these get a device *)
> + */
> +static ssize_t show_rev(struct device *device, struct device_attribute *attr,
> +                       char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +
> +       return sprintf(buf, "%x\n", dd_from_dev(dev)->minrev);
> +}
> +
> +static ssize_t show_hca(struct device *device, struct device_attribute *attr,
> +                       char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +       int ret;
> +
> +       if (!dd->boardname)
> +               ret = -EINVAL;
> +       else
> +               ret = scnprintf(buf, PAGE_SIZE, "%s\n", dd->boardname);
> +       return ret;
> +}
> +
> +static ssize_t show_version(struct device *device,
> +                           struct device_attribute *attr, char *buf)
> +{
> +       /* The string printed here is already newline-terminated. */
> +       return scnprintf(buf, PAGE_SIZE, "%s", (char *)ib_hfi1_version);
> +}
> +
> +static ssize_t show_boardversion(struct device *device,
> +                                struct device_attribute *attr, char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +
> +       /* The string printed here is already newline-terminated. */
> +       return scnprintf(buf, PAGE_SIZE, "%s", dd->boardversion);
> +}
> +
> +
> +static ssize_t show_localbus_info(struct device *device,
> +                                 struct device_attribute *attr, char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +
> +       return scnprintf(buf, PAGE_SIZE, "%s\n", dd->lbus_info);
> +}
> +
> +
> +static ssize_t show_nctxts(struct device *device,
> +                          struct device_attribute *attr, char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +
> +       /*
> +        * Return the smaller of send and receive contexts.
> +        * Normally, user level applications would require both a send
> +        * and a receive context, so returning the smaller of the two counts
> +        * give a more accurate picture of total contexts available.
> +        */
> +       return scnprintf(buf, PAGE_SIZE, "%u\n",
> +                        min(dd->num_rcv_contexts - dd->first_user_ctxt,
> +                            (u32)dd->sc_sizes[SC_USER].count));
> +}
> +
> +static ssize_t show_nfreectxts(struct device *device,
> +                          struct device_attribute *attr, char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +
> +       /* Return the number of free user ports (contexts) available. */
> +       return scnprintf(buf, PAGE_SIZE, "%u\n", dd->freectxts);
> +}
> +
> +static ssize_t show_serial(struct device *device,
> +                          struct device_attribute *attr, char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +
> +       return scnprintf(buf, PAGE_SIZE, "%s", dd->serial);
> +
> +}
> +
> +static ssize_t store_chip_reset(struct device *device,
> +                               struct device_attribute *attr, const char *buf,
> +                               size_t count)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +       int ret;
> +
> +       if (count < 5 || memcmp(buf, "reset", 5) || !dd->diag_client) {
> +               ret = -EINVAL;
> +               goto bail;
> +       }
> +
> +       ret = hfi1_reset_device(dd->unit);
> +bail:
> +       return ret < 0 ? ret : count;
> +}
> +
> +/*
> + * Convert the reported temperature from an integer (reported in
> + * units of 0.25C) to a floating point number.
> + */
> +#define temp2str(temp, buf, size, idx)                                 \
> +       scnprintf((buf) + (idx), (size) - (idx), "%u.%02u ",            \
> +                             ((temp) >> 2), ((temp) & 0x3) * 25)
> +
> +/*
> + * Dump tempsense values, in decimal, to ease shell-scripts.
> + */
> +static ssize_t show_tempsense(struct device *device,
> +                             struct device_attribute *attr, char *buf)
> +{
> +       struct hfi1_ibdev *dev =
> +               container_of(device, struct hfi1_ibdev, ibdev.dev);
> +       struct hfi1_devdata *dd = dd_from_dev(dev);
> +       struct hfi1_temp temp;
> +       int ret = -ENXIO;
> +
> +       ret = hfi1_tempsense_rd(dd, &temp);
> +       if (!ret) {
> +               int idx = 0;
> +
> +               idx += temp2str(temp.curr, buf, PAGE_SIZE, idx);
> +               idx += temp2str(temp.lo_lim, buf, PAGE_SIZE, idx);
> +               idx += temp2str(temp.hi_lim, buf, PAGE_SIZE, idx);
> +               idx += temp2str(temp.crit_lim, buf, PAGE_SIZE, idx);
> +               idx += scnprintf(buf + idx, PAGE_SIZE - idx,
> +                               "%u %u %u\n", temp.triggers & 0x1,
> +                               temp.triggers & 0x2, temp.triggers & 0x4);
> +               ret = idx;
> +       }
> +       return ret;
> +}
> +
> +/*
> + * end of per-unit (or driver, in some cases, but replicated
> + * per unit) functions
> + */
> +
> +/* start of per-unit file structures and support code */
> +static DEVICE_ATTR(hw_rev, S_IRUGO, show_rev, NULL);
> +static DEVICE_ATTR(hca_type, S_IRUGO, show_hca, NULL);
> +static DEVICE_ATTR(board_id, S_IRUGO, show_hca, NULL);
> +static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
> +static DEVICE_ATTR(nctxts, S_IRUGO, show_nctxts, NULL);
> +static DEVICE_ATTR(nfreectxts, S_IRUGO, show_nfreectxts, NULL);
> +static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
> +static DEVICE_ATTR(boardversion, S_IRUGO, show_boardversion, NULL);
> +static DEVICE_ATTR(tempsense, S_IRUGO, show_tempsense, NULL);
> +static DEVICE_ATTR(localbus_info, S_IRUGO, show_localbus_info, NULL);
> +static DEVICE_ATTR(chip_reset, S_IWUSR, NULL, store_chip_reset);
> +
> +static struct device_attribute *hfi1_attributes[] = {
> +       &dev_attr_hw_rev,
> +       &dev_attr_hca_type,
> +       &dev_attr_board_id,
> +       &dev_attr_version,
> +       &dev_attr_nctxts,
> +       &dev_attr_nfreectxts,
> +       &dev_attr_serial,
> +       &dev_attr_boardversion,
> +       &dev_attr_tempsense,
> +       &dev_attr_localbus_info,
> +       &dev_attr_chip_reset,
> +};
> +
> +int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num,
> +                          struct kobject *kobj)
> +{
> +       struct hfi1_pportdata *ppd;
> +       struct hfi1_devdata *dd = dd_from_ibdev(ibdev);
> +       int ret;
> +
> +       if (!port_num || port_num > dd->num_pports) {
> +               dd_dev_err(dd,
> +                       "Skipping infiniband class with invalid port %u\n",
> +                       port_num);
> +               ret = -ENODEV;
> +               goto bail;
> +       }
> +       ppd = &dd->pport[port_num - 1];
> +
> +       ret = kobject_init_and_add(&ppd->pport_kobj, &hfi1_port_ktype, kobj,
> +                                  "linkcontrol");
> +       if (ret) {
> +               dd_dev_err(dd,
> +                       "Skipping linkcontrol sysfs info, (err %d) port %u\n",
> +                       ret, port_num);
> +               goto bail;
> +       }
> +       kobject_uevent(&ppd->pport_kobj, KOBJ_ADD);
> +
> +       ret = kobject_init_and_add(&ppd->sc2vl_kobj, &hfi1_sc2vl_ktype, kobj,
> +                                  "sc2vl");
> +       if (ret) {
> +               dd_dev_err(dd,
> +                          "Skipping sc2vl sysfs info, (err %d) port %u\n",
> +                          ret, port_num);
> +               goto bail_link;
> +       }
> +       kobject_uevent(&ppd->sc2vl_kobj, KOBJ_ADD);
> +       ret = kobject_init_and_add(&ppd->sl2sc_kobj, &hfi1_sl2sc_ktype, kobj,
> +                                  "sl2sc");
> +       if (ret) {
> +               dd_dev_err(dd,
> +                          "Skipping sl2sc sysfs info, (err %d) port %u\n",
> +                          ret, port_num);
> +               goto bail_link;
> +       }
> +       kobject_uevent(&ppd->sl2sc_kobj, KOBJ_ADD);
> +
> +       ret = kobject_init_and_add(&ppd->vl2mtu_kobj, &hfi1_vl2mtu_ktype, kobj,
> +                                  "vl2mtu");
> +       if (ret) {
> +               dd_dev_err(dd,
> +                          "Skipping vl2mtu sysfs info, (err %d) port %u\n",
> +                          ret, port_num);
> +               goto bail_sl;
> +       }
> +       kobject_uevent(&ppd->vl2mtu_kobj, KOBJ_ADD);
> +
> +       ret = kobject_init_and_add(&ppd->diagc_kobj, &diagc_ktype, kobj,
> +                                  "diag_counters");
> +       if (ret) {
> +               dd_dev_err(dd,
> +                       "Skipping diag_counters sysfs info, (err %d) port %u\n",
> +                       ret, port_num);
> +               goto bail_mtu;
> +       }
> +       kobject_uevent(&ppd->diagc_kobj, KOBJ_ADD);
> +
> +       ret = kobject_init_and_add(&ppd->pport_cc_kobj, &port_cc_ktype,
> +                                  kobj, "CCMgtA");
> +       if (ret) {
> +               dd_dev_err(dd,
> +                "Skipping Congestion Control sysfs info, (err %d) port %u\n",
> +                ret, port_num);
> +               goto bail_diagc;
> +       }
> +
> +       kobject_uevent(&ppd->pport_cc_kobj, KOBJ_ADD);
> +
> +       ret = sysfs_create_bin_file(&ppd->pport_cc_kobj,
> +                               &cc_setting_bin_attr);
> +       if (ret) {
> +               dd_dev_err(dd,
> +                "Skipping Congestion Control setting sysfs info, (err %d) port %u\n",
> +                ret, port_num);
> +               goto bail_cc;
> +       }
> +
> +       ret = sysfs_create_bin_file(&ppd->pport_cc_kobj,
> +                               &cc_table_bin_attr);
> +       if (ret) {
> +               dd_dev_err(dd,
> +                "Skipping Congestion Control table sysfs info, (err %d) port %u\n",
> +                ret, port_num);
> +               goto bail_cc_entry_bin;
> +       }
> +
> +       dd_dev_info(dd,
> +               "IB%u: Congestion Control Agent enabled for port %d\n",
> +               dd->unit, port_num);
> +
> +       return 0;
> +
> +bail_cc_entry_bin:
> +       sysfs_remove_bin_file(&ppd->pport_cc_kobj, &cc_setting_bin_attr);
> +bail_cc:
> +       kobject_put(&ppd->pport_cc_kobj);
> +bail_diagc:
> +       kobject_put(&ppd->diagc_kobj);
> +bail_mtu:
> +       kobject_put(&ppd->vl2mtu_kobj);
> +bail_sl:
> +       kobject_put(&ppd->sc2vl_kobj);
> +bail_link:
> +       kobject_put(&ppd->pport_kobj);
> +bail:
> +       return ret;
> +}
> +
> +/*
> + * Register and create our files in /sys/class/infiniband.
> + */
> +int hfi1_verbs_register_sysfs(struct hfi1_devdata *dd)
> +{
> +       struct ib_device *dev = &dd->verbs_dev.ibdev;
> +       int i, ret;
> +
> +       for (i = 0; i < ARRAY_SIZE(hfi1_attributes); ++i) {
> +               ret = device_create_file(&dev->dev, hfi1_attributes[i]);
> +               if (ret)
> +                       goto bail;
> +       }
> +
> +       return 0;
> +bail:
> +       for (i = 0; i < ARRAY_SIZE(hfi1_attributes); ++i)
> +               device_remove_file(&dev->dev, hfi1_attributes[i]);
> +       return ret;
> +}
> +
> +/*
> + * Unregister and remove our files in /sys/class/infiniband.
> + */
> +void hfi1_verbs_unregister_sysfs(struct hfi1_devdata *dd)
> +{
> +       struct hfi1_pportdata *ppd;
> +       int i;
> +
> +       for (i = 0; i < dd->num_pports; i++) {
> +               ppd = &dd->pport[i];
> +
> +               sysfs_remove_bin_file(&ppd->pport_cc_kobj,
> +                       &cc_setting_bin_attr);
> +               sysfs_remove_bin_file(&ppd->pport_cc_kobj,
> +                       &cc_table_bin_attr);
> +               kobject_put(&ppd->pport_cc_kobj);
> +               kobject_put(&ppd->vl2mtu_kobj);
> +               kobject_put(&ppd->sc2vl_kobj);
> +               kobject_put(&ppd->pport_kobj);
> +       }
> +}
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Or Gerlitz June 15, 2015, 7:20 p.m. UTC | #2
On Mon, Jun 15, 2015 at 10:14 PM, Or Gerlitz <gerlitz.or@gmail.com> wrote:
> On Mon, Jun 15, 2015 at 4:29 PM, Mike Marciniszyn
> <mike.marciniszyn@intel.com> wrote:
>
> 58K LOC with a single non-empty change log line saying "This patch
> series adds the OPA gen1 driver" is surely a nice candidate for all
> times record of how not to submit upstream drivers. Why not sparing
>> +struct hfi1_sc2vl_attr {

what's SC and what's SC-to-VL? aren't you using SM to do such
mappings? if this and the below sysfs work-around/s for the maybe
current lack of SM to configure the port? why do the upstream kernel
has to carry ~hundreds of sysfs entries forever for such
non-documented things?




>> +HFI1_SL2SC_ATTR(0);

same comment on SL2SC

>> +HFI1_VL2MTU_ATTR(0);

same comment on VL2MTU, why in sysfs?!

>> +HFI1_DIAGC_ATTR(rc_resends);
>> +HFI1_DIAGC_ATTR_PCPU(rc_acks, C_SW_CPU_RC_ACKS, CNTR_INVALID_VL);
>> +HFI1_DIAGC_ATTR_PCPU(rc_qacks, C_SW_CPU_RC_QACKS, CNTR_INVALID_VL);
>> +HFI1_DIAGC_ATTR_PCPU(rc_delayed_comp, C_SW_CPU_RC_DELAYED_COMP,
>> +       CNTR_INVALID_VL);
>> +HFI1_DIAGC_ATTR(seq_naks);
>> +HFI1_DIAGC_ATTR(rdma_seq);
>> +HFI1_DIAGC_ATTR(rnr_naks);
>> +HFI1_DIAGC_ATTR(other_naks);
>> +HFI1_DIAGC_ATTR(rc_timeouts);
>> +HFI1_DIAGC_ATTR(loop_pkts);
>> +HFI1_DIAGC_ATTR(pkt_drops);
>> +HFI1_DIAGC_ATTR(dmawait);
>> +HFI1_DIAGC_ATTR(unaligned);
>> +HFI1_DIAGC_ATTR(rc_dupreq);
>> +HFI1_DIAGC_ATTR(rc_seqnak);

this belongs to the IB core, in a similar manner for the iWARP
counters which are reported from there.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marciniszyn, Mike June 17, 2015, 11:48 a.m. UTC | #3
PiANCj4gd2hhdCdzIFNDIGFuZCB3aGF0J3MgU0MtdG8tVkw/IGFyZW4ndCB5b3UgdXNpbmcgU00g
dG8gZG8gc3VjaCBtYXBwaW5ncz8gaWYgdGhpcw0KPiBhbmQgdGhlIGJlbG93IHN5c2ZzIHdvcmst
YXJvdW5kL3MgZm9yIHRoZSBtYXliZSBjdXJyZW50IGxhY2sgb2YgU00gdG8NCj4gY29uZmlndXJl
IHRoZSBwb3J0PyB3aHkgZG8gdGhlIHVwc3RyZWFtIGtlcm5lbCBoYXMgdG8gY2Fycnkgfmh1bmRy
ZWRzIG9mIHN5c2ZzDQo+IGVudHJpZXMgZm9yZXZlciBmb3Igc3VjaCBub24tZG9jdW1lbnRlZCB0
aGluZ3M/DQo+IA0KDQpUaGlzIHN5c2ZzIGVudHJpZXMgYXJlIHVzZWQgYnkgUFNNMiB0byBmb3Jt
IHBhY2tldHMgZnJvbSB1c2VyIHNwYWNlLg0KDQo+IA0KPiANCj4gDQo+ID4+ICtIRkkxX1NMMlND
X0FUVFIoMCk7DQo+IA0KPiBzYW1lIGNvbW1lbnQgb24gU0wyU0MNCj4gDQo+ID4+ICtIRkkxX1ZM
Mk1UVV9BVFRSKDApOw0KPiANCj4gc2FtZSBjb21tZW50IG9uIFZMMk1UVSwgd2h5IGluIHN5c2Zz
PyENCj4gDQoNClNhbWUgYW5zd2VyLg0KDQo+ID4+ICtIRkkxX0RJQUdDX0FUVFIocmNfcmVzZW5k
cyk7DQo+ID4+ICtIRkkxX0RJQUdDX0FUVFJfUENQVShyY19hY2tzLCBDX1NXX0NQVV9SQ19BQ0tT
LA0KPiBDTlRSX0lOVkFMSURfVkwpOw0KPiA+PiArSEZJMV9ESUFHQ19BVFRSX1BDUFUocmNfcWFj
a3MsIENfU1dfQ1BVX1JDX1FBQ0tTLA0KPiBDTlRSX0lOVkFMSURfVkwpOw0KPiA+PiArSEZJMV9E
SUFHQ19BVFRSX1BDUFUocmNfZGVsYXllZF9jb21wLA0KPiBDX1NXX0NQVV9SQ19ERUxBWUVEX0NP
TVAsDQo+ID4+ICsgICAgICAgQ05UUl9JTlZBTElEX1ZMKTsNCj4gPj4gK0hGSTFfRElBR0NfQVRU
UihzZXFfbmFrcyk7DQo+ID4+ICtIRkkxX0RJQUdDX0FUVFIocmRtYV9zZXEpOw0KPiA+PiArSEZJ
MV9ESUFHQ19BVFRSKHJucl9uYWtzKTsNCj4gPj4gK0hGSTFfRElBR0NfQVRUUihvdGhlcl9uYWtz
KTsNCj4gPj4gK0hGSTFfRElBR0NfQVRUUihyY190aW1lb3V0cyk7DQo+ID4+ICtIRkkxX0RJQUdD
X0FUVFIobG9vcF9wa3RzKTsNCj4gPj4gK0hGSTFfRElBR0NfQVRUUihwa3RfZHJvcHMpOw0KPiA+
PiArSEZJMV9ESUFHQ19BVFRSKGRtYXdhaXQpOw0KPiA+PiArSEZJMV9ESUFHQ19BVFRSKHVuYWxp
Z25lZCk7DQo+ID4+ICtIRkkxX0RJQUdDX0FUVFIocmNfZHVwcmVxKTsNCj4gPj4gK0hGSTFfRElB
R0NfQVRUUihyY19zZXFuYWspOw0KPiANCg0KVGhlIGNvdW50ZXJzIGNhbiBiZSBtZXRlcmVkIHZp
YSBvdGhlciBtZWNoYW5pc21zLiAgIFRoZXkgd2lsbCBiZSByZW1vdmVkIGluIHYzLg0K
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Or Gerlitz June 17, 2015, 3:50 p.m. UTC | #4
On Wed, Jun 17, 2015 at 2:48 PM, Marciniszyn, Mike
<mike.marciniszyn@intel.com> wrote:
>> what's SC and what's SC-to-VL? aren't you using SM to do such mappings? if this
>> and the below sysfs work-around/s for the maybe current lack of SM to
>> configure the port? why do the upstream kernel has to carry ~hundreds of sysfs
>> entries forever for such non-documented things?

> This sysfs entries are used by PSM2 to form packets from user space.

You didn't explain what's SC and what's SC-to-VL and why PSM2 can't
talk to the SM to query that.

>> >> +HFI1_SL2SC_ATTR(0);
>>
>> same comment on SL2SC

same response as the above

>> >> +HFI1_VL2MTU_ATTR(0);

>> same comment on VL2MTU, why in sysfs?!

> Same answer.

same response as the above

Or.
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marciniszyn, Mike July 8, 2015, 10:32 p.m. UTC | #5
> > This sysfs entries are used by PSM2 to form packets from user space.

> 

> You didn't explain what's SC and what's SC-to-VL and why PSM2 can't talk to

> the SM to query that.

> 


SC stands for Service Channel and is a Fabric wide concept.

These tables are used to as to perform the following mapping:
- SL -> SC -> VL

VL is virtual lane and pertains to the link with the immediate peer and is presented in the packets sent from PSM2.

The current design uses the core supported sysfs extensions to create driver specific files in the infiniband class as did qib and PSM1.

> >> >> +HFI1_VL2MTU_ATTR(0);


OPA has a per VL MTU, which PSM requires to form its packets correctly.

Mike
Ira Weiny July 8, 2015, 11:22 p.m. UTC | #6
On Wed, Jul 08, 2015 at 10:32:44PM +0000, Marciniszyn, Mike wrote:
> > > This sysfs entries are used by PSM2 to form packets from user space.
> > 
> > You didn't explain what's SC and what's SC-to-VL and why PSM2 can't talk to
> > the SM to query that.

Like IB the SL to SC to VL maps are available via SMA queries on the local
port.  However, it is more secure if SMP queries are limited to root or
management nodes.  (This is also true in IB.)

So requiring PSM, ie regular applications, to issue SMA queries on the local
port is not appropriate as it precludes a more secure policy of restricting
the umad interface.

sysfs is IMO a reasonable interface to communicate these tables to regular
user applications.

Ira

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/infiniband/hw/hfi1/sysfs.c b/drivers/infiniband/hw/hfi1/sysfs.c
new file mode 100644
index 0000000..fdedb20
--- /dev/null
+++ b/drivers/infiniband/hw/hfi1/sysfs.c
@@ -0,0 +1,1083 @@ 
+/*
+ *
+ * This file is provided under a dual BSD/GPLv2 license.  When using or
+ * redistributing this file, you may do so under either license.
+ *
+ * GPL LICENSE SUMMARY
+ *
+ * Copyright(c) 2015 Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * BSD LICENSE
+ *
+ * Copyright(c) 2015 Intel Corporation.
+ *
+ * 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.
+ *  - Neither the name of Intel Corporation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * 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
+ * OWNER 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.
+ *
+ */
+#include <linux/ctype.h>
+
+#include "hfi.h"
+#include "mad.h"
+#include "trace.h"
+
+/* start of per-port functions */
+/*
+ * Get/Set heartbeat enable. OR of 1=enabled, 2=auto
+ */
+static ssize_t show_hrtbt_enb(struct hfi1_pportdata *ppd, char *buf)
+{
+	int ret;
+
+	ret = hfi1_get_ib_cfg(ppd, HFI1_IB_CFG_HRTBT);
+	ret = scnprintf(buf, PAGE_SIZE, "%d\n", ret);
+	return ret;
+}
+
+static ssize_t store_hrtbt_enb(struct hfi1_pportdata *ppd, const char *buf,
+			       size_t count)
+{
+	struct hfi1_devdata *dd = ppd->dd;
+	int ret;
+	u16 val;
+
+	ret = kstrtou16(buf, 0, &val);
+	if (ret) {
+		dd_dev_err(dd, "attempt to set invalid Heartbeat enable\n");
+		return ret;
+	}
+
+	/*
+	 * 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.
+	 */
+	ret = hfi1_set_ib_cfg(ppd, HFI1_IB_CFG_HRTBT, val);
+	return ret < 0 ? ret : count;
+}
+
+static ssize_t store_led_override(struct hfi1_pportdata *ppd, const char *buf,
+				  size_t count)
+{
+	struct hfi1_devdata *dd = ppd->dd;
+	int ret;
+	u16 val;
+
+	ret = kstrtou16(buf, 0, &val);
+	if (ret) {
+		dd_dev_err(dd, "attempt to set invalid LED override\n");
+		return ret;
+	}
+
+	hfi1_set_led_override(ppd, val);
+	return count;
+}
+
+static ssize_t show_status(struct hfi1_pportdata *ppd, char *buf)
+{
+	ssize_t ret;
+
+	if (!ppd->statusp)
+		ret = -EINVAL;
+	else
+		ret = scnprintf(buf, PAGE_SIZE, "0x%llx\n",
+				(unsigned long long) *(ppd->statusp));
+	return ret;
+}
+
+/*
+ * For userland compatibility, these offsets must remain fixed.
+ * They are strings for HFI1_STATUS_*
+ */
+static const char * const hfi1_status_str[] = {
+	"Initted",
+	"",
+	"",
+	"",
+	"",
+	"Present",
+	"IB_link_up",
+	"IB_configured",
+	"",
+	"Fatal_Hardware_Error",
+	NULL,
+};
+
+static ssize_t show_status_str(struct hfi1_pportdata *ppd, char *buf)
+{
+	int i, any;
+	u64 s;
+	ssize_t ret;
+
+	if (!ppd->statusp) {
+		ret = -EINVAL;
+		goto bail;
+	}
+
+	s = *(ppd->statusp);
+	*buf = '\0';
+	for (any = i = 0; s && hfi1_status_str[i]; i++) {
+		if (s & 1) {
+			/* if overflow */
+			if (any && strlcat(buf, " ", PAGE_SIZE) >= PAGE_SIZE)
+				break;
+			if (strlcat(buf, hfi1_status_str[i], PAGE_SIZE) >=
+					PAGE_SIZE)
+				break;
+			any = 1;
+		}
+		s >>= 1;
+	}
+	if (any)
+		strlcat(buf, "\n", PAGE_SIZE);
+
+	ret = strlen(buf);
+
+bail:
+	return ret;
+}
+
+/* end of per-port functions */
+
+/*
+ * Start of per-port file structures and support code
+ * Because we are fitting into other infrastructure, we have to supply the
+ * full set of kobject/sysfs_ops structures and routines.
+ */
+#define HFI1_PORT_ATTR(name, mode, show, store) \
+	static struct hfi1_port_attr port_attr_##name = \
+		__ATTR(name, mode, show, store)
+
+struct hfi1_port_attr {
+	struct attribute attr;
+	ssize_t (*show)(struct hfi1_pportdata *, char *);
+	ssize_t (*store)(struct hfi1_pportdata *, const char *, size_t);
+};
+
+HFI1_PORT_ATTR(led_override, S_IWUSR, NULL, store_led_override);
+HFI1_PORT_ATTR(hrtbt_enable, S_IWUSR | S_IRUGO, show_hrtbt_enb,
+	       store_hrtbt_enb);
+HFI1_PORT_ATTR(status, S_IRUGO, show_status, NULL);
+HFI1_PORT_ATTR(status_str, S_IRUGO, show_status_str, NULL);
+
+static struct attribute *port_default_attributes[] = {
+	&port_attr_led_override.attr,
+	&port_attr_hrtbt_enable.attr,
+	&port_attr_status.attr,
+	&port_attr_status_str.attr,
+	NULL
+};
+
+/*
+ * Start of per-port congestion control structures and support code
+ */
+
+/*
+ * Congestion control table size followed by table entries
+ */
+static ssize_t read_cc_table_bin(struct file *filp, struct kobject *kobj,
+		struct bin_attribute *bin_attr,
+		char *buf, loff_t pos, size_t count)
+{
+	int ret;
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, pport_cc_kobj);
+	struct cc_state *cc_state;
+
+	ret = ppd->total_cct_entry * sizeof(struct ib_cc_table_entry_shadow)
+		 + sizeof(__be16);
+
+	if (pos > ret)
+		return -EINVAL;
+
+	if (count > ret - pos)
+		count = ret - pos;
+
+	if (!count)
+		return count;
+
+	rcu_read_lock();
+	cc_state = get_cc_state(ppd);
+	if (cc_state == NULL) {
+		rcu_read_unlock();
+		return -EINVAL;
+	}
+	memcpy(buf, &cc_state->cct, count);
+	rcu_read_unlock();
+
+	return count;
+}
+
+static void port_release(struct kobject *kobj)
+{
+	/* nothing to do since memory is freed by hfi1_free_devdata() */
+}
+
+static struct kobj_type port_cc_ktype = {
+	.release = port_release,
+};
+
+static struct bin_attribute cc_table_bin_attr = {
+	.attr = {.name = "cc_table_bin", .mode = 0444},
+	.read = read_cc_table_bin,
+	.size = PAGE_SIZE,
+};
+
+/*
+ * Congestion settings: port control, control map and an array of 16
+ * entries for the congestion entries - increase, timer, event log
+ * trigger threshold and the minimum injection rate delay.
+ */
+static ssize_t read_cc_setting_bin(struct file *filp, struct kobject *kobj,
+		struct bin_attribute *bin_attr,
+		char *buf, loff_t pos, size_t count)
+{
+	int ret;
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, pport_cc_kobj);
+	struct cc_state *cc_state;
+
+	ret = sizeof(struct opa_congestion_setting_attr_shadow);
+
+	if (pos > ret)
+		return -EINVAL;
+	if (count > ret - pos)
+		count = ret - pos;
+
+	if (!count)
+		return count;
+
+	rcu_read_lock();
+	cc_state = get_cc_state(ppd);
+	if (cc_state == NULL) {
+		rcu_read_unlock();
+		return -EINVAL;
+	}
+	memcpy(buf, &cc_state->cong_setting, count);
+	rcu_read_unlock();
+
+	return count;
+}
+
+static struct bin_attribute cc_setting_bin_attr = {
+	.attr = {.name = "cc_settings_bin", .mode = 0444},
+	.read = read_cc_setting_bin,
+	.size = PAGE_SIZE,
+};
+
+
+static ssize_t portattr_show(struct kobject *kobj,
+			     struct attribute *attr, char *buf)
+{
+	struct hfi1_port_attr *pattr =
+		container_of(attr, struct hfi1_port_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, pport_kobj);
+
+	return pattr->show(ppd, buf);
+}
+
+static ssize_t portattr_store(struct kobject *kobj,
+			      struct attribute *attr,
+			      const char *buf, size_t len)
+{
+	struct hfi1_port_attr *pattr =
+		container_of(attr, struct hfi1_port_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, pport_kobj);
+
+	return pattr->store(ppd, buf, len);
+}
+
+
+static const struct sysfs_ops hfi1_port_ops = {
+	.show = portattr_show,
+	.store = portattr_store,
+};
+
+static struct kobj_type hfi1_port_ktype = {
+	.release = port_release,
+	.sysfs_ops = &hfi1_port_ops,
+	.default_attrs = port_default_attributes
+};
+
+/* Start sc2vl */
+#define HFI1_SC2VL_ATTR(N)				    \
+	static struct hfi1_sc2vl_attr hfi1_sc2vl_attr_##N = { \
+		.attr = { .name = __stringify(N), .mode = 0444 }, \
+		.sc = N \
+	}
+
+struct hfi1_sc2vl_attr {
+	struct attribute attr;
+	int sc;
+};
+
+HFI1_SC2VL_ATTR(0);
+HFI1_SC2VL_ATTR(1);
+HFI1_SC2VL_ATTR(2);
+HFI1_SC2VL_ATTR(3);
+HFI1_SC2VL_ATTR(4);
+HFI1_SC2VL_ATTR(5);
+HFI1_SC2VL_ATTR(6);
+HFI1_SC2VL_ATTR(7);
+HFI1_SC2VL_ATTR(8);
+HFI1_SC2VL_ATTR(9);
+HFI1_SC2VL_ATTR(10);
+HFI1_SC2VL_ATTR(11);
+HFI1_SC2VL_ATTR(12);
+HFI1_SC2VL_ATTR(13);
+HFI1_SC2VL_ATTR(14);
+HFI1_SC2VL_ATTR(15);
+HFI1_SC2VL_ATTR(16);
+HFI1_SC2VL_ATTR(17);
+HFI1_SC2VL_ATTR(18);
+HFI1_SC2VL_ATTR(19);
+HFI1_SC2VL_ATTR(20);
+HFI1_SC2VL_ATTR(21);
+HFI1_SC2VL_ATTR(22);
+HFI1_SC2VL_ATTR(23);
+HFI1_SC2VL_ATTR(24);
+HFI1_SC2VL_ATTR(25);
+HFI1_SC2VL_ATTR(26);
+HFI1_SC2VL_ATTR(27);
+HFI1_SC2VL_ATTR(28);
+HFI1_SC2VL_ATTR(29);
+HFI1_SC2VL_ATTR(30);
+HFI1_SC2VL_ATTR(31);
+
+
+static struct attribute *sc2vl_default_attributes[] = {
+	&hfi1_sc2vl_attr_0.attr,
+	&hfi1_sc2vl_attr_1.attr,
+	&hfi1_sc2vl_attr_2.attr,
+	&hfi1_sc2vl_attr_3.attr,
+	&hfi1_sc2vl_attr_4.attr,
+	&hfi1_sc2vl_attr_5.attr,
+	&hfi1_sc2vl_attr_6.attr,
+	&hfi1_sc2vl_attr_7.attr,
+	&hfi1_sc2vl_attr_8.attr,
+	&hfi1_sc2vl_attr_9.attr,
+	&hfi1_sc2vl_attr_10.attr,
+	&hfi1_sc2vl_attr_11.attr,
+	&hfi1_sc2vl_attr_12.attr,
+	&hfi1_sc2vl_attr_13.attr,
+	&hfi1_sc2vl_attr_14.attr,
+	&hfi1_sc2vl_attr_15.attr,
+	&hfi1_sc2vl_attr_16.attr,
+	&hfi1_sc2vl_attr_17.attr,
+	&hfi1_sc2vl_attr_18.attr,
+	&hfi1_sc2vl_attr_19.attr,
+	&hfi1_sc2vl_attr_20.attr,
+	&hfi1_sc2vl_attr_21.attr,
+	&hfi1_sc2vl_attr_22.attr,
+	&hfi1_sc2vl_attr_23.attr,
+	&hfi1_sc2vl_attr_24.attr,
+	&hfi1_sc2vl_attr_25.attr,
+	&hfi1_sc2vl_attr_26.attr,
+	&hfi1_sc2vl_attr_27.attr,
+	&hfi1_sc2vl_attr_28.attr,
+	&hfi1_sc2vl_attr_29.attr,
+	&hfi1_sc2vl_attr_30.attr,
+	&hfi1_sc2vl_attr_31.attr,
+	NULL
+};
+
+static ssize_t sc2vl_attr_show(struct kobject *kobj, struct attribute *attr,
+			       char *buf)
+{
+	struct hfi1_sc2vl_attr *sattr =
+		container_of(attr, struct hfi1_sc2vl_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, sc2vl_kobj);
+	struct hfi1_devdata *dd = ppd->dd;
+
+	return sprintf(buf, "%u\n", *((u8 *)dd->sc2vl + sattr->sc));
+}
+
+static const struct sysfs_ops hfi1_sc2vl_ops = {
+	.show = sc2vl_attr_show,
+};
+
+static struct kobj_type hfi1_sc2vl_ktype = {
+	.release = port_release,
+	.sysfs_ops = &hfi1_sc2vl_ops,
+	.default_attrs = sc2vl_default_attributes
+};
+
+/* End sc2vl */
+
+/* Start sl2sc */
+#define HFI1_SL2SC_ATTR(N)				    \
+	static struct hfi1_sl2sc_attr hfi1_sl2sc_attr_##N = {	  \
+		.attr = { .name = __stringify(N), .mode = 0444 }, \
+		.sl = N						  \
+	}
+
+struct hfi1_sl2sc_attr {
+	struct attribute attr;
+	int sl;
+};
+
+HFI1_SL2SC_ATTR(0);
+HFI1_SL2SC_ATTR(1);
+HFI1_SL2SC_ATTR(2);
+HFI1_SL2SC_ATTR(3);
+HFI1_SL2SC_ATTR(4);
+HFI1_SL2SC_ATTR(5);
+HFI1_SL2SC_ATTR(6);
+HFI1_SL2SC_ATTR(7);
+HFI1_SL2SC_ATTR(8);
+HFI1_SL2SC_ATTR(9);
+HFI1_SL2SC_ATTR(10);
+HFI1_SL2SC_ATTR(11);
+HFI1_SL2SC_ATTR(12);
+HFI1_SL2SC_ATTR(13);
+HFI1_SL2SC_ATTR(14);
+HFI1_SL2SC_ATTR(15);
+HFI1_SL2SC_ATTR(16);
+HFI1_SL2SC_ATTR(17);
+HFI1_SL2SC_ATTR(18);
+HFI1_SL2SC_ATTR(19);
+HFI1_SL2SC_ATTR(20);
+HFI1_SL2SC_ATTR(21);
+HFI1_SL2SC_ATTR(22);
+HFI1_SL2SC_ATTR(23);
+HFI1_SL2SC_ATTR(24);
+HFI1_SL2SC_ATTR(25);
+HFI1_SL2SC_ATTR(26);
+HFI1_SL2SC_ATTR(27);
+HFI1_SL2SC_ATTR(28);
+HFI1_SL2SC_ATTR(29);
+HFI1_SL2SC_ATTR(30);
+HFI1_SL2SC_ATTR(31);
+
+
+static struct attribute *sl2sc_default_attributes[] = {
+	&hfi1_sl2sc_attr_0.attr,
+	&hfi1_sl2sc_attr_1.attr,
+	&hfi1_sl2sc_attr_2.attr,
+	&hfi1_sl2sc_attr_3.attr,
+	&hfi1_sl2sc_attr_4.attr,
+	&hfi1_sl2sc_attr_5.attr,
+	&hfi1_sl2sc_attr_6.attr,
+	&hfi1_sl2sc_attr_7.attr,
+	&hfi1_sl2sc_attr_8.attr,
+	&hfi1_sl2sc_attr_9.attr,
+	&hfi1_sl2sc_attr_10.attr,
+	&hfi1_sl2sc_attr_11.attr,
+	&hfi1_sl2sc_attr_12.attr,
+	&hfi1_sl2sc_attr_13.attr,
+	&hfi1_sl2sc_attr_14.attr,
+	&hfi1_sl2sc_attr_15.attr,
+	&hfi1_sl2sc_attr_16.attr,
+	&hfi1_sl2sc_attr_17.attr,
+	&hfi1_sl2sc_attr_18.attr,
+	&hfi1_sl2sc_attr_19.attr,
+	&hfi1_sl2sc_attr_20.attr,
+	&hfi1_sl2sc_attr_21.attr,
+	&hfi1_sl2sc_attr_22.attr,
+	&hfi1_sl2sc_attr_23.attr,
+	&hfi1_sl2sc_attr_24.attr,
+	&hfi1_sl2sc_attr_25.attr,
+	&hfi1_sl2sc_attr_26.attr,
+	&hfi1_sl2sc_attr_27.attr,
+	&hfi1_sl2sc_attr_28.attr,
+	&hfi1_sl2sc_attr_29.attr,
+	&hfi1_sl2sc_attr_30.attr,
+	&hfi1_sl2sc_attr_31.attr,
+	NULL
+};
+
+static ssize_t sl2sc_attr_show(struct kobject *kobj, struct attribute *attr,
+			       char *buf)
+{
+	struct hfi1_sl2sc_attr *sattr =
+		container_of(attr, struct hfi1_sl2sc_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, sl2sc_kobj);
+	struct hfi1_ibport *ibp = &ppd->ibport_data;
+
+	return sprintf(buf, "%u\n", ibp->sl_to_sc[sattr->sl]);
+}
+
+static const struct sysfs_ops hfi1_sl2sc_ops = {
+	.show = sl2sc_attr_show,
+};
+
+static struct kobj_type hfi1_sl2sc_ktype = {
+	.release = port_release,
+	.sysfs_ops = &hfi1_sl2sc_ops,
+	.default_attrs = sl2sc_default_attributes
+};
+
+/* End sl2sc */
+
+/* Start vl2mtu */
+
+#define HFI1_VL2MTU_ATTR(N) \
+	static struct hfi1_vl2mtu_attr hfi1_vl2mtu_attr_##N = { \
+		.attr = { .name = __stringify(N), .mode = 0444 }, \
+		.vl = N						  \
+	}
+
+struct hfi1_vl2mtu_attr {
+	struct attribute attr;
+	int vl;
+};
+
+HFI1_VL2MTU_ATTR(0);
+HFI1_VL2MTU_ATTR(1);
+HFI1_VL2MTU_ATTR(2);
+HFI1_VL2MTU_ATTR(3);
+HFI1_VL2MTU_ATTR(4);
+HFI1_VL2MTU_ATTR(5);
+HFI1_VL2MTU_ATTR(6);
+HFI1_VL2MTU_ATTR(7);
+HFI1_VL2MTU_ATTR(8);
+HFI1_VL2MTU_ATTR(9);
+HFI1_VL2MTU_ATTR(10);
+HFI1_VL2MTU_ATTR(11);
+HFI1_VL2MTU_ATTR(12);
+HFI1_VL2MTU_ATTR(13);
+HFI1_VL2MTU_ATTR(14);
+HFI1_VL2MTU_ATTR(15);
+
+static struct attribute *vl2mtu_default_attributes[] = {
+	&hfi1_vl2mtu_attr_0.attr,
+	&hfi1_vl2mtu_attr_1.attr,
+	&hfi1_vl2mtu_attr_2.attr,
+	&hfi1_vl2mtu_attr_3.attr,
+	&hfi1_vl2mtu_attr_4.attr,
+	&hfi1_vl2mtu_attr_5.attr,
+	&hfi1_vl2mtu_attr_6.attr,
+	&hfi1_vl2mtu_attr_7.attr,
+	&hfi1_vl2mtu_attr_8.attr,
+	&hfi1_vl2mtu_attr_9.attr,
+	&hfi1_vl2mtu_attr_10.attr,
+	&hfi1_vl2mtu_attr_11.attr,
+	&hfi1_vl2mtu_attr_12.attr,
+	&hfi1_vl2mtu_attr_13.attr,
+	&hfi1_vl2mtu_attr_14.attr,
+	&hfi1_vl2mtu_attr_15.attr,
+	NULL
+};
+
+static ssize_t vl2mtu_attr_show(struct kobject *kobj, struct attribute *attr,
+				char *buf)
+{
+	struct hfi1_vl2mtu_attr *vlattr =
+		container_of(attr, struct hfi1_vl2mtu_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, vl2mtu_kobj);
+	struct hfi1_devdata *dd = ppd->dd;
+
+	return sprintf(buf, "%u\n", dd->vld[vlattr->vl].mtu);
+}
+
+static const struct sysfs_ops hfi1_vl2mtu_ops = {
+	.show = vl2mtu_attr_show,
+};
+
+static struct kobj_type hfi1_vl2mtu_ktype = {
+	.release = port_release,
+	.sysfs_ops = &hfi1_vl2mtu_ops,
+	.default_attrs = vl2mtu_default_attributes
+};
+
+/* Start diag_counters */
+#define HFI1_DIAGC_NORMAL 0x0
+#define HFI1_DIAGC_PCPU   0x1
+
+#define HFI1_DIAGC_ATTR(N) \
+	static struct hfi1_diagc_attr diagc_attr_##N = { \
+		.attr = { .name = __stringify(N), .mode = 0664 }, \
+		.counter = offsetof(struct hfi1_ibport, n_##N), \
+		.type = HFI1_DIAGC_NORMAL, \
+		.vl = CNTR_INVALID_VL \
+	}
+
+#define HFI1_DIAGC_ATTR_PCPU(N, V, L) \
+	static struct hfi1_diagc_attr diagc_attr_##N = { \
+		.attr = { .name = __stringify(N), .mode = 0664 }, \
+		.counter = V, \
+		.type = HFI1_DIAGC_PCPU, \
+		.vl = L \
+	}
+
+struct hfi1_diagc_attr {
+	struct attribute attr;
+	size_t counter;
+	int type;
+	int vl;
+};
+
+HFI1_DIAGC_ATTR(rc_resends);
+HFI1_DIAGC_ATTR_PCPU(rc_acks, C_SW_CPU_RC_ACKS, CNTR_INVALID_VL);
+HFI1_DIAGC_ATTR_PCPU(rc_qacks, C_SW_CPU_RC_QACKS, CNTR_INVALID_VL);
+HFI1_DIAGC_ATTR_PCPU(rc_delayed_comp, C_SW_CPU_RC_DELAYED_COMP,
+	CNTR_INVALID_VL);
+HFI1_DIAGC_ATTR(seq_naks);
+HFI1_DIAGC_ATTR(rdma_seq);
+HFI1_DIAGC_ATTR(rnr_naks);
+HFI1_DIAGC_ATTR(other_naks);
+HFI1_DIAGC_ATTR(rc_timeouts);
+HFI1_DIAGC_ATTR(loop_pkts);
+HFI1_DIAGC_ATTR(pkt_drops);
+HFI1_DIAGC_ATTR(dmawait);
+HFI1_DIAGC_ATTR(unaligned);
+HFI1_DIAGC_ATTR(rc_dupreq);
+HFI1_DIAGC_ATTR(rc_seqnak);
+
+static struct attribute *diagc_default_attributes[] = {
+	&diagc_attr_rc_resends.attr,
+	&diagc_attr_rc_acks.attr,
+	&diagc_attr_rc_qacks.attr,
+	&diagc_attr_rc_delayed_comp.attr,
+	&diagc_attr_seq_naks.attr,
+	&diagc_attr_rdma_seq.attr,
+	&diagc_attr_rnr_naks.attr,
+	&diagc_attr_other_naks.attr,
+	&diagc_attr_rc_timeouts.attr,
+	&diagc_attr_loop_pkts.attr,
+	&diagc_attr_pkt_drops.attr,
+	&diagc_attr_dmawait.attr,
+	&diagc_attr_unaligned.attr,
+	&diagc_attr_rc_dupreq.attr,
+	&diagc_attr_rc_seqnak.attr,
+	NULL
+};
+
+static ssize_t diagc_attr_show(struct kobject *kobj, struct attribute *attr,
+			       char *buf)
+{
+	struct hfi1_diagc_attr *dattr =
+		container_of(attr, struct hfi1_diagc_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, diagc_kobj);
+	struct hfi1_ibport *hfip = &ppd->ibport_data;
+
+	switch (dattr->type) {
+	case (HFI1_DIAGC_PCPU):
+		return(sprintf(buf, "%lld\n",
+			read_port_cntr(ppd,
+				       dattr->counter,
+				       dattr->vl)));
+	case (HFI1_DIAGC_NORMAL):
+		/* Fall through */
+	default:
+		return sprintf(buf, "%u\n",
+			*(u32 *)((char *)hfip + dattr->counter));
+	}
+}
+
+static ssize_t diagc_attr_store(struct kobject *kobj, struct attribute *attr,
+				const char *buf, size_t size)
+{
+	struct hfi1_diagc_attr *dattr =
+		container_of(attr, struct hfi1_diagc_attr, attr);
+	struct hfi1_pportdata *ppd =
+		container_of(kobj, struct hfi1_pportdata, diagc_kobj);
+	struct hfi1_ibport *hfip = &ppd->ibport_data;
+	u32 val;
+	int ret;
+
+	ret = kstrtou32(buf, 0, &val);
+	if (ret)
+		return ret;
+	*(u32 *)((char *)hfip + dattr->counter) = val;
+	return size;
+}
+
+static const struct sysfs_ops hfi1_diagc_ops = {
+	.show = diagc_attr_show,
+	.store = diagc_attr_store,
+};
+
+static struct kobj_type diagc_ktype = {
+	.release = port_release,
+	.sysfs_ops = &hfi1_diagc_ops,
+	.default_attrs = diagc_default_attributes
+};
+
+/* End diag_counters */
+
+/* end of per-port file structures and support code */
+
+/*
+ * Start of per-unit (or driver, in some cases, but replicated
+ * per unit) functions (these get a device *)
+ */
+static ssize_t show_rev(struct device *device, struct device_attribute *attr,
+			char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+
+	return sprintf(buf, "%x\n", dd_from_dev(dev)->minrev);
+}
+
+static ssize_t show_hca(struct device *device, struct device_attribute *attr,
+			char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+	int ret;
+
+	if (!dd->boardname)
+		ret = -EINVAL;
+	else
+		ret = scnprintf(buf, PAGE_SIZE, "%s\n", dd->boardname);
+	return ret;
+}
+
+static ssize_t show_version(struct device *device,
+			    struct device_attribute *attr, char *buf)
+{
+	/* The string printed here is already newline-terminated. */
+	return scnprintf(buf, PAGE_SIZE, "%s", (char *)ib_hfi1_version);
+}
+
+static ssize_t show_boardversion(struct device *device,
+				 struct device_attribute *attr, char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+
+	/* The string printed here is already newline-terminated. */
+	return scnprintf(buf, PAGE_SIZE, "%s", dd->boardversion);
+}
+
+
+static ssize_t show_localbus_info(struct device *device,
+				  struct device_attribute *attr, char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+
+	return scnprintf(buf, PAGE_SIZE, "%s\n", dd->lbus_info);
+}
+
+
+static ssize_t show_nctxts(struct device *device,
+			   struct device_attribute *attr, char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+
+	/*
+	 * Return the smaller of send and receive contexts.
+	 * Normally, user level applications would require both a send
+	 * and a receive context, so returning the smaller of the two counts
+	 * give a more accurate picture of total contexts available.
+	 */
+	return scnprintf(buf, PAGE_SIZE, "%u\n",
+			 min(dd->num_rcv_contexts - dd->first_user_ctxt,
+			     (u32)dd->sc_sizes[SC_USER].count));
+}
+
+static ssize_t show_nfreectxts(struct device *device,
+			   struct device_attribute *attr, char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+
+	/* Return the number of free user ports (contexts) available. */
+	return scnprintf(buf, PAGE_SIZE, "%u\n", dd->freectxts);
+}
+
+static ssize_t show_serial(struct device *device,
+			   struct device_attribute *attr, char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+
+	return scnprintf(buf, PAGE_SIZE, "%s", dd->serial);
+
+}
+
+static ssize_t store_chip_reset(struct device *device,
+				struct device_attribute *attr, const char *buf,
+				size_t count)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+	int ret;
+
+	if (count < 5 || memcmp(buf, "reset", 5) || !dd->diag_client) {
+		ret = -EINVAL;
+		goto bail;
+	}
+
+	ret = hfi1_reset_device(dd->unit);
+bail:
+	return ret < 0 ? ret : count;
+}
+
+/*
+ * Convert the reported temperature from an integer (reported in
+ * units of 0.25C) to a floating point number.
+ */
+#define temp2str(temp, buf, size, idx)					\
+	scnprintf((buf) + (idx), (size) - (idx), "%u.%02u ",		\
+			      ((temp) >> 2), ((temp) & 0x3) * 25)
+
+/*
+ * Dump tempsense values, in decimal, to ease shell-scripts.
+ */
+static ssize_t show_tempsense(struct device *device,
+			      struct device_attribute *attr, char *buf)
+{
+	struct hfi1_ibdev *dev =
+		container_of(device, struct hfi1_ibdev, ibdev.dev);
+	struct hfi1_devdata *dd = dd_from_dev(dev);
+	struct hfi1_temp temp;
+	int ret = -ENXIO;
+
+	ret = hfi1_tempsense_rd(dd, &temp);
+	if (!ret) {
+		int idx = 0;
+
+		idx += temp2str(temp.curr, buf, PAGE_SIZE, idx);
+		idx += temp2str(temp.lo_lim, buf, PAGE_SIZE, idx);
+		idx += temp2str(temp.hi_lim, buf, PAGE_SIZE, idx);
+		idx += temp2str(temp.crit_lim, buf, PAGE_SIZE, idx);
+		idx += scnprintf(buf + idx, PAGE_SIZE - idx,
+				"%u %u %u\n", temp.triggers & 0x1,
+				temp.triggers & 0x2, temp.triggers & 0x4);
+		ret = idx;
+	}
+	return ret;
+}
+
+/*
+ * end of per-unit (or driver, in some cases, but replicated
+ * per unit) functions
+ */
+
+/* start of per-unit file structures and support code */
+static DEVICE_ATTR(hw_rev, S_IRUGO, show_rev, NULL);
+static DEVICE_ATTR(hca_type, S_IRUGO, show_hca, NULL);
+static DEVICE_ATTR(board_id, S_IRUGO, show_hca, NULL);
+static DEVICE_ATTR(version, S_IRUGO, show_version, NULL);
+static DEVICE_ATTR(nctxts, S_IRUGO, show_nctxts, NULL);
+static DEVICE_ATTR(nfreectxts, S_IRUGO, show_nfreectxts, NULL);
+static DEVICE_ATTR(serial, S_IRUGO, show_serial, NULL);
+static DEVICE_ATTR(boardversion, S_IRUGO, show_boardversion, NULL);
+static DEVICE_ATTR(tempsense, S_IRUGO, show_tempsense, NULL);
+static DEVICE_ATTR(localbus_info, S_IRUGO, show_localbus_info, NULL);
+static DEVICE_ATTR(chip_reset, S_IWUSR, NULL, store_chip_reset);
+
+static struct device_attribute *hfi1_attributes[] = {
+	&dev_attr_hw_rev,
+	&dev_attr_hca_type,
+	&dev_attr_board_id,
+	&dev_attr_version,
+	&dev_attr_nctxts,
+	&dev_attr_nfreectxts,
+	&dev_attr_serial,
+	&dev_attr_boardversion,
+	&dev_attr_tempsense,
+	&dev_attr_localbus_info,
+	&dev_attr_chip_reset,
+};
+
+int hfi1_create_port_files(struct ib_device *ibdev, u8 port_num,
+			   struct kobject *kobj)
+{
+	struct hfi1_pportdata *ppd;
+	struct hfi1_devdata *dd = dd_from_ibdev(ibdev);
+	int ret;
+
+	if (!port_num || port_num > dd->num_pports) {
+		dd_dev_err(dd,
+			"Skipping infiniband class with invalid port %u\n",
+			port_num);
+		ret = -ENODEV;
+		goto bail;
+	}
+	ppd = &dd->pport[port_num - 1];
+
+	ret = kobject_init_and_add(&ppd->pport_kobj, &hfi1_port_ktype, kobj,
+				   "linkcontrol");
+	if (ret) {
+		dd_dev_err(dd,
+			"Skipping linkcontrol sysfs info, (err %d) port %u\n",
+			ret, port_num);
+		goto bail;
+	}
+	kobject_uevent(&ppd->pport_kobj, KOBJ_ADD);
+
+	ret = kobject_init_and_add(&ppd->sc2vl_kobj, &hfi1_sc2vl_ktype, kobj,
+				   "sc2vl");
+	if (ret) {
+		dd_dev_err(dd,
+			   "Skipping sc2vl sysfs info, (err %d) port %u\n",
+			   ret, port_num);
+		goto bail_link;
+	}
+	kobject_uevent(&ppd->sc2vl_kobj, KOBJ_ADD);
+	ret = kobject_init_and_add(&ppd->sl2sc_kobj, &hfi1_sl2sc_ktype, kobj,
+				   "sl2sc");
+	if (ret) {
+		dd_dev_err(dd,
+			   "Skipping sl2sc sysfs info, (err %d) port %u\n",
+			   ret, port_num);
+		goto bail_link;
+	}
+	kobject_uevent(&ppd->sl2sc_kobj, KOBJ_ADD);
+
+	ret = kobject_init_and_add(&ppd->vl2mtu_kobj, &hfi1_vl2mtu_ktype, kobj,
+				   "vl2mtu");
+	if (ret) {
+		dd_dev_err(dd,
+			   "Skipping vl2mtu sysfs info, (err %d) port %u\n",
+			   ret, port_num);
+		goto bail_sl;
+	}
+	kobject_uevent(&ppd->vl2mtu_kobj, KOBJ_ADD);
+
+	ret = kobject_init_and_add(&ppd->diagc_kobj, &diagc_ktype, kobj,
+				   "diag_counters");
+	if (ret) {
+		dd_dev_err(dd,
+			"Skipping diag_counters sysfs info, (err %d) port %u\n",
+			ret, port_num);
+		goto bail_mtu;
+	}
+	kobject_uevent(&ppd->diagc_kobj, KOBJ_ADD);
+
+	ret = kobject_init_and_add(&ppd->pport_cc_kobj, &port_cc_ktype,
+				   kobj, "CCMgtA");
+	if (ret) {
+		dd_dev_err(dd,
+		 "Skipping Congestion Control sysfs info, (err %d) port %u\n",
+		 ret, port_num);
+		goto bail_diagc;
+	}
+
+	kobject_uevent(&ppd->pport_cc_kobj, KOBJ_ADD);
+
+	ret = sysfs_create_bin_file(&ppd->pport_cc_kobj,
+				&cc_setting_bin_attr);
+	if (ret) {
+		dd_dev_err(dd,
+		 "Skipping Congestion Control setting sysfs info, (err %d) port %u\n",
+		 ret, port_num);
+		goto bail_cc;
+	}
+
+	ret = sysfs_create_bin_file(&ppd->pport_cc_kobj,
+				&cc_table_bin_attr);
+	if (ret) {
+		dd_dev_err(dd,
+		 "Skipping Congestion Control table sysfs info, (err %d) port %u\n",
+		 ret, port_num);
+		goto bail_cc_entry_bin;
+	}
+
+	dd_dev_info(dd,
+		"IB%u: Congestion Control Agent enabled for port %d\n",
+		dd->unit, port_num);
+
+	return 0;
+
+bail_cc_entry_bin:
+	sysfs_remove_bin_file(&ppd->pport_cc_kobj, &cc_setting_bin_attr);
+bail_cc:
+	kobject_put(&ppd->pport_cc_kobj);
+bail_diagc:
+	kobject_put(&ppd->diagc_kobj);
+bail_mtu:
+	kobject_put(&ppd->vl2mtu_kobj);
+bail_sl:
+	kobject_put(&ppd->sc2vl_kobj);
+bail_link:
+	kobject_put(&ppd->pport_kobj);
+bail:
+	return ret;
+}
+
+/*
+ * Register and create our files in /sys/class/infiniband.
+ */
+int hfi1_verbs_register_sysfs(struct hfi1_devdata *dd)
+{
+	struct ib_device *dev = &dd->verbs_dev.ibdev;
+	int i, ret;
+
+	for (i = 0; i < ARRAY_SIZE(hfi1_attributes); ++i) {
+		ret = device_create_file(&dev->dev, hfi1_attributes[i]);
+		if (ret)
+			goto bail;
+	}
+
+	return 0;
+bail:
+	for (i = 0; i < ARRAY_SIZE(hfi1_attributes); ++i)
+		device_remove_file(&dev->dev, hfi1_attributes[i]);
+	return ret;
+}
+
+/*
+ * Unregister and remove our files in /sys/class/infiniband.
+ */
+void hfi1_verbs_unregister_sysfs(struct hfi1_devdata *dd)
+{
+	struct hfi1_pportdata *ppd;
+	int i;
+
+	for (i = 0; i < dd->num_pports; i++) {
+		ppd = &dd->pport[i];
+
+		sysfs_remove_bin_file(&ppd->pport_cc_kobj,
+			&cc_setting_bin_attr);
+		sysfs_remove_bin_file(&ppd->pport_cc_kobj,
+			&cc_table_bin_attr);
+		kobject_put(&ppd->pport_cc_kobj);
+		kobject_put(&ppd->vl2mtu_kobj);
+		kobject_put(&ppd->sc2vl_kobj);
+		kobject_put(&ppd->pport_kobj);
+	}
+}