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

Commit 3e52d063 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fix from Wolfram Sang:
 "Here is the revert for the regression of the i2c-octeon driver I
  mentioned last time. I wished for a bit more feedback, but all people
  working actively on it are in need of this patch, so here it goes"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  Revert "i2c: octeon: thunderx: Limit register access retries"
parents 8ab2ae65 dfa2ccc3

drivers/i2c/busses/i2c-octeon-core.c

+1 −3
Original line number Diff line number Diff line
@@ -381,9 +381,7 @@ static int octeon_i2c_read(struct octeon_i2c *i2c, int target, 
		if (result)

			return result;



		data[i] = octeon_i2c_data_read(i2c, &result);

		if (result)

			return result;

		data[i] = octeon_i2c_data_read(i2c);

		if (recv_len && i == 0) {

			if (data[i] > I2C_SMBUS_BLOCK_MAX + 1)

				return -EPROTO;

drivers/i2c/busses/i2c-octeon-core.h

+11 −16
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/i2c.h>

#include <linux/i2c-smbus.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/kernel.h>

#include <linux/pci.h>
@@ -145,9 +144,9 @@ static inline void octeon_i2c_reg_write(struct octeon_i2c *i2c, u64 eop_reg, u8 
	u64 tmp;



	__raw_writeq(SW_TWSI_V | eop_reg | data, i2c->twsi_base + SW_TWSI(i2c));



	readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp, tmp & SW_TWSI_V,

			   I2C_OCTEON_EVENT_WAIT, i2c->adap.timeout);

	do {

		tmp = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));

	} while ((tmp & SW_TWSI_V) != 0);

}



#define octeon_i2c_ctl_write(i2c, val)					\
@@ -164,28 +163,24 @@ static inline void octeon_i2c_reg_write(struct octeon_i2c *i2c, u64 eop_reg, u8 
 *

 * The I2C core registers are accessed indirectly via the SW_TWSI CSR.

 */

static inline int octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg,

				      int *error)

static inline u8 octeon_i2c_reg_read(struct octeon_i2c *i2c, u64 eop_reg)

{

	u64 tmp;

	int ret;



	__raw_writeq(SW_TWSI_V | eop_reg | SW_TWSI_R, i2c->twsi_base + SW_TWSI(i2c));

	do {

		tmp = __raw_readq(i2c->twsi_base + SW_TWSI(i2c));

	} while ((tmp & SW_TWSI_V) != 0);



	ret = readq_poll_timeout(i2c->twsi_base + SW_TWSI(i2c), tmp,

				 tmp & SW_TWSI_V, I2C_OCTEON_EVENT_WAIT,

				 i2c->adap.timeout);

	if (error)

		*error = ret;

	return tmp & 0xFF;

}



#define octeon_i2c_ctl_read(i2c)					\

	octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_CTL, NULL)

#define octeon_i2c_data_read(i2c, error)				\

	octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_DATA, error)

	octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_CTL)

#define octeon_i2c_data_read(i2c)					\

	octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_DATA)

#define octeon_i2c_stat_read(i2c)					\

	octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_STAT, NULL)

	octeon_i2c_reg_read(i2c, SW_TWSI_EOP_TWSI_STAT)



/**

 * octeon_i2c_read_int - read the TWSI_INT register