[coreboot-gerrit] Patch set updated for coreboot: be96510 smbus: Add guards to avoid calling NULL.
Vladimir Serbinenko (phcoder@gmail.com)
gerrit at coreboot.org
Sat Feb 1 18:32:34 CET 2014
Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4837
-gerrit
commit be9651002c3473df0f3950b24636743beb5e48f1
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date: Mon Jan 27 23:46:46 2014 +0100
smbus: Add guards to avoid calling NULL.
Many of SMBus functions are unavailable on many controllers.
While calling unavailable function is bad, it shouldn't lead
to spectacular crash.
Change-Id: I7912f3bbbb438603893223a586dcedf57e8a7e28
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
src/device/smbus_ops.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/src/device/smbus_ops.c b/src/device/smbus_ops.c
index bcef4cd..41b31ed 100644
--- a/src/device/smbus_ops.c
+++ b/src/device/smbus_ops.c
@@ -79,59 +79,89 @@ int smbus_set_link(device_t dev)
return pbus_num;
}
+#define CHECK_PRESENCE(x) \
+ if (!ops_smbus_bus(get_pbus_smbus(dev))->x) { \
+ printk(BIOS_ERR, "%s missing " #x "\n", \
+ dev_path(dev)); \
+ return -1; \
+ }
+
+
int smbus_quick_read(device_t dev)
{
+ CHECK_PRESENCE(quick_read);
+
return ops_smbus_bus(get_pbus_smbus(dev))->quick_read(dev);
}
int smbus_quick_write(device_t dev)
{
+ CHECK_PRESENCE(quick_write);
+
return ops_smbus_bus(get_pbus_smbus(dev))->quick_write(dev);
}
int smbus_recv_byte(device_t dev)
{
+ CHECK_PRESENCE(recv_byte);
+
return ops_smbus_bus(get_pbus_smbus(dev))->recv_byte(dev);
}
int smbus_send_byte(device_t dev, u8 byte)
{
+ CHECK_PRESENCE(send_byte);
+
return ops_smbus_bus(get_pbus_smbus(dev))->send_byte(dev, byte);
}
int smbus_read_byte(device_t dev, u8 addr)
{
+ CHECK_PRESENCE(read_byte);
+
return ops_smbus_bus(get_pbus_smbus(dev))->read_byte(dev, addr);
}
int smbus_write_byte(device_t dev, u8 addr, u8 val)
{
+ CHECK_PRESENCE(write_byte);
+
return ops_smbus_bus(get_pbus_smbus(dev))->write_byte(dev, addr, val);
}
int smbus_read_word(device_t dev, u8 addr)
{
+ CHECK_PRESENCE(read_word);
+
return ops_smbus_bus(get_pbus_smbus(dev))->read_word(dev, addr);
}
int smbus_write_word(device_t dev, u8 addr, u16 val)
{
+ CHECK_PRESENCE(write_word);
+
return ops_smbus_bus(get_pbus_smbus(dev))->write_word(dev, addr, val);
}
int smbus_process_call(device_t dev, u8 cmd, u16 data)
{
+ CHECK_PRESENCE(process_call);
+
return ops_smbus_bus(get_pbus_smbus(dev))->process_call(dev, cmd, data);
}
int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer)
{
+ CHECK_PRESENCE(block_read);
+
return ops_smbus_bus(get_pbus_smbus(dev))->block_read(dev, cmd,
bytes, buffer);
}
int smbus_block_write(device_t dev, u8 cmd, u8 bytes, const u8 *buffer)
{
+ CHECK_PRESENCE(block_write);
+
return ops_smbus_bus(get_pbus_smbus(dev))->block_write(dev, cmd,
bytes, buffer);
}
More information about the coreboot-gerrit
mailing list