Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.2/patches/809967/?format=api
{ "id": 809967, "url": "http://patchwork.ozlabs.org/api/1.2/patches/809967/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openbmc/patch/20170905070132.17682-1-andrew@aj.id.au/", "project": { "id": 56, "url": "http://patchwork.ozlabs.org/api/1.2/projects/56/?format=api", "name": "OpenBMC development", "link_name": "openbmc", "list_id": "openbmc.lists.ozlabs.org", "list_email": "openbmc@lists.ozlabs.org", "web_url": "http://github.com/openbmc/", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170905070132.17682-1-andrew@aj.id.au>", "list_archive_url": null, "date": "2017-09-05T07:01:32", "name": "hwmon: pmbus: Make reg check and clear faults functions return errors", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "d6299bfdc9c6b16b6fec5de3c5f2b47b18448372", "submitter": { "id": 68332, "url": "http://patchwork.ozlabs.org/api/1.2/people/68332/?format=api", "name": "Andrew Jeffery", "email": "andrew@aj.id.au" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/openbmc/patch/20170905070132.17682-1-andrew@aj.id.au/mbox/", "series": [ { "id": 1496, "url": "http://patchwork.ozlabs.org/api/1.2/series/1496/?format=api", "web_url": "http://patchwork.ozlabs.org/project/openbmc/list/?series=1496", "date": "2017-09-05T07:01:32", "name": "hwmon: pmbus: Make reg check and clear faults functions return errors", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/1496/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/809967/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/809967/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "openbmc@lists.ozlabs.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "openbmc@lists.ozlabs.org" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xmd4r3p4gz9sPk\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Sep 2017 17:04:44 +1000 (AEST)", "from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xmd4r2SGKzDrN5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 5 Sep 2017 17:04:44 +1000 (AEST)", "from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com\n\t[66.111.4.25])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xmd1w5xySzDrKL\n\tfor <openbmc@lists.ozlabs.org>; Tue, 5 Sep 2017 17:02:12 +1000 (AEST)", "from compute4.internal (compute4.nyi.internal [10.202.2.44])\n\tby mailout.nyi.internal (Postfix) with ESMTP id 40C8720CC9;\n\tTue, 5 Sep 2017 03:02:10 -0400 (EDT)", "from frontend2 ([10.202.2.161])\n\tby compute4.internal (MEProxy); Tue, 05 Sep 2017 03:02:10 -0400", "from keelia.au.ibm.com (bh02i525f01.au.ibm.com [202.81.18.30])\n\tby mail.messagingengine.com (Postfix) with ESMTPA id 049392494B;\n\tTue, 5 Sep 2017 03:02:05 -0400 (EDT)" ], "Authentication-Results": [ "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"alFL+mHr\";\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"oSKJCdOJ\"; \n\tdkim-atps=neutral", "lists.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"alFL+mHr\";\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com header.b=\"oSKJCdOJ\"; \n\tdkim-atps=neutral", "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=aj.id.au\n\t(client-ip=66.111.4.25; helo=out1-smtp.messagingengine.com;\n\tenvelope-from=andrew@aj.id.au; receiver=<UNKNOWN>)", "lists.ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=aj.id.au header.i=@aj.id.au header.b=\"alFL+mHr\";\n\tdkim=pass (2048-bit key;\n\tunprotected) header.d=messagingengine.com\n\theader.i=@messagingengine.com\n\theader.b=\"oSKJCdOJ\"; dkim-atps=neutral" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=aj.id.au; h=cc\n\t:date:from:message-id:subject:to:x-me-sender:x-me-sender\n\t:x-sasl-enc:x-sasl-enc; s=fm1; bh=LCNtbnVIXq0mKhS/k3MTXNp2ObuZAa\n\trt/Hngt3CQz8g=; b=alFL+mHrqqFYfd5kyaRHkC50x02xXyhBS0CugPb7FiL2O8\n\tvX5s9cwG+KsNRNIaBV2g+8CYWaflGMW7hRjuwKv4K3O6jZwCMPC4B35H1SqIsUjW\n\tevHD5YS79CD68S94g3E6UhihHbS11vtyfsOJM+buDBGTzRBwH12x46AVNA2GIXTX\n\tYLQWjVB5htJiupAI03W8VSPAbpuQBHfQJsZIBXalLf7zMHwsXoB6BMyXokxCnyyZ\n\tO0tZ7uQsGkbZW+yXio6C0218jcX43VGI1z6xcUleyk8vt1gJTnN/BaVPTGSxHIZT\n\te1vNk+Dt8FiQw0VfOamjP0cKQ7uIxvw/QMGiLKRQ==", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=\n\tmessagingengine.com; h=cc:date:from:message-id:subject:to\n\t:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=LCNtbn\n\tVIXq0mKhS/k3MTXNp2ObuZAart/Hngt3CQz8g=; b=oSKJCdOJfO8BkA42WUyFAt\n\t1JexKtqneliJptLeEYAPOTO7MSB3eFGj9/k00NUXjYcvWk21Oiecxh4QE5E0G7lz\n\tfSaBvEhPS5X6hUSzIHSs/kLRZ4wOGT2fYZIP1tScYgu7yHkVd1KDImZlEaO+cmOT\n\tOnGYvWwbgh4XSBTQEiZYJ0DPDkGVXRgUgzutM7YmVw40MSYKeuX84nAHlOjg7s/b\n\t9Fvv3WlXabYlvg2OmujzK75e/0Je3JSsn7V0wx5djHq3mRcNL3aBxDf6VJ11Dtmz\n\t8BS1y9t7yZWxBlOCDo9M8LXYUQ+zr+r9XZ4PnlUExp7+DDaF57vq+ZIyfedalMmQ\n\t==" ], "X-ME-Sender": "<xms:8kuuWZ24a4XLkxIAS5knrEtSKYvuzXQGDlrAaq3YnGfGvbNhly9DeQ>", "X-Sasl-enc": "evW5lMylfj8WXPmbn9a3g/gx5Xk2bfrj7YN8tAKBhx3r 1504594929", "From": "Andrew Jeffery <andrew@aj.id.au>", "To": "linux-hwmon@vger.kernel.org", "Subject": "[PATCH] hwmon: pmbus: Make reg check and clear faults functions\n\treturn errors", "Date": "Tue, 5 Sep 2017 17:01:32 +1000", "Message-Id": "<20170905070132.17682-1-andrew@aj.id.au>", "X-Mailer": "git-send-email 2.11.0", "X-BeenThere": "openbmc@lists.ozlabs.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "Development list for OpenBMC <openbmc.lists.ozlabs.org>", "List-Unsubscribe": "<https://lists.ozlabs.org/options/openbmc>,\n\t<mailto:openbmc-request@lists.ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://lists.ozlabs.org/pipermail/openbmc/>", "List-Post": "<mailto:openbmc@lists.ozlabs.org>", "List-Help": "<mailto:openbmc-request@lists.ozlabs.org?subject=help>", "List-Subscribe": "<https://lists.ozlabs.org/listinfo/openbmc>,\n\t<mailto:openbmc-request@lists.ozlabs.org?subject=subscribe>", "Cc": "jdelvare@suse.com, linux-doc@vger.kernel.org,\n\tAndrew Jeffery <andrew@aj.id.au>, openbmc@lists.ozlabs.org,\n\tcorbet@lwn.net, linux-kernel@vger.kernel.org, linux@roeck-us.net", "Errors-To": "openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org", "Sender": "\"openbmc\"\n\t<openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>" }, "content": "Some functions exposed by pmbus core conflated errors that occurred when\nsetting the page to access with errors that occurred when accessing\nregisters in a page. In some cases, this caused legitimate errors to be\nhidden under the guise of the register not being supported.\n\nSigned-off-by: Andrew Jeffery <andrew@aj.id.au>\n---\n Documentation/hwmon/pmbus-core | 12 ++--\n drivers/hwmon/pmbus/pmbus.h | 6 +-\n drivers/hwmon/pmbus/pmbus_core.c | 115 +++++++++++++++++++++++++++++----------\n 3 files changed, 95 insertions(+), 38 deletions(-)", "diff": "diff --git a/Documentation/hwmon/pmbus-core b/Documentation/hwmon/pmbus-core\nindex 8ed10e9ddfb5..3e9f41bb756f 100644\n--- a/Documentation/hwmon/pmbus-core\n+++ b/Documentation/hwmon/pmbus-core\n@@ -218,17 +218,17 @@ Specifically, it provides the following information.\n This function calls the device specific write_byte function if defined.\n Therefore, it must _not_ be called from that function.\n \n- bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg);\n+ int pmbus_check_byte_register(struct i2c_client *client, int page, int reg);\n \n- Check if byte register exists. Return true if the register exists, false\n- otherwise.\n+ Check if byte register exists. Returns 1 if the register exists, 0 if it does\n+ not, and less than zero on an unexpected error.\n This function calls the device specific write_byte function if defined to\n obtain the chip status. Therefore, it must _not_ be called from that function.\n \n- bool pmbus_check_word_register(struct i2c_client *client, int page, int reg);\n+ int pmbus_check_word_register(struct i2c_client *client, int page, int reg);\n \n- Check if word register exists. Return true if the register exists, false\n- otherwise.\n+ Check if word register exists. Returns 1 if the register exists, 0 if it does\n+ not, and less than zero on an unexpected error.\n This function calls the device specific write_byte function if defined to\n obtain the chip status. Therefore, it must _not_ be called from that function.\n \ndiff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h\nindex bfcb13bae34b..c53032a04a6f 100644\n--- a/drivers/hwmon/pmbus/pmbus.h\n+++ b/drivers/hwmon/pmbus/pmbus.h\n@@ -413,9 +413,9 @@ int pmbus_write_byte_data(struct i2c_client *client, int page, u8 reg,\n \t\t\t u8 value);\n int pmbus_update_byte_data(struct i2c_client *client, int page, u8 reg,\n \t\t\t u8 mask, u8 value);\n-void pmbus_clear_faults(struct i2c_client *client);\n-bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg);\n-bool pmbus_check_word_register(struct i2c_client *client, int page, int reg);\n+int pmbus_clear_faults(struct i2c_client *client);\n+int pmbus_check_byte_register(struct i2c_client *client, int page, int reg);\n+int pmbus_check_word_register(struct i2c_client *client, int page, int reg);\n int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,\n \t\t struct pmbus_driver_info *info);\n int pmbus_do_remove(struct i2c_client *client);\ndiff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c\nindex f1eff6b6c798..153700e35431 100644\n--- a/drivers/hwmon/pmbus/pmbus_core.c\n+++ b/drivers/hwmon/pmbus/pmbus_core.c\n@@ -304,18 +304,24 @@ static int _pmbus_read_byte_data(struct i2c_client *client, int page, int reg)\n \treturn pmbus_read_byte_data(client, page, reg);\n }\n \n-static void pmbus_clear_fault_page(struct i2c_client *client, int page)\n+static int pmbus_clear_fault_page(struct i2c_client *client, int page)\n {\n-\t_pmbus_write_byte(client, page, PMBUS_CLEAR_FAULTS);\n+\treturn _pmbus_write_byte(client, page, PMBUS_CLEAR_FAULTS);\n }\n \n-void pmbus_clear_faults(struct i2c_client *client)\n+int pmbus_clear_faults(struct i2c_client *client)\n {\n \tstruct pmbus_data *data = i2c_get_clientdata(client);\n+\tint rv;\n \tint i;\n \n-\tfor (i = 0; i < data->info->pages; i++)\n-\t\tpmbus_clear_fault_page(client, i);\n+\tfor (i = 0; i < data->info->pages; i++) {\n+\t\trv = pmbus_clear_fault_page(client, i);\n+\t\tif (rv)\n+\t\t\treturn rv;\n+\t}\n+\n+\treturn 0;\n }\n EXPORT_SYMBOL_GPL(pmbus_clear_faults);\n \n@@ -333,28 +339,45 @@ static int pmbus_check_status_cml(struct i2c_client *client)\n \treturn 0;\n }\n \n-static bool pmbus_check_register(struct i2c_client *client,\n+static int pmbus_check_register(struct i2c_client *client,\n \t\t\t\t int (*func)(struct i2c_client *client,\n \t\t\t\t\t int page, int reg),\n \t\t\t\t int page, int reg)\n {\n+\tstruct pmbus_data *data;\n+\tint check;\n \tint rv;\n-\tstruct pmbus_data *data = i2c_get_clientdata(client);\n \n-\trv = func(client, page, reg);\n-\tif (rv >= 0 && !(data->flags & PMBUS_SKIP_STATUS_CHECK))\n-\t\trv = pmbus_check_status_cml(client);\n-\tpmbus_clear_fault_page(client, -1);\n-\treturn rv >= 0;\n+\tdata = i2c_get_clientdata(client);\n+\n+\t/*\n+\t * pmbus_set_page() guards transactions on the requested page matching\n+\t * the current page. This may be done in the execution of func(), but\n+\t * at that point a set-page error is conflated with accessing a\n+\t * non-existent register.\n+\t */\n+\trv = pmbus_set_page(client, page);\n+\tif (rv < 0)\n+\t\treturn rv;\n+\n+\tcheck = func(client, page, reg);\n+\tif (check >= 0 && !(data->flags & PMBUS_SKIP_STATUS_CHECK))\n+\t\tcheck = pmbus_check_status_cml(client);\n+\n+\trv = pmbus_clear_fault_page(client, -1);\n+\tif (rv < 0)\n+\t\treturn rv;\n+\n+\treturn check >= 0;\n }\n \n-bool pmbus_check_byte_register(struct i2c_client *client, int page, int reg)\n+int pmbus_check_byte_register(struct i2c_client *client, int page, int reg)\n {\n \treturn pmbus_check_register(client, _pmbus_read_byte_data, page, reg);\n }\n EXPORT_SYMBOL_GPL(pmbus_check_byte_register);\n \n-bool pmbus_check_word_register(struct i2c_client *client, int page, int reg)\n+int pmbus_check_word_register(struct i2c_client *client, int page, int reg)\n {\n \treturn pmbus_check_register(client, _pmbus_read_word_data, page, reg);\n }\n@@ -390,7 +413,7 @@ static struct pmbus_data *pmbus_update_device(struct device *dev)\n \n \tmutex_lock(&data->update_lock);\n \tif (time_after(jiffies, data->last_updated + HZ) || !data->valid) {\n-\t\tint i, j;\n+\t\tint i, j, ret;\n \n \t\tfor (i = 0; i < info->pages; i++) {\n \t\t\tdata->status[PB_STATUS_BASE + i]\n@@ -424,7 +447,13 @@ static struct pmbus_data *pmbus_update_device(struct device *dev)\n \t\t\t\t\t\t\t sensor->page,\n \t\t\t\t\t\t\t sensor->reg);\n \t\t}\n-\t\tpmbus_clear_faults(client);\n+\n+\t\tret = pmbus_clear_faults(client);\n+\t\tif (ret < 0) {\n+\t\t\tmutex_unlock(&data->update_lock);\n+\t\t\treturn ERR_PTR(ret);\n+\t\t}\n+\n \t\tdata->last_updated = jiffies;\n \t\tdata->valid = 1;\n \t}\n@@ -754,6 +783,9 @@ static ssize_t pmbus_show_boolean(struct device *dev,\n \tstruct pmbus_data *data = pmbus_update_device(dev);\n \tint val;\n \n+\tif (IS_ERR(data))\n+\t\treturn PTR_ERR(data);\n+\n \tval = pmbus_get_boolean(data, boolean, attr->index);\n \tif (val < 0)\n \t\treturn val;\n@@ -766,6 +798,9 @@ static ssize_t pmbus_show_sensor(struct device *dev,\n \tstruct pmbus_data *data = pmbus_update_device(dev);\n \tstruct pmbus_sensor *sensor = to_pmbus_sensor(devattr);\n \n+\tif (IS_ERR(data))\n+\t\treturn PTR_ERR(data);\n+\n \tif (sensor->data < 0)\n \t\treturn sensor->data;\n \n@@ -995,7 +1030,11 @@ static int pmbus_add_limit_attrs(struct i2c_client *client,\n \tstruct pmbus_sensor *curr;\n \n \tfor (i = 0; i < nlimit; i++) {\n-\t\tif (pmbus_check_word_register(client, page, l->reg)) {\n+\t\tret = pmbus_check_word_register(client, page, l->reg);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\n+\t\tif (ret) {\n \t\t\tcurr = pmbus_add_sensor(data, name, l->attr, index,\n \t\t\t\t\t\tpage, l->reg, attr->class,\n \t\t\t\t\t\tattr->update || l->update,\n@@ -1041,6 +1080,8 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,\n \tif (!base)\n \t\treturn -ENOMEM;\n \tif (attr->sfunc) {\n+\t\tint check;\n+\n \t\tret = pmbus_add_limit_attrs(client, data, info, name,\n \t\t\t\t\t index, page, base, attr);\n \t\tif (ret < 0)\n@@ -1050,9 +1091,13 @@ static int pmbus_add_sensor_attrs_one(struct i2c_client *client,\n \t\t * alarm attributes, if there is a global alarm bit, and if\n \t\t * the generic status register for this page is accessible.\n \t\t */\n-\t\tif (!ret && attr->gbit &&\n-\t\t pmbus_check_byte_register(client, page,\n-\t\t\t\t\t data->status_register)) {\n+\n+\t\tcheck = pmbus_check_byte_register(client, page,\n+\t\t\t\t\t\t data->status_register);\n+\t\tif (check < 0)\n+\t\t\treturn check;\n+\n+\t\tif (!ret && attr->gbit && check) {\n \t\t\tret = pmbus_add_boolean(data, name, \"alarm\", index,\n \t\t\t\t\t\tNULL, NULL,\n \t\t\t\t\t\tPB_STATUS_BASE + page,\n@@ -1604,8 +1649,12 @@ static int pmbus_add_fan_attributes(struct i2c_client *client,\n \t\t\tif (!(info->func[page] & pmbus_fan_flags[f]))\n \t\t\t\tbreak;\n \n-\t\t\tif (!pmbus_check_word_register(client, page,\n-\t\t\t\t\t\t pmbus_fan_registers[f]))\n+\t\t\tret = pmbus_check_word_register(client, page,\n+\t\t\t\t\t\t pmbus_fan_registers[f]);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\n+\t\t\tif (!ret)\n \t\t\t\tbreak;\n \n \t\t\t/*\n@@ -1628,9 +1677,13 @@ static int pmbus_add_fan_attributes(struct i2c_client *client,\n \t\t\t * Each fan status register covers multiple fans,\n \t\t\t * so we have to do some magic.\n \t\t\t */\n-\t\t\tif ((info->func[page] & pmbus_fan_status_flags[f]) &&\n-\t\t\t pmbus_check_byte_register(client,\n-\t\t\t\t\tpage, pmbus_fan_status_registers[f])) {\n+\t\t\tret = pmbus_check_byte_register(client, page,\n+\t\t\t\t\t\tpmbus_fan_status_registers[f]);\n+\t\t\tif (ret < 0)\n+\t\t\t\treturn ret;\n+\n+\t\t\tif ((info->func[page] & pmbus_fan_status_flags[f])\n+\t\t\t\t\t&& ret) {\n \t\t\t\tint base;\n \n \t\t\t\tif (f > 1)\t/* fan 3, 4 */\n@@ -1696,10 +1749,13 @@ static int pmbus_identify_common(struct i2c_client *client,\n \t\t\t\t struct pmbus_data *data, int page)\n {\n \tint vout_mode = -1;\n+\tint rv;\n \n-\tif (pmbus_check_byte_register(client, page, PMBUS_VOUT_MODE))\n+\trv = pmbus_check_byte_register(client, page, PMBUS_VOUT_MODE);\n+\tif (rv == 1)\n \t\tvout_mode = _pmbus_read_byte_data(client, page,\n \t\t\t\t\t\t PMBUS_VOUT_MODE);\n+\n \tif (vout_mode >= 0 && vout_mode != 0xff) {\n \t\t/*\n \t\t * Not all chips support the VOUT_MODE command,\n@@ -1725,8 +1781,7 @@ static int pmbus_identify_common(struct i2c_client *client,\n \t\t}\n \t}\n \n-\tpmbus_clear_fault_page(client, page);\n-\treturn 0;\n+\treturn pmbus_clear_fault_page(client, page);\n }\n \n static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data,\n@@ -1756,7 +1811,9 @@ static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data,\n \tif (ret >= 0 && (ret & PB_CAPABILITY_ERROR_CHECK))\n \t\tclient->flags |= I2C_CLIENT_PEC;\n \n-\tpmbus_clear_faults(client);\n+\tret = pmbus_clear_faults(client);\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \tif (info->identify) {\n \t\tret = (*info->identify)(client, info);\n", "prefixes": [] }