i2c: npcm: Correct register access width
authorTyrone Ting <kfting@nuvoton.com>
Tue, 17 May 2022 10:11:38 +0000 (18:11 +0800)
committerWolfram Sang <wsa@kernel.org>
Sat, 21 May 2022 05:52:56 +0000 (07:52 +0200)
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: 56a1485b102e ("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>
drivers/i2c/busses/i2c-npcm7xx.c

index 36f8aa7ab10609695b91bc587ffb4a058a66a5ce..58d7175f0362835e276fa1843664b5ba8b4488c4 100644 (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);
 
-       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)
 {
        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)