Commit 014441d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i2c-for-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:
 "A revert for the i801 driver restoring old locking behaviour"

* tag 'i2c-for-7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: i801: Revert "i2c: i801: replace acpi_lock with I2C bus lock"
parents c23719ab cfc69c2e

drivers/i2c/busses/i2c-i801.c

+10 −4
Original line number Diff line number Diff line
@@ -310,9 +310,10 @@ struct i801_priv { 


	/*

	 * If set to true the host controller registers are reserved for

	 * ACPI AML use.

	 * ACPI AML use. Needs extra protection by acpi_lock.

	 */

	bool acpi_reserved;

	struct mutex acpi_lock;

};



#define FEATURE_SMBUS_PEC	BIT(0)
@@ -894,8 +895,11 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, 
	int hwpec, ret;

	struct i801_priv *priv = i2c_get_adapdata(adap);



	if (priv->acpi_reserved)

	mutex_lock(&priv->acpi_lock);

	if (priv->acpi_reserved) {

		mutex_unlock(&priv->acpi_lock);

		return -EBUSY;

	}



	pm_runtime_get_sync(&priv->pci_dev->dev);
@@ -935,6 +939,7 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr, 
	iowrite8(SMBHSTSTS_INUSE_STS | STATUS_FLAGS, SMBHSTSTS(priv));



	pm_runtime_put_autosuspend(&priv->pci_dev->dev);

	mutex_unlock(&priv->acpi_lock);

	return ret;

}
@@ -1465,7 +1470,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, 
	 * further access from the driver itself. This device is now owned

	 * by the system firmware.

	 */

	i2c_lock_bus(&priv->adapter, I2C_LOCK_SEGMENT);

	mutex_lock(&priv->acpi_lock);



	if (!priv->acpi_reserved && i801_acpi_is_smbus_ioport(priv, address)) {

		priv->acpi_reserved = true;
@@ -1485,7 +1490,7 @@ i801_acpi_io_handler(u32 function, acpi_physical_address address, u32 bits, 
	else

		status = acpi_os_write_port(address, (u32)*value, bits);



	i2c_unlock_bus(&priv->adapter, I2C_LOCK_SEGMENT);

	mutex_unlock(&priv->acpi_lock);



	return status;

}
@@ -1545,6 +1550,7 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	priv->adapter.dev.parent = &dev->dev;

	acpi_use_parent_companion(&priv->adapter.dev);

	priv->adapter.retries = 3;

	mutex_init(&priv->acpi_lock);



	priv->pci_dev = dev;

	priv->features = id->driver_data;