From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9029FC2D0CA for ; Thu, 12 Dec 2019 23:55:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69B852173E for ; Thu, 12 Dec 2019 23:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731496AbfLLXzE (ORCPT ); Thu, 12 Dec 2019 18:55:04 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36668 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731442AbfLLXzD (ORCPT ); Thu, 12 Dec 2019 18:55:03 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xBCNqbO4001118; Thu, 12 Dec 2019 18:54:39 -0500 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wusvh9w1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Dec 2019 18:54:39 -0500 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id xBCNo2aO032426; Thu, 12 Dec 2019 23:54:43 GMT Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by ppma01wdc.us.ibm.com with ESMTP id 2wr3q72ap8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Dec 2019 23:54:43 +0000 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xBCNsbQv22216990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 12 Dec 2019 23:54:37 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 72D6BAE05F; Thu, 12 Dec 2019 23:54:37 +0000 (GMT) Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2DC82AE063; Thu, 12 Dec 2019 23:54:36 +0000 (GMT) Received: from [9.163.51.183] (unknown [9.163.51.183]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP; Thu, 12 Dec 2019 23:54:36 +0000 (GMT) Subject: Re: [ v2] hwmon: (pmbus) Add Wistron power supply pmbus driver To: Ben Pai , linux@roeck-us.net Cc: robh+dt@kernel.org, jdelvare@suse.com, linux-kernel@vger.kernel.org, linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org, corbet@lwn.net, wangat@tw.ibm.com, Andy_YF_Wang@wistron.com, Claire_Ku@wistron.com References: <20191208134438.12925-1-Ben_Pai@wistron.com> From: Eddie James Message-ID: <97651ec9-e467-dbd9-dcb8-b3efe1387fef@linux.ibm.com> Date: Thu, 12 Dec 2019 17:54:35 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.0 MIME-Version: 1.0 In-Reply-To: <20191208134438.12925-1-Ben_Pai@wistron.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-12-12_08:2019-12-12,2019-12-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 clxscore=1011 suspectscore=0 adultscore=0 mlxlogscore=999 phishscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 priorityscore=1501 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1912120184 Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org On 12/8/19 7:44 AM, Ben Pai wrote: > Add the driver to monitor Wisreon power supplies with hwmon over pmbus. Hi Ben. This driver looks very similar to the IBM CFFPS driver. If you think they are similar enough, you may want to simply add a new version to that driver that supports your PSU. Thanks, Eddie > > Signed-off-by: Ben Pai > --- > .../devicetree/bindings/hwmon/wistron-wps.txt | 30 +++ > drivers/hwmon/pmbus/Kconfig | 9 + > drivers/hwmon/pmbus/Makefile | 1 + > drivers/hwmon/pmbus/wistron-wps.c | 176 ++++++++++++++++++ > 4 files changed, 216 insertions(+) > create mode 100644 Documentation/devicetree/bindings/hwmon/wistron-wps.txt > create mode 100644 drivers/hwmon/pmbus/wistron-wps.c > > diff --git a/Documentation/devicetree/bindings/hwmon/wistron-wps.txt b/Documentation/devicetree/bindings/hwmon/wistron-wps.txt > new file mode 100644 > index 000000000000..aacb2e66736e > --- /dev/null > +++ b/Documentation/devicetree/bindings/hwmon/wistron-wps.txt > @@ -0,0 +1,30 @@ > +ver ibm-cffps > +======================= > + > +Supported chips: > + > + * Wistron Common Form Factor power supply(wps). > + > +Author: Ben Pai > + > +Description > +----------- > + > +Our company name is Wistron, so this driver is written to supports > +Wistron Common Form Factor power supplies(wps). This driver > +is a client to the core PMBus driver. Read information from psu, > +and create debug-files and write information to them via driver. > + > +Usage Notes > +----------- > + > +This driver does not auto-detect devices. You will have to instantiate the > +devices explicitly. Please see Documentation/i2c/instantiating-devices for > +details. > + > +Information of the data read > +--------------------- > +FRU : name of psu manufacturer. > +PN : part_number of psu. > +SN : serial_number of psu. > +mfr_date : Date of psu's manufacture. > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index d62d69bb7e49..ebb7024e58ab 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -219,6 +219,15 @@ config SENSORS_UCD9200 > This driver can also be built as a module. If so, the module will > be called ucd9200. > > +config SENSORS_WISTRON_WPS > + tristate "Wistron Power Supply" > + help > + If you say yes here you get hardware monitoring support for the Wistron > + power supply. > + > + This driver can also be built as a module. If so, the module will > + be called wistron-wps. > + > config SENSORS_ZL6100 > tristate "Intersil ZL6100 and compatibles" > help > diff --git a/drivers/hwmon/pmbus/Makefile b/drivers/hwmon/pmbus/Makefile > index 03bacfcfd660..cad38f99e8c5 100644 > --- a/drivers/hwmon/pmbus/Makefile > +++ b/drivers/hwmon/pmbus/Makefile > @@ -25,4 +25,5 @@ obj-$(CONFIG_SENSORS_TPS40422) += tps40422.o > obj-$(CONFIG_SENSORS_TPS53679) += tps53679.o > obj-$(CONFIG_SENSORS_UCD9000) += ucd9000.o > obj-$(CONFIG_SENSORS_UCD9200) += ucd9200.o > +obj-$(CONFIG_SENSORS_WISTRON_WPS) += wistron-wps.o > obj-$(CONFIG_SENSORS_ZL6100) += zl6100.o > diff --git a/drivers/hwmon/pmbus/wistron-wps.c b/drivers/hwmon/pmbus/wistron-wps.c > new file mode 100644 > index 000000000000..4e2649e7b3f2 > --- /dev/null > +++ b/drivers/hwmon/pmbus/wistron-wps.c > @@ -0,0 +1,176 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright 2019 Wistron Corp. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "pmbus.h" > + > +#define WPS_FRU_CMD 0x99 > +#define WPS_PN_CMD 0x9A > +#define WPS_FW_CMD 0x9B > +#define WPS_DATE_CMD 0x9D > +#define WPS_SN_CMD 0x9E > + > +enum { > + WPS_DEBUGFS_FRU, > + WPS_DEBUGFS_PN, > + WPS_DEBUGFS_SN, > + WPS_DEBUGFS_FW, > + WPS_DEBUGFS_DATE, > + WPS_DEBUGFS_NUM_ENTRIES > +}; > + > +struct wistron_wps { > + struct i2c_client *client; > + int debugfs_entries[WPS_DEBUGFS_NUM_ENTRIES]; > +}; > + > +#define to_psu(x, y) container_of(x, struct wistron_wps, debugfs_entries[y]) > + > +static ssize_t wistron_wps_debugfs_op(struct file *file, char __user *buf, > + size_t count, loff_t *ppos) > +{ > + u8 cmd; > + int rc; > + int *idxp = file->private_data; > + int idx = *idxp; > + struct wistron_wps *psu = to_psu(idxp, idx); > + char data[I2C_SMBUS_BLOCK_MAX] = { 0 }; > + > + pmbus_set_page(psu->client, 0); > + switch (idx) { > + case WPS_DEBUGFS_FRU: > + cmd = WPS_FRU_CMD; > + break; > + case WPS_DEBUGFS_PN: > + cmd = WPS_PN_CMD; > + break; > + case WPS_DEBUGFS_SN: > + cmd = WPS_SN_CMD; > + break; > + case WPS_DEBUGFS_FW: > + cmd = WPS_FW_CMD; > + break; > + case WPS_DEBUGFS_DATE: > + cmd = WPS_DATE_CMD; > + break; > + default: > + return -EINVAL; > + } > + > + rc = i2c_smbus_read_block_data(psu->client, cmd, data); > + if (rc < 0) > + return rc; > + > +done: > + data[rc] = '\n'; > + rc += 2; > + > + return simple_read_from_buffer(buf, count, ppos, data, rc); > +} > + > +static const struct file_operations wistron_wps_fops = { > + > + .llseek = noop_llseek, > + .read = wistron_wps_debugfs_op, > + .open = simple_open, > +}; > + > +static struct pmbus_driver_info wistron_wps_info = { > + .pages = 1, > + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | > + PMBUS_HAVE_PIN | PMBUS_HAVE_POUT | PMBUS_HAVE_FAN12 | > + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | > + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT | > + PMBUS_HAVE_STATUS_INPUT | PMBUS_HAVE_STATUS_TEMP | > + PMBUS_HAVE_STATUS_FAN12, > +}; > + > +static struct pmbus_platform_data wistron_wps_pdata = { > + .flags = PMBUS_SKIP_STATUS_CHECK, > +}; > + > +static int wistron_wps_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > +{ > + int i, rc; > + struct dentry *debugfs; > + struct dentry *wistron_wps_dir; > + struct wistron_wps *psu; > + > + client->dev.platform_data = &wistron_wps_pdata; > + rc = pmbus_do_probe(client, id, &wistron_wps_info); > + if (rc) > + return rc; > + > + psu = devm_kzalloc(&client->dev, sizeof(*psu), GFP_KERNEL); > + if (!psu) > + return 0; > + > + psu->client = client; > + > + debugfs = pmbus_get_debugfs_dir(client); > + if (!debugfs) > + return 0; > + > + wistron_wps_dir = debugfs_create_dir(client->name, debugfs); > + if (!wistron_wps_dir) > + return 0; > + > + for (i = 0; i < WPS_DEBUGFS_NUM_ENTRIES; ++i) > + psu->debugfs_entries[i] = i; > + > + debugfs_create_file("fru", 0444, wistron_wps_dir, > + &psu->debugfs_entries[WPS_DEBUGFS_FRU], > + &wistron_wps_fops); > + debugfs_create_file("part_number", 0444, wistron_wps_dir, > + &psu->debugfs_entries[WPS_DEBUGFS_PN], > + &wistron_wps_fops); > + debugfs_create_file("serial_number", 0444, wistron_wps_dir, > + &psu->debugfs_entries[WPS_DEBUGFS_SN], > + &wistron_wps_fops); > + debugfs_create_file("fw_version", 0444, wistron_wps_dir, > + &psu->debugfs_entries[WPS_DEBUGFS_FW], > + &wistron_wps_fops); > + debugfs_create_file("mfr_date", 0444, wistron_wps_dir, > + &psu->debugfs_entries[WPS_DEBUGFS_DATE], > + &wistron_wps_fops); > + > + return 0; > +} > + > +static const struct i2c_device_id wistron_wps_id[] = { > + { "wistron_wps", 1 }, > + {} > +}; > +MODULE_DEVICE_TABLE(i2c, wistron_wps_id); > + > +static const struct of_device_id wistron_wps_of_match[] = { > + { .compatible = "wistron, wps" }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, wistron_wps_of_match); > + > +static struct i2c_driver wistron_wps_driver = { > + .driver = { > + .name = "wistron-wps", > + .of_match_table = wistron_wps_of_match, > + }, > + .probe = wistron_wps_probe, > + .remove = pmbus_do_remove, > + .id_table = wistron_wps_id, > +}; > + > +module_i2c_driver(wistron_wps_driver); > + > +MODULE_AUTHOR("Ben Pai"); > +MODULE_DESCRIPTION("PMBus driver for Wistron power supplies"); > +MODULE_LICENSE("GPL");