[coreboot-gerrit] Change in coreboot[master]: mediatek: Refactor PMIC wrapper code among similar SoCs
Tristan Hsieh (Code Review)
gerrit at coreboot.org
Thu Nov 1 11:54:12 CET 2018
Tristan Hsieh has uploaded this change for review. ( https://review.coreboot.org/29420
Change subject: mediatek: Refactor PMIC wrapper code among similar SoCs
......................................................................
mediatek: Refactor PMIC wrapper code among similar SoCs
Refactor PMIC wrapper code which will be reused among similar SoCs.
BUG=b:80501386
BRANCH=none
TEST=Boots correctly on Kukui
Change-Id: I25acb6da49e72748d856804ef4f97e9ec3bef72d
Signed-off-by: Tristan Shieh <tristan.shieh at mediatek.com>
---
A src/soc/mediatek/common/include/soc/pmic_wrap_common.h
A src/soc/mediatek/common/pmic_wrap.c
M src/soc/mediatek/mt8173/Makefile.inc
M src/soc/mediatek/mt8173/include/soc/pmic_wrap.h
M src/soc/mediatek/mt8173/pmic_wrap.c
5 files changed, 376 insertions(+), 337 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/29420/1
diff --git a/src/soc/mediatek/common/include/soc/pmic_wrap_common.h b/src/soc/mediatek/common/include/soc/pmic_wrap_common.h
new file mode 100644
index 0000000..f01e9b0
--- /dev/null
+++ b/src/soc/mediatek/common/include/soc/pmic_wrap_common.h
@@ -0,0 +1,204 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 MediaTek Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef SOC_MEDIATEK_PMIC_WRAP_COMMON_H
+#define SOC_MEDIATEK_PMIC_WRAP_COMMON_H
+
+#include <arch/io.h>
+#include <console/console.h>
+#include <timer.h>
+
+#define PWRAPTAG "[PWRAP] "
+#define pwrap_err(fmt, arg ...) printk(BIOS_ERR, PWRAPTAG "ERROR,line=%d" fmt, \
+ __LINE__, ## arg)
+
+/* external API */
+s32 pwrap_read(u16 adr, u16 *rdata);
+s32 pwrap_write(u16 adr, u16 wdata);
+s32 pwrap_wacs2(u32 write, u16 adr, u16 wdata, u16 *rdata, u32 init_check);
+s32 pwrap_init(void);
+
+/* internal API */
+s32 pwrap_reset_spislv(void);
+s32 pwrap_read_nochk(u16 adr, u16 *rdata);
+s32 pwrap_write_nochk(u16 adr, u16 wdata);
+
+/* dewrapper defaule value */
+enum {
+ DEFAULT_VALUE_READ_TEST = 0x5aa5,
+ WRITE_TEST_VALUE = 0xa55a
+};
+
+/* timeout setting */
+enum {
+ TIMEOUT_READ_US = 255,
+ TIMEOUT_WAIT_IDLE_US = 255
+};
+
+/* manual commnd */
+enum {
+ OP_WR = 0x1,
+ OP_CSH = 0x0,
+ OP_CSL = 0x1,
+ OP_OUTS = 0x8,
+};
+
+enum {
+ RDATA_WACS_RDATA_SHIFT = 0,
+ RDATA_WACS_FSM_SHIFT = 16,
+ RDATA_WACS_REQ_SHIFT = 19,
+ RDATA_SYNC_IDLE_SHIFT,
+ RDATA_INIT_DONE_SHIFT,
+ RDATA_SYS_IDLE_SHIFT,
+};
+
+enum {
+ RDATA_WACS_RDATA_MASK = 0xffff,
+ RDATA_WACS_FSM_MASK = 0x7,
+ RDATA_WACS_REQ_MASK = 0x1,
+ RDATA_SYNC_IDLE_MASK = 0x1,
+ RDATA_INIT_DONE_MASK = 0x1,
+ RDATA_SYS_IDLE_MASK = 0x1,
+};
+
+/* WACS_FSM */
+enum {
+ WACS_FSM_IDLE = 0x00,
+ WACS_FSM_REQ = 0x02,
+ WACS_FSM_WFDLE = 0x04, /* wait for dle, wait for read data done */
+ WACS_FSM_WFVLDCLR = 0x06, /* finish read data, wait for valid flag
+ * clearing */
+ WACS_INIT_DONE = 0x01,
+ WACS_SYNC_IDLE = 0x01,
+ WACS_SYNC_BUSY = 0x00
+};
+
+/* error information flag */
+enum {
+ E_PWR_INVALID_ARG = 1,
+ E_PWR_INVALID_RW = 2,
+ E_PWR_INVALID_ADDR = 3,
+ E_PWR_INVALID_WDAT = 4,
+ E_PWR_INVALID_OP_MANUAL = 5,
+ E_PWR_NOT_IDLE_STATE = 6,
+ E_PWR_NOT_INIT_DONE = 7,
+ E_PWR_NOT_INIT_DONE_READ = 8,
+ E_PWR_WAIT_IDLE_TIMEOUT = 9,
+ E_PWR_WAIT_IDLE_TIMEOUT_READ = 10,
+ E_PWR_INIT_SIDLY_FAIL = 11,
+ E_PWR_RESET_TIMEOUT = 12,
+ E_PWR_TIMEOUT = 13,
+ E_PWR_INIT_RESET_SPI = 20,
+ E_PWR_INIT_SIDLY = 21,
+ E_PWR_INIT_REG_CLOCK = 22,
+ E_PWR_INIT_ENABLE_PMIC = 23,
+ E_PWR_INIT_DIO = 24,
+ E_PWR_INIT_CIPHER = 25,
+ E_PWR_INIT_WRITE_TEST = 26,
+ E_PWR_INIT_ENABLE_CRC = 27,
+ E_PWR_INIT_ENABLE_DEWRAP = 28,
+ E_PWR_INIT_ENABLE_EVENT = 29,
+ E_PWR_READ_TEST_FAIL = 30,
+ E_PWR_WRITE_TEST_FAIL = 31,
+ E_PWR_SWITCH_DIO = 32
+};
+
+typedef u32 (*loop_condition_fp)(u32);
+
+static inline u32 wait_for_fsm_vldclr(u32 x)
+{
+ return ((x >> RDATA_WACS_FSM_SHIFT) & RDATA_WACS_FSM_MASK) !=
+ WACS_FSM_WFVLDCLR;
+}
+
+static inline u32 wait_for_sync(u32 x)
+{
+ return ((x >> RDATA_SYNC_IDLE_SHIFT) & RDATA_SYNC_IDLE_MASK) !=
+ WACS_SYNC_IDLE;
+}
+
+static inline u32 wait_for_idle_and_sync(u32 x)
+{
+ return ((((x >> RDATA_WACS_FSM_SHIFT) & RDATA_WACS_FSM_MASK) !=
+ WACS_FSM_IDLE) || (((x >> RDATA_SYNC_IDLE_SHIFT) &
+ RDATA_SYNC_IDLE_MASK) != WACS_SYNC_IDLE));
+}
+
+static inline u32 wait_for_cipher_ready(u32 x)
+{
+ return x != 3;
+}
+
+static inline u32 wait_for_state_idle(u32 timeout_us, void *wacs_register,
+ void *wacs_vldclr_register,
+ u32 *read_reg)
+{
+ u32 reg_rdata;
+
+ struct stopwatch sw;
+
+ stopwatch_init_usecs_expire(&sw, timeout_us);
+ do {
+ reg_rdata = read32((wacs_register));
+ /* if last read command timeout,clear vldclr bit
+ read command state machine:FSM_REQ-->wfdle-->WFVLDCLR;
+ write:FSM_REQ-->idle */
+ switch (((reg_rdata >> RDATA_WACS_FSM_SHIFT) &
+ RDATA_WACS_FSM_MASK)) {
+ case WACS_FSM_WFVLDCLR:
+ write32(wacs_vldclr_register, 1);
+ pwrap_err("WACS_FSM = PMIC_WRAP_WACS_VLDCLR\n");
+ break;
+ case WACS_FSM_WFDLE:
+ pwrap_err("WACS_FSM = WACS_FSM_WFDLE\n");
+ break;
+ case WACS_FSM_REQ:
+ pwrap_err("WACS_FSM = WACS_FSM_REQ\n");
+ break;
+ default:
+ break;
+ }
+
+ if (stopwatch_expired(&sw))
+ return E_PWR_WAIT_IDLE_TIMEOUT;
+
+ } while (((reg_rdata >> RDATA_WACS_FSM_SHIFT) & RDATA_WACS_FSM_MASK) !=
+ WACS_FSM_IDLE); /* IDLE State */
+ if (read_reg)
+ *read_reg = reg_rdata;
+ return 0;
+}
+
+static inline u32 wait_for_state_ready(loop_condition_fp fp, u32 timeout_us,
+ void *wacs_register, u32 *read_reg)
+{
+ u32 reg_rdata;
+ struct stopwatch sw;
+
+ stopwatch_init_usecs_expire(&sw, timeout_us);
+ do {
+ reg_rdata = read32((wacs_register));
+
+ if (stopwatch_expired(&sw)) {
+ pwrap_err("timeout when waiting for idle\n");
+ return E_PWR_WAIT_IDLE_TIMEOUT;
+ }
+ } while (fp(reg_rdata)); /* IDLE State */
+ if (read_reg)
+ *read_reg = reg_rdata;
+ return 0;
+}
+
+#endif /* SOC_MEDIATEK_PMIC_WRAP_COMMON_H */
diff --git a/src/soc/mediatek/common/pmic_wrap.c b/src/soc/mediatek/common/pmic_wrap.c
new file mode 100644
index 0000000..9e0832a
--- /dev/null
+++ b/src/soc/mediatek/common/pmic_wrap.c
@@ -0,0 +1,133 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 MediaTek Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <arch/io.h>
+#include <assert.h>
+#include <soc/pmic_wrap.h>
+
+s32 pwrap_reset_spislv(void)
+{
+ u32 ret = 0;
+ u32 return_value = 0;
+
+ write32(&mtk_pwrap->hiprio_arb_en, 0);
+ write32(&mtk_pwrap->wrap_en, 0);
+ write32(&mtk_pwrap->mux_sel, 1);
+ write32(&mtk_pwrap->man_en, 1);
+ write32(&mtk_pwrap->dio_en, 0);
+
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_CSL << 8));
+ /* to reset counter */
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_CSH << 8));
+ /*
+ * In order to pull CSN signal to PMIC,
+ * PMIC will count it then reset spi slave
+ */
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
+ write32(&mtk_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
+
+ return_value = wait_for_state_ready(wait_for_sync,
+ TIMEOUT_WAIT_IDLE_US,
+ &mtk_pwrap->wacs2_rdata, 0);
+ if (return_value != 0) {
+ pwrap_err("%s fail,return_value=%#x\n", __func__, return_value);
+ ret = E_PWR_TIMEOUT;
+ }
+
+ write32(&mtk_pwrap->man_en, 0);
+ write32(&mtk_pwrap->mux_sel, 0);
+
+ return ret;
+}
+
+s32 pwrap_read_nochk(u16 adr, u16 *rdata)
+{
+ return pwrap_wacs2(0, adr, 0, rdata, 0);
+}
+
+s32 pwrap_write_nochk(u16 adr, u16 wdata)
+{
+ return pwrap_wacs2(1, adr, wdata, 0, 0);
+}
+
+s32 pwrap_wacs2(u32 write, u16 adr, u16 wdata, u16 *rdata, u32 init_check)
+{
+ u32 reg_rdata = 0;
+ u32 wacs_write = 0;
+ u32 wacs_adr = 0;
+ u32 wacs_cmd = 0;
+ u32 return_value = 0;
+
+ if (init_check) {
+ reg_rdata = read32(&mtk_pwrap->wacs2_rdata);
+ /* Prevent someone to used pwrap before pwrap init */
+ if (((reg_rdata >> RDATA_INIT_DONE_SHIFT) &
+ RDATA_INIT_DONE_MASK) != WACS_INIT_DONE) {
+ pwrap_err("initialization isn't finished\n");
+ return E_PWR_NOT_INIT_DONE;
+ }
+ }
+ reg_rdata = 0;
+ /* Check IDLE in advance */
+ return_value = wait_for_state_idle(TIMEOUT_WAIT_IDLE_US,
+ &mtk_pwrap->wacs2_rdata,
+ &mtk_pwrap->wacs2_vldclr,
+ 0);
+ if (return_value != 0) {
+ pwrap_err("wait_for_fsm_idle fail,return_value=%d\n",
+ return_value);
+ return E_PWR_WAIT_IDLE_TIMEOUT;
+ }
+ wacs_write = write << 31;
+ wacs_adr = (adr >> 1) << 16;
+ wacs_cmd = wacs_write | wacs_adr | wdata;
+
+ write32(&mtk_pwrap->wacs2_cmd, wacs_cmd);
+ if (write == 0) {
+ if (rdata == NULL) {
+ pwrap_err("rdata is a NULL pointer\n");
+ return E_PWR_INVALID_ARG;
+ }
+ return_value = wait_for_state_ready(wait_for_fsm_vldclr,
+ TIMEOUT_READ_US,
+ &mtk_pwrap->wacs2_rdata,
+ ®_rdata);
+ if (return_value != 0) {
+ pwrap_err("wait_for_fsm_vldclr fail,return_value=%d\n",
+ return_value);
+ return E_PWR_WAIT_IDLE_TIMEOUT_READ;
+ }
+ *rdata = ((reg_rdata >> RDATA_WACS_RDATA_SHIFT)
+ & RDATA_WACS_RDATA_MASK);
+ write32(&mtk_pwrap->wacs2_vldclr, 1);
+ }
+
+ return 0;
+}
+
+/* external API for pmic_wrap user */
+
+s32 pwrap_read(u16 adr, u16 *rdata)
+{
+ return pwrap_wacs2(0, adr, 0, rdata, 1);
+}
+
+s32 pwrap_write(u16 adr, u16 wdata)
+{
+ return pwrap_wacs2(1, adr, wdata, 0, 1);
+}
diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc
index e125e03..b2a5ebd 100644
--- a/src/soc/mediatek/mt8173/Makefile.inc
+++ b/src/soc/mediatek/mt8173/Makefile.inc
@@ -27,7 +27,8 @@
bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c
endif
-bootblock-y += ../common/gpio.c gpio.c gpio_init.c pmic_wrap.c mt6391.c
+bootblock-y += ../common/gpio.c gpio.c gpio_init.c
+bootblock-y += ../common/pmic_wrap.c pmic_wrap.c mt6391.c
bootblock-y += ../common/wdt.c
bootblock-y += ../common/mmu_operations.c mmu_operations.c
@@ -56,7 +57,7 @@
romstage-y += ../common/cbmem.c
romstage-y += ../common/gpio.c gpio.c
romstage-y += ../common/spi.c spi.c
-romstage-y += pmic_wrap.c mt6391.c
+romstage-y += ../common/pmic_wrap.c pmic_wrap.c mt6391.c
romstage-y += memory.c
romstage-y += emi.c dramc_pi_basic_api.c dramc_pi_calibration_api.c
romstage-$(CONFIG_MEMORY_TEST) += ../common/memory_test.c
@@ -72,7 +73,7 @@
ramstage-y += ../common/timer.c
ramstage-y += timer.c
ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
-ramstage-y += pmic_wrap.c mt6391.c i2c.c
+ramstage-y += ../common/pmic_wrap.c pmic_wrap.c mt6391.c i2c.c
ramstage-y += mt6311.c
ramstage-y += da9212.c
ramstage-y += ../common/gpio.c gpio.c
diff --git a/src/soc/mediatek/mt8173/include/soc/pmic_wrap.h b/src/soc/mediatek/mt8173/include/soc/pmic_wrap.h
index 6807b13..3687a29 100644
--- a/src/soc/mediatek/mt8173/include/soc/pmic_wrap.h
+++ b/src/soc/mediatek/mt8173/include/soc/pmic_wrap.h
@@ -17,15 +17,10 @@
#define SOC_MEDIATEK_MT8173_PMIC_WRAP_H
#include <soc/addressmap.h>
+#include <soc/pmic_wrap_common.h>
#include <types.h>
-/* external API */
-s32 pwrap_read(u16 adr, u16 *rdata);
-s32 pwrap_write(u16 adr, u16 wdata);
-s32 pwrap_wacs2(u32 write, u16 adr, u16 wdata, u16 *rdata, u32 init_check);
-s32 pwrap_init(void);
-
-static struct mt8173_pwrap_regs *const mt8173_pwrap = (void *)PMIC_WRAP_BASE;
+static struct mt8173_pwrap_regs *const mtk_pwrap = (void *)PMIC_WRAP_BASE;
enum {
WACS2 = 1 << 4
@@ -44,12 +39,6 @@
PMIC_TOP_CKCON3 = PMIC_BASE + 0x01D4
};
-/* timeout setting */
-enum {
- TIMEOUT_READ_US = 255,
- TIMEOUT_WAIT_IDLE_US = 255
-};
-
/* PMIC_WRAP registers */
struct mt8173_pwrap_regs {
u32 mux_sel;
@@ -136,36 +125,6 @@
check_member(mt8173_pwrap_regs, dcm_dbc_prd, 0x148);
-enum {
- RDATA_WACS_RDATA_SHIFT = 0,
- RDATA_WACS_FSM_SHIFT = 16,
- RDATA_WACS_REQ_SHIFT = 19,
- RDATA_SYNC_IDLE_SHIFT,
- RDATA_INIT_DONE_SHIFT,
- RDATA_SYS_IDLE_SHIFT,
-};
-
-enum {
- RDATA_WACS_RDATA_MASK = 0xffff,
- RDATA_WACS_FSM_MASK = 0x7,
- RDATA_WACS_REQ_MASK = 0x1,
- RDATA_SYNC_IDLE_MASK = 0x1,
- RDATA_INIT_DONE_MASK = 0x1,
- RDATA_SYS_IDLE_MASK = 0x1,
-};
-
-/* WACS_FSM */
-enum {
- WACS_FSM_IDLE = 0x00,
- WACS_FSM_REQ = 0x02,
- WACS_FSM_WFDLE = 0x04, /* wait for dle, wait for read data done */
- WACS_FSM_WFVLDCLR = 0x06, /* finish read data, wait for valid flag
- * clearing */
- WACS_INIT_DONE = 0x01,
- WACS_SYNC_IDLE = 0x01,
- WACS_SYNC_BUSY = 0x00
-};
-
/* dewrapper regsister */
enum {
DEW_EVENT_OUT_EN = DEW_BASE + 0x0,
@@ -195,57 +154,10 @@
DEW_CIPHER_IV5 = DEW_BASE + 0x30
};
-/* dewrapper defaule value */
-enum {
- DEFAULT_VALUE_READ_TEST = 0x5aa5,
- WRITE_TEST_VALUE = 0xa55a
-};
-
enum pmic_regck {
REG_CLOCK_18MHZ,
REG_CLOCK_26MHZ,
REG_CLOCK_SAFE_MODE
};
-/* manual commnd */
-enum {
- OP_WR = 0x1,
- OP_CSH = 0x0,
- OP_CSL = 0x1,
- OP_OUTS = 0x8,
- OP_OUTD = 0x9,
- OP_INS = 0xC,
- OP_IND = 0xD
-};
-
-/* error information flag */
-enum {
- E_PWR_INVALID_ARG = 1,
- E_PWR_INVALID_RW = 2,
- E_PWR_INVALID_ADDR = 3,
- E_PWR_INVALID_WDAT = 4,
- E_PWR_INVALID_OP_MANUAL = 5,
- E_PWR_NOT_IDLE_STATE = 6,
- E_PWR_NOT_INIT_DONE = 7,
- E_PWR_NOT_INIT_DONE_READ = 8,
- E_PWR_WAIT_IDLE_TIMEOUT = 9,
- E_PWR_WAIT_IDLE_TIMEOUT_READ = 10,
- E_PWR_INIT_SIDLY_FAIL = 11,
- E_PWR_RESET_TIMEOUT = 12,
- E_PWR_TIMEOUT = 13,
- E_PWR_INIT_RESET_SPI = 20,
- E_PWR_INIT_SIDLY = 21,
- E_PWR_INIT_REG_CLOCK = 22,
- E_PWR_INIT_ENABLE_PMIC = 23,
- E_PWR_INIT_DIO = 24,
- E_PWR_INIT_CIPHER = 25,
- E_PWR_INIT_WRITE_TEST = 26,
- E_PWR_INIT_ENABLE_CRC = 27,
- E_PWR_INIT_ENABLE_DEWRAP = 28,
- E_PWR_INIT_ENABLE_EVENT = 29,
- E_PWR_READ_TEST_FAIL = 30,
- E_PWR_WRITE_TEST_FAIL = 31,
- E_PWR_SWITCH_DIO = 32
-};
-
#endif /* SOC_MEDIATEK_MT8173_PMIC_WRAP_H */
diff --git a/src/soc/mediatek/mt8173/pmic_wrap.c b/src/soc/mediatek/mt8173/pmic_wrap.c
index d7d4193..2c60e76 100644
--- a/src/soc/mediatek/mt8173/pmic_wrap.c
+++ b/src/soc/mediatek/mt8173/pmic_wrap.c
@@ -15,183 +15,10 @@
#include <arch/io.h>
#include <assert.h>
-#include <console/console.h>
#include <delay.h>
#include <soc/infracfg.h>
#include <soc/pmic_wrap.h>
-#include <timer.h>
-#define PWRAPTAG "[PWRAP] "
-#define pwrap_log(fmt, arg ...) printk(BIOS_INFO, PWRAPTAG fmt, ## arg)
-#define pwrap_err(fmt, arg ...) printk(BIOS_ERR, PWRAPTAG "ERROR,line=%d" fmt, \
- __LINE__, ## arg)
-
-/* define macro and inline function (for do while loop) */
-
-typedef u32 (*loop_condition_fp)(u32);
-
-static inline u32 wait_for_fsm_vldclr(u32 x)
-{
- return ((x >> RDATA_WACS_FSM_SHIFT) & RDATA_WACS_FSM_MASK) !=
- WACS_FSM_WFVLDCLR;
-}
-
-static inline u32 wait_for_sync(u32 x)
-{
- return ((x >> RDATA_SYNC_IDLE_SHIFT) & RDATA_SYNC_IDLE_MASK) !=
- WACS_SYNC_IDLE;
-}
-
-static inline u32 wait_for_idle_and_sync(u32 x)
-{
- return ((((x >> RDATA_WACS_FSM_SHIFT) & RDATA_WACS_FSM_MASK) !=
- WACS_FSM_IDLE) || (((x >> RDATA_SYNC_IDLE_SHIFT) &
- RDATA_SYNC_IDLE_MASK)!= WACS_SYNC_IDLE));
-}
-
-static inline u32 wait_for_cipher_ready(u32 x)
-{
- return x != 3;
-}
-
-static inline u32 wait_for_state_idle(u32 timeout_us, void *wacs_register,
- void *wacs_vldclr_register,
- u32 *read_reg)
-{
- u32 reg_rdata;
-
- struct stopwatch sw;
-
- stopwatch_init_usecs_expire(&sw, timeout_us);
- do {
- reg_rdata = read32((wacs_register));
- /* if last read command timeout,clear vldclr bit
- read command state machine:FSM_REQ-->wfdle-->WFVLDCLR;
- write:FSM_REQ-->idle */
- switch (((reg_rdata >> RDATA_WACS_FSM_SHIFT) &
- RDATA_WACS_FSM_MASK)) {
- case WACS_FSM_WFVLDCLR:
- write32(wacs_vldclr_register, 1);
- pwrap_err("WACS_FSM = PMIC_WRAP_WACS_VLDCLR\n");
- break;
- case WACS_FSM_WFDLE:
- pwrap_err("WACS_FSM = WACS_FSM_WFDLE\n");
- break;
- case WACS_FSM_REQ:
- pwrap_err("WACS_FSM = WACS_FSM_REQ\n");
- break;
- default:
- break;
- }
-
- if (stopwatch_expired(&sw))
- return E_PWR_WAIT_IDLE_TIMEOUT;
-
- } while (((reg_rdata >> RDATA_WACS_FSM_SHIFT) & RDATA_WACS_FSM_MASK) !=
- WACS_FSM_IDLE); /* IDLE State */
- if (read_reg)
- *read_reg = reg_rdata;
- return 0;
-}
-
-static inline u32 wait_for_state_ready(loop_condition_fp fp, u32 timeout_us,
- void *wacs_register, u32 *read_reg)
-{
- u32 reg_rdata;
- struct stopwatch sw;
-
- stopwatch_init_usecs_expire(&sw, timeout_us);
- do {
- reg_rdata = read32((wacs_register));
-
- if (stopwatch_expired(&sw)) {
- pwrap_err("timeout when waiting for idle\n");
- return E_PWR_WAIT_IDLE_TIMEOUT;
- }
- } while (fp(reg_rdata)); /* IDLE State */
- if (read_reg)
- *read_reg = reg_rdata;
- return 0;
-}
-
-s32 pwrap_wacs2(u32 write, u16 adr, u16 wdata, u16 *rdata, u32 init_check)
-{
- u32 reg_rdata = 0;
- u32 wacs_write = 0;
- u32 wacs_adr = 0;
- u32 wacs_cmd = 0;
- u32 return_value = 0;
-
- if (init_check) {
- reg_rdata = read32(&mt8173_pwrap->wacs2_rdata);
- /* Prevent someone to used pwrap before pwrap init */
- if (((reg_rdata >> RDATA_INIT_DONE_SHIFT) &
- RDATA_INIT_DONE_MASK) != WACS_INIT_DONE) {
- pwrap_err("initialization isn't finished\n");
- return E_PWR_NOT_INIT_DONE;
- }
- }
- reg_rdata = 0;
- /* Check IDLE in advance */
- return_value = wait_for_state_idle(TIMEOUT_WAIT_IDLE_US,
- &mt8173_pwrap->wacs2_rdata,
- &mt8173_pwrap->wacs2_vldclr,
- 0);
- if (return_value != 0) {
- pwrap_err("wait_for_fsm_idle fail,return_value=%d\n",
- return_value);
- return E_PWR_WAIT_IDLE_TIMEOUT;
- }
- wacs_write = write << 31;
- wacs_adr = (adr >> 1) << 16;
- wacs_cmd = wacs_write | wacs_adr | wdata;
-
- write32(&mt8173_pwrap->wacs2_cmd, wacs_cmd);
- if (write == 0) {
- if (NULL == rdata) {
- pwrap_err("rdata is a NULL pointer\n");
- return E_PWR_INVALID_ARG;
- }
- return_value = wait_for_state_ready(wait_for_fsm_vldclr,
- TIMEOUT_READ_US,
- &mt8173_pwrap->wacs2_rdata,
- ®_rdata);
- if (return_value != 0) {
- pwrap_err("wait_for_fsm_vldclr fail,return_value=%d\n",
- return_value);
- return E_PWR_WAIT_IDLE_TIMEOUT_READ;
- }
- *rdata = ((reg_rdata >> RDATA_WACS_RDATA_SHIFT)
- & RDATA_WACS_RDATA_MASK);
- write32(&mt8173_pwrap->wacs2_vldclr, 1);
- }
-
- return 0;
-}
-
-/* external API for pmic_wrap user */
-
-s32 pwrap_read(u16 adr, u16 *rdata)
-{
- return pwrap_wacs2(0, adr, 0, rdata, 1);
-}
-
-s32 pwrap_write(u16 adr, u16 wdata)
-{
- return pwrap_wacs2(1, adr, wdata, 0, 1);
-}
-
-static s32 pwrap_read_nochk(u16 adr, u16 *rdata)
-{
- return pwrap_wacs2(0, adr, 0, rdata, 0);
-}
-
-static s32 pwrap_write_nochk(u16 adr, u16 wdata)
-{
- return pwrap_wacs2(1, adr, wdata, 0, 0);
-}
-
-/* call it in pwrap_init,mustn't check init done */
static s32 pwrap_init_dio(u32 dio_en)
{
u16 rdata = 0;
@@ -203,13 +30,13 @@
return_value =
wait_for_state_ready(wait_for_idle_and_sync,
TIMEOUT_WAIT_IDLE_US,
- &mt8173_pwrap->wacs2_rdata,
+ &mtk_pwrap->wacs2_rdata,
0);
if (return_value != 0) {
pwrap_err("%s fail,return_value=%#x\n", __func__, return_value);
return return_value;
}
- write32(&mt8173_pwrap->dio_en, dio_en);
+ write32(&mtk_pwrap->dio_en, dio_en);
/* Read Test */
pwrap_read_nochk(DEW_READ_TEST, &rdata);
if (rdata != DEFAULT_VALUE_READ_TEST) {
@@ -235,7 +62,7 @@
u32 sidly = 0;
for (i = 0; i < 4; i++) {
- write32(&mt8173_pwrap->sidly, i);
+ write32(&mtk_pwrap->sidly, i);
pwrap_wacs2(0, DEW_READ_TEST, 0, &rdata, 0);
if (rdata == DEFAULT_VALUE_READ_TEST)
pass |= 1 << i;
@@ -285,49 +112,11 @@
die("sidly pass range not continuous\n");
}
- write32(&mt8173_pwrap->sidly, sidly);
+ write32(&mtk_pwrap->sidly, sidly);
return 0;
}
-static s32 pwrap_reset_spislv(void)
-{
- u32 ret = 0;
- u32 return_value = 0;
-
- write32(&mt8173_pwrap->hiprio_arb_en, 0);
- write32(&mt8173_pwrap->wrap_en, 0);
- write32(&mt8173_pwrap->mux_sel, 1);
- write32(&mt8173_pwrap->man_en, 1);
- write32(&mt8173_pwrap->dio_en, 0);
-
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_CSL << 8));
- /* to reset counter */
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_CSH << 8));
- /*
- * In order to pull CSN signal to PMIC,
- * PMIC will count it then reset spi slave
- */
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
- write32(&mt8173_pwrap->man_cmd, (OP_WR << 13) | (OP_OUTS << 8));
-
- return_value = wait_for_state_ready(wait_for_sync,
- TIMEOUT_WAIT_IDLE_US,
- &mt8173_pwrap->wacs2_rdata, 0);
- if (return_value != 0) {
- pwrap_err("%s fail,return_value=%#x\n", __func__, return_value);
- ret = E_PWR_TIMEOUT;
- }
-
- write32(&mt8173_pwrap->man_en, 0);
- write32(&mt8173_pwrap->mux_sel, 0);
-
- return ret;
-}
-
static s32 pwrap_init_reg_clock(enum pmic_regck regck_sel)
{
u16 wdata = 0;
@@ -350,25 +139,25 @@
/* Config SPI Waveform according to reg clk */
switch (regck_sel) {
case REG_CLOCK_18MHZ:
- write32(&mt8173_pwrap->rddmy, 0xc);
- write32(&mt8173_pwrap->cshext_write, 0x0);
- write32(&mt8173_pwrap->cshext_read, 0x4);
- write32(&mt8173_pwrap->cslext_start, 0x0);
- write32(&mt8173_pwrap->cslext_end, 0x4);
+ write32(&mtk_pwrap->rddmy, 0xc);
+ write32(&mtk_pwrap->cshext_write, 0x0);
+ write32(&mtk_pwrap->cshext_read, 0x4);
+ write32(&mtk_pwrap->cslext_start, 0x0);
+ write32(&mtk_pwrap->cslext_end, 0x4);
break;
case REG_CLOCK_26MHZ:
- write32(&mt8173_pwrap->rddmy, 0xc);
- write32(&mt8173_pwrap->cshext_write, 0x0);
- write32(&mt8173_pwrap->cshext_read, 0x4);
- write32(&mt8173_pwrap->cslext_start, 0x2);
- write32(&mt8173_pwrap->cslext_end, 0x2);
+ write32(&mtk_pwrap->rddmy, 0xc);
+ write32(&mtk_pwrap->cshext_write, 0x0);
+ write32(&mtk_pwrap->cshext_read, 0x4);
+ write32(&mtk_pwrap->cslext_start, 0x2);
+ write32(&mtk_pwrap->cslext_end, 0x2);
break;
default:
- write32(&mt8173_pwrap->rddmy, 0xf);
- write32(&mt8173_pwrap->cshext_write, 0xf);
- write32(&mt8173_pwrap->cshext_read, 0xf);
- write32(&mt8173_pwrap->cslext_start, 0xf);
- write32(&mt8173_pwrap->cslext_end, 0xf);
+ write32(&mtk_pwrap->rddmy, 0xf);
+ write32(&mtk_pwrap->cshext_write, 0xf);
+ write32(&mtk_pwrap->cshext_read, 0xf);
+ write32(&mtk_pwrap->cslext_start, 0xf);
+ write32(&mtk_pwrap->cslext_end, 0xf);
break;
}
@@ -388,8 +177,8 @@
clrbits_le32(&mt8173_infracfg->infra_rst0, INFRA_PMIC_WRAP_RST);
/* Enable DCM */
- write32(&mt8173_pwrap->dcm_en, 3);
- write32(&mt8173_pwrap->dcm_dbc_prd, 0);
+ write32(&mtk_pwrap->dcm_en, 3);
+ write32(&mtk_pwrap->dcm_dbc_prd, 0);
/* Reset SPISLV */
sub_return = pwrap_reset_spislv();
@@ -399,9 +188,9 @@
return E_PWR_INIT_RESET_SPI;
}
/* Enable WACS2 */
- write32(&mt8173_pwrap->wrap_en, 1);
- write32(&mt8173_pwrap->hiprio_arb_en, WACS2);
- write32(&mt8173_pwrap->wacs2_en, 1);
+ write32(&mtk_pwrap->wrap_en, 1);
+ write32(&mtk_pwrap->hiprio_arb_en, WACS2);
+ write32(&mtk_pwrap->wacs2_en, 1);
/* SIDLY setting */
sub_return = pwrap_init_sidly();
@@ -461,14 +250,14 @@
pwrap_err("enable CRC fail,sub_return=%#x\n", sub_return);
return E_PWR_INIT_ENABLE_CRC;
}
- write32(&mt8173_pwrap->crc_en, 0x1);
- write32(&mt8173_pwrap->sig_mode, 0x0);
- write32(&mt8173_pwrap->sig_adr, DEW_CRC_VAL);
+ write32(&mtk_pwrap->crc_en, 0x1);
+ write32(&mtk_pwrap->sig_mode, 0x0);
+ write32(&mtk_pwrap->sig_adr, DEW_CRC_VAL);
/* PMIC_WRAP enables */
- write32(&mt8173_pwrap->hiprio_arb_en, 0x1ff);
- write32(&mt8173_pwrap->wacs0_en, 0x1);
- write32(&mt8173_pwrap->wacs1_en, 0x1);
+ write32(&mtk_pwrap->hiprio_arb_en, 0x1ff);
+ write32(&mtk_pwrap->wacs0_en, 0x1);
+ write32(&mtk_pwrap->wacs1_en, 0x1);
/*
* switch event pin from usbdl mode to normal mode for pmic interrupt,
@@ -481,9 +270,9 @@
sub_return);
/* Initialization Done */
- write32(&mt8173_pwrap->init_done2, 0x1);
- write32(&mt8173_pwrap->init_done0, 0x1);
- write32(&mt8173_pwrap->init_done1, 0x1);
+ write32(&mtk_pwrap->init_done2, 0x1);
+ write32(&mtk_pwrap->init_done0, 0x1);
+ write32(&mtk_pwrap->init_done1, 0x1);
return 0;
}
--
To view, visit https://review.coreboot.org/29420
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25acb6da49e72748d856804ef4f97e9ec3bef72d
Gerrit-Change-Number: 29420
Gerrit-PatchSet: 1
Gerrit-Owner: Tristan Hsieh <tristan.shieh at mediatek.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181101/305c3451/attachment-0001.html>
More information about the coreboot-gerrit
mailing list