Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38049 )
Change subject: soc/intel/common: Split some SMBUS support file ......................................................................
soc/intel/common: Split some SMBUS support file
It is expected that smbuslib.c will be removed, leave the parts we want to keep in smbus_early.c.
Change-Id: I21355fe95385d07c9f254fc80c90264a9539bb00 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/common/block/smbus/smbus_early.c M src/soc/intel/common/block/smbus/smbuslib.c 2 files changed, 16 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/38049/1
diff --git a/src/soc/intel/common/block/smbus/smbus_early.c b/src/soc/intel/common/block/smbus/smbus_early.c index 76de352..9202b5a 100644 --- a/src/soc/intel/common/block/smbus/smbus_early.c +++ b/src/soc/intel/common/block/smbus/smbus_early.c @@ -14,11 +14,9 @@ */
#include <device/pci_def.h> -#include <device/early_smbus.h> #include <intelblocks/smbus.h> #include <reg_script.h> #include <soc/pci_devs.h> -#include "smbuslib.h"
static const struct reg_script smbus_init_script[] = { /* Set SMBus I/O base address */ @@ -35,21 +33,6 @@ REG_SCRIPT_END, };
-u16 smbus_read_word(u32 smbus_dev, u8 addr, u8 offset) -{ - return smbus_read16(SMBUS_IO_BASE, addr, offset); -} - -u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset) -{ - return smbus_read8(SMBUS_IO_BASE, addr, offset); -} - -u8 smbus_write_byte(u32 smbus_dev, u8 addr, u8 offset, u8 value) -{ - return smbus_write8(SMBUS_IO_BASE, addr, offset, value); -} - void smbus_common_init(void) { reg_script_run_on_dev(PCH_DEV_SMBUS, smbus_init_script); diff --git a/src/soc/intel/common/block/smbus/smbuslib.c b/src/soc/intel/common/block/smbus/smbuslib.c index 0d3901f..e2a0ed9 100644 --- a/src/soc/intel/common/block/smbus/smbuslib.c +++ b/src/soc/intel/common/block/smbus/smbuslib.c @@ -14,6 +14,7 @@ */
#include <arch/io.h> +#include <device/early_smbus.h> #include <device/smbus_def.h> #include <timer.h> #include "smbuslib.h" @@ -176,3 +177,18 @@
return data; } + +u16 smbus_read_word(u32 smbus_dev, u8 addr, u8 offset) +{ + return smbus_read16(SMBUS_IO_BASE, addr, offset); +} + +u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset) +{ + return smbus_read8(SMBUS_IO_BASE, addr, offset); +} + +u8 smbus_write_byte(u32 smbus_dev, u8 addr, u8 offset, u8 value) +{ + return smbus_write8(SMBUS_IO_BASE, addr, offset, value); +}
Hello Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/38049
to look at the new patch set (#2).
Change subject: soc/intel/common: Split some SMBUS support file ......................................................................
soc/intel/common: Split some SMBUS support file
It is expected that smbuslib.c will be removed, leave the parts we want to keep in smbus_early.c.
Change-Id: I21355fe95385d07c9f254fc80c90264a9539bb00 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/common/block/smbus/smbus_early.c M src/soc/intel/common/block/smbus/smbuslib.c 2 files changed, 16 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/38049/2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38049 )
Change subject: soc/intel/common: Split some SMBUS support file ......................................................................
Patch Set 2: Code-Review+2
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38049 )
Change subject: soc/intel/common: Split some SMBUS support file ......................................................................
soc/intel/common: Split some SMBUS support file
It is expected that smbuslib.c will be removed, leave the parts we want to keep in smbus_early.c.
Change-Id: I21355fe95385d07c9f254fc80c90264a9539bb00 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38049 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/soc/intel/common/block/smbus/smbus_early.c M src/soc/intel/common/block/smbus/smbuslib.c 2 files changed, 16 insertions(+), 16 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/common/block/smbus/smbus_early.c b/src/soc/intel/common/block/smbus/smbus_early.c index 76de352..9ecd7e0 100644 --- a/src/soc/intel/common/block/smbus/smbus_early.c +++ b/src/soc/intel/common/block/smbus/smbus_early.c @@ -14,7 +14,6 @@ */
#include <device/pci_def.h> -#include <device/early_smbus.h> #include <intelblocks/smbus.h> #include <reg_script.h> #include <soc/pci_devs.h> @@ -35,21 +34,6 @@ REG_SCRIPT_END, };
-u16 smbus_read_word(u32 smbus_dev, u8 addr, u8 offset) -{ - return smbus_read16(SMBUS_IO_BASE, addr, offset); -} - -u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset) -{ - return smbus_read8(SMBUS_IO_BASE, addr, offset); -} - -u8 smbus_write_byte(u32 smbus_dev, u8 addr, u8 offset, u8 value) -{ - return smbus_write8(SMBUS_IO_BASE, addr, offset, value); -} - void smbus_common_init(void) { reg_script_run_on_dev(PCH_DEV_SMBUS, smbus_init_script); diff --git a/src/soc/intel/common/block/smbus/smbuslib.c b/src/soc/intel/common/block/smbus/smbuslib.c index 0d3901f..e2a0ed9 100644 --- a/src/soc/intel/common/block/smbus/smbuslib.c +++ b/src/soc/intel/common/block/smbus/smbuslib.c @@ -14,6 +14,7 @@ */
#include <arch/io.h> +#include <device/early_smbus.h> #include <device/smbus_def.h> #include <timer.h> #include "smbuslib.h" @@ -176,3 +177,18 @@
return data; } + +u16 smbus_read_word(u32 smbus_dev, u8 addr, u8 offset) +{ + return smbus_read16(SMBUS_IO_BASE, addr, offset); +} + +u8 smbus_read_byte(u32 smbus_dev, u8 addr, u8 offset) +{ + return smbus_read8(SMBUS_IO_BASE, addr, offset); +} + +u8 smbus_write_byte(u32 smbus_dev, u8 addr, u8 offset, u8 value) +{ + return smbus_write8(SMBUS_IO_BASE, addr, offset, value); +}
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)