Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38120 )
Change subject: soc/intel/common: Sync early SMBUS prototypes ......................................................................
soc/intel/common: Sync early SMBUS prototypes
Change-Id: I6b4b5ffd552b9eb4467689c8df85905a1c199bb0 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/common/block/smbus/smbus.c M src/soc/intel/common/block/smbus/smbuslib.c M src/soc/intel/common/block/smbus/smbuslib.h 3 files changed, 15 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/38120/1
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index 6be2a5e..f22bacd 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -30,7 +30,7 @@ device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4); - return smbus_read8(res->base, device, address); + return do_smbus_read_byte(res->base, device, address); }
static int lsmbus_write_byte(struct device *dev, u8 address, u8 data) @@ -42,7 +42,7 @@ device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4); - return smbus_write8(res->base, device, address, data); + return do_smbus_write_byte(res->base, device, address, data); }
static struct smbus_bus_operations lops_smbus_bus = { diff --git a/src/soc/intel/common/block/smbus/smbuslib.c b/src/soc/intel/common/block/smbus/smbuslib.c index a8c2dad..e2df730 100644 --- a/src/soc/intel/common/block/smbus/smbuslib.c +++ b/src/soc/intel/common/block/smbus/smbuslib.c @@ -47,8 +47,7 @@ return -1; }
-int smbus_read8(unsigned int smbus_base, unsigned int device, - unsigned int address) +int do_smbus_read_byte(unsigned int smbus_base, u8 device, unsigned int address) { unsigned char global_status_register; unsigned char byte; @@ -93,8 +92,8 @@ return byte; }
-int smbus_write8(unsigned int smbus_base, unsigned int device, - unsigned int address, unsigned int data) +int do_smbus_write_byte(unsigned int smbus_base, u8 device, unsigned int address, + unsigned int data) { unsigned char global_status_register;
@@ -137,8 +136,7 @@ return 0; }
-int smbus_read16(unsigned int smbus_base, unsigned int device, - unsigned int address) +int do_smbus_read_word(unsigned int smbus_base, u8 device, unsigned int address) { unsigned char global_status_register; unsigned short data; @@ -180,15 +178,15 @@
u16 smbus_read_word(u8 addr, u8 offset) { - return smbus_read16(SMBUS_IO_BASE, addr, offset); + return do_smbus_read_word(SMBUS_IO_BASE, addr, offset); }
u8 smbus_read_byte(u8 addr, u8 offset) { - return smbus_read8(SMBUS_IO_BASE, addr, offset); + return do_smbus_read_byte(SMBUS_IO_BASE, addr, offset); }
u8 smbus_write_byte(u8 addr, u8 offset, u8 value) { - return smbus_write8(SMBUS_IO_BASE, addr, offset, value); + return do_smbus_write_byte(SMBUS_IO_BASE, addr, offset, value); } diff --git a/src/soc/intel/common/block/smbus/smbuslib.h b/src/soc/intel/common/block/smbus/smbuslib.h index 05dafe9..45902a0 100644 --- a/src/soc/intel/common/block/smbus/smbuslib.h +++ b/src/soc/intel/common/block/smbus/smbuslib.h @@ -16,6 +16,8 @@ #ifndef SOC_INTEL_COMMON_BLOCK_SMBUS__LIB_H #define SOC_INTEL_COMMON_BLOCK_SMBUS__LIB_H
+#include <stdint.h> + /* SMBus IO Base Address */ #define SMBUS_IO_BASE 0xefa0 /* PCI Configuration Space : SMBus */ @@ -30,11 +32,9 @@
#define SMBUS_TIMEOUT 15 /* 15ms */
-int smbus_read8(unsigned int smbus_base, unsigned int device, - unsigned int address); -int smbus_write8(unsigned int smbus_base, unsigned int device, - unsigned int address, unsigned int data); -int smbus_read16(unsigned int smbus_base, unsigned int device, - unsigned int address); +int do_smbus_read_byte(unsigned int smbus_base, u8 device, unsigned int address); +int do_smbus_write_byte(unsigned int smbus_base, u8 device, unsigned int address, + unsigned int data); +int do_smbus_read_word(unsigned int smbus_base, u8 device, unsigned int address);
#endif /* SOC_INTEL_COMMON_BLOCK_SMBUS__LIB_H */
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38120 )
Change subject: soc/intel/common: Sync early SMBUS prototypes ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38120 )
Change subject: soc/intel/common: Sync early SMBUS prototypes ......................................................................
Patch Set 3: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/38120/3/src/soc/intel/common/block/... File src/soc/intel/common/block/smbus/smbuslib.h:
https://review.coreboot.org/c/coreboot/+/38120/3/src/soc/intel/common/block/... PS3, Line 37: unsigned int data); ouch, so close...
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38120 )
Change subject: soc/intel/common: Sync early SMBUS prototypes ......................................................................
soc/intel/common: Sync early SMBUS prototypes
Change-Id: I6b4b5ffd552b9eb4467689c8df85905a1c199bb0 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38120 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Patrick Rudolph siro@das-labor.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/common/block/smbus/smbus.c M src/soc/intel/common/block/smbus/smbuslib.c M src/soc/intel/common/block/smbus/smbuslib.h 3 files changed, 15 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/common/block/smbus/smbus.c b/src/soc/intel/common/block/smbus/smbus.c index 6be2a5e..f22bacd 100644 --- a/src/soc/intel/common/block/smbus/smbus.c +++ b/src/soc/intel/common/block/smbus/smbus.c @@ -30,7 +30,7 @@ device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4); - return smbus_read8(res->base, device, address); + return do_smbus_read_byte(res->base, device, address); }
static int lsmbus_write_byte(struct device *dev, u8 address, u8 data) @@ -42,7 +42,7 @@ device = dev->path.i2c.device; pbus = get_pbus_smbus(dev); res = find_resource(pbus->dev, PCI_BASE_ADDRESS_4); - return smbus_write8(res->base, device, address, data); + return do_smbus_write_byte(res->base, device, address, data); }
static struct smbus_bus_operations lops_smbus_bus = { diff --git a/src/soc/intel/common/block/smbus/smbuslib.c b/src/soc/intel/common/block/smbus/smbuslib.c index a8c2dad..e2df730 100644 --- a/src/soc/intel/common/block/smbus/smbuslib.c +++ b/src/soc/intel/common/block/smbus/smbuslib.c @@ -47,8 +47,7 @@ return -1; }
-int smbus_read8(unsigned int smbus_base, unsigned int device, - unsigned int address) +int do_smbus_read_byte(unsigned int smbus_base, u8 device, unsigned int address) { unsigned char global_status_register; unsigned char byte; @@ -93,8 +92,8 @@ return byte; }
-int smbus_write8(unsigned int smbus_base, unsigned int device, - unsigned int address, unsigned int data) +int do_smbus_write_byte(unsigned int smbus_base, u8 device, unsigned int address, + unsigned int data) { unsigned char global_status_register;
@@ -137,8 +136,7 @@ return 0; }
-int smbus_read16(unsigned int smbus_base, unsigned int device, - unsigned int address) +int do_smbus_read_word(unsigned int smbus_base, u8 device, unsigned int address) { unsigned char global_status_register; unsigned short data; @@ -180,15 +178,15 @@
u16 smbus_read_word(u8 addr, u8 offset) { - return smbus_read16(SMBUS_IO_BASE, addr, offset); + return do_smbus_read_word(SMBUS_IO_BASE, addr, offset); }
u8 smbus_read_byte(u8 addr, u8 offset) { - return smbus_read8(SMBUS_IO_BASE, addr, offset); + return do_smbus_read_byte(SMBUS_IO_BASE, addr, offset); }
u8 smbus_write_byte(u8 addr, u8 offset, u8 value) { - return smbus_write8(SMBUS_IO_BASE, addr, offset, value); + return do_smbus_write_byte(SMBUS_IO_BASE, addr, offset, value); } diff --git a/src/soc/intel/common/block/smbus/smbuslib.h b/src/soc/intel/common/block/smbus/smbuslib.h index 05dafe9..45902a0 100644 --- a/src/soc/intel/common/block/smbus/smbuslib.h +++ b/src/soc/intel/common/block/smbus/smbuslib.h @@ -16,6 +16,8 @@ #ifndef SOC_INTEL_COMMON_BLOCK_SMBUS__LIB_H #define SOC_INTEL_COMMON_BLOCK_SMBUS__LIB_H
+#include <stdint.h> + /* SMBus IO Base Address */ #define SMBUS_IO_BASE 0xefa0 /* PCI Configuration Space : SMBus */ @@ -30,11 +32,9 @@
#define SMBUS_TIMEOUT 15 /* 15ms */
-int smbus_read8(unsigned int smbus_base, unsigned int device, - unsigned int address); -int smbus_write8(unsigned int smbus_base, unsigned int device, - unsigned int address, unsigned int data); -int smbus_read16(unsigned int smbus_base, unsigned int device, - unsigned int address); +int do_smbus_read_byte(unsigned int smbus_base, u8 device, unsigned int address); +int do_smbus_write_byte(unsigned int smbus_base, u8 device, unsigned int address, + unsigned int data); +int do_smbus_read_word(unsigned int smbus_base, u8 device, unsigned int address);
#endif /* SOC_INTEL_COMMON_BLOCK_SMBUS__LIB_H */
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Patrick Rudolph (Code Review)