leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: mxc: add a condition in case the parameter is NULL

Browse Source 
This could avoid executing the code that only applies to i.MX platforms.

The bus_i2c_init() is called before relocation and will assgin value
to a static variable. If U-Boot is then still running in a flash
device, it's theoretically not allowed to write data to flash without
an erasing operation. For i.MX platforms, the U-Boot is always running
in DDR.

Actually it causes asynchronous error when the ARM64 system error
report is enabled and the flash write protect is set.

Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Gong Qianyu 2015-12-18 17:38:01 +08:00 committed by Stefano Babic
parent 40f4839ce1
commit aee3fddb67
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/i2c/mxc_i2c.c
View File

@ -581,8 +581,16 @@ void bus_i2c_init(int index, int speed, int unused,
return; return;
} }
mxc_i2c_buses[index].idle_bus_fn = idle_bus_fn; /*
mxc_i2c_buses[index].idle_bus_data = idle_bus_data; * Warning: Be careful to allow the assignment to a static
* variable here. This function could be called while U-Boot is
* still running in flash memory. So such assignment is equal
* to write data to flash without erasing.
*/
if (idle_bus_fn)
mxc_i2c_buses[index].idle_bus_fn = idle_bus_fn;
if (idle_bus_data)
mxc_i2c_buses[index].idle_bus_data = idle_bus_data;
ret = enable_i2c_clk(1, index); ret = enable_i2c_clk(1, index);
if (ret < 0) { if (ret < 0) {