From patchwork Wed Jan 27 08:44:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Ying-22455 X-Patchwork-Id: 573879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7927D1402D2 for ; Wed, 27 Jan 2016 19:53:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753474AbcA0IxJ (ORCPT ); Wed, 27 Jan 2016 03:53:09 -0500 Received: from mail-by2on0058.outbound.protection.outlook.com ([207.46.100.58]:42496 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754186AbcA0IxE (ORCPT ); Wed, 27 Jan 2016 03:53:04 -0500 Received: from DM2PR03CA0031.namprd03.prod.outlook.com (10.141.96.30) by BY1PR0301MB1254.namprd03.prod.outlook.com (10.161.203.26) with Microsoft SMTP Server (TLS) id 15.1.365.19; Wed, 27 Jan 2016 08:53:00 +0000 Received: from BN1AFFO11FD012.protection.gbl (2a01:111:f400:7c10::191) by DM2PR03CA0031.outlook.office365.com (2a01:111:e400:2428::30) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Wed, 27 Jan 2016 08:53:00 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD012.mail.protection.outlook.com (10.58.52.72) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Wed, 27 Jan 2016 08:53:00 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u0R8qstB019563; Wed, 27 Jan 2016 01:52:58 -0700 From: To: CC: , , Ying Zhang Subject: [PATCH 2/2] drivers/i2c/i2c-imx.c: improve i2c bus error recovery Date: Wed, 27 Jan 2016 16:44:43 +0800 Message-ID: <1453884283-33414-2-git-send-email-ying.zhang22455@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1453884283-33414-1-git-send-email-ying.zhang22455@nxp.com> References: <1453884283-33414-1-git-send-email-ying.zhang22455@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130983583803457152; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD012; 1:TomLz71B/fr/Qye1LNh37jqHIX3mRUOPo1FAFxlw+6QJQ/q55HnUu+XHswwzjN2ut9MMFoqf5xKtV1aENyurEkAtPUUCoW25U5/7qAqywkqHLAIOUZICDLitJ7z2L+oE+gZwzdlucjs4s44IYEe76d6hFJPleGqtbawyhPNHHNACoIL/JJAPP1GXInT29/pOJitXfSB2xxwypw0xTtbuqe9I1g+HsWjGaCYQEbuexeFl5ANZUYKYIH1oeDWzeU/F+SHs7ipicQR5hpvE+KuzRHwVWnWWpfGPGf20RrM7UKD/BJ+bMPFRmJGMFj4WFEygMISuj8mQ8UT+qic+Qaq7NagW0xbuECA8i0zs8EPGumKOr6cg1n3A1rr7KVcz3fN+y6ezvsDRRRHi0RcZYbTHzCGes56S+V9IKhxFnL83LoD0S0Mwh0ChviisJtY88XJf+vVZqQDA1v4deW9gSwHAm16UPJHBA5LYzs1qdrMLUB0= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(4326007)(86152002)(2876002)(19580405001)(2906002)(87936001)(92566002)(33646002)(86362001)(575784001)(85426001)(48376002)(50226001)(97736004)(2351001)(104016004)(36756003)(189998001)(5003940100001)(6806005)(107886002)(11100500001)(110136002)(50466002)(5001960100002)(2950100001)(106466001)(1220700001)(4001430100002)(76176999)(81156007)(47776003)(19580395003)(105606002)(50986999)(586003)(5008740100001)(1096002)(3470700001)(77096005)(229853001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0301MB1254; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 4dbe19b7-f306-44cb-dd1f-08d326f74277 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1254; 2:hyHt353Oi/tOFP+nQvZ0sUMsCdvxvjusDahvYvppw9g/DvEQ2HEISW6yL7OebU2gpxENdyhtV6KwuwCdjnOEdYw2ZlSvQ/AFB6nyRtsn4bUSsY0QZHpsm5E4LLz3XBwWDDW/zpKyGMq3S8gZYpPAcw+BvUqUo3yHm0qOgmE1u5jthEkrAPCMtIa2YuFDBMUg; 3:IJuj4FWE/6UL9UezU/7eQRmPMdkPdx39CDkesbvfiamqitS+22tWu8pW9pxQt9dtra+9lBVDZfhO4fqBjJ/L/DButKB3UyBplDTMLceNpsC5AvGJmfr+rGInMQyfaHPU6CAMMcx1ZHd0WlDldDJ85qZjFkbgnnO3QXi0uhDRpUccCr3wu14sd7OGU3/aADq4GH9D0P0e6rsBp6w7B0hGkpA0pO51YDbj2IuDLFw/DpE=; 25:T07ZBiLLZVlKhdPQHSQR0PjgCVkY1nCOOpJ8menPoRDLratPVttCMI7vWkNqvVwJrjtIMgJf8I/1Obzosef9QbUOoRhOxnwJS/y/pJX00ld3pFX1d4bb7bkDCPpV+WrwshFui2D/9jl0tRJioJgZPv2ny2LmHf7QjJGJyJQg53SmjQo9pw5F0+HTXaLIzMV5pm+kivF5nzV+L7EJs2V4y1obSfGkWozASK9EiZxBqEb8mulpmq8iWeu4pN1MsiKt X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0301MB1254; UriScan:(101931422205132); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(13015025)(13017025)(8121501046)(5005006)(13018025)(13023025)(10201501046)(3002001); SRVR:BY1PR0301MB1254; BCL:0; PCL:0; RULEID:(400006); SRVR:BY1PR0301MB1254; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1254; 4:SdaH6F3XP3ok1IE5EllqLUfUUdL4YdkfydJADcfcU1bvVj19srdbsvu0lDSG3vvB2H9rtaTB/t6NQ66wwdqGVklsXZn0FCBiCTlrbve5iaqw3+qHYrL9HeA5u+7xnzan8z9KdHuhVq9N/5Ljcs+4+Wasw53yHaxBPy1382J51q0G+dE/8PaNzzbacgC/cynNrPIRNiHi/C9/G6dGMHVJvs8+WpjuyKBgP5pbUAgPq7dWnKHv59iXWdtvZJEKgW0sUx9BKrfSSssTEoWZqG0jPYV9du7ZAlnHVxKP3pJyBPQaTIpq/a2+2ayWGruX3DpknPx+pzdwnOLIS6fRJIn7YM5MNVDaNmw0uNQMNUTySUSEx/GpKlBFxROZfPKTYQhBSlEoRpQDHUQgiTPCH1Qt7gUGUXJWi2n7Vw6e9vNZfGRdfWMFPWIHozkAqvDYRXdzCcwuimTUkr3D9oyh8nMhzCsa5MyCWBSq5BzJ5wwnu1trz+hfDOyNkQriPT8WbEbZ X-Forefront-PRVS: 0834BAF534 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1254; 23:Sshab+TTC1cRisFBgheHWjT3FFMAQUflOGy/A/x?= =?us-ascii?Q?DEONN8scfw9cJO+dmVIDyWuT/9rYgCzqJivgSUKlZ7Ivdz9JVZ2Rb7Cvdhja?= =?us-ascii?Q?+iaWfMnzIHQQUKB5o6x8vqhzrBKKGQroe6FXsc6AOjIJE9S7yS3mi/pjvXn3?= =?us-ascii?Q?96gYD/t9W5lWNOAJEqZO71s6CES1oe/eh3vpP53zv8GEXXL5Tuxq17srp5W4?= =?us-ascii?Q?kVDpXdXA7jvQcHlQTJoQTIw8PoR6EdaqS2CS0j49h1SdbChwl3p3G6Ah8BeN?= =?us-ascii?Q?uygu7c4RVmUHuPMopRlwGmZxZPu5VpENScWSxEMWf1gxBT2oe3IEe8C+N5Xz?= =?us-ascii?Q?iUq4L9OPlOl2+hzmcDgCzLM17uX08yhAcksLFk3/AmltFhcWP2Me0H0pO4wR?= =?us-ascii?Q?F4WctJvXeasjrrwoHE9+YlfPVowv3t/dacAqp/7ldjHFnR9CG75gWgfdxODA?= =?us-ascii?Q?j6HZUX0vkkFKKACcX3E/zbKGdbOvL77BPmrk2Fb2mxeC036X1anLtDV94ZVE?= =?us-ascii?Q?C337pbBsGkKWTZqNu54R5PuRX2soq0MYGjgq7xSg/SEtOXgvGWqfvbuVYuq9?= =?us-ascii?Q?IYKjuHdaaoXRQy4OZyuiXSPjHfAg2F0jmMPQsLwKnCoPAa3nmjJmXs9BaIkG?= =?us-ascii?Q?G7mQD8oO6sUbnwcyFyIL7eKZfq9kT1nIbj4MyxKcg3kST7Ufpg3LQgZa/Azq?= =?us-ascii?Q?ogTzH+5lB8QJE0PxasFMY0Q6KE7t9AmiKr5Q0x9jH27f0sI5FlqkhGTr/gxx?= =?us-ascii?Q?joYwHVYrgAA9gVie7sP0XWbeW3IfoSVJxg0EdkAj6ZI5UjUtJW/cTrGXD/jS?= =?us-ascii?Q?pp7cYSWj5kTHQRANiZPMftrbUrdvEPmRqe8umH0hawoIQNshz4FXVPNS62Ni?= =?us-ascii?Q?kr6KW3Kad0iP/9hXsCHhF1MyCy64XUKA/+A7lo3/jAoQmWlsA7W7MYcoHRn8?= =?us-ascii?Q?WHGjYzlMF7oWSBb9ReQN5H7YyMHtKS2SzqSpqQkmeaNGy6DwN4c+fE51quVb?= =?us-ascii?Q?DHt62Jhiqmsn+Z4dX7fusXCdQRR5o4D9glla/bczAWNOjih3oFxFZJRMvfyV?= =?us-ascii?Q?9C1aj5XFmJPprx8+kJunTjKvkDBdyLP1mid5Pamw1OXpAUZR7Y0AZrEFsoaW?= =?us-ascii?Q?MZFtv8ee2VgBgreMrd8rkgCVSlzkwBmPrJRChAfLJrqhKLVeXy8nhuRQokQV?= =?us-ascii?Q?tMu7AYMqI0EWfWibq9xsT4YY6rlmHY0tOj1mGyCMagGf7yWMnjF1GiJZMz+o?= =?us-ascii?Q?onALaPeLOnb++uR0FZyx+GYQglniaSBIix+1qUUEk?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1254; 5:wzXK9VdresQEPDEBfNJYSg3Fusb6dlC5jkge4Cglfg4yGHUmC2GWqYYY5xk6FFfiUBMJJ/nFVWuqsLtXLCLQJdNcqWXxzmyY0OYNvXaZd0wca33XP5v9EXhRxv62t7TS+vNT4u6RyQlp8Z0Sd+NN5/fE366JyXe+BUH20prqJv4=; 24:HN9yO1WcxjPJsrjTu3MzE+YBUVsV+DnFYuQJW+5vpuck5a66sdPcXxa1spDub0Wd7OrmzE4fGyhkyKBro+5aHbPwovjiOLW138FLKDgDTUM= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2016 08:53:00.1117 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB1254 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Ying Zhang When a system reset does not cause all I2C devices to be reset, slave can hold bus low to cause bus hang. It is necessary to force the I2C module to become the I2C bus master out of reset and drive SCL. The patch fixup the bus if a hang has been detected. Signed-off-by: Ying Zhang --- drivers/i2c/busses/i2c-imx.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index f1fe599..0e0db81 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -411,6 +411,32 @@ static void i2c_imx_dma_free(struct imx_i2c_struct *i2c_imx) dma->chan_using = NULL; } +/* + * When a system reset does not cause all I2C devices to be reset, it is + * sometimes necessary to force the I2C module to become the I2C bus master + * out of reset and drive SCL A slave can hold bus low to cause bus hang. + * Thus, SDA can be driven low by another I2C device while this I2C module + * is coming out of reset and will stay low indefinitely. + * The I2C master has to generate 9 clock pulses to get the bus free or idle. + */ +static void imx_i2c_fixup(struct imx_i2c_struct *i2c) +{ + int k; + u32 delay_val = 1000000 / i2c->real_clk + 1; + + if (delay_val < 2) + delay_val = 2; + + for (k = 9; k; k--) { + imx_i2c_write_reg(0, i2c_imx, IMX_I2C_I2CR); + imx_i2c_write_reg(I2CR_MSTA | I2CR_MTX | I2CR_IEN, + i2c_imx, IMX_I2C_I2CR); + imx_i2c_read_reg(i2c_imx, IMX_I2C_I2DR); + imx_i2c_write_reg(I2CR_IEN, i2c_imx, IMX_I2C_I2CR); + udelay(delay_val << 1); + } +} + static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) { unsigned long orig_jiffies = jiffies; @@ -433,8 +459,15 @@ static int i2c_imx_bus_busy(struct imx_i2c_struct *i2c_imx, int for_busy) if (!for_busy && !(temp & I2SR_IBB)) break; if (time_after(jiffies, orig_jiffies + msecs_to_jiffies(500))) { + u8 status = imx_i2c_read_reg(i2c_imx, IMX_I2C_I2SR); + dev_dbg(&i2c_imx->adapter.dev, "<%s> I2C bus is busy\n", __func__); + if ((status & (I2SR_ICF | I2SR_IBB | I2CR_TXAK)) != 0) { + imx_i2c_write_reg(status & ~I2SR_IAL, i2c_imx, + IMX_I2C_I2CR); + imx_i2c_fixup(); + } return -ETIMEDOUT; } schedule();