summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/amd/common/block/include/amdblocks/acpimmio.h4
-rw-r--r--src/soc/amd/common/block/smbus/smbus_early_fch.c14
2 files changed, 14 insertions, 4 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h
index 3887f73cf7..865ad48a9b 100644
--- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h
+++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h
@@ -15,12 +15,12 @@
* newer SoCs, but not for the generations with separate FCH or Kabini.
*/
#define PM_DECODE_EN 0x00
+#define SMBUS_ASF_IO_BASE_SHIFT 8
+#define SMBUS_ASF_IO_BASE_MASK (0xff << SMBUS_ASF_IO_BASE_SHIFT)
#define SMBUS_ASF_IO_EN (1 << 4)
#define CF9_IO_EN (1 << 1)
#define LEGACY_IO_EN (1 << 0)
-#define SMB_ASF_IO_BASE 0x01 /* part of PM_DECODE_EN */
-
/*
* Earlier devices enable the ACPIMMIO bank decodes in PMx24. All discrete FCHs
* and the Kabini SoC fall into this category. Kabini's successor, Mullins, uses
diff --git a/src/soc/amd/common/block/smbus/smbus_early_fch.c b/src/soc/amd/common/block/smbus/smbus_early_fch.c
index 3d04778b24..2b204253d4 100644
--- a/src/soc/amd/common/block/smbus/smbus_early_fch.c
+++ b/src/soc/amd/common/block/smbus/smbus_early_fch.c
@@ -3,14 +3,24 @@
#include <stdint.h>
#include <amdblocks/acpimmio.h>
#include <amdblocks/smbus.h>
-#include <soc/southbridge.h>
+#include <soc/iomap.h>
+
+static void fch_smbus_enable_decode(uint16_t base)
+{
+ uint32_t val = pm_read32(PM_DECODE_EN);
+ /* Configure upper byte of the I/O address; lower byte is always 0 */
+ val = (val & ~SMBUS_ASF_IO_BASE_MASK) | (base & SMBUS_ASF_IO_BASE_MASK);
+ /* Set enable decode bit even though it should already be set */
+ val |= SMBUS_ASF_IO_EN;
+ pm_write32(PM_DECODE_EN, val);
+}
void fch_smbus_init(void)
{
/* 400 kHz smbus speed. */
const uint8_t smbus_speed = (66000000 / (400000 * 4));
- pm_write8(SMB_ASF_IO_BASE, SMB_BASE_ADDR >> 8);
+ fch_smbus_enable_decode(SMB_BASE_ADDR);
smbus_write8(SMBTIMING, smbus_speed);
/* Clear all SMBUS status bits */
smbus_write8(SMBHSTSTAT, SMBHST_STAT_CLEAR);