Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807427/?format=api
{ "id": 807427, "url": "http://patchwork.ozlabs.org/api/patches/807427/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-i2c/patch/1504073857-122449-5-git-send-email-preid@electromag.com.au/", "project": { "id": 35, "url": "http://patchwork.ozlabs.org/api/projects/35/?format=api", "name": "Linux I2C development", "link_name": "linux-i2c", "list_id": "linux-i2c.vger.kernel.org", "list_email": "linux-i2c@vger.kernel.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1504073857-122449-5-git-send-email-preid@electromag.com.au>", "list_archive_url": null, "date": "2017-08-30T06:17:37", "name": "[v3,4/4] i2c: designware: add i2c gpio recovery option", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "27e7f96f16c41d01d755455eb1287aeb47bf29ab", "submitter": { "id": 66145, "url": "http://patchwork.ozlabs.org/api/people/66145/?format=api", "name": "Phil Reid", "email": "preid@electromag.com.au" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-i2c/patch/1504073857-122449-5-git-send-email-preid@electromag.com.au/mbox/", "series": [ { "id": 531, "url": "http://patchwork.ozlabs.org/api/series/531/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-i2c/list/?series=531", "date": "2017-08-30T06:17:35", "name": "i2c: designware: add i2c gpio recovery option", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/531/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807427/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807427/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<linux-i2c-owner@vger.kernel.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=linux-i2c-owner@vger.kernel.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhwKT66czz9t0M\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 16:17:49 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750862AbdH3GRr (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);\n\tWed, 30 Aug 2017 02:17:47 -0400", "from anchovy2.45ru.net.au ([203.30.46.146]:47409 \"EHLO\n\tanchovy.45ru.net.au\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1750824AbdH3GRp (ORCPT\n\t<rfc822; linux-i2c@vger.kernel.org>); Wed, 30 Aug 2017 02:17:45 -0400", "(qmail 10648 invoked by uid 5089); 30 Aug 2017 06:17:42 -0000", "by simscan 1.2.0 ppid: 10546, pid: 10549, t: 0.0970s\n\tscanners: regex: 1.2.0 attach: 1.2.0 clamav: 0.88.3/m:40/d:1950", "from unknown (HELO preid-centos7.electromag.com.au)\n\t(preid@electromag.com.au@203.59.230.133)\n\tby anchovy3.45ru.net.au with ESMTPA; 30 Aug 2017 06:17:41 -0000", "by preid-centos7.electromag.com.au (Postfix, from userid 1000)\n\tid 3FF76333CE9FA; Wed, 30 Aug 2017 14:17:40 +0800 (AWST)" ], "X-RBL": "$rbltext", "From": "Phil Reid <preid@electromag.com.au>", "To": "jarkko.nikula@linux.intel.com, andriy.shevchenko@linux.intel.com,\n\tmika.westerberg@linux.intel.com, wsa@the-dreams.de,\n\ttim@krieglstein.org, preid@electromag.com.au, linux-i2c@vger.kernel.org", "Subject": "[PATCH v3 4/4] i2c: designware: add i2c gpio recovery option", "Date": "Wed, 30 Aug 2017 14:17:37 +0800", "Message-Id": "<1504073857-122449-5-git-send-email-preid@electromag.com.au>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1504073857-122449-1-git-send-email-preid@electromag.com.au>", "References": "<1504073857-122449-1-git-send-email-preid@electromag.com.au>", "Sender": "linux-i2c-owner@vger.kernel.org", "Precedence": "bulk", "List-ID": "<linux-i2c.vger.kernel.org>", "X-Mailing-List": "linux-i2c@vger.kernel.org" }, "content": "From: Tim Sander <tim@krieglstein.org>\n\nThis patch contains much input from Phil Reid and has been tested\non Intel/Altera Cyclone V SOC Hardware with Altera GPIO's for the\nSCL and SDA GPIO's. I am still a little unsure about the recover\nin the timeout case (i2c-designware-core.c:770) as i could not\ntest this codepath.\n\nSigned-off-by: Tim Sander <tim@krieglstein.org>\nSigned-off-by: Phil Reid <preid@electromag.com.au>\n---\n drivers/i2c/busses/i2c-designware-common.c | 11 ++++--\n drivers/i2c/busses/i2c-designware-core.h | 1 +\n drivers/i2c/busses/i2c-designware-master.c | 57 ++++++++++++++++++++++++++++++\n 3 files changed, 66 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c\nindex 3d684c6..e3120987 100644\n--- a/drivers/i2c/busses/i2c-designware-common.c\n+++ b/drivers/i2c/busses/i2c-designware-common.c\n@@ -230,7 +230,11 @@ int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev)\n \twhile (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY) {\n \t\tif (timeout <= 0) {\n \t\t\tdev_warn(dev->dev, \"timeout waiting for bus ready\\n\");\n-\t\t\treturn -ETIMEDOUT;\n+\t\t\ti2c_recover_bus(&dev->adapter);\n+\n+\t\t\tif (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY)\n+\t\t\t\treturn -ETIMEDOUT;\n+\t\t\treturn 0;\n \t\t}\n \t\ttimeout--;\n \t\tusleep_range(1000, 1100);\n@@ -254,9 +258,10 @@ int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev)\n \tfor_each_set_bit(i, &abort_source, ARRAY_SIZE(abort_sources))\n \t\tdev_err(dev->dev, \"%s: %s\\n\", __func__, abort_sources[i]);\n \n-\tif (abort_source & DW_IC_TX_ARB_LOST)\n+\tif (abort_source & DW_IC_TX_ARB_LOST) {\n+\t\ti2c_recover_bus(&dev->adapter);\n \t\treturn -EAGAIN;\n-\telse if (abort_source & DW_IC_TX_ABRT_GCALL_READ)\n+\t} else if (abort_source & DW_IC_TX_ABRT_GCALL_READ)\n \t\treturn -EINVAL; /* wrong msgs[] data */\n \telse\n \t\treturn -EIO;\ndiff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h\nindex fef44b5..8707c76 100644\n--- a/drivers/i2c/busses/i2c-designware-core.h\n+++ b/drivers/i2c/busses/i2c-designware-core.h\n@@ -284,6 +284,7 @@ struct dw_i2c_dev {\n \tvoid\t\t\t(*disable_int)(struct dw_i2c_dev *dev);\n \tint\t\t\t(*init)(struct dw_i2c_dev *dev);\n \tint\t\t\tmode;\n+\tstruct i2c_bus_recovery_info rinfo;\n };\n \n #define ACCESS_SWAP\t\t0x00000001\ndiff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c\nindex 418c233..07e34fe 100644\n--- a/drivers/i2c/busses/i2c-designware-master.c\n+++ b/drivers/i2c/busses/i2c-designware-master.c\n@@ -25,11 +25,13 @@\n #include <linux/err.h>\n #include <linux/errno.h>\n #include <linux/export.h>\n+#include <linux/gpio/consumer.h>\n #include <linux/i2c.h>\n #include <linux/interrupt.h>\n #include <linux/io.h>\n #include <linux/module.h>\n #include <linux/pm_runtime.h>\n+#include <linux/reset.h>\n \n #include \"i2c-designware-core.h\"\n \n@@ -443,6 +445,7 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev)\n \tif (!wait_for_completion_timeout(&dev->cmd_complete, adap->timeout)) {\n \t\tdev_err(dev->dev, \"controller timed out\\n\");\n \t\t/* i2c_dw_init implicitly disables the adapter */\n+\t\ti2c_recover_bus(&dev->adapter);\n \t\ti2c_dw_init_master(dev);\n \t\tret = -ETIMEDOUT;\n \t\tgoto done;\n@@ -613,6 +616,57 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id)\n \treturn IRQ_HANDLED;\n }\n \n+static void i2c_dw_prepare_recovery(struct i2c_adapter *adap)\n+{\n+\tstruct dw_i2c_dev *dev = i2c_get_adapdata(adap);\n+\n+\ti2c_dw_disable(dev);\n+\treset_control_assert(dev->rst);\n+\ti2c_dw_prepare_clk(dev, false);\n+}\n+\n+static void i2c_dw_unprepare_recovery(struct i2c_adapter *adap)\n+{\n+\tstruct dw_i2c_dev *dev = i2c_get_adapdata(adap);\n+\n+\ti2c_dw_prepare_clk(dev, true);\n+\treset_control_deassert(dev->rst);\n+\ti2c_dw_init_master(dev);\n+}\n+\n+static int i2c_dw_init_recovery_info(struct dw_i2c_dev *dev)\n+{\n+\tstruct i2c_bus_recovery_info *rinfo = &dev->rinfo;\n+\tstruct i2c_adapter *adap = &dev->adapter;\n+\tstruct gpio_desc *gpio;\n+\tint r;\n+\n+\tgpio = devm_gpiod_get(dev->dev, \"scl\", GPIOD_OUT_HIGH);\n+\tif (IS_ERR(gpio)) {\n+\t\tr = PTR_ERR(gpio);\n+\t\tif ((r == -ENOENT) || (r == -ENOENT))\n+\t\t\treturn 0;\n+\t\treturn r;\n+\t}\n+\trinfo->scl_gpiod = gpio;\n+\n+\tgpio = devm_gpiod_get_optional(dev->dev, \"sda\", GPIOD_IN);\n+\tif (IS_ERR(gpio))\n+\t\treturn PTR_ERR(gpio);\n+\trinfo->sda_gpiod = gpio;\n+\n+\trinfo->recover_bus = i2c_generic_scl_recovery;\n+\trinfo->prepare_recovery = i2c_dw_prepare_recovery;\n+\trinfo->unprepare_recovery = i2c_dw_unprepare_recovery;\n+\tadap->bus_recovery_info = rinfo;\n+\n+\tdev_info(dev->dev,\n+\t\t\"adapter: %s running with gpio recovery mode! scl:%i sda:%i\\n\",\n+\t\tadap->name, !!rinfo->scl_gpiod, !!rinfo->sda_gpiod);\n+\n+\treturn 0;\n+}\n+\n int i2c_dw_probe(struct dw_i2c_dev *dev)\n {\n \tstruct i2c_adapter *adap = &dev->adapter;\n@@ -664,6 +718,9 @@ int i2c_dw_probe(struct dw_i2c_dev *dev)\n \t\tdev_err(dev->dev, \"failure adding adapter: %d\\n\", ret);\n \tpm_runtime_put_noidle(dev->dev);\n \n+\tif (!ret)\n+\t\tret = i2c_dw_init_recovery_info(dev);\n+\n \treturn ret;\n }\n EXPORT_SYMBOL_GPL(i2c_dw_probe);\n", "prefixes": [ "v3", "4/4" ] }