From patchwork Wed Aug 2 21:17:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eddie James X-Patchwork-Id: 9877791 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB8FE60360 for ; Wed, 2 Aug 2017 21:18:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDED128843 for ; Wed, 2 Aug 2017 21:18:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0D2B28846; Wed, 2 Aug 2017 21:18:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5576228843 for ; Wed, 2 Aug 2017 21:18:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750725AbdHBVR3 (ORCPT ); Wed, 2 Aug 2017 17:17:29 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:59533 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751959AbdHBVR0 (ORCPT ); Wed, 2 Aug 2017 17:17:26 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v72LFxQH042262 for ; Wed, 2 Aug 2017 17:17:26 -0400 Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) by mx0a-001b2d01.pphosted.com with ESMTP id 2c3hrwx80p-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 02 Aug 2017 17:17:26 -0400 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 2 Aug 2017 15:17:25 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 2 Aug 2017 15:17:21 -0600 Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v72LHLX364225468; Wed, 2 Aug 2017 14:17:21 -0700 Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4BBB8BE03A; Wed, 2 Aug 2017 15:17:21 -0600 (MDT) Received: from oc3016140333.ibm.com (unknown [9.41.174.252]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id CA0FBBE039; Wed, 2 Aug 2017 15:17:20 -0600 (MDT) From: Eddie James To: linux@roeck-us.net Cc: linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, jdelvare@suse.com, joel@jms.id.au, eajames@linux.vnet.ibm.com, "Edward A. James" Subject: [PATCH 2/4] drivers/hwmon/pmbus: ibmps: Add non-hwmon attributes Date: Wed, 2 Aug 2017 16:17:11 -0500 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1501708633-2964-1-git-send-email-eajames@linux.vnet.ibm.com> References: <1501708633-2964-1-git-send-email-eajames@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17080221-0016-0000-0000-000007492BF4 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007473; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000216; SDB=6.00896649; UDB=6.00448573; IPR=6.00676836; BA=6.00005506; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016503; XFM=3.00000015; UTC=2017-08-02 21:17:24 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17080221-0017-0000-0000-00003ADE72CC Message-Id: <1501708633-2964-3-git-send-email-eajames@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-02_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1706020000 definitions=main-1708020340 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Edward A. James" Add sysfs entries to dump out PS registers and clear faults. Signed-off-by: Edward A. James --- drivers/hwmon/pmbus/ibmps.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/drivers/hwmon/pmbus/ibmps.c b/drivers/hwmon/pmbus/ibmps.c index 1928dd9..f55d2bf 100644 --- a/drivers/hwmon/pmbus/ibmps.c +++ b/drivers/hwmon/pmbus/ibmps.c @@ -9,8 +9,10 @@ #include #include +#include #include #include +#include #include "pmbus.h" @@ -122,14 +124,90 @@ static int ibmps_read_word_data(struct i2c_client *client, int page, int reg) .read_word_data = ibmps_read_word_data, }; +static ssize_t ibmps_clear_faults(struct device *dev, + struct device_attribute *dev_attr, + const char *buf, size_t count) +{ + struct i2c_client *client = to_i2c_client(dev); + + pmbus_clear_faults(client); + + return count; +} +static DEVICE_ATTR(clear_faults, 0200, NULL, ibmps_clear_faults); + +static ssize_t ibmps_show_status_word(struct device *dev, + struct device_attribute *dev_attr, + char *buf) +{ + int rc; + struct i2c_client *client = to_i2c_client(dev); + + rc = pmbus_read_word_data(client, 0, PMBUS_STATUS_WORD); + if (rc < 0) + return rc; + + return snprintf(buf, PAGE_SIZE - 1, "%04x\n", rc); +} +static DEVICE_ATTR(status_word, 0444, ibmps_show_status_word, NULL); + +static ssize_t ibmps_show_status_byte(struct device *dev, + struct device_attribute *dev_attr, + char *buf) +{ + int rc; + struct i2c_client *client = to_i2c_client(dev); + struct sensor_device_attribute *sattr = to_sensor_dev_attr(dev_attr); + + rc = pmbus_read_byte_data(client, 0, PMBUS_STATUS_VOUT + sattr->index); + if (rc < 0) + return rc; + + return snprintf(buf, PAGE_SIZE - 1, "%02x\n", rc); +} + +static SENSOR_DEVICE_ATTR(status_vout, 0444, ibmps_show_status_byte, NULL, 0); +static SENSOR_DEVICE_ATTR(status_iout, 0444, ibmps_show_status_byte, NULL, 1); +static SENSOR_DEVICE_ATTR(status_input, 0444, ibmps_show_status_byte, NULL, 2); +static SENSOR_DEVICE_ATTR(status_temp, 0444, ibmps_show_status_byte, NULL, 3); +static SENSOR_DEVICE_ATTR(status_cml, 0444, ibmps_show_status_byte, NULL, 4); +static SENSOR_DEVICE_ATTR(status_other, 0444, ibmps_show_status_byte, NULL, 5); +static SENSOR_DEVICE_ATTR(status_mfr, 0444, ibmps_show_status_byte, NULL, 6); +static SENSOR_DEVICE_ATTR(status_fan, 0444, ibmps_show_status_byte, NULL, 7); + +static struct attribute *ibmps_attributes[] = { + &dev_attr_clear_faults.attr, + &dev_attr_status_word.attr, + &sensor_dev_attr_status_vout.dev_attr.attr, + &sensor_dev_attr_status_iout.dev_attr.attr, + &sensor_dev_attr_status_input.dev_attr.attr, + &sensor_dev_attr_status_temp.dev_attr.attr, + &sensor_dev_attr_status_cml.dev_attr.attr, + &sensor_dev_attr_status_other.dev_attr.attr, + &sensor_dev_attr_status_mfr.dev_attr.attr, + &sensor_dev_attr_status_fan.dev_attr.attr, + NULL +}; + +static const struct attribute_group ibmps_attribute_group = { + .attrs = ibmps_attributes, +}; + static int ibmps_probe(struct i2c_client *client, const struct i2c_device_id *id) { + int rc = sysfs_create_group(&client->dev.kobj, + &ibmps_attribute_group); + if (rc) + return rc; + return pmbus_do_probe(client, id, &ibmps_info); } static int ibmps_remove(struct i2c_client *client) { + sysfs_remove_group(&client->dev.kobj, &ibmps_attribute_group); + return pmbus_do_remove(client); }