Merge remote-tracking branch 'partner/android13-gs-pixel-5.10-tm-qpr2'

Change-Id: Id99e2215c468608a6368b229805a3e34506c77d4

5 files changed, 87 insertions, 10 deletions

diff --git a/kernel/drivers/net/ieee802154/dw3000.h b/kernel/drivers/net/ieee802154/dw3000.h
index e21ef8e..4495a2d 100644
--- a/kernel/drivers/net/ieee802154/dw3000.h
+++ b/kernel/drivers/net/ieee802154/dw3000.h
@@ -714,7 +714,8 @@ struct dw3000 {
 	/* Buffer for queued transfers */
 	char *msg_queue_buf;
 	char *msg_queue_buf_pos;
-
+	/* dw3000 thread clamp value  */
+	int min_clamp_value;
 	/* Insert new fields before this line */
 
 	/* Shared message protected by a mutex */
diff --git a/kernel/drivers/net/ieee802154/dw3000_core.c b/kernel/drivers/net/ieee802154/dw3000_core.c
index 4b384b9..0419221 100644
--- a/kernel/drivers/net/ieee802154/dw3000_core.c
+++ b/kernel/drivers/net/ieee802154/dw3000_core.c
@@ -187,8 +187,8 @@ const struct dw3000_chip_version dw3000_chip_versions[] = {
 #define DW3000_TXRXSWITCH_TX 0x01011100
 #define DW3000_TXRXSWITCH_AUTO 0x1C000000
 
-#define DW3000_RF_TXCTRL_CH5 0x1C071134UL
-#define DW3000_RF_TXCTRL_CH9 0x1C010034UL
+#define DW3000_RF_TXCTRL_CH5 0x1C081134UL
+#define DW3000_RF_TXCTRL_CH9 0x1C020034UL
 #define DW3000_RF_TXCTRL_LO_B2 0x0E
 #define DW3000_RF_PLL_CFG_CH5 0x1F3C
 #define DW3000_RF_PLL_CFG_CH9 0x0F3C
@@ -297,6 +297,12 @@ enum ciadiag_dbl_options {
 /* Disable CIA diagnostic. CIACONFIG's bit-4 in RX_ANTENNA_DELAY + 1 */
 #define DW3000_CIA_CONFIG_DIAG_OFF (0x1 << 4)
 
+/* LDO VOUT value */
+#define DW3000_RF_LDO_VOUT 0x0D7FFFFFUL
+
+/* PLL common value  */
+#define DW3000_RF_PLL_COMMON 0xE104
+
 struct dw3000_ciadiag_reg_info {
 	u32 diag1;
 	u32 diag12;
@@ -1796,6 +1802,12 @@ static int dw3000_power_supply(struct dw3000 *dw, int onoff)
 			onoff ? "enable" : "disable", rc);
 		return rc;
 	}
+	/* Set 2p5 reg to 2.7V  */
+	rc = regulator_set_voltage(power->regulator_2p5, 2700000, 2700000);
+	if (rc < 0) {
+		dev_err(dw->dev, "regulator failed to set voltage :%d\n", rc);
+		return rc;
+	}
 
 	rc = dw3000_power_supply_one(power->regulator_vdd, onoff);
 	if (rc < 0) {
@@ -1823,6 +1835,7 @@ static int dw3000_power_supply(struct dw3000 *dw, int onoff)
 static int dw3000_reset_assert(struct dw3000 *dw, bool reset)
 {
 	int rc;
+	int value;
 
 	if (!gpio_is_valid(dw->reset_gpio)) {
 		dev_err(dw->dev, "invalid reset gpio\n");
@@ -1838,10 +1851,22 @@ static int dw3000_reset_assert(struct dw3000 *dw, bool reset)
 	} else {
 		/* Release RESET GPIO.
 		 * Reset should be open drain, or switched to input whenever not driven
-		 * low. It should not be driven high. */
+		 * low. It should not be driven high during chip cold boot process.  */
 		rc = gpio_direction_input(dw->reset_gpio);
-		if (rc)
+		if (rc) {
 			dev_err(dw->dev, "Could not set reset gpio as input\n");
+			return rc;
+		}
+		/* check if dw3000 finishes cold boot */
+		value = gpio_get_value(dw->reset_gpio);
+		if (!value) {
+			return -EPROBE_DEFER;
+		}
+
+		/* set pin to output and drive high */
+		rc = gpio_direction_output(dw->reset_gpio, 1);
+		if (rc)
+			dev_err(dw->dev, "Could not set reset gpio as output\n");
 	}
 	return rc;
 }
@@ -4253,6 +4278,11 @@ static inline int dw3000_configure_rf(struct dw3000 *dw)
 	rc = dw3000_reg_write16(dw, DW3000_PLL_CFG_ID, 0, rf_pll_cfg);
 	if (rc)
 		return rc;
+
+	rc = dw3000_reg_write16(dw, DW3000_PLL_COMMON_ID, 0, DW3000_RF_PLL_COMMON);
+	if (rc)
+		return rc;
+
 	rc = dw3000_reg_write8(dw, DW3000_LDO_RLOAD_ID, 1,
 			       DW3000_LDO_RLOAD_VAL_B1);
 	if (rc)
@@ -4390,6 +4420,8 @@ int dw3000_configure_chan(struct dw3000 *dw)
 	rc = dw3000_configure_rf(dw);
 	if (rc)
 		return rc;
+	/* Disable AGC */
+	dw3000_reg_modify32(dw, DW3000_AGC_CFG_ID, 0, DW3000_AGC_DIS_MASK, 0);
 	/* Configure DGC. */
 	return dw3000_configure_dgc(dw);
 }
@@ -5213,6 +5245,8 @@ static int dw3000_configure(struct dw3000 *dw)
 
 	/* Update configuration dependent timings */
 	dw3000_update_timings(dw);
+	/* update VOUT */
+	rc = dw3000_reg_write32(dw, DW3000_LDO_VOUT_ID, 0, DW3000_RF_LDO_VOUT);
 	return rc;
 }
 
@@ -7453,6 +7487,9 @@ static inline int dw3000_isr_handle_spi_ready(struct dw3000 *dw,
 
 	/* TODO: So, just add below this line more required unsaved registers
 	 * setup. */
+	 rc = dw3000_reg_write32(dw, DW3000_LDO_VOUT_ID, 0, DW3000_RF_LDO_VOUT);
+	 if (rc)
+		 return rc;
 
 setuperror:
 #ifdef CONFIG_DW3000_DEBUG
diff --git a/kernel/drivers/net/ieee802154/dw3000_core.h b/kernel/drivers/net/ieee802154/dw3000_core.h
index e3c28a8..bf936b9 100644
--- a/kernel/drivers/net/ieee802154/dw3000_core.h
+++ b/kernel/drivers/net/ieee802154/dw3000_core.h
@@ -199,7 +199,7 @@ enum spi_modes {
 /* Size of RX LUT configuration tables */
 #define DW3000_CONFIGMRXLUT_MAX 7
 #define DW3000_DGC_CFG 0x38
-#define DW3000_DGC_CFG0 0x10000240
+#define DW3000_DGC_CFG0 0x00000240
 #define DW3000_DGC_CFG1 0x1a491248
 #define DW3000_DGC_CFG2 0x2db248db
 
diff --git a/kernel/drivers/net/ieee802154/dw3000_core_reg.h b/kernel/drivers/net/ieee802154/dw3000_core_reg.h
index 7b77584..8847bf8 100644
--- a/kernel/drivers/net/ieee802154/dw3000_core_reg.h
+++ b/kernel/drivers/net/ieee802154/dw3000_core_reg.h
@@ -649,6 +649,7 @@
 #define DW3000_AGC_CFG_ID 0x30014
 #define DW3000_AGC_CFG_LEN (4U)
 #define DW3000_AGC_CFG_MASK 0xFFFFFFFFUL
+#define DW3000_AGC_DIS_MASK 0xFFFFFFFEUL
 
 /* Register DGC_CFG. */
 #define DW3000_DGC_CFG_ID 0x30018
@@ -1368,6 +1369,9 @@
 #define DW3000_LDO_CTRL_LDO_VDDMS1_EN_BIT_LEN (1U)
 #define DW3000_LDO_CTRL_LDO_VDDMS1_EN_BIT_MASK 0x1U
 
+/* register LDO_VOUT*/
+#define DW3000_LDO_VOUT_ID  0x7004C
+
 /* register LDO_RLOAD */
 #define DW3000_LDO_RLOAD_ID 0x70050
 
@@ -1402,6 +1406,11 @@
 /* register PLL_CFG */
 #define DW3000_PLL_CFG_ID 0x90000
 
+/* register PLL_COMMON  */
+#define DW3000_PLL_COMMON_ID 0x90010
+#define DW3000_PLL_COMMON_LEN (2U)
+#define DW3000_PLL_COMMON_MASK 0x0000FFFFUL
+
 /* register XTAL */
 #define DW3000_XTAL_ID 0x90014
 #define DW3000_XTAL_TRIM_BIT_OFFSET (0U)
diff --git a/kernel/drivers/net/ieee802154/dw3000_stm.c b/kernel/drivers/net/ieee802154/dw3000_stm.c
index 5eee5cf..5b85643 100644
--- a/kernel/drivers/net/ieee802154/dw3000_stm.c
+++ b/kernel/drivers/net/ieee802154/dw3000_stm.c
@@ -21,21 +21,50 @@
  * Qorvo. Please contact Qorvo to inquire about licensing terms.
  */
 #include <linux/version.h>
+#include <linux/module.h>
 #include <linux/workqueue.h>
 #include <linux/sched.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 
 #include "dw3000.h"
 #include "dw3000_core.h"
 
-#define DW3000_MIN_CLAMP_VALUE	170
+#define DW3000_MIN_CLAMP_VALUE 460
 
 /* First version with sched_setattr_nocheck: v4.16-rc1~164^2~5 */
 #if (KERNEL_VERSION(4, 11, 0) <= LINUX_VERSION_CODE)
 #include <uapi/linux/sched/types.h>
 #endif
 
-static inline int dw3000_set_sched_attr(struct task_struct *p)
+static int dw3000_min_clamp_value = 0;
+
+module_param_named(min_clamp_value, dw3000_min_clamp_value, int, 0644);
+MODULE_PARM_DESC(min_clamp_value, "Sets the minimum cpu frequency the dw3000 thread must run at");
+
+
+static void dw3000_get_clamp_from_dt(struct dw3000 *dw) {
+	int dt_clamp = DW3000_MIN_CLAMP_VALUE;
+	int ret;
+
+	if (!dw->dev->of_node)
+		return;
+	/* debug value is priority  */
+	if (dw3000_min_clamp_value) {
+		dw->min_clamp_value = dw3000_min_clamp_value;
+		dev_info(dw->dev, "using debug min clamp=%d\n", dw->min_clamp_value);
+		return;
+	}
+
+	ret = of_property_read_u32(dw->dev->of_node, "min_clamp", &dt_clamp);
+	if (ret) {
+		dev_err(dw->dev, "error reading dt_clamp ret=%d\n", ret);
+	}
+	dw->min_clamp_value = dt_clamp;
+	dev_info(dw->dev, "dt_clamp=%d\n", dw->min_clamp_value);
+}
+
+static inline int dw3000_set_sched_attr(struct dw3000 *dw, struct task_struct *p)
 {
 #if (KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE)
 	struct sched_param sched_par = { .sched_priority = MAX_RT_PRIO - 2 };
@@ -45,7 +74,7 @@ static inline int dw3000_set_sched_attr(struct task_struct *p)
 	struct sched_attr attr = { .sched_policy = SCHED_FIFO,
 				   .sched_priority = MAX_RT_PRIO - 2,
 				   .sched_flags = SCHED_FLAG_UTIL_CLAMP_MIN,
-				   .sched_util_min = DW3000_MIN_CLAMP_VALUE };
+				   .sched_util_min = dw->min_clamp_value };
 	return sched_setattr_nocheck(p, &attr);
 #endif
 }
@@ -312,7 +341,8 @@ int dw3000_state_init(struct dw3000 *dw, int cpu)
 	dw->dw3000_pid = stm->mthread->pid;
 
 	/* Increase thread priority */
-	rc = dw3000_set_sched_attr(stm->mthread);
+	dw3000_get_clamp_from_dt(dw);
+	rc = dw3000_set_sched_attr(dw, stm->mthread);
 	if (rc)
 		dev_err(dw->dev, "dw3000_set_sched_attr failed: %d\n", rc);
 	return 0;