leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: npcm: Correct register access width

Browse Source 
The SMBnCTL3 register is 8-bit wide and the 32-bit access was always
incorrect, but simply didn't cause a visible error on the 32-bit machine.

On the 64-bit machine, the kernel message reports that ESR value is
0x96000021. Checking Arm Architecture Reference Manual Armv8 suggests that
it's the alignment fault.

SMBnCTL3's address is 0xE.

Fixes: 56a1485b10 ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
Signed-off-by: Tyrone Ting <kfting@nuvoton.com>
Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
This commit is contained in:
Tyrone Ting 2022-05-17 18:11:38 +08:00 committed by Wolfram Sang
parent 0bf58eb12f
commit ea9f8426d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/i2c/busses/i2c-npcm7xx.c
View File

@ -360,14 +360,14 @@ static int npcm_i2c_get_SCL(struct i2c_adapter *_adap)
{ {
struct npcm_i2c *bus = container_of(_adap, struct npcm_i2c, adap); struct npcm_i2c *bus = container_of(_adap, struct npcm_i2c, adap);
return !!(I2CCTL3_SCL_LVL & ioread32(bus->reg + NPCM_I2CCTL3)); return !!(I2CCTL3_SCL_LVL & ioread8(bus->reg + NPCM_I2CCTL3));
} }
static int npcm_i2c_get_SDA(struct i2c_adapter *_adap) static int npcm_i2c_get_SDA(struct i2c_adapter *_adap)
{ {
struct npcm_i2c *bus = container_of(_adap, struct npcm_i2c, adap); struct npcm_i2c *bus = container_of(_adap, struct npcm_i2c, adap);
return !!(I2CCTL3_SDA_LVL & ioread32(bus->reg + NPCM_I2CCTL3)); return !!(I2CCTL3_SDA_LVL & ioread8(bus->reg + NPCM_I2CCTL3));
} }
static inline u16 npcm_i2c_get_index(struct npcm_i2c *bus) static inline u16 npcm_i2c_get_index(struct npcm_i2c *bus)