GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/smbus: Reuse I2C bus operations where applicable 

Reuse generic I2C functions that work for SMBus operations as well.

Change-Id: I5a93f17b905de38752254891aa4347ba4ed3b205
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/20855
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Nico Huber 2017-08-02 16:57:17 +02:00 committed by Martin Roth
parent 0594c5973c
commit 632d6abb8a
2 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/device/smbus_ops.c
View File

@ -15,35 +15,19 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <console/console.h>
#include <stdint.h> #include <stdint.h>
#include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/path.h>
#include <device/smbus.h> #include <device/smbus.h>
struct bus *get_pbus_smbus(device_t dev) struct bus *get_pbus_smbus(device_t dev)
{ {
struct bus *pbus = dev->bus; struct bus *const pbus = i2c_link(dev);
if (!pbus->dev->ops->ops_smbus_bus) {
while (pbus && pbus->dev && !ops_smbus_bus(pbus)) {
if (pbus->dev->bus != pbus) {
pbus = pbus->dev->bus;
}
else {
printk(BIOS_WARNING,
"%s Find SMBus bus operations: unable to proceed\n",
dev_path(dev));
break;
}
}
if (!pbus || !pbus->dev || !pbus->dev->ops
|| !pbus->dev->ops->ops_smbus_bus) {
printk(BIOS_ALERT, "%s Cannot find SMBus bus operations", printk(BIOS_ALERT, "%s Cannot find SMBus bus operations",
dev_path(dev)); dev_path(dev));
die(""); die("");
} }
return pbus; return pbus;
} }
@ -91,35 +75,6 @@ int smbus_set_link(device_t dev)
return -1; \ return -1; \
} }
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_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer) int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer)
{ {
CHECK_PRESENCE(block_read); CHECK_PRESENCE(block_read);

26
src/include/device/smbus.h
View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <device/device.h> #include <device/device.h>
#include <device/path.h> #include <device/i2c_bus.h>
#include <device/smbus_def.h> #include <device/smbus_def.h>
/* Common SMBus bus operations */ /* Common SMBus bus operations */
@ -30,10 +30,26 @@ static inline const struct smbus_bus_operations *ops_smbus_bus(struct bus *bus)
struct bus *get_pbus_smbus(device_t dev); struct bus *get_pbus_smbus(device_t dev);
int smbus_set_link(device_t dev); int smbus_set_link(device_t dev);
int smbus_recv_byte(device_t dev); static inline int smbus_recv_byte(struct device *const dev)
int smbus_send_byte(device_t dev, u8 byte); {
int smbus_read_byte(device_t dev, u8 addr); return i2c_readb(dev);
int smbus_write_byte(device_t dev, u8 addr, u8 val); }
static inline int smbus_send_byte(struct device *const dev, u8 byte)
{
return i2c_writeb(dev, byte);
}
static inline int smbus_read_byte(struct device *const dev, u8 addr)
{
return i2c_readb_at(dev, addr);
}
static inline int smbus_write_byte(struct device *const dev, u8 addr, u8 val)
{
return i2c_writeb_at(dev, addr, val);
}
int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer); int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer);
int smbus_block_write(device_t dev, u8 cmd, u8 bytes, const u8 *buffer); int smbus_block_write(device_t dev, u8 cmd, u8 bytes, const u8 *buffer);