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.3 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 368C3C41514 for ; Fri, 30 Aug 2019 18:20:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0632B2342E for ; Fri, 30 Aug 2019 18:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728180AbfH3SUa (ORCPT ); Fri, 30 Aug 2019 14:20:30 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:18848 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727963AbfH3SU3 (ORCPT ); Fri, 30 Aug 2019 14:20:29 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x7UIHUmW143508; Fri, 30 Aug 2019 14:19:54 -0400 Received: from ppma03wdc.us.ibm.com (ba.79.3fa9.ip4.static.sl-reverse.com [169.63.121.186]) by mx0a-001b2d01.pphosted.com with ESMTP id 2uq77fbchq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Aug 2019 14:19:54 -0400 Received: from pps.filterd (ppma03wdc.us.ibm.com [127.0.0.1]) by ppma03wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id x7UIJmfw013615; Fri, 30 Aug 2019 18:19:53 GMT Received: from b03cxnp08028.gho.boulder.ibm.com (b03cxnp08028.gho.boulder.ibm.com [9.17.130.20]) by ppma03wdc.us.ibm.com with ESMTP id 2upp5dwh4m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 30 Aug 2019 18:19:52 +0000 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x7UIJq0D61931928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Aug 2019 18:19:52 GMT Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 040656E04E; Fri, 30 Aug 2019 18:19:52 +0000 (GMT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 82ACE6E04C; Fri, 30 Aug 2019 18:19:50 +0000 (GMT) Received: from [9.85.210.225] (unknown [9.85.210.225]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP; Fri, 30 Aug 2019 18:19:50 +0000 (GMT) Subject: Re: [PATCH 3/3] pmbus: ibm-cffps: Add support for version 2 of the PSU To: Guenter Roeck Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, devicetree@vger.kernel.org, andrew@aj.id.au, joel@jms.id.au, mark.rutland@arm.com, robh+dt@kernel.org, jdelvare@suse.com References: <1567181385-22129-1-git-send-email-eajames@linux.ibm.com> <1567181385-22129-4-git-send-email-eajames@linux.ibm.com> <20190830173603.GA10472@roeck-us.net> From: Eddie James Message-ID: <6b2feb94-eb69-35c5-a7a9-0ca08c392fcc@linux.ibm.com> Date: Fri, 30 Aug 2019 13:19:49 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190830173603.GA10472@roeck-us.net> 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:,, definitions=2019-08-30_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908300177 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/30/19 12:36 PM, Guenter Roeck wrote: > On Fri, Aug 30, 2019 at 11:09:45AM -0500, Eddie James wrote: >> Version 2 of the PSU supports a second page of data and changes the >> format of the FW version. Use the devicetree binding to differentiate >> between the version the driver should use. >> >> Signed-off-by: Eddie James >> --- >> drivers/hwmon/pmbus/ibm-cffps.c | 109 ++++++++++++++++++++++++++++++++-------- >> 1 file changed, 87 insertions(+), 22 deletions(-) >> >> diff --git a/drivers/hwmon/pmbus/ibm-cffps.c b/drivers/hwmon/pmbus/ibm-cffps.c >> index ee2ee9e..ca26fbd 100644 >> --- a/drivers/hwmon/pmbus/ibm-cffps.c >> +++ b/drivers/hwmon/pmbus/ibm-cffps.c >> @@ -12,16 +12,20 @@ >> #include >> #include >> #include >> +#include >> #include >> >> #include "pmbus.h" >> >> +#define CFFPS_VERSIONS 2 >> + > Any chance you can use an enum for the versions ? Using version > numbers 1/2 combined with array indices 0/1 is confusing, error > prone, and seems unnecessary. Sure, good idea. Thanks, Eddie > > Thanks, > Guenter > >> #define CFFPS_FRU_CMD 0x9A >> #define CFFPS_PN_CMD 0x9B >> #define CFFPS_SN_CMD 0x9E >> #define CFFPS_CCIN_CMD 0xBD >> -#define CFFPS_FW_CMD_START 0xFA >> -#define CFFPS_FW_NUM_BYTES 4 >> +#define CFFPS_FW_CMD 0xFA >> +#define CFFPS1_FW_NUM_BYTES 4 >> +#define CFFPS2_FW_NUM_WORDS 3 >> #define CFFPS_SYS_CONFIG_CMD 0xDA >> >> #define CFFPS_INPUT_HISTORY_CMD 0xD6 >> @@ -61,6 +65,7 @@ struct ibm_cffps_input_history { >> }; >> >> struct ibm_cffps { >> + int version; >> struct i2c_client *client; >> >> struct ibm_cffps_input_history input_history; >> @@ -132,6 +137,8 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf, >> struct ibm_cffps *psu = to_psu(idxp, idx); >> char data[I2C_SMBUS_BLOCK_MAX] = { 0 }; >> >> + pmbus_set_page(psu->client, 0); >> + >> switch (idx) { >> case CFFPS_DEBUGFS_INPUT_HISTORY: >> return ibm_cffps_read_input_history(psu, buf, count, ppos); >> @@ -152,16 +159,36 @@ static ssize_t ibm_cffps_debugfs_op(struct file *file, char __user *buf, >> rc = snprintf(data, 5, "%04X", rc); >> goto done; >> case CFFPS_DEBUGFS_FW: >> - for (i = 0; i < CFFPS_FW_NUM_BYTES; ++i) { >> - rc = i2c_smbus_read_byte_data(psu->client, >> - CFFPS_FW_CMD_START + i); >> - if (rc < 0) >> - return rc; >> + switch (psu->version) { >> + case 1: >> + for (i = 0; i < CFFPS1_FW_NUM_BYTES; ++i) { >> + rc = i2c_smbus_read_byte_data(psu->client, >> + CFFPS_FW_CMD + >> + i); >> + if (rc < 0) >> + return rc; >> + >> + snprintf(&data[i * 2], 3, "%02X", rc); >> + } >> >> - snprintf(&data[i * 2], 3, "%02X", rc); >> - } >> + rc = i * 2; >> + break; >> + case 2: >> + for (i = 0; i < CFFPS2_FW_NUM_WORDS; ++i) { >> + rc = i2c_smbus_read_word_data(psu->client, >> + CFFPS_FW_CMD + >> + i); >> + if (rc < 0) >> + return rc; >> + >> + snprintf(&data[i * 4], 5, "%04X", rc); >> + } >> >> - rc = i * 2; >> + rc = i * 4; >> + break; >> + default: >> + return -EOPNOTSUPP; >> + } >> goto done; >> default: >> return -EINVAL; >> @@ -279,6 +306,8 @@ static void ibm_cffps_led_brightness_set(struct led_classdev *led_cdev, >> psu->led_state = CFFPS_LED_ON; >> } >> >> + pmbus_set_page(psu->client, 0); >> + >> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD, >> psu->led_state); >> if (rc < 0) >> @@ -299,6 +328,8 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev, >> if (led_cdev->brightness == LED_OFF) >> return 0; >> >> + pmbus_set_page(psu->client, 0); >> + >> rc = i2c_smbus_write_byte_data(psu->client, CFFPS_SYS_CONFIG_CMD, >> CFFPS_LED_BLINK); >> if (rc < 0) >> @@ -328,15 +359,32 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu) >> dev_warn(dev, "failed to register led class: %d\n", rc); >> } >> >> -static struct pmbus_driver_info ibm_cffps_info = { >> - .pages = 1, >> - .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >> - PMBUS_HAVE_PIN | 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, >> - .read_byte_data = ibm_cffps_read_byte_data, >> - .read_word_data = ibm_cffps_read_word_data, >> +static struct pmbus_driver_info ibm_cffps_info[CFFPS_VERSIONS] = { >> + [0] = { >> + .pages = 1, >> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >> + PMBUS_HAVE_PIN | 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, >> + .read_byte_data = ibm_cffps_read_byte_data, >> + .read_word_data = ibm_cffps_read_word_data, >> + }, >> + [1] = { >> + .pages = 2, >> + .func[0] = PMBUS_HAVE_VIN | PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >> + PMBUS_HAVE_PIN | 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, >> + .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_IOUT | >> + PMBUS_HAVE_TEMP | PMBUS_HAVE_TEMP2 | PMBUS_HAVE_TEMP3 | >> + PMBUS_HAVE_STATUS_VOUT | PMBUS_HAVE_STATUS_IOUT, >> + .read_byte_data = ibm_cffps_read_byte_data, >> + .read_word_data = ibm_cffps_read_word_data, >> + }, >> }; >> >> static struct pmbus_platform_data ibm_cffps_pdata = { >> @@ -346,13 +394,21 @@ static void ibm_cffps_create_led_class(struct ibm_cffps *psu) >> static int ibm_cffps_probe(struct i2c_client *client, >> const struct i2c_device_id *id) >> { >> - int i, rc; >> + int i, rc, vs; >> struct dentry *debugfs; >> struct dentry *ibm_cffps_dir; >> struct ibm_cffps *psu; >> + const void *md = of_device_get_match_data(&client->dev); >> + >> + if (md) >> + vs = (int)md; >> + else if (id) >> + vs = (int)id->driver_data; >> + else >> + vs = 1; >> >> client->dev.platform_data = &ibm_cffps_pdata; >> - rc = pmbus_do_probe(client, id, &ibm_cffps_info); >> + rc = pmbus_do_probe(client, id, &ibm_cffps_info[vs - 1]); >> if (rc) >> return rc; >> >> @@ -364,6 +420,7 @@ static int ibm_cffps_probe(struct i2c_client *client, >> if (!psu) >> return 0; >> >> + psu->version = vs; >> psu->client = client; >> mutex_init(&psu->input_history.update_lock); >> psu->input_history.last_update = jiffies - HZ; >> @@ -406,12 +463,20 @@ static int ibm_cffps_probe(struct i2c_client *client, >> >> static const struct i2c_device_id ibm_cffps_id[] = { >> { "ibm_cffps1", 1 }, >> + { "ibm_cffps2", 2 }, >> {} >> }; >> MODULE_DEVICE_TABLE(i2c, ibm_cffps_id); >> >> static const struct of_device_id ibm_cffps_of_match[] = { >> - { .compatible = "ibm,cffps1" }, >> + { >> + .compatible = "ibm,cffps1", >> + .data = (void *)1 >> + }, >> + { >> + .compatible = "ibm,cffps2", >> + .data = (void *)2 >> + }, >> {} >> }; >> MODULE_DEVICE_TABLE(of, ibm_cffps_of_match); >> -- >> 1.8.3.1 >>