src/superio/ite/common: Prepare for ITE IT8786E SuperIO

Introduce 7bit Slope PWM registers. New ITE SuperIO may have contiguous
7bit values for PWM slope.

Add option to enable External Sensor SMBus Host.

Update/add registers macros for IT8786E-F which are not backwards
compatible.

Change-Id: I68fbfe62dfa05d0c166abaefbdc2ab873114b236
Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/30553
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>

4 files changed, 46 insertions, 2 deletions

diff --git a/src/superio/ite/common/Kconfig b/src/superio/ite/common/Kconfig
index 6c78741723..55f765004c 100644
--- a/src/superio/ite/common/Kconfig
+++ b/src/superio/ite/common/Kconfig
@@ -51,4 +51,11 @@ config SUPERIO_ITE_ENV_CTRL_5FANS
 	bool
 	help
 	  ITE FAN controller has 5 independent outputs.
+
+config SUPERIO_ITE_ENV_CTRL_7BIT_SLOPE_REG
+	bool
+	help
+	  Slope PWM registers have no separate BIT6 and are set directly by
+	  7-bit values instead.
+
 endif
diff --git a/src/superio/ite/common/env_ctrl.c b/src/superio/ite/common/env_ctrl.c
index 57896e0c01..1b93036845 100644
--- a/src/superio/ite/common/env_ctrl.c
+++ b/src/superio/ite/common/env_ctrl.c
@@ -4,6 +4,7 @@
  * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
  * Copyright (C) 2016 secunet Security Networks AG
  * Copyright (C) 2019 Protectli
+ * Copyright (C) 2019 Libretrend LDA
  *
  * 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
@@ -165,9 +166,14 @@ static void fan_smartconfig(const u16 base, const u8 fan,
 		pwm_ctrl |= ITE_EC_FAN_CTL_TEMPIN(conf->tmpin);
 
 		pwm_start = ITE_EC_FAN_CTL_PWM_START_DUTY(conf->pwm_start);
-		pwm_start |= ITE_EC_FAN_CTL_PWM_SLOPE_BIT6(conf->slope);
 
-		pwm_auto = ITE_EC_FAN_CTL_PWM_SLOPE_LOWER(conf->slope);
+		if (CONFIG(SUPERIO_ITE_ENV_CTRL_7BIT_SLOPE_REG)) {
+			pwm_auto = conf->slope & 0x7f;
+		} else {
+			pwm_start |= ITE_EC_FAN_CTL_PWM_SLOPE_BIT6(conf->slope);
+			pwm_auto = ITE_EC_FAN_CTL_PWM_SLOPE_LOWER(conf->slope);
+		}
+
 		if (conf->smoothing)
 			pwm_auto |= ITE_EC_FAN_CTL_AUTO_SMOOTHING_EN;
 
@@ -287,6 +293,13 @@ void ite_ec_init(const u16 base, const struct ite_ec_config *const conf)
 	for (i = 0; i < ITE_EC_TMPIN_CNT; ++i)
 		enable_tmpin(base, i + 1, &conf->tmpin[i]);
 
+	/* Enable External Sensor SMBus Host if configured */
+	if (conf->smbus_en) {
+		ite_ec_write(base, ITE_EC_INTERFACE_SELECT,
+				ite_ec_read(base, ITE_EC_INTERFACE_SELECT) |
+				ITE_EC_INTERFACE_SMB_ENABLE);
+	}
+
 	/* Enable reading of voltage pins */
 	ite_ec_write(base, ITE_EC_ADC_VOLTAGE_CHANNEL_ENABLE, conf->vin_mask);
 
diff --git a/src/superio/ite/common/env_ctrl.h b/src/superio/ite/common/env_ctrl.h
index e29e33f54a..20e44ad5f1 100644
--- a/src/superio/ite/common/env_ctrl.h
+++ b/src/superio/ite/common/env_ctrl.h
@@ -4,6 +4,7 @@
  * Copyright (C) 2011 The ChromiumOS Authors.  All rights reserved.
  * Copyright (C) 2016 secunet Security Networks AG
  * Copyright (C) 2019 Protectli
+ * Copyright (C) 2019 Libretrend LDA
  *
  * 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
@@ -50,6 +51,14 @@
 #define   ITE_EC_FAN_PWM_SMOOTHING_256HZ	(1 << 6)
 #define   ITE_EC_FAN_PWM_SMOOTHING_64HZ		(2 << 6)
 #define   ITE_EC_FAN_PWM_SMOOTHING_16HZ		(3 << 6)
+/* ITE IT8786E PWM_SMOOTHING_FREQ */
+#define   ITE_EC_FAN_ALT_PWM_SMOOTHING_16HZ	(1 << 6)
+#define   ITE_EC_FAN_ALT_PWM_SMOOTHING_8HZ	(2 << 6)
+#define   ITE_EC_FAN_ALT_PWM_SMOOTHING_4HZ	(3 << 6)
+#define   ITE_EC_FAN_CTL5_SEL(FAN_CTLx)		((((FAN_CTLx)-1) & 3) << 2)
+#define   ITE_EC_FAN_CTL5_SEL_NONE		(3 << 2)
+#define   ITE_EC_FAN_CTL4_SEL(FAN_CTLx)		(((FAN_CTLx)-1) & 3)
+#define   ITE_EC_FAN_CTL4_SEL_NONE		(3 << 0)
 
 #define ITE_EC_FAN_TAC_COUNTER_ENABLE		0x0c
 #define   ITE_EC_FAN_TAC_16BIT_ENABLE(x)	(1 << ((x)-1))
@@ -68,6 +77,14 @@
 						: (0x1b + ((x)-1))	\
 	)
 
+#define ITE_EC_FAN_TAC_CNTRL			0x0c
+#define   ITE_EC_TMPIN3_ENHANCED_INT_MODE	(1 << 7)
+#define   ITE_EC_TMPIN2_ENHANCED_INT_MODE	(1 << 6)
+#define   ITE_EC_FAN_TAC5_EN			(1 << 5)
+#define   ITE_EC_FAN_TAC4_EN			(1 << 4)
+#define   ITE_EC_TMPIN1_ENHANCED_INT_MODE	(1 << 3)
+#define   ITE_EC_AMDTSI_ERR_EN			(1 << 0)
+
 #define ITE_EC_FAN_MAIN_CTL			0x13
 #define   ITE_EC_FAN_MAIN_CTL_TAC_EN(x)		(1 << ((x)+3))
 #define   ITE_EC_FAN_MAIN_CTL_COLL_FULL_SPEED	(1 << 3)
@@ -185,6 +202,8 @@ static const u8 ITE_EC_TEMP_ADJUST[] = { 0x56, 0x57, 0x59 };
 
 /* Common for ITE_EC_FAN_CTL_DELTA_TEMP */
 #define   ITE_EC_FAN_CTL_DELTA_TEMP_INTRVL(c)	((c) & 0x1f)
+#define ITE_EC_FAN_CTL_TARGET_ZONE(x)		(0x66 + ((x)-1) * 8)
+#define   ITE_EC_FAN_CTL_TARGET_ZONE_MASK	0x0f
 
 #define ITE_EC_EXTEMP_STATUS			0x88
 #define   ITE_EC_EXTEMP_STATUS_HOST_BUSY	(1 << 0)
diff --git a/src/superio/ite/common/env_ctrl_chip.h b/src/superio/ite/common/env_ctrl_chip.h
index 923bfa3aea..f5116e6465 100644
--- a/src/superio/ite/common/env_ctrl_chip.h
+++ b/src/superio/ite/common/env_ctrl_chip.h
@@ -101,6 +101,11 @@ struct ite_ec_config {
 	bool tmpin_beep;
 	bool fan_beep;
 	bool vin_beep;
+
+	/*
+	 * Enable SMBus for external thermal sensor.
+	 */
+	bool smbus_en;
 };
 
 /* Some shorthands for device trees */