Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3b8df97 authored by Jean Delvare's avatar Jean Delvare Committed by Wolfram Sang
Browse files

i2c: i801: Use wait_event_timeout to wait for interrupts 



Some systems have been reported to have trouble with interrupts. Use
wait_event_timeout() instead of wait_event() so we don't get stuck in
that case, and log the problem.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 0285f8f5

drivers/i2c/busses/i2c-i801.c

+22 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
    Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,

    Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker

    <mdsxyz123@yahoo.com>

    Copyright (C) 2007 - 2012  Jean Delvare <jdelvare@suse.de>

    Copyright (C) 2007 - 2014  Jean Delvare <jdelvare@suse.de>

    Copyright (C) 2010         Intel Corporation,

                               David Woodhouse <dwmw2@infradead.org>
@@ -371,6 +371,7 @@ static int i801_transaction(struct i801_priv *priv, int xact) 
{

	int status;

	int result;

	const struct i2c_adapter *adap = &priv->adapter;



	result = i801_check_pre(priv);

	if (result < 0)
@@ -379,7 +380,14 @@ static int i801_transaction(struct i801_priv *priv, int xact) 
	if (priv->features & FEATURE_IRQ) {

		outb_p(xact | SMBHSTCNT_INTREN | SMBHSTCNT_START,

		       SMBHSTCNT(priv));

		wait_event(priv->waitq, (status = priv->status));

		result = wait_event_timeout(priv->waitq,

					    (status = priv->status),

					    adap->timeout);

		if (!result) {

			status = -ETIMEDOUT;

			dev_warn(&priv->pci_dev->dev,

				 "Timeout waiting for interrupt!\n");

		}

		priv->status = 0;

		return i801_check_post(priv, status);

	}
@@ -527,6 +535,7 @@ static int i801_block_transaction_byte_by_byte(struct i801_priv *priv, 
	int smbcmd;

	int status;

	int result;

	const struct i2c_adapter *adap = &priv->adapter;



	result = i801_check_pre(priv);

	if (result < 0)
@@ -555,7 +564,14 @@ static int i801_block_transaction_byte_by_byte(struct i801_priv *priv, 
		priv->data = &data->block[1];



		outb_p(priv->cmd | SMBHSTCNT_START, SMBHSTCNT(priv));

		wait_event(priv->waitq, (status = priv->status));

		result = wait_event_timeout(priv->waitq,

					    (status = priv->status),

					    adap->timeout);

		if (!result) {

			status = -ETIMEDOUT;

			dev_warn(&priv->pci_dev->dev,

				 "Timeout waiting for interrupt!\n");

		}

		priv->status = 0;

		return i801_check_post(priv, status);

	}
@@ -1212,6 +1228,9 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
		outb_p(inb_p(SMBAUXCTL(priv)) &

		       ~(SMBAUXCTL_CRC | SMBAUXCTL_E32B), SMBAUXCTL(priv));



	/* Default timeout in interrupt mode: 200 ms */

	priv->adapter.timeout = HZ / 5;



	if (priv->features & FEATURE_IRQ) {

		init_waitqueue_head(&priv->waitq);